summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
Diffstat (limited to 'maps')
-rw-r--r--maps/BattleTower1F.asm14
-rw-r--r--maps/BattleTowerBattleRoom.asm2
-rw-r--r--maps/OlivineLighthouse2F.asm76
-rw-r--r--maps/OlivineLighthouse6F.asm82
-rw-r--r--maps/PokemonFanClub.asm56
-rw-r--r--maps/RadioTower1F.asm40
-rw-r--r--maps/RadioTower2F.asm102
-rw-r--r--maps/RadioTower3F.asm24
-rw-r--r--maps/Route30BerryHouse.asm20
-rw-r--r--maps/Route34IlexForestGate.asm20
-rw-r--r--maps/Route36NationalParkGate.asm40
-rw-r--r--maps/RuinsOfAlphAerodactylChamber.asm8
-rw-r--r--maps/RuinsOfAlphHoOhChamber.asm8
-rw-r--r--maps/RuinsOfAlphKabutoChamber.asm20
-rw-r--r--maps/RuinsOfAlphOmanyteChamber.asm8
-rw-r--r--maps/RuinsOfAlphResearchCenter.asm40
-rw-r--r--maps/SaffronCity.asm12
-rw-r--r--maps/TeamRocketBaseB3F.asm12
-rw-r--r--maps/VermilionPort.asm56
-rw-r--r--maps/VictoryRoad.asm48
20 files changed, 344 insertions, 344 deletions
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index 474d3c04a..5d164365a 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -44,10 +44,10 @@ MapBattleTower1FSignpost0Script:
opentext
writetext Text_ReadBattleTowerRules
yesorno
- iffalse UnknownScript_0x9e3e0
+ iffalse .skip
writetext Text_BattleTowerRules
waitbutton
-UnknownScript_0x9e3e0:
+.skip:
closetext
end
@@ -186,7 +186,7 @@ UnreferencedScript_0x9e4be:
UnreferencedScript_0x9e4ea:
writebyte BATTLETOWERACTION_LEVEL_CHECK
special BattleTowerAction
- ifnotequal $0, Script_APkmnLevelExceeds
+ ifnotequal $0, Script_AMonLevelExceeds
writebyte BATTLETOWERACTION_UBERS_CHECK
special BattleTowerAction
ifnotequal $0, Script_MayNotEnterABattleRoomUnderL70
@@ -223,8 +223,8 @@ UnreferencedScript_0x9e53b:
waitbutton
jump Script_BattleTowerHopeToServeYouAgain
-Script_APkmnLevelExceeds: ; 0x9e542
- writetext Text_APkmnLevelExceeds
+Script_AMonLevelExceeds: ; 0x9e542
+ writetext Text_AMonLevelExceeds
waitbutton
jump Script_Menu_ChallengeExplanationCancel
@@ -626,7 +626,7 @@ Text_BattleTower_LeftWithoutSaving:
line "invalid."
done
-Text_YourPkmnWillBeHealedToFullHealth: ; 0x9ee92
+Text_YourMonWillBeHealedToFullHealth: ; 0x9ee92
text "Your #MON will"
line "be healed to full"
cont "health."
@@ -730,7 +730,7 @@ Text_RegisterRecordTimedOut_Mobile:
cont "challenge."
done
-Text_APkmnLevelExceeds: ; 0x9f1e5
+Text_AMonLevelExceeds: ; 0x9f1e5
text "One or more of"
line "your #MON's"
cont "levels exceeds @"
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index d4dc279ac..f939ae44d 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -42,7 +42,7 @@ Script_BattleRoomLoop: ; 0x9f425
applymovement BATTLETOWERBATTLEROOM_RECEPTIONIST, MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer
applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceReceptionist
opentext
- writetext Text_YourPkmnWillBeHealedToFullHealth
+ writetext Text_YourMonWillBeHealedToFullHealth
waitbutton
closetext
playmusic MUSIC_HEAL
diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm
index 21c19b8fb..122e6cc09 100644
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -18,36 +18,36 @@ TrainerGentlemanAlfred:
closetext
end
-TrainerSailorHuey1:
- trainer SAILOR, HUEY1, EVENT_BEAT_SAILOR_HUEY, SailorHuey1SeenText, SailorHuey1BeatenText, 0, .Script
+TrainerSailorHuey:
+ trainer SAILOR, HUEY1, EVENT_BEAT_SAILOR_HUEY, SailorHueySeenText, SailorHueyBeatenText, 0, .Script
.Script:
writecode VAR_CALLERID, PHONE_SAILOR_HUEY
endifjustbattled
opentext
checkflag ENGINE_HUEY
- iftrue UnknownScript_0x5afc7
+ iftrue .WantsBattle
checkcellnum PHONE_SAILOR_HUEY
- iftrue UnknownScript_0x5b05f
+ iftrue .NumberAccepted
checkevent EVENT_HUEY_ASKED_FOR_PHONE_NUMBER
- iftrue UnknownScript_0x5afb0
+ iftrue .AskedBefore
setevent EVENT_HUEY_ASKED_FOR_PHONE_NUMBER
- scall UnknownScript_0x5b053
- jump UnknownScript_0x5afb3
+ scall .AskNumber1
+ jump .AskForNumber
-UnknownScript_0x5afb0:
- scall UnknownScript_0x5b057
-UnknownScript_0x5afb3:
+.AskedBefore:
+ scall .AskNumber2
+.AskForNumber:
askforphonenumber PHONE_SAILOR_HUEY
- ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5b067
- ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5b063
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext SAILOR, HUEY1, MEM_BUFFER_0
- scall UnknownScript_0x5b05b
- jump UnknownScript_0x5b05f
+ scall .RegisteredNumber
+ jump .NumberAccepted
-UnknownScript_0x5afc7:
- scall UnknownScript_0x5b06b
- winlosstext SailorHuey1BeatenText, 0
+.WantsBattle:
+ scall .Rematch
+ winlosstext SailorHueyBeatenText, 0
copybytetovar wHueyFightCount
ifequal 3, .Fight3
ifequal 2, .Fight2
@@ -92,72 +92,72 @@ UnknownScript_0x5afc7:
reloadmapafterbattle
clearflag ENGINE_HUEY
checkevent EVENT_HUEY_PROTEIN
- iftrue UnknownScript_0x5b03f
+ iftrue .HasProtein
checkevent EVENT_GOT_PROTEIN_FROM_HUEY
- iftrue UnknownScript_0x5b03e
- scall UnknownScript_0x5b076
+ iftrue .SkipGift
+ scall .RematchGift
verbosegiveitem PROTEIN
- iffalse UnknownScript_0x5b06f
+ iffalse .PackFull
setevent EVENT_GOT_PROTEIN_FROM_HUEY
- jump UnknownScript_0x5b05f
+ jump .NumberAccepted
-UnknownScript_0x5b03e:
+.SkipGift:
end
-UnknownScript_0x5b03f:
+.HasProtein:
opentext
writetext UnknownText_0x5b1b6
waitbutton
verbosegiveitem PROTEIN
- iffalse UnknownScript_0x5b06f
+ iffalse .PackFull
clearevent EVENT_HUEY_PROTEIN
setevent EVENT_GOT_PROTEIN_FROM_HUEY
- jump UnknownScript_0x5b05f
+ jump .NumberAccepted
-UnknownScript_0x5b053:
+.AskNumber1:
jumpstd asknumber1m
end
-UnknownScript_0x5b057:
+.AskNumber2:
jumpstd asknumber2m
end
-UnknownScript_0x5b05b:
+.RegisteredNumber:
jumpstd registerednumberm
end
-UnknownScript_0x5b05f:
+.NumberAccepted:
jumpstd numberacceptedm
end
-UnknownScript_0x5b063:
+.NumberDeclined:
jumpstd numberdeclinedm
end
-UnknownScript_0x5b067:
+.PhoneFull:
jumpstd phonefullm
end
-UnknownScript_0x5b06b:
+.Rematch:
jumpstd rematchm
end
-UnknownScript_0x5b06f:
+.PackFull:
setevent EVENT_HUEY_PROTEIN
jumpstd packfullm
end
-UnknownScript_0x5b076:
+.RematchGift:
jumpstd rematchgiftm
end
-SailorHuey1SeenText:
+SailorHueySeenText:
text "Men of the sea are"
line "always spoiling"
cont "for a good fight!"
done
-SailorHuey1BeatenText:
+SailorHueyBeatenText:
text "Urf!"
line "I lose!"
done
@@ -218,5 +218,5 @@ OlivineLighthouse2F_MapEvents:
db 0 ; bg events
db 2 ; object events
- object_event 9, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey1, -1
+ object_event 9, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey, -1
object_event 17, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index ed244cc7c..47baa335c 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -8,30 +8,30 @@ OlivineLighthouse6F_MapScripts:
db 0 ; callbacks
-JasmineScript_0x60b91:
+OlivineLighthouseJasmine:
faceplayer
opentext
checkitem SECRETPOTION
- iftrue UnknownScript_0x60bab
+ iftrue .BroughtSecretpotion
checkevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS
- iftrue UnknownScript_0x60ba5
- writetext UnknownText_0x60c81
+ iftrue .ExplainedSickness
+ writetext JasmineCianwoodPharmacyText
buttonsound
setevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS
-UnknownScript_0x60ba5:
- writetext UnknownText_0x60d64
+.ExplainedSickness:
+ writetext JasmineGetSomeMedicineText
waitbutton
closetext
end
-UnknownScript_0x60bab:
- writetext UnknownText_0x60d99
+.BroughtSecretpotion:
+ writetext JasmineCureAmphyText
yesorno
- iffalse UnknownScript_0x60c25
- writetext UnknownText_0x60dc3
+ iffalse .no
+ writetext PlayerHandedSecretpotionText
buttonsound
takeitem SECRETPOTION
- writetext UnknownText_0x60dea
+ writetext JasmineDontBeOffendedText
waitbutton
closetext
turnobject OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
@@ -39,7 +39,7 @@ UnknownScript_0x60bab:
turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
opentext
playmusic MUSIC_HEAL
- writetext UnknownText_0x60e44
+ writetext JasmineAmphyHowAreYouFeelingText
pause 60
buttonsound
closetext
@@ -49,7 +49,7 @@ UnknownScript_0x60bab:
pause 10
special FadeInPalettes
opentext
- writetext UnknownText_0x60f3d
+ writetext AmphyPaluPaluluText
waitbutton
closetext
turnobject OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
@@ -62,37 +62,37 @@ UnknownScript_0x60bab:
pause 10
faceplayer
opentext
- writetext UnknownText_0x60e6c
+ writetext JasmineThankYouText
waitbutton
closetext
setevent EVENT_JASMINE_RETURNED_TO_GYM
clearevent EVENT_OLIVINE_GYM_JASMINE
checkcode VAR_FACING
- ifequal DOWN, UnknownScript_0x60c17
- ifequal RIGHT, UnknownScript_0x60c1e
+ ifequal DOWN, .FacingDown
+ ifequal RIGHT, .FacingRight
applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c68
disappear OLIVINELIGHTHOUSE6F_JASMINE
end
-UnknownScript_0x60c17:
+.FacingDown:
applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c70
disappear OLIVINELIGHTHOUSE6F_JASMINE
end
-UnknownScript_0x60c1e:
+.FacingRight:
applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c79
disappear OLIVINELIGHTHOUSE6F_JASMINE
end
-UnknownScript_0x60c25:
- writetext UnknownText_0x60edf
+.no:
+ writetext JasmineISeeText
waitbutton
closetext
turnobject OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
pause 15
turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
opentext
- writetext UnknownText_0x60ef1
+ writetext JasmineAmphyHangOnText
waitbutton
closetext
end
@@ -100,22 +100,22 @@ UnknownScript_0x60c25:
UnknownScript_0x60c39:
end
-MonsterScript_0x60c3a:
+OlivineLighthouseAmphy:
faceplayer
opentext
checkevent EVENT_JASMINE_RETURNED_TO_GYM
- iftrue UnknownScript_0x60c51
- writetext UnknownText_0x60f03
+ iftrue .HealthyNow
+ writetext AmphyPalPalooText
writebyte AMPHAROS
special PlaySlowCry
buttonsound
- writetext UnknownText_0x60f19
+ writetext AmphyBreathingLaboredText
waitbutton
closetext
end
-UnknownScript_0x60c51:
- writetext UnknownText_0x60f3d
+.HealthyNow:
+ writetext AmphyPaluPaluluText
cry AMPHAROS
waitbutton
closetext
@@ -159,7 +159,7 @@ MovementData_0x60c79:
step_sleep 8
step_end
-UnknownText_0x60c81:
+JasmineCianwoodPharmacyText:
text "JASMINE: … This"
line "#MON always"
@@ -183,25 +183,25 @@ UnknownText_0x60c81:
line "AMPHY unattended…"
done
-UnknownText_0x60d64:
+JasmineGetSomeMedicineText:
text "…May I ask you to"
line "get some medicine"
cont "for me? Please?"
done
-UnknownText_0x60d99:
+JasmineCureAmphyText:
text "JASMINE: …Will"
line "that medicine cure"
cont "AMPHY?"
done
-UnknownText_0x60dc3:
+PlayerHandedSecretpotionText:
text "<PLAYER> handed the"
line "SECRETPOTION to"
cont "JASMINE."
done
-UnknownText_0x60dea:
+JasmineDontBeOffendedText:
text "JASMINE: …Um,"
line "please don't be"
cont "offended…"
@@ -211,14 +211,14 @@ UnknownText_0x60dea:
cont "anyone but me…"
done
-UnknownText_0x60e44:
+JasmineAmphyHowAreYouFeelingText:
text "JASMINE: …"
para "AMPHY, how are you"
line "feeling?"
done
-UnknownText_0x60e6c:
+JasmineThankYouText:
text "JASMINE: …Oh, I'm"
line "so relieved…"
@@ -232,25 +232,25 @@ UnknownText_0x60e6c:
line "the GYM…"
done
-UnknownText_0x60edf:
+JasmineISeeText:
text "JASMINE: …I see…"
done
-UnknownText_0x60ef1:
+JasmineAmphyHangOnText:
text "…AMPHY, hang on!"
done
-UnknownText_0x60f03:
+AmphyPalPalooText:
text "AMPHY: …"
line "…Pa… paloo…"
done
-UnknownText_0x60f19:
+AmphyBreathingLaboredText:
text "Its breathing is"
line "terribly labored…"
done
-UnknownText_0x60f3d:
+AmphyPaluPaluluText:
text "AMPHY: Palu!"
line "Palulu!"
done
@@ -268,6 +268,6 @@ OlivineLighthouse6F_MapEvents:
db 0 ; bg events
db 3 ; object events
- object_event 8, 8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE
- object_event 9, 8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1
+ object_event 8, 8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineLighthouseJasmine, EVENT_OLIVINE_LIGHTHOUSE_JASMINE
+ object_event 9, 8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, OlivineLighthouseAmphy, -1
object_event 3, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION
diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm
index 1f54460ba..3b30a71e4 100644
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -11,72 +11,72 @@ PokemonFanClub_MapScripts:
db 0 ; callbacks
-GentlemanScript_0x1917e9:
+PokemonFanClubPresidentScript:
faceplayer
opentext
checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT
- iftrue UnknownScript_0x191815
+ iftrue .HeardSpeech
checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL
- iftrue UnknownScript_0x191802
+ iftrue .HeardSpeechButBagFull
writetext UnknownText_0x191881
yesorno
- iffalse UnknownScript_0x19181b
+ iffalse .NotListening
writetext UnknownText_0x191911
buttonsound
-UnknownScript_0x191802:
+.HeardSpeechButBagFull:
writetext UnknownText_0x191a3d
buttonsound
verbosegiveitem RARE_CANDY
- iffalse UnknownScript_0x19181f
+ iffalse .BagFull
setevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT
writetext UnknownText_0x191a72
waitbutton
closetext
end
-UnknownScript_0x191815:
+.HeardSpeech:
writetext UnknownText_0x191ae0
waitbutton
closetext
end
-UnknownScript_0x19181b:
+.NotListening:
writetext UnknownText_0x191b38
waitbutton
-UnknownScript_0x19181f:
+.BagFull:
closetext
end
PokemonFanClubReceptionistScript:
jumptextfaceplayer PokemonFanClubReceptionistText
-FisherScript_0x191824:
+PokemonFanClubClefairyGuyScript:
faceplayer
opentext
checkevent EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB
- iftrue UnknownScript_0x19185f
+ iftrue .GotLostItem
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x191838
+ iftrue .FoundClefairyDoll
writetext UnknownText_0x191ba0
waitbutton
closetext
end
-UnknownScript_0x191838:
+.FoundClefairyDoll:
writetext UnknownText_0x191bff
checkevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM
- iftrue UnknownScript_0x191844
+ iftrue .MetCopycat
waitbutton
closetext
end
-UnknownScript_0x191844:
+.MetCopycat:
buttonsound
writetext UnknownText_0x191c5a
buttonsound
waitsfx
giveitem LOST_ITEM
- iffalse UnknownScript_0x191865
+ iffalse .NoRoom
disappear POKEMONFANCLUB_FAIRY
writetext UnknownText_0x191d0a
playsound SFX_KEY_ITEM
@@ -86,13 +86,13 @@ UnknownScript_0x191844:
closetext
end
-UnknownScript_0x19185f:
+.GotLostItem:
writetext UnknownText_0x191d1e
waitbutton
closetext
end
-UnknownScript_0x191865:
+.NoRoom:
writetext UnknownText_0x191d58
waitbutton
closetext
@@ -101,10 +101,10 @@ UnknownScript_0x191865:
PokemonFanClubTeacherScript:
jumptextfaceplayer PokemonFanClubTeacherText
-ClefairyDoll:
+PokemonFanClubClefairyDollScript:
jumptext ClefairyDollText
-FanClubBayleef:
+PokemonFanClubBayleefScript:
opentext
writetext FanClubBayleefText
cry BAYLEEF
@@ -113,10 +113,10 @@ FanClubBayleef:
end
MapPokemonFanClubSignpost0Script:
- jumptext UnknownText_0x191dfc
+ jumptext PokemonFanClubListenSignText
MapPokemonFanClubSignpost1Script:
- jumptext UnknownText_0x191e29
+ jumptext PokemonFanClubBraggingSignText
UnknownText_0x191881:
text "I'm the CHAIRMAN"
@@ -283,13 +283,13 @@ FanClubBayleefText:
text "BAYLEEF: Li liif!"
done
-UnknownText_0x191dfc:
+PokemonFanClubListenSignText:
text "Let's all listen"
line "politely to other"
cont "trainers."
done
-UnknownText_0x191e29:
+PokemonFanClubBraggingSignText:
text "If someone brags,"
line "brag right back!"
done
@@ -308,9 +308,9 @@ PokemonFanClub_MapEvents:
bg_event 9, 0, BGEVENT_READ, MapPokemonFanClubSignpost1Script
db 6 ; object events
- object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1
+ object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubPresidentScript, -1
object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1
- object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FisherScript_0x191824, -1
+ object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubClefairyGuyScript, -1
object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1
- object_event 2, 4, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL
- object_event 7, 3, SPRITE_ODDISH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FanClubBayleef, -1
+ object_event 2, 4, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubClefairyDollScript, EVENT_VERMILION_FAN_CLUB_DOLL
+ object_event 7, 3, SPRITE_ODDISH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubBayleefScript, -1
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index fdc85f46f..034a10fb9 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -11,17 +11,17 @@ RadioTower1F_MapScripts:
db 0 ; callbacks
-ReceptionistScript_0x5cd29:
+RadioTower1FReceptionistScript:
faceplayer
opentext
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
- iftrue UnknownScript_0x5cd37
+ iftrue .Rockets
writetext UnknownText_0x5ce77
waitbutton
closetext
end
-UnknownScript_0x5cd37:
+.Rockets:
writetext UnknownText_0x5ce81
waitbutton
closetext
@@ -111,67 +111,67 @@ GentlemanScript_0x5cd3d:
closetext
end
-CooltrainerFScript_0x5cdd5:
+RadioTower1FRadioCardWomanScript:
faceplayer
opentext
checkflag ENGINE_RADIO_CARD
- iftrue UnknownScript_0x5ce2d
+ iftrue .GotCard
writetext UnknownText_0x5d12d
yesorno
- iffalse UnknownScript_0x5ce4b
+ iffalse .NoQuiz
writetext UnknownText_0x5d1f2
yesorno
- iffalse UnknownScript_0x5ce42
+ iffalse .WrongAnswer
playsound SFX_ELEVATOR_END
waitsfx
writetext UnknownText_0x5d231
yesorno
- iffalse UnknownScript_0x5ce42
+ iffalse .WrongAnswer
playsound SFX_ELEVATOR_END
waitsfx
writetext UnknownText_0x5d282
yesorno
- iftrue UnknownScript_0x5ce42
+ iftrue .WrongAnswer
playsound SFX_ELEVATOR_END
waitsfx
writetext UnknownText_0x5d2bc
yesorno
- iffalse UnknownScript_0x5ce42
+ iffalse .WrongAnswer
playsound SFX_ELEVATOR_END
waitsfx
writetext UnknownText_0x5d30e
yesorno
- iftrue UnknownScript_0x5ce42
+ iftrue .WrongAnswer
playsound SFX_ELEVATOR_END
waitsfx
writetext UnknownText_0x5d37b
buttonsound
- stringtotext RadioCardText, MEM_BUFFER_1
- scall UnknownScript_0x5ce3e
+ stringtotext .RadioCardText, MEM_BUFFER_1
+ scall .ReceiveItem
writetext UnknownText_0x5d3c0
buttonsound
setflag ENGINE_RADIO_CARD
-UnknownScript_0x5ce2d:
+.GotCard:
writetext UnknownText_0x5d3e5
waitbutton
closetext
end
-RadioCardText:
+.RadioCardText:
db "RADIO CARD@"
-UnknownScript_0x5ce3e:
+.ReceiveItem:
jumpstd receiveitem
end
-UnknownScript_0x5ce42:
+.WrongAnswer:
playsound SFX_WRONG
writetext UnknownText_0x5d409
waitbutton
closetext
end
-UnknownScript_0x5ce4b:
+.NoQuiz:
writetext UnknownText_0x5d443
waitbutton
closetext
@@ -485,9 +485,9 @@ RadioTower1F_MapEvents:
bg_event 13, 0, BGEVENT_READ, MapRadioTower1FSignpost1Script
db 6 ; object events
- object_event 5, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1
+ object_event 5, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FReceptionistScript, -1
object_event 16, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
object_event 15, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS
object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS
- object_event 12, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS
+ object_event 12, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower1FRadioCardWomanScript, EVENT_GOLDENROD_CITY_CIVILIANS
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index 004fe2f77..d22ba96fe 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -100,31 +100,31 @@ Buena:
faceplayer
opentext
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
- iftrue UnknownScript_0x5d865
+ iftrue .MidRocketTakeover
checkevent EVENT_MET_BUENA
- iffalse UnknownScript_0x5d800
+ iffalse .Introduction
checkflag ENGINE_BUENAS_PASSWORD_2
- iftrue UnknownScript_0x5d82f
+ iftrue .PlayedAlready
checkcode VAR_HOUR
- ifless 18, UnknownScript_0x5d893
+ ifless 18, .TooEarly
checkflag ENGINE_BUENAS_PASSWORD
- iffalse UnknownScript_0x5d80a
+ iffalse .TuneIn
checkitem BLUE_CARD
- iffalse UnknownScript_0x5d86b
+ iffalse .NoBlueCard
checkcode VAR_BLUECARDBALANCE
- ifequal 30, UnknownScript_0x5d87f
+ ifequal 30, .BlueCardCapped0
playmusic MUSIC_BUENAS_PASSWORD
writetext UnknownText_0x5de35
special AskRememberPassword
- iffalse UnknownScript_0x5d81e
+ iffalse .ForgotPassword
writetext UnknownText_0x5de84
waitbutton
closetext
turnobject RADIOTOWER2F_BUENA, RIGHT
checkcode VAR_FACING
- ifnotequal RIGHT, UnknownScript_0x5d7be
+ ifnotequal RIGHT, .DontNeedToMove
applymovement PLAYER, MovementData_0x5d921
-UnknownScript_0x5d7be:
+.DontNeedToMove:
turnobject PLAYER, RIGHT
opentext
writetext UnknownText_0x5dedd
@@ -134,7 +134,7 @@ UnknownScript_0x5d7be:
refreshscreen
special BuenasPassword
closetext
- iffalse UnknownScript_0x5d845
+ iffalse .WrongAnswer
opentext
writetext UnknownText_0x5dfc1
waitbutton
@@ -155,27 +155,27 @@ UnknownScript_0x5d7be:
pause 20
special RestartMapMusic
checkcode VAR_BLUECARDBALANCE
- ifequal 30, UnknownScript_0x5d8a4
+ ifequal 30, .BlueCardCapped1
end
-UnknownScript_0x5d800:
+.Introduction:
writetext UnknownText_0x5dcf4
buttonsound
setevent EVENT_MET_BUENA
verbosegiveitem BLUE_CARD
-UnknownScript_0x5d80a:
+.TuneIn:
writetext UnknownText_0x5de10
waitbutton
closetext
checkcellnum PHONE_BUENA
- iftrue UnknownScript_0x5d81a
+ iftrue .Registered0
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
- iftrue UnknownScript_0x5d8cc
-UnknownScript_0x5d81a:
+ iftrue .OfferedNumberBefore
+.Registered0:
turnobject RADIOTOWER2F_BUENA, RIGHT
end
-UnknownScript_0x5d81e:
+.ForgotPassword:
writetext UnknownText_0x5df29
waitbutton
closetext
@@ -185,20 +185,20 @@ UnknownScript_0x5d81e:
special RestartMapMusic
end
-UnknownScript_0x5d82f:
+.PlayedAlready:
writetext UnknownText_0x5df6c
waitbutton
closetext
checkcellnum PHONE_BUENA
- iftrue UnknownScript_0x5d83f
+ iftrue .Registered1
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
- iftrue UnknownScript_0x5d8cc
-UnknownScript_0x5d83f:
+ iftrue .OfferedNumberBefore
+.Registered1:
turnobject RADIOTOWER2F_BUENA, RIGHT
pause 10
end
-UnknownScript_0x5d845:
+.WrongAnswer:
setflag ENGINE_BUENAS_PASSWORD_2
opentext
writetext UnknownText_0x5e01c
@@ -216,71 +216,71 @@ UnknownScript_0x5d845:
special RestartMapMusic
end
-UnknownScript_0x5d865:
+.MidRocketTakeover:
writetext UnknownText_0x5e0c2
waitbutton
closetext
end
-UnknownScript_0x5d86b:
+.NoBlueCard:
writetext UnknownText_0x5e192
waitbutton
closetext
checkcellnum PHONE_BUENA
- iftrue UnknownScript_0x5d87b
+ iftrue .Registered2
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
- iftrue UnknownScript_0x5d8cc
-UnknownScript_0x5d87b:
+ iftrue .OfferedNumberBefore
+.Registered2:
turnobject RADIOTOWER2F_BUENA, RIGHT
end
-UnknownScript_0x5d87f:
+.BlueCardCapped0:
writetext UnknownText_0x5e0f1
waitbutton
closetext
checkcellnum PHONE_BUENA
- iftrue UnknownScript_0x5d88f
+ iftrue .Registered3
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
- iftrue UnknownScript_0x5d8cc
-UnknownScript_0x5d88f:
+ iftrue .OfferedNumberBefore
+.Registered3:
turnobject RADIOTOWER2F_BUENA, RIGHT
end
-UnknownScript_0x5d893:
+.TooEarly:
writetext UnknownText_0x5e131
waitbutton
closetext
checkcellnum PHONE_BUENA
- iftrue UnknownScript_0x5d8a3
+ iftrue .Registered4
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
- iftrue UnknownScript_0x5d8cc
-UnknownScript_0x5d8a3:
+ iftrue .OfferedNumberBefore
+.Registered4:
end
-UnknownScript_0x5d8a4:
+.BlueCardCapped1:
checkcellnum PHONE_BUENA
- iftrue UnknownScript_0x5d8fe
+ iftrue .HasNumber
pause 20
turnobject RADIOTOWER2F_BUENA, DOWN
pause 15
turnobject PLAYER, UP
pause 15
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
- iftrue UnknownScript_0x5d8cc
+ iftrue .OfferedNumberBefore
showemote EMOTE_SHOCK, RADIOTOWER2F_BUENA, 15
setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
opentext
writetext UnknownText_0x5e1ee
- jump UnknownScript_0x5d8d0
+ jump .AskForNumber
-UnknownScript_0x5d8cc:
+.OfferedNumberBefore:
opentext
writetext UnknownText_0x5e2bf
-UnknownScript_0x5d8d0:
+.AskForNumber:
askforphonenumber PHONE_BUENA
- ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5d8f6
- ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5d8ed
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
writetext UnknownText_0x5e2f3
playsound SFX_REGISTER_PHONE_NUMBER
waitsfx
@@ -292,33 +292,33 @@ UnknownScript_0x5d8d0:
addcellnum PHONE_BUENA
end
-UnknownScript_0x5d8ed:
+.NumberDeclined:
writetext UnknownText_0x5e33c
waitbutton
closetext
turnobject RADIOTOWER2F_BUENA, RIGHT
end
-UnknownScript_0x5d8f6:
+.PhoneFull:
writetext UnknownText_0x5e35e
waitbutton
closetext
turnobject RADIOTOWER2F_BUENA, RIGHT
-UnknownScript_0x5d8fe:
+.HasNumber:
end
-ReceptionistScript_0x5d8ff:
+RadioTowerBuenaPrizeReceptionist:
faceplayer
opentext
checkitem BLUE_CARD
- iffalse UnknownScript_0x5d90f
+ iffalse .NoCard
writetext UnknownText_0x5e392
buttonsound
special BuenaPrize
closetext
end
-UnknownScript_0x5d90f:
+.NoCard:
writetext UnknownText_0x5e3d8
buttonsound
closetext
@@ -736,4 +736,4 @@ RadioTower2F_MapEvents:
object_event 1, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER
object_event 12, 1, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1
object_event 14, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Buena, -1
- object_event 12, 7, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS
+ object_event 12, 7, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTowerBuenaPrizeReceptionist, EVENT_GOLDENROD_CITY_CIVILIANS
diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
index b409066dc..e722bbdc4 100644
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -30,13 +30,13 @@ GymGuyScript_0x5e556:
faceplayer
opentext
checkevent EVENT_CLEARED_RADIO_TOWER
- iftrue UnknownScript_0x5e564
+ iftrue .NoRockets
writetext UnknownText_0x5e682
waitbutton
closetext
end
-UnknownScript_0x5e564:
+.NoRockets:
writetext UnknownText_0x5e6eb
waitbutton
closetext
@@ -46,37 +46,37 @@ CooltrainerFScript_0x5e56a:
faceplayer
opentext
checkevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER
- iftrue UnknownScript_0x5e59d
+ iftrue .GotSunnyDay
checkevent EVENT_CLEARED_RADIO_TOWER
- iftrue UnknownScript_0x5e58a
+ iftrue .NoRockets
checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
- iftrue UnknownScript_0x5e584
+ iftrue .UsedCardKey
writetext UnknownText_0x5e754
waitbutton
closetext
end
-UnknownScript_0x5e584:
+.UsedCardKey:
writetext UnknownText_0x5e7cb
waitbutton
closetext
end
-UnknownScript_0x5e58a:
+.NoRockets:
writetext UnknownText_0x5e7e2
buttonsound
verbosegiveitem TM_SUNNY_DAY
- iffalse UnknownScript_0x5e5a1
+ iffalse .NoRoom
writetext UnknownText_0x5e821
waitbutton
closetext
setevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER
end
-UnknownScript_0x5e59d:
+.GotSunnyDay:
writetext UnknownText_0x5e85c
waitbutton
-UnknownScript_0x5e5a1:
+.NoRoom:
closetext
end
@@ -129,10 +129,10 @@ MapRadioTower3FSignpost2Script::
writetext UnknownText_0x5eaa4
waitbutton
checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
- iftrue UnknownScript_0x5e603
+ iftrue .UsedCardKey
checkitem CARD_KEY
iftrue UnknownScript_0x5e605
-UnknownScript_0x5e603:
+.UsedCardKey:
closetext
end
diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm
index 829ea271f..f24c58084 100644
--- a/maps/Route30BerryHouse.asm
+++ b/maps/Route30BerryHouse.asm
@@ -6,27 +6,27 @@ Route30BerryHouse_MapScripts:
db 0 ; callbacks
-PokefanMScript_0x196d64:
+Route30BerryHousePokefanMScript:
faceplayer
opentext
checkevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
- iftrue UnknownScript_0x196d79
- writetext UnknownText_0x196d82
+ iftrue .GotBerry
+ writetext Route30BerrySpeechHouseMonEatBerriesText
buttonsound
verbosegiveitem BERRY
- iffalse UnknownScript_0x196d7d
+ iffalse .NoRoom
setevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
-UnknownScript_0x196d79:
- writetext UnknownText_0x196dec
+.GotBerry:
+ writetext Route30BerrySpeechHouseCheckTreesText
waitbutton
-UnknownScript_0x196d7d:
+.NoRoom:
closetext
end
Route30BerryHouseBookshelf:
jumpstd magazinebookshelf
-UnknownText_0x196d82:
+Route30BerrySpeechHouseMonEatBerriesText:
text "You know, #MON"
line "eat BERRIES."
@@ -38,7 +38,7 @@ UnknownText_0x196d82:
line "one with you!"
done
-UnknownText_0x196dec:
+Route30BerrySpeechHouseCheckTreesText:
text "Check trees for"
line "BERRIES. They just"
cont "drop right off."
@@ -58,4 +58,4 @@ Route30BerryHouse_MapEvents:
bg_event 1, 1, BGEVENT_READ, Route30BerryHouseBookshelf
db 1 ; object events
- object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1
+ object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route30BerryHousePokefanMScript, -1
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index 95d45ecc7..bd208e61d 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -22,9 +22,9 @@ Route34IlexForestGate_MapScripts:
appear ROUTE34ILEXFORESTGATE_TEACHER1
return
-UnknownScript_0x62d3d:
+Route34IlexForestGateCelebiEvent:
checkevent EVENT_FOREST_IS_RESTLESS
- iffalse UnknownScript_0x62d62
+ iffalse .skip
showemote EMOTE_SHOCK, ROUTE34ILEXFORESTGATE_TEACHER2, 20
turnobject ROUTE34ILEXFORESTGATE_TEACHER2, LEFT
turnobject PLAYER, RIGHT
@@ -37,29 +37,29 @@ UnknownScript_0x62d3d:
waitbutton
closetext
applymovement ROUTE34ILEXFORESTGATE_TEACHER2, MovementData_0x62d9a
-UnknownScript_0x62d62:
+.skip:
end
TeacherScript_0x62d63:
faceplayer
opentext
checkevent EVENT_FOREST_IS_RESTLESS
- iftrue UnknownScript_0x62d84
+ iftrue .ForestIsRestless
checkevent EVENT_GOT_TM12_SWEET_SCENT
- iftrue UnknownScript_0x62d7e
+ iftrue .GotSweetScent
writetext UnknownText_0x62d9d
buttonsound
verbosegiveitem TM_SWEET_SCENT
- iffalse UnknownScript_0x62d82
+ iffalse .NoRoom
setevent EVENT_GOT_TM12_SWEET_SCENT
-UnknownScript_0x62d7e:
+.GotSweetScent:
writetext UnknownText_0x62df6
waitbutton
-UnknownScript_0x62d82:
+.NoRoom:
closetext
end
-UnknownScript_0x62d84:
+.ForestIsRestless:
writetext UnknownText_0x62e41
buttonsound
closetext
@@ -143,7 +143,7 @@ Route34IlexForestGate_MapEvents:
warp_event 5, 7, ILEX_FOREST, 1
db 1 ; coord events
- coord_event 4, 7, SCENE_DEFAULT, UnknownScript_0x62d3d
+ coord_event 4, 7, SCENE_DEFAULT, Route34IlexForestGateCelebiEvent
db 0 ; bg events
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 198536229..7073e90ed 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -307,13 +307,13 @@ YoungsterScript_0x6ad06:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iffalse UnknownScript_0x6ad14
+ iffalse .StillCompeting
writetext UnknownText_0x6b399
waitbutton
closetext
end
-UnknownScript_0x6ad14:
+.StillCompeting:
writetext UnknownText_0x6b3c4
waitbutton
closetext
@@ -323,13 +323,13 @@ YoungsterScript_0x6ad1a:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iffalse UnknownScript_0x6ad28
+ iffalse .StillCompeting
writetext UnknownText_0x6b40f
waitbutton
closetext
end
-UnknownScript_0x6ad28:
+.StillCompeting:
writetext UnknownText_0x6b440
waitbutton
closetext
@@ -339,13 +339,13 @@ RockerScript_0x6ad2e:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iffalse UnknownScript_0x6ad3c
+ iffalse .StillCompeting
writetext UnknownText_0x6b462
waitbutton
closetext
end
-UnknownScript_0x6ad3c:
+.StillCompeting:
writetext UnknownText_0x6b496
waitbutton
closetext
@@ -355,13 +355,13 @@ PokefanMScript_0x6ad42:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iffalse UnknownScript_0x6ad50
+ iffalse .StillCompeting
writetext UnknownText_0x6b4da
waitbutton
closetext
end
-UnknownScript_0x6ad50:
+.StillCompeting:
writetext UnknownText_0x6b50a
waitbutton
closetext
@@ -371,13 +371,13 @@ YoungsterScript_0x6ad56:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iffalse UnknownScript_0x6ad64
+ iffalse .StillCompeting
writetext UnknownText_0x6b54e
waitbutton
closetext
end
-UnknownScript_0x6ad64:
+.StillCompeting:
writetext UnknownText_0x6b57c
waitbutton
closetext
@@ -387,13 +387,13 @@ YoungsterScript_0x6ad6a:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iffalse UnknownScript_0x6ad78
+ iffalse .StillCompeting
writetext UnknownText_0x6b5b0
waitbutton
closetext
end
-UnknownScript_0x6ad78:
+.StillCompeting:
writetext UnknownText_0x6b5dd
waitbutton
closetext
@@ -403,13 +403,13 @@ LassScript_0x6ad7e:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iffalse UnknownScript_0x6ad8c
+ iffalse .StillCompeting
writetext UnknownText_0x6b64b
waitbutton
closetext
end
-UnknownScript_0x6ad8c:
+.StillCompeting:
writetext UnknownText_0x6b698
waitbutton
closetext
@@ -419,13 +419,13 @@ YoungsterScript_0x6ad92:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iffalse UnknownScript_0x6ada0
+ iffalse .StillCompeting
writetext UnknownText_0x6b6b8
waitbutton
closetext
end
-UnknownScript_0x6ada0:
+.StillCompeting:
writetext UnknownText_0x6b6e9
waitbutton
closetext
@@ -435,13 +435,13 @@ YoungsterScript_0x6ada6:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iffalse UnknownScript_0x6adb4
+ iffalse .StillCompeting
writetext UnknownText_0x6b71b
waitbutton
closetext
end
-UnknownScript_0x6adb4:
+.StillCompeting:
writetext UnknownText_0x6b740
waitbutton
closetext
@@ -451,13 +451,13 @@ YoungsterScript_0x6adba:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iffalse UnknownScript_0x6adc8
+ iffalse .StillCompeting
writetext UnknownText_0x6b76f
waitbutton
closetext
end
-UnknownScript_0x6adc8:
+.StillCompeting:
writetext UnknownText_0x6b7af
waitbutton
closetext
diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm
index 747c2d40d..7a253049a 100644
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -50,10 +50,10 @@ MapRuinsOfAlphAerodactylChamberSignpost2Script:
writebyte UNOWNPUZZLE_AERODACTYL
special UnownPuzzle
closetext
- iftrue UnknownScript_0x58df7
+ iftrue .PuzzleComplete
end
-UnknownScript_0x58df7:
+.PuzzleComplete:
setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
setevent EVENT_SOLVED_AERODACTYL_PUZZLE
setflag ENGINE_UNLOCKED_UNOWNS_S_TO_W
@@ -88,7 +88,7 @@ MapRuinsOfAlphAerodactylChamberSignpost4Script:
MapRuinsOfAlphAerodactylChamberSignpost5Script:
checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
- iftrue UnknownScript_0x58e46
+ iftrue .WallOpen
opentext
writetext UnknownText_0x58e81
writebyte UNOWNWORDS_LIGHT
@@ -96,7 +96,7 @@ MapRuinsOfAlphAerodactylChamberSignpost5Script:
closetext
end
-UnknownScript_0x58e46:
+.WallOpen:
opentext
writetext UnknownText_0x58ea2
waitbutton
diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm
index e4df9dbe0..9c03e2654 100644
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -51,10 +51,10 @@ MapRuinsOfAlphHoOhChamberSignpost2Script:
writebyte UNOWNPUZZLE_HO_OH
special UnownPuzzle
closetext
- iftrue UnknownScript_0x585ba
+ iftrue .PuzzleComplete
end
-UnknownScript_0x585ba:
+.PuzzleComplete:
setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
setevent EVENT_SOLVED_HO_OH_PUZZLE
setflag ENGINE_UNLOCKED_UNOWNS_X_TO_Z
@@ -89,7 +89,7 @@ MapRuinsOfAlphHoOhChamberSignpost4Script:
MapRuinsOfAlphHoOhChamberSignpost5Script:
checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
- iftrue UnknownScript_0x58609
+ iftrue .WallOpen
opentext
writetext UnknownText_0x58644
writebyte UNOWNWORDS_HO_OH
@@ -97,7 +97,7 @@ MapRuinsOfAlphHoOhChamberSignpost5Script:
closetext
end
-UnknownScript_0x58609:
+.WallOpen:
opentext
writetext UnknownText_0x58665
waitbutton
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index c56f6d1d0..da288c52b 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -57,10 +57,10 @@ MapRuinsOfAlphKabutoChamberSignpost2Script:
writebyte UNOWNPUZZLE_KABUTO
special UnownPuzzle
closetext
- iftrue UnknownScript_0x58778
+ iftrue .PuzzleComplete
end
-UnknownScript_0x58778:
+.PuzzleComplete:
setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
setevent EVENT_SOLVED_KABUTO_PUZZLE
setflag ENGINE_UNLOCKED_UNOWNS_A_TO_K
@@ -84,27 +84,27 @@ ScientistScript_0x587a8:
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
- ifequal NUM_UNOWN, UnknownScript_0x587cf
+ ifequal NUM_UNOWN, .AllUnownCaught
checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
- iftrue UnknownScript_0x587c9
+ iftrue .WallOpen
checkevent EVENT_SOLVED_KABUTO_PUZZLE
- iffalse UnknownScript_0x587c0
+ iffalse .PuzzleIncomplete
writetext UnknownText_0x589b8
buttonsound
-UnknownScript_0x587c0:
+.PuzzleIncomplete:
writetext UnknownText_0x588f5
waitbutton
closetext
turnobject RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP
end
-UnknownScript_0x587c9:
+.WallOpen:
writetext UnknownText_0x5897c
waitbutton
closetext
end
-UnknownScript_0x587cf:
+.AllUnownCaught:
writetext UnknownText_0x594cb
waitbutton
closetext
@@ -126,7 +126,7 @@ MapRuinsOfAlphKabutoChamberSignpost4Script:
MapRuinsOfAlphKabutoChamberSignpost5Script:
checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
- iftrue UnknownScript_0x587f7
+ iftrue .WallOpen
opentext
writetext UnknownText_0x58ad9
writebyte UNOWNWORDS_ESCAPE
@@ -134,7 +134,7 @@ MapRuinsOfAlphKabutoChamberSignpost5Script:
closetext
end
-UnknownScript_0x587f7:
+.WallOpen:
opentext
writetext UnknownText_0x58afa
waitbutton
diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm
index 6f166a416..1f364e67e 100644
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -51,10 +51,10 @@ MapRuinsOfAlphOmanyteChamberSignpost2Script:
writebyte UNOWNPUZZLE_OMANYTE
special UnownPuzzle
closetext
- iftrue UnknownScript_0x58c36
+ iftrue .PuzzleComplete
end
-UnknownScript_0x58c36:
+.PuzzleComplete:
setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
setevent EVENT_SOLVED_OMANYTE_PUZZLE
setflag ENGINE_UNLOCKED_UNOWNS_L_TO_R
@@ -89,7 +89,7 @@ MapRuinsOfAlphOmanyteChamberSignpost4Script:
MapRuinsOfAlphOmanyteChamberSignpost5Script:
checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
- iftrue UnknownScript_0x58c85
+ iftrue .WallOpen
opentext
writetext UnknownText_0x58cc0
writebyte UNOWNWORDS_WATER
@@ -97,7 +97,7 @@ MapRuinsOfAlphOmanyteChamberSignpost5Script:
closetext
end
-UnknownScript_0x58c85:
+.WallOpen:
opentext
writetext UnknownText_0x58ce1
waitbutton
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index c05583cd4..491cc5a80 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -61,13 +61,13 @@ ScientistScript_0x591d1:
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
- ifequal NUM_UNOWN, UnknownScript_0x591df
+ ifequal NUM_UNOWN, .PrinterAvailable
writetext UnknownText_0x59311
waitbutton
closetext
end
-UnknownScript_0x591df:
+.PrinterAvailable:
writetext UnknownText_0x5935f
waitbutton
closetext
@@ -77,29 +77,29 @@ ScientistScript_0x591e5:
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
- ifequal NUM_UNOWN, UnknownScript_0x5920b
+ ifequal NUM_UNOWN, .GotAllUnown
checkflag ENGINE_UNOWN_DEX
- iftrue UnknownScript_0x59205
+ iftrue .GotUnownDex
checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
- iftrue UnknownScript_0x591ff
+ iftrue .UnownAppeared
writetext UnknownText_0x593ed
waitbutton
closetext
end
-UnknownScript_0x591ff:
+.UnownAppeared:
writetext UnknownText_0x59478
waitbutton
closetext
end
-UnknownScript_0x59205:
+.GotUnownDex:
writetext UnknownText_0x59445
waitbutton
closetext
end
-UnknownScript_0x5920b:
+.GotAllUnown:
writetext UnknownText_0x594cb
waitbutton
closetext
@@ -110,21 +110,21 @@ ScientistScript_0x59214:
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
- ifequal NUM_UNOWN, UnknownScript_0x5922e
+ ifequal NUM_UNOWN, .GotAllUnown
checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
- iftrue UnknownScript_0x59228
+ iftrue .UnownAppeared
writetext UnknownText_0x5954f
waitbutton
closetext
end
-UnknownScript_0x59228:
+.UnownAppeared:
writetext UnknownText_0x595cb
waitbutton
closetext
end
-UnknownScript_0x5922e:
+.GotAllUnown:
writetext UnknownText_0x59769
waitbutton
closetext
@@ -133,16 +133,16 @@ UnknownScript_0x5922e:
MapRuinsOfAlphResearchCenterSignpost1Script:
opentext
checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
- iftrue UnknownScript_0x59241
+ iftrue .SkipChecking
checkcode VAR_UNOWNCOUNT
- ifequal NUM_UNOWN, UnknownScript_0x59247
-UnknownScript_0x59241:
+ ifequal NUM_UNOWN, .GotAllUnown
+.SkipChecking:
writetext UnknownText_0x597b6
waitbutton
closetext
end
-UnknownScript_0x59247:
+.GotAllUnown:
writetext UnknownText_0x597d9
waitbutton
closetext
@@ -151,16 +151,16 @@ UnknownScript_0x59247:
MapRuinsOfAlphResearchCenterSignpost2Script:
opentext
checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
- iftrue UnknownScript_0x5925a
+ iftrue .SkipChecking
checkcode VAR_UNOWNCOUNT
- ifequal NUM_UNOWN, UnknownScript_0x59260
-UnknownScript_0x5925a:
+ ifequal NUM_UNOWN, .PrinterAvailable
+.SkipChecking:
writetext UnknownText_0x5980e
waitbutton
closetext
end
-UnknownScript_0x59260:
+.PrinterAvailable:
writetext UnknownText_0x5982d
waitbutton
special UnownPrinter
diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm
index 6d1ddbebc..45a12672e 100644
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -22,13 +22,13 @@ LassScript_0x19932a:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x199338
+ iftrue .ReturnedPart
writetext UnknownText_0x19938d
waitbutton
closetext
end
-UnknownScript_0x199338:
+.ReturnedPart:
writetext UnknownText_0x19940d
waitbutton
closetext
@@ -38,13 +38,13 @@ PokefanMScript_0x19933e:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x19934c
+ iftrue .ReturnedPart
writetext UnknownText_0x199460
waitbutton
closetext
end
-UnknownScript_0x19934c:
+.ReturnedPart:
writetext UnknownText_0x1994ae
waitbutton
closetext
@@ -60,13 +60,13 @@ FisherScript_0x199358:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x199366
+ iftrue .ReturnedPart
writetext UnknownText_0x1995fc
waitbutton
closetext
end
-UnknownScript_0x199366:
+.ReturnedPart:
writetext UnknownText_0x19964b
waitbutton
closetext
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 53fc9e44e..ac23b7b92 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -96,18 +96,18 @@ UnknownScript_0x6e056:
playmusic MUSIC_ROCKET_ENCOUNTER
turnobject TEAMROCKETBASEB3F_ROCKET1, DOWN
opentext
- writetext UnknownText_0x6e400
+ writetext ExecutiveM4BeforeText
waitbutton
closetext
applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e142
- winlosstext UnknownText_0x6e511, 0
+ winlosstext ExecutiveM4BeatenText, 0
setlasttalked TEAMROCKETBASEB3F_ROCKET1
loadtrainer EXECUTIVEM, EXECUTIVEM_4
startbattle
reloadmapafterbattle
setevent EVENT_BEAT_ROCKET_EXECUTIVEM_4
opentext
- writetext UnknownText_0x6e548
+ writetext ExecutiveM4AfterText
waitbutton
closetext
applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e144
@@ -383,7 +383,7 @@ RocketBaseRivalText:
cont "the likes of you!"
done
-UnknownText_0x6e400:
+ExecutiveM4BeforeText:
text "What? Who are you?"
line "This is the office"
@@ -410,7 +410,7 @@ UnknownText_0x6e400:
cont "place!"
done
-UnknownText_0x6e511:
+ExecutiveM4BeatenText:
text "I… I couldn't do a"
line "thing…"
@@ -418,7 +418,7 @@ UnknownText_0x6e511:
line "forgive me…"
done
-UnknownText_0x6e548:
+ExecutiveM4AfterText:
text "No, I can't let"
line "this affect me."
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 8d8ed3ea8..b231bfa8b 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -35,11 +35,11 @@ VermilionPort_MapScripts:
blackoutmod VERMILION_CITY
end
-SailorScript_0x74dc4:
+VermilionPortSailorAtGangway:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iftrue UnknownScript_0x74e1a
+ iftrue VermilionPortAlreadyRodeScript
writetext UnknownText_0x74f06
waitbutton
closetext
@@ -70,71 +70,71 @@ SailorScript_0x74dc4:
warp FAST_SHIP_1F, 25, 1
end
-UnknownScript_0x74e1a:
+VermilionPortAlreadyRodeScript:
writetext UnknownText_0x74f31
waitbutton
closetext
end
-UnknownScript_0x74e20:
+VermilionPortWalkUpToShipScript:
turnobject VERMILIONPORT_SAILOR2, RIGHT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iftrue UnknownScript_0x74e86
+ iftrue .skip
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
- iftrue UnknownScript_0x74e86
+ iftrue .skip
turnobject PLAYER, LEFT
opentext
checkcode VAR_WEEKDAY
- ifequal MONDAY, UnknownScript_0x74e72
- ifequal TUESDAY, UnknownScript_0x74e72
- ifequal THURSDAY, UnknownScript_0x74e7c
- ifequal FRIDAY, UnknownScript_0x74e7c
- ifequal SATURDAY, UnknownScript_0x74e7c
+ ifequal MONDAY, .NextShipWednesday
+ ifequal TUESDAY, .NextShipWednesday
+ ifequal THURSDAY, .NextShipSunday
+ ifequal FRIDAY, .NextShipSunday
+ ifequal SATURDAY, .NextShipSunday
writetext UnknownText_0x74f4d
yesorno
- iffalse UnknownScript_0x74e8d
+ iffalse VermilionPortNotRidingMoveAwayScript
writetext UnknownText_0x74f8b
buttonsound
checkitem S_S_TICKET
- iffalse UnknownScript_0x74e68
- writetext UnknownText_0x74fc2
+ iffalse .NoTicket
+ writetext VermilionPortSSTicketText
waitbutton
closetext
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
applymovement PLAYER, MovementData_0x74ef8
- jump SailorScript_0x74dc4
+ jump VermilionPortSailorAtGangway
-UnknownScript_0x74e68:
+.NoTicket:
writetext UnknownText_0x74ff2
waitbutton
closetext
applymovement PLAYER, MovementData_0x74ef5
end
-UnknownScript_0x74e72:
+.NextShipWednesday:
writetext UnknownText_0x75059
waitbutton
closetext
applymovement PLAYER, MovementData_0x74ef5
end
-UnknownScript_0x74e7c:
+.NextShipSunday:
writetext UnknownText_0x75080
waitbutton
closetext
applymovement PLAYER, MovementData_0x74ef5
end
-UnknownScript_0x74e86:
+.skip:
end
-UnknownScript_0x74e87:
+VermilionPortNotRidingScript:
writetext UnknownText_0x74fa7
waitbutton
closetext
end
-UnknownScript_0x74e8d:
+VermilionPortNotRidingMoveAwayScript:
writetext UnknownText_0x74fa7
waitbutton
closetext
@@ -145,7 +145,7 @@ SailorScript_0x74e97:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iftrue UnknownScript_0x74e1a
+ iftrue VermilionPortAlreadyRodeScript
checkcode VAR_WEEKDAY
ifequal MONDAY, .NextShipWednesday
ifequal TUESDAY, .NextShipWednesday
@@ -154,17 +154,17 @@ SailorScript_0x74e97:
ifequal SATURDAY, .NextShipSunday
writetext UnknownText_0x74f4d
yesorno
- iffalse UnknownScript_0x74e87
+ iffalse VermilionPortNotRidingScript
writetext UnknownText_0x74f8b
buttonsound
checkitem S_S_TICKET
iffalse .NoTicket
- writetext UnknownText_0x74fc2
+ writetext VermilionPortSSTicketText
waitbutton
closetext
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
applymovement PLAYER, MovementData_0x74efe
- jump SailorScript_0x74dc4
+ jump VermilionPortSailorAtGangway
.NoTicket:
writetext UnknownText_0x74ff2
@@ -255,7 +255,7 @@ UnknownText_0x74fa7:
line "again!"
done
-UnknownText_0x74fc2:
+VermilionPortSSTicketText:
text "<PLAYER> flashed"
line "the S.S.TICKET."
@@ -304,12 +304,12 @@ VermilionPort_MapEvents:
warp_event 7, 17, FAST_SHIP_1F, 1
db 1 ; coord events
- coord_event 7, 11, SCENE_DEFAULT, UnknownScript_0x74e20
+ coord_event 7, 11, SCENE_DEFAULT, VermilionPortWalkUpToShipScript
db 1 ; bg events
bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron
db 3 ; object events
- object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
+ object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSailorAtGangway, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1
object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index cf2219908..065b3335a 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -19,7 +19,7 @@ VictoryRoad_MapScripts:
.DummyScene1:
end
-UnknownScript_0x74492:
+VictoryRoadRivalLeft:
moveobject VICTORYROAD_SILVER, 18, 11
turnobject PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
@@ -27,69 +27,69 @@ UnknownScript_0x74492:
pause 15
appear VICTORYROAD_SILVER
applymovement VICTORYROAD_SILVER, MovementData_0x74539
- scall UnknownScript_0x744d4
+ scall VictoryRoadRivalNext
applymovement VICTORYROAD_SILVER, MovementData_0x7454c
disappear VICTORYROAD_SILVER
setscene SCENE_FINISHED
playmapmusic
end
-UnknownScript_0x744b5:
+VictoryRoadRivalRight:
turnobject PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
appear VICTORYROAD_SILVER
applymovement VICTORYROAD_SILVER, MovementData_0x74542
- scall UnknownScript_0x744d4
+ scall VictoryRoadRivalNext
applymovement VICTORYROAD_SILVER, MovementData_0x74555
disappear VICTORYROAD_SILVER
setscene SCENE_FINISHED
playmapmusic
end
-UnknownScript_0x744d4:
+VictoryRoadRivalNext:
turnobject PLAYER, DOWN
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
- writetext UnknownText_0x7455f
+ writetext VictoryRoadRivalBeforeText
waitbutton
closetext
setevent EVENT_RIVAL_VICTORY_ROAD
checkevent EVENT_GOT_TOTODILE_FROM_ELM
- iftrue UnknownScript_0x744ff
+ iftrue .GotTotodile
checkevent EVENT_GOT_CHIKORITA_FROM_ELM
- iftrue UnknownScript_0x7450f
- winlosstext UnknownText_0x7463d, UnknownText_0x747aa
+ iftrue .GotChikorita
+ winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText
setlasttalked VICTORYROAD_SILVER
loadtrainer RIVAL1, RIVAL1_5_TOTODILE
startbattle
dontrestartmapmusic
reloadmapafterbattle
- jump UnknownScript_0x7451f
+ jump .AfterBattle
-UnknownScript_0x744ff:
- winlosstext UnknownText_0x7463d, UnknownText_0x747aa
+.GotTotodile:
+ winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText
setlasttalked VICTORYROAD_SILVER
loadtrainer RIVAL1, RIVAL1_5_CHIKORITA
startbattle
dontrestartmapmusic
reloadmapafterbattle
- jump UnknownScript_0x7451f
+ jump .AfterBattle
-UnknownScript_0x7450f:
- winlosstext UnknownText_0x7463d, UnknownText_0x747aa
+.GotChikorita:
+ winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText
setlasttalked VICTORYROAD_SILVER
loadtrainer RIVAL1, RIVAL1_5_CYNDAQUIL
startbattle
dontrestartmapmusic
reloadmapafterbattle
- jump UnknownScript_0x7451f
+ jump .AfterBattle
-UnknownScript_0x7451f:
+.AfterBattle:
playmusic MUSIC_RIVAL_AFTER
opentext
- writetext UnknownText_0x746ce
+ writetext VictoryRoadRivalAfterText
waitbutton
closetext
end
@@ -161,7 +161,7 @@ MovementData_0x74555:
step DOWN
step_end
-UnknownText_0x7455f:
+VictoryRoadRivalBeforeText:
text "Hold it."
para "…Are you going to"
@@ -187,7 +187,7 @@ UnknownText_0x7455f:
line "I challenge you!"
done
-UnknownText_0x7463d:
+VictoryRoadRivalDefeatText:
text "…I couldn't win…"
para "I gave it every-"
@@ -203,7 +203,7 @@ UnknownText_0x7463d:
line "said to me…"
done
-UnknownText_0x746ce:
+VictoryRoadRivalAfterText:
text "…I haven't given up"
line "on becoming the"
cont "greatest trainer…"
@@ -225,7 +225,7 @@ UnknownText_0x746ce:
line "at it until then."
done
-UnknownText_0x747aa:
+VictoryRoadRivalVictoryText:
text "…Humph!"
para "When it comes down"
@@ -252,8 +252,8 @@ VictoryRoad_MapEvents:
warp_event 13, 5, ROUTE_23, 3
db 2 ; coord events
- coord_event 12, 8, SCENE_DEFAULT, UnknownScript_0x74492
- coord_event 13, 8, SCENE_DEFAULT, UnknownScript_0x744b5
+ coord_event 12, 8, SCENE_DEFAULT, VictoryRoadRivalLeft
+ coord_event 13, 8, SCENE_DEFAULT, VictoryRoadRivalRight
db 2 ; bg events
bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-31 01:53:26 +0000