ref: da4ade7ef4cd28e8788cbb917c0b5cc3deb8cd0e
parent: 73db02d3cdaf81a214ec6faa5462195618a80a48
parent: 3165b9e0d32e1055540d922b43c432dcfde23632
author: yenatch <[email protected]>
date: Mon Dec 25 14:02:10 EST 2017
Merge pull request #431 from surskitty/master A few more label changes
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -16,113 +16,113 @@
.MapCallbacks:
db 0
-TrainerKimono_girlNaoko2:
- trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, 0, .Script
+TrainerKimonoGirlNaoko2:
+ trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script
.Script:
end_if_just_battled
opentext
- writetext Kimono_girlNaoko2AfterBattleText
+ writetext KimonoGirlNaoko2AfterBattleText
waitbutton
closetext
end
-TrainerKimono_girlSayo:
- trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, 0, .Script
+TrainerKimonoGirlSayo:
+ trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, KimonoGirlSayoSeenText, KimonoGirlSayoBeatenText, 0, .Script
.Script:
end_if_just_battled
opentext
- writetext Kimono_girlSayoAfterBattleText
+ writetext KimonoGirlSayoAfterBattleText
waitbutton
closetext
end
-TrainerKimono_girlZuki:
- trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, 0, .Script
+TrainerKimonoGirlZuki:
+ trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, KimonoGirlZukiSeenText, KimonoGirlZukiBeatenText, 0, .Script
.Script:
end_if_just_battled
opentext
- writetext Kimono_girlZukiAfterBattleText
+ writetext KimonoGirlZukiAfterBattleText
waitbutton
closetext
end
-TrainerKimono_girlKuni:
- trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, 0, .Script
+TrainerKimonoGirlKuni:
+ trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, KimonoGirlKuniSeenText, KimonoGirlKuniBeatenText, 0, .Script
.Script:
end_if_just_battled
opentext
- writetext Kimono_girlKuniAfterBattleText
+ writetext KimonoGirlKuniAfterBattleText
waitbutton
closetext
end
-TrainerKimono_girlMiki:
- trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, 0, .Script
+TrainerKimonoGirlMiki:
+ trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, KimonoGirlMikiSeenText, KimonoGirlMikiBeatenText, 0, .Script
.Script:
end_if_just_battled
opentext
- writetext Kimono_girlMikiAfterBattleText
+ writetext KimonoGirlMikiAfterBattleText
waitbutton
closetext
end
-GentlemanScript_0x994c6:
+DanceTheaterSurfGuy:
faceplayer
opentext
- writetext UnknownText_0x9980a
+ writetext SurfGuyNeverLeftAScratchText
buttonsound
checkevent EVENT_GOT_HM03_SURF
- iftrue UnknownScript_0x99515
+ iftrue SurfGuyAlreadyGaveSurf
checkevent EVENT_BEAT_KIMONO_GIRL_NAOKO
- iffalse UnknownScript_0x994f3
+ iffalse .KimonoGirlsUndefeated
checkevent EVENT_BEAT_KIMONO_GIRL_SAYO
- iffalse UnknownScript_0x994f3
+ iffalse .KimonoGirlsUndefeated
checkevent EVENT_BEAT_KIMONO_GIRL_ZUKI
- iffalse UnknownScript_0x994f3
+ iffalse .KimonoGirlsUndefeated
checkevent EVENT_BEAT_KIMONO_GIRL_KUNI
- iffalse UnknownScript_0x994f3
+ iffalse .KimonoGirlsUndefeated
checkevent EVENT_BEAT_KIMONO_GIRL_MIKI
- iffalse UnknownScript_0x994f3
- jump UnknownScript_0x99505
+ iffalse .KimonoGirlsUndefeated
+ jump .GetSurf
-UnknownScript_0x994f3:
+.KimonoGirlsUndefeated:
checkflag ENGINE_PLAYER_IS_FEMALE
- iftrue UnknownScript_0x994ff
- writetext UnknownText_0x99891
+ iftrue .PlayerIsFemale
+ writetext SurfGuyLadGiftText
waitbutton
closetext
end
-UnknownScript_0x994ff:
- writetext UnknownText_0x998d4
+.PlayerIsFemale:
+ writetext SurfGuyLassieGiftText
waitbutton
closetext
end
-UnknownScript_0x99505:
- writetext UnknownText_0x9991a
+.GetSurf:
+ writetext SurfGuyLikeADanceText
buttonsound
verbosegiveitem HM_SURF
setevent EVENT_GOT_HM03_SURF
- writetext UnknownText_0x9999b
+ writetext SurfGuySurfExplanationText
waitbutton
closetext
end
-UnknownScript_0x99515:
- writetext UnknownText_0x999d5
+SurfGuyAlreadyGaveSurf:
+ writetext SurfGuyElegantKimonoGirlsText
waitbutton
closetext
end
-RhydonScript_0x9951b:
+DanceTheaterRhydon:
opentext
- writetext UnknownText_0x99a0a
+ writetext RhydonText
cry RHYDON
waitbutton
closetext
@@ -135,26 +135,26 @@
jumptextfaceplayer DanceTheatreGrannyText
MapDanceTheatreSignpost1Script:
- jumptext UnknownText_0x99b79
+ jumptext FancyPanelText
-Kimono_girlNaoko2SeenText:
+KimonoGirlNaoko2SeenText:
text "You have lovely"
line "#MON. May I see"
cont "them in battle?"
done
-Kimono_girlNaoko2BeatenText:
+KimonoGirlNaoko2BeatenText:
text "Oh, you are very"
line "strong."
done
-Kimono_girlNaoko2AfterBattleText:
+KimonoGirlNaoko2AfterBattleText:
text "I enjoyed that"
line "bout. I would like"
cont "to see you again."
done
-Kimono_girlSayoSeenText:
+KimonoGirlSayoSeenText:
text "I always dance"
line "with my #MON."
@@ -162,12 +162,12 @@
line "train them."
done
-Kimono_girlSayoBeatenText:
+KimonoGirlSayoBeatenText:
text "Oh, so close!"
line "I almost had you."
done
-Kimono_girlSayoAfterBattleText:
+KimonoGirlSayoAfterBattleText:
text "Rhythm is impor-"
line "tant for both"
@@ -175,7 +175,7 @@
line "MON."
done
-Kimono_girlZukiSeenText:
+KimonoGirlZukiSeenText:
text "Isn't my barrette"
line "pretty?"
@@ -183,29 +183,29 @@
line "battle?"
done
-Kimono_girlZukiBeatenText:
+KimonoGirlZukiBeatenText:
text "I don't have any"
line "#MON left…"
done
-Kimono_girlZukiAfterBattleText:
+KimonoGirlZukiAfterBattleText:
text "I put a different"
line "flower in my bar-"
cont "rette every month."
done
-Kimono_girlKuniSeenText:
+KimonoGirlKuniSeenText:
text "Oh, you're a cute"
line "trainer. Would you"
cont "like to battle?"
done
-Kimono_girlKuniBeatenText:
+KimonoGirlKuniBeatenText:
text "You're stronger"
line "than you look."
done
-Kimono_girlKuniAfterBattleText:
+KimonoGirlKuniAfterBattleText:
text "I trained a lot,"
line "so I thought I was"
@@ -213,18 +213,18 @@
line "I guess I'm not."
done
-Kimono_girlMikiSeenText:
+KimonoGirlMikiSeenText:
text "Do you like my"
line "dancing? I'm good"
cont "at #MON too."
done
-Kimono_girlMikiBeatenText:
+KimonoGirlMikiBeatenText:
text "Ooh, you're good"
line "at #MON too."
done
-Kimono_girlMikiAfterBattleText:
+KimonoGirlMikiAfterBattleText:
text "I can keep dancing"
line "because there are"
@@ -235,7 +235,7 @@
line "spirits up too."
done
-UnknownText_0x9980a:
+SurfGuyNeverLeftAScratchText:
text "Not only are the"
line "KIMONO GIRLS great"
@@ -250,7 +250,7 @@
line "scratch…"
done
-UnknownText_0x99891:
+SurfGuyLadGiftText:
text "Lad! If you can"
line "defeat all the"
@@ -258,7 +258,7 @@
line "give you a gift."
done
-UnknownText_0x998d4:
+SurfGuyLassieGiftText:
text "Lassie, if you can"
line "defeat all the"
@@ -266,7 +266,7 @@
line "give you a gift."
done
-UnknownText_0x9991a:
+SurfGuyLikeADanceText:
text "The way you bat-"
line "tled, it was like"
cont "watching a dance."
@@ -279,7 +279,7 @@
cont "--take it!"
done
-UnknownText_0x9999b:
+SurfGuySurfExplanationText:
text "That's SURF."
para "It's a move that"
@@ -287,13 +287,13 @@
cont "across water."
done
-UnknownText_0x999d5:
+SurfGuyElegantKimonoGirlsText:
text "I wish my #MON"
line "were as elegant as"
cont "the KIMONO GIRLS…"
done
-UnknownText_0x99a0a:
+RhydonText:
text "RHYDON: Gugooh"
line "gugogooh!"
done
@@ -331,7 +331,7 @@
cont "thing is possible."
done
-UnknownText_0x99b79:
+FancyPanelText:
text "It's a fancy panel"
line "that's decorated"
cont "with flowers."
@@ -356,12 +356,12 @@
.ObjectEvents:
db 9
- object_event SPRITE_KIMONO_GIRL, 2, 0, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimono_girlNaoko2, -1
- object_event SPRITE_KIMONO_GIRL, 1, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimono_girlSayo, -1
- object_event SPRITE_KIMONO_GIRL, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimono_girlZuki, -1
- object_event SPRITE_KIMONO_GIRL, 1, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimono_girlKuni, -1
- object_event SPRITE_KIMONO_GIRL, 2, 11, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimono_girlMiki, -1
- object_event SPRITE_GENTLEMAN, 10, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x994c6, -1
- object_event SPRITE_RHYDON, 8, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9951b, -1
+ object_event SPRITE_KIMONO_GIRL, 2, 0, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1
+ object_event SPRITE_KIMONO_GIRL, 1, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1
+ object_event SPRITE_KIMONO_GIRL, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1
+ object_event SPRITE_KIMONO_GIRL, 1, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlKuni, -1
+ object_event SPRITE_KIMONO_GIRL, 2, 11, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlMiki, -1
+ object_event SPRITE_GENTLEMAN, 10, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheaterSurfGuy, -1
+ object_event SPRITE_RHYDON, 8, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, DanceTheaterRhydon, -1
object_event SPRITE_COOLTRAINER_M, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DanceTheatreCooltrainerMScript, -1
object_event SPRITE_GRANNY, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -9,47 +9,47 @@
.MapCallbacks:
db 0
-CooltrainerMScript_0x9a5fb:
+EcruteakItemfinderGuy:
faceplayer
opentext
checkevent EVENT_GOT_ITEMFINDER
- iftrue UnknownScript_0x9a614
- writetext UnknownText_0x9a63c
+ iftrue .itemfinder
+ writetext EcruteakItemfinderAdventureText
yesorno
- iffalse UnknownScript_0x9a61a
- writetext UnknownText_0x9a6b5
+ iffalse .no
+ writetext EcruteakItemfinderTrueSpiritText
buttonsound
verbosegiveitem ITEMFINDER
setevent EVENT_GOT_ITEMFINDER
-UnknownScript_0x9a614:
- writetext UnknownText_0x9a70e
+.itemfinder:
+ writetext ItemfinderExplanationText
waitbutton
closetext
end
-UnknownScript_0x9a61a:
- writetext UnknownText_0x9a805
+.no:
+ writetext EcruteakItemfinderToEachHisOwnText
waitbutton
closetext
end
-PokedexScript_0x9a620:
+EcruteakHistoryBook:
opentext
- writetext UnknownText_0x9a826
+ writetext EcruteakHistoryBookText
yesorno
- iftrue UnknownScript_0x9a62a
+ iftrue .ReadBook
closetext
end
-UnknownScript_0x9a62a:
- writetext UnknownText_0x9a84c
+.ReadBook:
+ writetext EcruteakTwoTowersText
yesorno
- iftrue UnknownScript_0x9a633
+ iftrue .KeepReading
closetext
end
-UnknownScript_0x9a633:
- writetext UnknownText_0x9a902
+.KeepReading:
+ writetext EcruteakThreeMonText
waitbutton
closetext
end
@@ -57,7 +57,7 @@
ItemFinderHouseRadio:
jumpstd radio2
-UnknownText_0x9a63c:
+EcruteakItemfinderAdventureText:
text "Ah. You're on an"
line "adventure with"
cont "your #MON?"
@@ -70,7 +70,7 @@
line "I right?"
done
-UnknownText_0x9a6b5:
+EcruteakItemfinderTrueSpiritText:
text "Good! You under-"
line "stand the true"
@@ -81,7 +81,7 @@
line "this with you."
done
-UnknownText_0x9a70e:
+ItemfinderExplanationText:
text "There are many"
line "items lying about"
@@ -107,12 +107,12 @@
line "BURNED TOWER."
done
-UnknownText_0x9a805:
+EcruteakItemfinderToEachHisOwnText:
text "Oh… To each his"
line "own, I suppose…"
done
-UnknownText_0x9a826:
+EcruteakHistoryBookText:
text "HISTORY OF"
line "ECRUTEAK"
@@ -119,7 +119,7 @@
para "Want to read it?"
done
-UnknownText_0x9a84c:
+EcruteakTwoTowersText:
text "In ECRUTEAK, there"
line "were two towers."
@@ -138,7 +138,7 @@
para "Keep reading?"
done
-UnknownText_0x9a902:
+EcruteakThreeMonText:
text "ECRUTEAK was also"
line "home to three"
@@ -180,5 +180,5 @@
.ObjectEvents:
db 2
- object_event SPRITE_COOLTRAINER_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9a5fb, -1
- object_event SPRITE_POKEDEX, 3, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x9a620, -1
+ object_event SPRITE_COOLTRAINER_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakItemfinderGuy, -1
+ object_event SPRITE_POKEDEX, 3, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHistoryBook, -1
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -18,34 +18,34 @@
.MapCallbacks:
db 0
-UnknownScript_0x75ea6:
+Unused_0x75ea6:
end
-CaptainScript_0x75ea7:
+SSAquaCaptain:
faceplayer
opentext
checkevent EVENT_FAST_SHIP_FIRST_TIME
- iftrue UnknownScript_0x75eb5
- writetext UnknownText_0x76012
+ iftrue .LaterTrip
+ writetext SSAquaCaptainExhaustingText
waitbutton
closetext
end
-UnknownScript_0x75eb5:
- writetext UnknownText_0x76064
+.LaterTrip:
+ writetext SSAquaCaptainHowDoYouLikeText
waitbutton
closetext
end
-TwinScript_0x75ebb:
+SSAquaGranddaughterBefore:
spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT
opentext
- writetext UnknownText_0x761e0
+ writetext SSAquaGranddaughterCaptainPlayWithMeText
waitbutton
closetext
faceplayer
opentext
- writetext UnknownText_0x7621f
+ writetext SSAquaGranddaughterHasToFindGrandpaText
waitbutton
closetext
special Special_FadeBlackQuickly
@@ -62,54 +62,54 @@
applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, MovementData_0x7600c
spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT
checkflag ENGINE_PLAYER_IS_FEMALE
- iftrue UnknownScript_0x75f03
+ iftrue .PlayerIsFemale
opentext
- writetext UnknownText_0x76284
+ writetext SSAquaGranddaughterWasPlayingMText
waitbutton
closetext
- jump UnknownScript_0x75f09
+ jump .cont
-UnknownScript_0x75f03:
+.PlayerIsFemale:
opentext
- writetext UnknownText_0x762c6
+ writetext SSAquaGranddaughterWasPlayingFText
waitbutton
closetext
-UnknownScript_0x75f09:
+.cont:
spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN
applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x76010
opentext
- writetext UnknownText_0x76143
+ writetext SSAquaEntertainedGranddaughterText
buttonsound
setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
setmapscene FAST_SHIP_1F, $0
- jump UnknownScript_0x75f37
+ jump SSAquaMetalCoatAndDocking
-GentlemanScript_0x75f1f:
+SSAquaGrandpa:
faceplayer
opentext
checkevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
- iftrue UnknownScript_0x75f67
+ iftrue SSAquaGotMetalCoat
checkevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2
- iftrue UnknownScript_0x75f58
- writetext UnknownText_0x760ae
+ iftrue SSAquaFoundGranddaughter
+ writetext SSAquaCantFindGranddaughterText
waitbutton
closetext
setmapscene FAST_SHIP_1F, $0
end
-UnknownScript_0x75f37:
- writetext UnknownText_0x7619b
+SSAquaMetalCoatAndDocking:
+ writetext SSAquaGrandpaHaveThisText
buttonsound
verbosegiveitem METAL_COAT
- iffalse UnknownScript_0x75f44
+ iffalse .NoRoom
setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
-UnknownScript_0x75f44:
+.NoRoom:
closetext
waitsfx
playsound SFX_ELEVATOR_END
pause 30
opentext
- writetext UnknownText_0x76645
+ writetext SSAquaHasArrivedVermilionText
waitbutton
setevent EVENT_FAST_SHIP_HAS_ARRIVED
setevent EVENT_FAST_SHIP_FOUND_GIRL
@@ -116,26 +116,26 @@
closetext
end
-UnknownScript_0x75f58:
- writetext UnknownText_0x7619b
+SSAquaFoundGranddaughter:
+ writetext SSAquaGrandpaHaveThisText
buttonsound
verbosegiveitem METAL_COAT
- iffalse UnknownScript_0x75f65
+ iffalse .NoRoom
setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
-UnknownScript_0x75f65:
+.NoRoom:
closetext
end
-UnknownScript_0x75f67:
- writetext UnknownText_0x761be
+SSAquaGotMetalCoat:
+ writetext SSAquaGrandpaTravellingText
waitbutton
closetext
end
-TwinScript_0x75f6d:
+SSAquaGranddaughterAfter:
faceplayer
opentext
- writetext UnknownText_0x7630d
+ writetext SSAquaGranddaughterHadFunText
waitbutton
closetext
end
@@ -240,7 +240,7 @@
step DOWN
step_end
-UnknownText_0x76012:
+SSAquaCaptainExhaustingText:
text "Whew! Thanks for"
line "coming along."
@@ -249,7 +249,7 @@
cont "was exhausting."
done
-UnknownText_0x76064:
+SSAquaCaptainHowDoYouLikeText:
text "How do you like"
line "S.S.AQUA's ride?"
@@ -258,7 +258,7 @@
cont "waves."
done
-UnknownText_0x760ae:
+SSAquaCantFindGranddaughterText:
text "Oh, hello…"
para "I still can't find"
@@ -274,7 +274,7 @@
line "one. I'm worried…"
done
-UnknownText_0x76143:
+SSAquaEntertainedGranddaughterText:
text "<PLAY_G>, was it?"
line "I heard you enter-"
cont "tained my grand-"
@@ -284,17 +284,17 @@
line "you for that."
done
-UnknownText_0x7619b:
+SSAquaGrandpaHaveThisText:
text "I know! I'd like"
line "you to have this!"
done
-UnknownText_0x761be:
+SSAquaGrandpaTravellingText:
text "We're traveling"
line "around the world."
done
-UnknownText_0x761e0:
+SSAquaGranddaughterCaptainPlayWithMeText:
text "CAPTAIN, play with"
line "me, please?"
@@ -302,7 +302,7 @@
line "to play more!"
done
-UnknownText_0x7621f:
+SSAquaGranddaughterHasToFindGrandpaText:
text "Hi! Will you play"
line "with me?"
@@ -317,7 +317,7 @@
line "Grandpa!"
done
-UnknownText_0x76284:
+SSAquaGranddaughterWasPlayingMText:
text "Grandpa, here I"
line "am! I was playing"
@@ -325,7 +325,7 @@
line "and this guy!"
done
-UnknownText_0x762c6:
+SSAquaGranddaughterWasPlayingFText:
text "Grandpa, here I"
line "am! I was playing"
@@ -333,7 +333,7 @@
line "and this big girl!"
done
-UnknownText_0x7630d:
+SSAquaGranddaughterHadFunText:
text "I had lots of fun"
line "playing!"
done
@@ -456,7 +456,7 @@
cont "the situation."
done
-UnknownText_0x76645:
+SSAquaHasArrivedVermilionText:
text "FAST SHIP S.S.AQUA"
line "has arrived in"
cont "VERMILION CITY."
@@ -484,10 +484,10 @@
.ObjectEvents:
db 11
- object_event SPRITE_CAPTAIN, 25, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CaptainScript_0x75ea7, -1
- object_event SPRITE_GENTLEMAN, 17, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x75f1f, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
- object_event SPRITE_TWIN, 17, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x75f6d, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
- object_event SPRITE_TWIN, 25, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x75ebb, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2
+ object_event SPRITE_CAPTAIN, 25, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1
+ object_event SPRITE_GENTLEMAN, 17, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaGrandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
+ object_event SPRITE_TWIN, 17, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterAfter, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
+ object_event SPRITE_TWIN, 25, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterBefore, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2
object_event SPRITE_POKEFAN_M, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
object_event SPRITE_TWIN, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
object_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
--- a/maps/MountMoonGiftShop.asm
+++ b/maps/MountMoonGiftShop.asm
@@ -1,8 +1,8 @@
const_value set 2
- const MOUNTMOONGIFTSHOP_GRAMPS1
- const MOUNTMOONGIFTSHOP_GRAMPS2
- const MOUNTMOONGIFTSHOP_LASS1
- const MOUNTMOONGIFTSHOP_LASS2
+ const MOUNTMOONGIFTSHOP_GRAMPS1 ; morning only
+ const MOUNTMOONGIFTSHOP_GRAMPS2 ; day only
+ const MOUNTMOONGIFTSHOP_LASS1 ; morning only
+ const MOUNTMOONGIFTSHOP_LASS2 ; day only
MountMoonGiftShop_MapScriptHeader:
.SceneScripts:
@@ -11,7 +11,7 @@
.MapCallbacks:
db 0
-GrampsScript_0x771a8:
+MountMoonGiftShopClerkScript:
faceplayer
opentext
pokemart MARTTYPE_STANDARD, MART_MT_MOON
@@ -44,7 +44,7 @@
.ObjectEvents:
db 4
- object_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1
- object_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1
+ object_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
+ object_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
object_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1
object_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1
--- a/maps/PewterNidoranSpeechHouse.asm
+++ b/maps/PewterNidoranSpeechHouse.asm
@@ -1,6 +1,6 @@
const_value set 2
const PEWTERNIDORANSPEECHHOUSE_SUPER_NERD
- const PEWTERNIDORANSPEECHHOUSE_GROWLITHE
+ const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M
PewterNidoranSpeechHouse_MapScriptHeader:
.SceneScripts:
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -95,26 +95,26 @@
closetext
end
-SlowpokeScript_0x5a681:
+SlowpokeWellB1FSlowpokeWithMailScript:
faceplayer
opentext
cry SLOWPOKE
- writetext UnknownText_0x5abcb
+ writetext SlowpokeWellB1FSlowpokeWithMailText
yesorno
- iftrue UnknownScript_0x5a68f
+ iftrue .ReadMail
closetext
end
-UnknownScript_0x5a68f:
- writetext UnknownText_0x5ac09
+.ReadMail:
+ writetext SlowpokeWellB1FSlowpokeMailText
waitbutton
closetext
end
-SlowpokeScript_0x5a695:
+SlowpokeWellB1FTaillessSlowpokeScript:
faceplayer
opentext
- writetext UnknownText_0x5ac61
+ writetext SlowpokeWellB1FTaillessSlowpokeText
cry SLOWPOKE
waitbutton
closetext
@@ -294,7 +294,7 @@
line "selling them?"
done
-UnknownText_0x5abcb:
+SlowpokeWellB1FSlowpokeWithMailText:
text "A SLOWPOKE with"
line "its TAIL cut off…"
@@ -302,7 +302,7 @@
line "Read it?"
done
-UnknownText_0x5ac09:
+SlowpokeWellB1FSlowpokeMailText:
text "<PLAYER> read the"
line "MAIL."
@@ -315,7 +315,7 @@
para "Love, Dad"
done
-UnknownText_0x5ac61:
+SlowpokeWellB1FTaillessSlowpokeText:
text "A SLOWPOKE with"
line "its TAIL cut off…"
done
@@ -341,8 +341,8 @@
object_event SPRITE_ROCKET, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS
object_event SPRITE_ROCKET, 6, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS
object_event SPRITE_ROCKET_GIRL, 4, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS
- object_event SPRITE_SLOWPOKE, 4, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeScript_0x5a681, EVENT_SLOWPOKE_WELL_SLOWPOKES
- object_event SPRITE_SLOWPOKE, 2, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES
+ object_event SPRITE_SLOWPOKE, 4, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FSlowpokeWithMailScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
+ object_event SPRITE_SLOWPOKE, 2, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FTaillessSlowpokeScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
object_event SPRITE_KURT, 14, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FKurtScript, EVENT_SLOWPOKE_WELL_KURT
object_event SPRITE_BOULDER, 2, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1
object_event SPRITE_POKE_BALL, 3, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION