ref: f404af8a4326e4cc632a3810ff77a013c1d3e24f
parent: 4046b41c3aaaf0d930f0268e52112aa7ea01e0a4
parent: c959f7a2ea7dbe044489eb2ba6dc963a40717535
author: yenatch <yenatch@gmail.com>
date: Sun Feb 25 15:12:31 EST 2018
Merge pull request #486 from surskitty/master Another batch of label names
--- a/engine/phone/phone_gossip.asm
+++ b/engine/phone/phone_gossip.asm
@@ -258,89 +258,89 @@
IrwinRumorScript:
checkevent EVENT_OPENED_MT_SILVER
- iftrue IrwinMtSilver
+ iftrue .MtSilver
checkevent EVENT_FOUGHT_SNORLAX
- iftrue IrwinSnorlax
+ iftrue .Snorlax
checkevent EVENT_GOT_PASS_FROM_COPYCAT
- iftrue IrwinTrainPass
+ iftrue .TrainPass
checkflag ENGINE_MARSHBADGE
- iftrue IrwinMarshBadge
+ iftrue .MarshBadge
checkflag ENGINE_FLYPOINT_VERMILION
- iftrue IrwinVermilionCity
+ iftrue .VermilionCity
checkevent EVENT_BEAT_ELITE_FOUR
- iftrue IrwinEliteFour
+ iftrue .EliteFour
checkflag ENGINE_RISINGBADGE
- iftrue IrwinRisingBadge
+ iftrue .RisingBadge
checkevent EVENT_CLEARED_RADIO_TOWER
- iftrue IrwinRadioTower
+ iftrue .RadioTower
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
- iftrue IrwinRocketHideout
+ iftrue .RocketHideout
checkevent EVENT_JASMINE_RETURNED_TO_GYM
- iftrue IrwinJasmineReturned
+ iftrue .JasmineReturned
checkflag ENGINE_FOGBADGE
- iftrue IrwinFogBadge
+ iftrue .FogBadge
checkflag ENGINE_PLAINBADGE
- iftrue IrwinPlainBadge
+ iftrue .PlainBadge
farwritetext IrwinCalledRightAwayText
buttonsound
jump PhoneScript_HangupText_Male
-IrwinPlainBadge:
+.PlainBadge:
farwritetext UnknownText_0x64099
buttonsound
jump PhoneScript_HangupText_Male
-IrwinJasmineReturned:
+.JasmineReturned:
farwritetext UnknownText_0x640e6
buttonsound
jump PhoneScript_HangupText_Male
-IrwinRocketHideout:
+.RocketHideout:
farwritetext UnknownText_0x6416d
buttonsound
jump PhoneScript_HangupText_Male
-IrwinRadioTower:
+.RadioTower:
farwritetext UnknownText_0x641e8
buttonsound
jump PhoneScript_HangupText_Male
-IrwinRisingBadge:
+.RisingBadge:
farwritetext UnknownText_0x64247
buttonsound
jump PhoneScript_HangupText_Male
-IrwinEliteFour:
+.EliteFour:
farwritetext UnknownText_0x642bb
buttonsound
jump PhoneScript_HangupText_Male
-IrwinVermilionCity:
+.VermilionCity:
farwritetext UnknownText_0x643d4
buttonsound
jump PhoneScript_HangupText_Male
-IrwinTrainPass:
+.TrainPass:
farwritetext UnknownText_0x64448
buttonsound
jump PhoneScript_HangupText_Male
-IrwinSnorlax:
+.Snorlax:
farwritetext UnknownText_0x6455b
buttonsound
jump PhoneScript_HangupText_Male
-IrwinMtSilver:
+.MtSilver:
farwritetext UnknownText_0x645ff
buttonsound
jump PhoneScript_HangupText_Male
-IrwinFogBadge:
+.FogBadge:
farwritetext UnknownText_0x646df
buttonsound
jump PhoneScript_HangupText_Male
-IrwinMarshBadge:
+.MarshBadge:
farwritetext UnknownText_0x647d8
buttonsound
jump PhoneScript_HangupText_Male
--- a/engine/phone/phone_scripts.asm
+++ b/engine/phone/phone_scripts.asm
@@ -74,17 +74,17 @@
MomSavingMoney: ; 0xbcf37
checkflag ENGINE_MOM_SAVING_MONEY
- iffalse MomIsNotSaving
+ iffalse .NotSaving
checkmoney MOMS_MONEY, 0
- if_equal HAVE_MORE, MomSavingHasMoney
- jump MomSavingButBroke
+ if_equal HAVE_MORE, .SavingHasMoney
+ jump .SavingNoMoney
-MomIsNotSaving: ; 0xbcf49
+.NotSaving: ; 0xbcf49
checkmoney MOMS_MONEY, 0
- if_equal HAVE_MORE, MomHasMoney
- jump MomHasNoMoney
+ if_equal HAVE_MORE, .HasMoney
+ jump .NoMoney
-MomSavingHasMoney: ; 0xbcf55
+.SavingHasMoney: ; 0xbcf55
readmoney MOMS_MONEY, MEM_BUFFER_0
farwritetext MomCheckBalanceText
yesorno
@@ -91,19 +91,19 @@
iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript
-MomSavingButBroke: ; 0xbcf63
+.SavingNoMoney: ; 0xbcf63
farwritetext MomImportantToSaveText
yesorno
iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript
-MomHasNoMoney: ; 0xbcf6e
+.NoMoney: ; 0xbcf6e
farwritetext MomYoureNotSavingText
yesorno
iftrue MomPhoneSaveMoneyScript
jump MomPhoneWontSaveMoneyScript
-MomHasMoney: ; 0xbcf79
+.HasMoney: ; 0xbcf79
readmoney MOMS_MONEY, MEM_BUFFER_0
farwritetext MomYouveSavedText
yesorno
@@ -663,12 +663,12 @@
WadePhoneScript1:
trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0
checkflag ENGINE_WADE
- iftrue WadeWantsBattle
+ iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_WADE_TUESDAY_NIGHT
iftrue .NotTuesday
checkflag ENGINE_WADE_HAS_ITEM
- iftrue WadeHasItem
+ iftrue .HasItem
checkcode VAR_WEEKDAY
if_not_equal TUESDAY, .NotTuesday
checknite
@@ -680,21 +680,21 @@
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue .NoContest
checkcode VAR_WEEKDAY
- if_equal TUESDAY, WadeContestToday
- if_equal THURSDAY, WadeContestToday
- if_equal SATURDAY, WadeContestToday
+ if_equal TUESDAY, .ContestToday
+ if_equal THURSDAY, .ContestToday
+ if_equal SATURDAY, .ContestToday
.NoContest:
farjump UnknownScript_0xa0938
-WadeContestToday:
+.ContestToday:
farjump PhoneScript_BugCatchingContest
-WadeWantsBattle:
+.WantsBattle:
landmarktotext ROUTE_31, MEM_BUFFER_2
farjump UnknownScript_0xa0a50
-WadeHasItem:
+.HasItem:
landmarktotext ROUTE_31, MEM_BUFFER_2
farjump UnknownScript_0xa0ab5
@@ -706,9 +706,9 @@
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue .NoContest
checkcode VAR_WEEKDAY
- if_equal TUESDAY, Wade_ContestToday
- if_equal THURSDAY, Wade_ContestToday
- if_equal SATURDAY, Wade_ContestToday
+ if_equal TUESDAY, .ContestToday
+ if_equal THURSDAY, .ContestToday
+ if_equal SATURDAY, .ContestToday
.NoContest:
checkflag ENGINE_WADE
@@ -729,7 +729,7 @@
if_equal 0, WadeFoundRare
farjump Phone_GenericCall_Male
-Wade_ContestToday:
+.ContestToday:
farjump PhoneScript_BugCatchingContest
WadeTuesdayNight:
@@ -779,24 +779,24 @@
RalphPhoneScript1:
trainertotext FISHER, RALPH1, MEM_BUFFER_0
checkflag ENGINE_RALPH
- iftrue Ralph_Rematch
+ iftrue .Rematch
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_RALPH_WEDNESDAY_MORNING
- iftrue Ralph_CheckSwarm
+ iftrue .CheckSwarm
checkcode VAR_WEEKDAY
- if_not_equal WEDNESDAY, Ralph_CheckSwarm
+ if_not_equal WEDNESDAY, .CheckSwarm
checkmorn
iftrue Ralph_WednesdayMorning
-Ralph_CheckSwarm:
+.CheckSwarm:
checkflag ENGINE_SPECIAL_WILDDATA
- iftrue Ralph_ReportSwarm
+ iftrue .ReportSwarm
farjump UnknownScript_0xa0940
-Ralph_Rematch:
+.Rematch:
landmarktotext ROUTE_32, MEM_BUFFER_2
farjump UnknownScript_0xa0a55
-Ralph_ReportSwarm:
+.ReportSwarm:
landmarktotext ROUTE_32, MEM_BUFFER_2
farjump UnknownScript_0xa0af5
@@ -804,14 +804,14 @@
trainertotext FISHER, RALPH1, MEM_BUFFER_0
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_FLYPOINT_GOLDENROD
- iffalse Ralph_CheckSwarm2
+ iffalse .CheckSwarm
checkflag ENGINE_RALPH
- iftrue Ralph_CheckSwarm2
+ iftrue .CheckSwarm
checkflag ENGINE_RALPH_WEDNESDAY_MORNING
- iftrue Ralph_CheckSwarm2
+ iftrue .CheckSwarm
farscall PhoneScript_Random2
if_equal 0, Ralph_FightMe
-Ralph_CheckSwarm2:
+.CheckSwarm:
farscall PhoneScript_Random5
if_equal 0, Ralph_SetUpSwarm
farjump Phone_GenericCall_Male
@@ -1039,7 +1039,7 @@
checkflag ENGINE_TODD_SATURDAY_MORNING
iftrue .TryForSale
checkflag ENGINE_FLYPOINT_GOLDENROD
- iffalse ToddNoGoldenrod
+ iffalse .NoGoldenrod
farscall PhoneScript_Random2
if_equal 0, ToddWantsBattle
@@ -1047,7 +1047,7 @@
farscall PhoneScript_Random2
if_equal 0, ToddDeptStoreSale
-ToddNoGoldenrod:
+.NoGoldenrod:
farscall PhoneScript_Random3
if_equal 0, ToddFoundRare
farjump Phone_GenericCall_Male
@@ -1262,11 +1262,11 @@
trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_ALAN
- iftrue AlanGenericCall
+ iftrue .Generic
checkflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
- iftrue AlanGenericCall
+ iftrue .Generic
checkflag ENGINE_ALAN_HAS_FIRE_STONE
- iftrue AlanGenericCall
+ iftrue .Generic
farscall PhoneScript_Random3
if_equal 0, AlanWantsBattle
checkevent EVENT_ALAN_GAVE_FIRE_STONE
@@ -1278,7 +1278,7 @@
farscall PhoneScript_Random11
if_equal 0, AlanHasFireStone
-AlanGenericCall:
+.Generic:
farjump Phone_GenericCall_Male
AlanWednesdayDay:
@@ -1471,7 +1471,7 @@
checkflag ENGINE_TULLY_SUNDAY_NIGHT
iftrue .NotSunday
checkflag ENGINE_TULLY_HAS_WATER_STONE
- iftrue TullyHasWaterStone
+ iftrue .WaterStone
checkcode VAR_WEEKDAY
if_not_equal SUNDAY, .NotSunday
checknite
@@ -1484,7 +1484,7 @@
landmarktotext ROUTE_42, MEM_BUFFER_2
farjump UnknownScript_0xa0a82
-TullyHasWaterStone:
+.WaterStone:
landmarktotext ROUTE_42, MEM_BUFFER_2
farjump UnknownScript_0xa0add
@@ -1600,11 +1600,11 @@
if_equal 0, TiffanysFamilyMembers
farscall PhoneScript_GreetPhone_Female
checkflag ENGINE_TIFFANY
- iftrue TiffanyGenericCall
+ iftrue .Generic
checkflag ENGINE_TIFFANY_TUESDAY_AFTERNOON
- iftrue TiffanyGenericCall
+ iftrue .Generic
checkflag ENGINE_TIFFANY_HAS_PINK_BOW
- iftrue TiffanyGenericCall
+ iftrue .Generic
farscall PhoneScript_Random3
if_equal 0, TiffanyWantsBattle
checkevent EVENT_TIFFANY_GAVE_PINK_BOW
@@ -1616,7 +1616,7 @@
farscall PhoneScript_Random11
if_equal 0, TiffanyHasPinkBow
-TiffanyGenericCall:
+.Generic:
farjump Phone_GenericCall_Female
TiffanyTuesdayAfternoon:
@@ -1638,29 +1638,29 @@
.Grandma:
stringtotext GrandmaString, MEM_BUFFER_1
- jump TiffanysPoorClefairy
+ jump .PoorClefairy
.Grandpa:
stringtotext GrandpaString, MEM_BUFFER_1
- jump TiffanysPoorClefairy
+ jump .PoorClefairy
.Mom:
stringtotext MomString, MEM_BUFFER_1
- jump TiffanysPoorClefairy
+ jump .PoorClefairy
.Dad:
stringtotext DadString, MEM_BUFFER_1
- jump TiffanysPoorClefairy
+ jump .PoorClefairy
.Sister:
stringtotext SisterString, MEM_BUFFER_1
- jump TiffanysPoorClefairy
+ jump .PoorClefairy
.Brother:
stringtotext BrotherString, MEM_BUFFER_1
- jump TiffanysPoorClefairy
+ jump .PoorClefairy
-TiffanysPoorClefairy:
+.PoorClefairy:
farjump TiffanyItsAwful
TiffanyHasPinkBow:
@@ -1673,7 +1673,7 @@
VancePhoneScript1:
trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0
checkflag ENGINE_VANCE
- iftrue VanceWantsBattle
+ iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_VANCE_WEDNESDAY_NIGHT
iftrue .NotWednesday
@@ -1685,7 +1685,7 @@
.NotWednesday:
farjump VanceLookingForward
-VanceWantsBattle:
+.WantsBattle:
landmarktotext ROUTE_44, MEM_BUFFER_2
farjump VanceHurryHurry
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -46,10 +46,10 @@
opentext
writetext Text_ReadBattleTowerRules
yesorno
- iffalse UnknownScript_0x9e3e0
+ iffalse .skip
writetext Text_BattleTowerRules
waitbutton
-UnknownScript_0x9e3e0:
+.skip:
closetext
end
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -20,8 +20,8 @@
closetext
end
-TrainerSailorHuey1:
- trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, 0, .Script
+TrainerSailorHuey:
+ trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHueySeenText, SailorHueyBeatenText, 0, .Script
.Script:
writecode VAR_CALLERID, PHONE_SAILOR_HUEY
@@ -28,28 +28,28 @@
end_if_just_battled
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
- if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5b067
- if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5b063
+ if_equal PHONE_CONTACTS_FULL, .PhoneFull
+ if_equal 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
if_equal 3, .Fight3
if_equal 2, .Fight2
@@ -94,72 +94,72 @@
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
@@ -225,5 +225,5 @@
.ObjectEvents:
db 2
- 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
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -10,30 +10,30 @@
.MapCallbacks:
db 0
-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
spriteface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
@@ -41,7 +41,7 @@
spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
opentext
playmusic MUSIC_HEAL
- writetext UnknownText_0x60e44
+ writetext JasmineAmphyHowAreYouFeelingText
pause 60
buttonsound
closetext
@@ -51,7 +51,7 @@
pause 10
special Special_FadeInPalettes
opentext
- writetext UnknownText_0x60f3d
+ writetext AmphyPaluPaluluText
waitbutton
closetext
spriteface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
@@ -64,30 +64,30 @@
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
- if_equal DOWN, UnknownScript_0x60c17
- if_equal RIGHT, UnknownScript_0x60c1e
+ if_equal DOWN, .FacingDown
+ if_equal 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
spriteface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
@@ -94,7 +94,7 @@
pause 15
spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
opentext
- writetext UnknownText_0x60ef1
+ writetext JasmineAmphyHangOnText
waitbutton
closetext
end
@@ -102,22 +102,22 @@
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 Special_PlaySlowCry
buttonsound
- writetext UnknownText_0x60f19
+ writetext AmphyBreathingLaboredText
waitbutton
closetext
end
-UnknownScript_0x60c51:
- writetext UnknownText_0x60f3d
+.HealthyNow:
+ writetext AmphyPaluPaluluText
cry AMPHAROS
waitbutton
closetext
@@ -161,7 +161,7 @@
step_sleep 8
step_end
-UnknownText_0x60c81:
+JasmineCianwoodPharmacyText:
text "JASMINE: … This"
line "#MON always"
@@ -185,25 +185,25 @@
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…"
@@ -213,7 +213,7 @@
cont "anyone but me…"
done
-UnknownText_0x60e44:
+JasmineAmphyHowAreYouFeelingText:
text "JASMINE: …"
para "AMPHY, how are you"
@@ -220,7 +220,7 @@
line "feeling?"
done
-UnknownText_0x60e6c:
+JasmineThankYouText:
text "JASMINE: …Oh, I'm"
line "so relieved…"
@@ -234,25 +234,25 @@
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
@@ -275,6 +275,6 @@
.ObjectEvents:
db 3
- 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_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -13,23 +13,23 @@
.MapCallbacks:
db 0
-GentlemanScript_0x1917e9:
+PokemonFanClubPresident:
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
@@ -36,16 +36,16 @@
closetext
end
-UnknownScript_0x191815:
+.HeardSpeech:
writetext UnknownText_0x191ae0
waitbutton
closetext
end
-UnknownScript_0x19181b:
+.NotListening:
writetext UnknownText_0x191b38
waitbutton
-UnknownScript_0x19181f:
+.BagFull:
closetext
end
@@ -52,33 +52,33 @@
PokemonFanClubReceptionistScript:
jumptextfaceplayer PokemonFanClubReceptionistText
-FisherScript_0x191824:
+PokemonFanClubClefairyGuy:
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
@@ -88,13 +88,13 @@
closetext
end
-UnknownScript_0x19185f:
+.GotLostItem:
writetext UnknownText_0x191d1e
waitbutton
closetext
end
-UnknownScript_0x191865:
+.NoRoom:
writetext UnknownText_0x191d58
waitbutton
closetext
@@ -115,10 +115,10 @@
end
MapPokemonFanClubSignpost0Script:
- jumptext UnknownText_0x191dfc
+ jumptext PokemonFanClubListenSignText
MapPokemonFanClubSignpost1Script:
- jumptext UnknownText_0x191e29
+ jumptext PokemonFanClubBraggingSignText
UnknownText_0x191881:
text "I'm the CHAIRMAN"
@@ -285,13 +285,13 @@
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
@@ -315,9 +315,9 @@
.ObjectEvents:
db 6
- 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, PokemonFanClubPresident, -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, PokemonFanClubClefairyGuy, -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
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -13,17 +13,17 @@
.MapCallbacks:
db 0
-ReceptionistScript_0x5cd29:
+RadioTower1FReceptionist:
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
@@ -113,60 +113,60 @@
closetext
end
-CooltrainerFScript_0x5cdd5:
+RadioTower1FRadioCardWoman:
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
@@ -173,7 +173,7 @@
closetext
end
-UnknownScript_0x5ce4b:
+.NoQuiz:
writetext UnknownText_0x5d443
waitbutton
closetext
@@ -492,9 +492,9 @@
.ObjectEvents:
db 6
- 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, RadioTower1FReceptionist, -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, RadioTower1FRadioCardWoman, EVENT_GOLDENROD_CITY_CIVILIANS
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -102,31 +102,31 @@
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
- if_less_than 18, UnknownScript_0x5d893
+ if_less_than 18, .TooEarly
checkflag ENGINE_BUENAS_PASSWORD
- iffalse UnknownScript_0x5d80a
+ iffalse .TuneIn
checkitem BLUE_CARD
- iffalse UnknownScript_0x5d86b
+ iffalse .NoBlueCard
checkcode VAR_BLUECARDBALANCE
- if_equal 30, UnknownScript_0x5d87f
+ if_equal 30, .BlueCardCapped0
playmusic MUSIC_BUENAS_PASSWORD
writetext UnknownText_0x5de35
special Special_AskRememberPassword
- iffalse UnknownScript_0x5d81e
+ iffalse .ForgotPassword
writetext UnknownText_0x5de84
waitbutton
closetext
spriteface RADIOTOWER2F_BUENA, RIGHT
checkcode VAR_FACING
- if_not_equal RIGHT, UnknownScript_0x5d7be
+ if_not_equal RIGHT, .DontNeedToMove
applymovement PLAYER, MovementData_0x5d921
-UnknownScript_0x5d7be:
+.DontNeedToMove:
spriteface PLAYER, RIGHT
opentext
writetext UnknownText_0x5dedd
@@ -136,7 +136,7 @@
refreshscreen
special Special_BuenasPassword
closetext
- iffalse UnknownScript_0x5d845
+ iffalse .WrongAnswer
opentext
writetext UnknownText_0x5dfc1
waitbutton
@@ -157,27 +157,27 @@
pause 20
special RestartMapMusic
checkcode VAR_BLUECARDBALANCE
- if_equal 30, UnknownScript_0x5d8a4
+ if_equal 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:
spriteface RADIOTOWER2F_BUENA, RIGHT
end
-UnknownScript_0x5d81e:
+.ForgotPassword:
writetext UnknownText_0x5df29
waitbutton
closetext
@@ -187,20 +187,20 @@
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:
spriteface RADIOTOWER2F_BUENA, RIGHT
pause 10
end
-UnknownScript_0x5d845:
+.WrongAnswer:
setflag ENGINE_BUENAS_PASSWORD_2
opentext
writetext UnknownText_0x5e01c
@@ -218,50 +218,50 @@
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:
spriteface 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:
spriteface 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
spriteface RADIOTOWER2F_BUENA, DOWN
pause 15
@@ -268,21 +268,21 @@
spriteface 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
- if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5d8f6
- if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5d8ed
+ if_equal PHONE_CONTACTS_FULL, .PhoneFull
+ if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
writetext UnknownText_0x5e2f3
playsound SFX_REGISTER_PHONE_NUMBER
waitsfx
@@ -294,7 +294,7 @@
addcellnum PHONE_BUENA
end
-UnknownScript_0x5d8ed:
+.NumberDeclined:
writetext UnknownText_0x5e33c
waitbutton
closetext
@@ -301,19 +301,19 @@
spriteface RADIOTOWER2F_BUENA, RIGHT
end
-UnknownScript_0x5d8f6:
+.PhoneFull:
writetext UnknownText_0x5e35e
waitbutton
closetext
spriteface 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 Special_BuenaPrize
@@ -320,7 +320,7 @@
closetext
end
-UnknownScript_0x5d90f:
+.NoCard:
writetext UnknownText_0x5e3d8
buttonsound
closetext
@@ -743,4 +743,4 @@
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
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -32,13 +32,13 @@
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
@@ -48,27 +48,27 @@
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
@@ -75,10 +75,10 @@
setevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER
end
-UnknownScript_0x5e59d:
+.GotSunnyDay:
writetext UnknownText_0x5e85c
waitbutton
-UnknownScript_0x5e5a1:
+.NoRoom:
closetext
end
@@ -131,10 +131,10 @@
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
--- a/maps/Route30BerrySpeechHouse.asm
+++ b/maps/Route30BerrySpeechHouse.asm
@@ -8,20 +8,20 @@
.MapCallbacks:
db 0
-PokefanMScript_0x196d64:
+Route30BerrySpeechPokefanM:
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
@@ -28,7 +28,7 @@
Route30BerrySpeechHouseBookshelf:
jumpstd magazinebookshelf
-UnknownText_0x196d82:
+Route30BerrySpeechHouseMonEatBerriesText:
text "You know, #MON"
line "eat BERRIES."
@@ -40,7 +40,7 @@
line "one with you!"
done
-UnknownText_0x196dec:
+Route30BerrySpeechHouseCheckTreesText:
text "Check trees for"
line "BERRIES. They just"
cont "drop right off."
@@ -65,4 +65,4 @@
.ObjectEvents:
db 1
- 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, Route30BerrySpeechPokefanM, -1
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -24,9 +24,9 @@
appear ROUTE34ILEXFORESTGATE_TEACHER1
return
-UnknownScript_0x62d3d:
+Route34IlexForestGateCelebiEvent:
checkevent EVENT_FOREST_IS_RESTLESS
- iffalse UnknownScript_0x62d62
+ iffalse .skip
showemote EMOTE_SHOCK, ROUTE34ILEXFORESTGATE_TEACHER2, 20
spriteface ROUTE34ILEXFORESTGATE_TEACHER2, LEFT
spriteface PLAYER, RIGHT
@@ -39,7 +39,7 @@
waitbutton
closetext
applymovement ROUTE34ILEXFORESTGATE_TEACHER2, MovementData_0x62d9a
-UnknownScript_0x62d62:
+.skip:
end
TeacherScript_0x62d63:
@@ -46,22 +46,22 @@
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
@@ -148,7 +148,7 @@
.CoordEvents:
db 1
- coord_event 4, 7, 0, UnknownScript_0x62d3d
+ coord_event 4, 7, 0, Route34IlexForestGateCelebiEvent
.BGEvents:
db 0
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -309,13 +309,13 @@
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
- iffalse UnknownScript_0x6ad14
+ iffalse .StillCompeting
writetext UnknownText_0x6b399
waitbutton
closetext
end
-UnknownScript_0x6ad14:
+.StillCompeting:
writetext UnknownText_0x6b3c4
waitbutton
closetext
@@ -325,13 +325,13 @@
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
- iffalse UnknownScript_0x6ad28
+ iffalse .StillCompeting
writetext UnknownText_0x6b40f
waitbutton
closetext
end
-UnknownScript_0x6ad28:
+.StillCompeting:
writetext UnknownText_0x6b440
waitbutton
closetext
@@ -341,13 +341,13 @@
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
- iffalse UnknownScript_0x6ad3c
+ iffalse .StillCompeting
writetext UnknownText_0x6b462
waitbutton
closetext
end
-UnknownScript_0x6ad3c:
+.StillCompeting:
writetext UnknownText_0x6b496
waitbutton
closetext
@@ -357,13 +357,13 @@
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
- iffalse UnknownScript_0x6ad50
+ iffalse .StillCompeting
writetext UnknownText_0x6b4da
waitbutton
closetext
end
-UnknownScript_0x6ad50:
+.StillCompeting:
writetext UnknownText_0x6b50a
waitbutton
closetext
@@ -373,13 +373,13 @@
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
- iffalse UnknownScript_0x6ad64
+ iffalse .StillCompeting
writetext UnknownText_0x6b54e
waitbutton
closetext
end
-UnknownScript_0x6ad64:
+.StillCompeting:
writetext UnknownText_0x6b57c
waitbutton
closetext
@@ -389,13 +389,13 @@
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
- iffalse UnknownScript_0x6ad78
+ iffalse .StillCompeting
writetext UnknownText_0x6b5b0
waitbutton
closetext
end
-UnknownScript_0x6ad78:
+.StillCompeting:
writetext UnknownText_0x6b5dd
waitbutton
closetext
@@ -405,13 +405,13 @@
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
- iffalse UnknownScript_0x6ad8c
+ iffalse .StillCompeting
writetext UnknownText_0x6b64b
waitbutton
closetext
end
-UnknownScript_0x6ad8c:
+.StillCompeting:
writetext UnknownText_0x6b698
waitbutton
closetext
@@ -421,13 +421,13 @@
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
- iffalse UnknownScript_0x6ada0
+ iffalse .StillCompeting
writetext UnknownText_0x6b6b8
waitbutton
closetext
end
-UnknownScript_0x6ada0:
+.StillCompeting:
writetext UnknownText_0x6b6e9
waitbutton
closetext
@@ -437,13 +437,13 @@
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
- iffalse UnknownScript_0x6adb4
+ iffalse .StillCompeting
writetext UnknownText_0x6b71b
waitbutton
closetext
end
-UnknownScript_0x6adb4:
+.StillCompeting:
writetext UnknownText_0x6b740
waitbutton
closetext
@@ -453,13 +453,13 @@
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
- iffalse UnknownScript_0x6adc8
+ iffalse .StillCompeting
writetext UnknownText_0x6b76f
waitbutton
closetext
end
-UnknownScript_0x6adc8:
+.StillCompeting:
writetext UnknownText_0x6b7af
waitbutton
closetext
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -52,10 +52,10 @@
writebyte UNOWNPUZZLE_AERODACTYL
special 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_3
@@ -90,7 +90,7 @@
MapRuinsOfAlphAerodactylChamberSignpost5Script:
checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
- iftrue UnknownScript_0x58e46
+ iftrue .WallOpen
opentext
writetext UnknownText_0x58e81
writebyte UNOWNWORDS_LIGHT
@@ -98,7 +98,7 @@
closetext
end
-UnknownScript_0x58e46:
+.WallOpen:
opentext
writetext UnknownText_0x58ea2
waitbutton
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -53,10 +53,10 @@
writebyte UNOWNPUZZLE_HO_OH
special 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_4
@@ -91,7 +91,7 @@
MapRuinsOfAlphHoOhChamberSignpost5Script:
checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
- iftrue UnknownScript_0x58609
+ iftrue .WallOpen
opentext
writetext UnknownText_0x58644
writebyte UNOWNWORDS_HO_OH
@@ -99,7 +99,7 @@
closetext
end
-UnknownScript_0x58609:
+.WallOpen:
opentext
writetext UnknownText_0x58665
waitbutton
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -59,10 +59,10 @@
writebyte UNOWNPUZZLE_KABUTO
special 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_1
@@ -86,14 +86,14 @@
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
- if_equal NUM_UNOWN, UnknownScript_0x587cf
+ if_equal 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
@@ -100,13 +100,13 @@
spriteface RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP
end
-UnknownScript_0x587c9:
+.WallOpen:
writetext UnknownText_0x5897c
waitbutton
closetext
end
-UnknownScript_0x587cf:
+.AllUnownCaught:
writetext UnknownText_0x594cb
waitbutton
closetext
@@ -128,7 +128,7 @@
MapRuinsOfAlphKabutoChamberSignpost5Script:
checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
- iftrue UnknownScript_0x587f7
+ iftrue .WallOpen
opentext
writetext UnknownText_0x58ad9
writebyte UNOWNWORDS_ESCAPE
@@ -136,7 +136,7 @@
closetext
end
-UnknownScript_0x587f7:
+.WallOpen:
opentext
writetext UnknownText_0x58afa
waitbutton
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -53,10 +53,10 @@
writebyte UNOWNPUZZLE_OMANYTE
special 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_2
@@ -91,7 +91,7 @@
MapRuinsOfAlphOmanyteChamberSignpost5Script:
checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
- iftrue UnknownScript_0x58c85
+ iftrue .WallOpen
opentext
writetext UnknownText_0x58cc0
writebyte UNOWNWORDS_WATER
@@ -99,7 +99,7 @@
closetext
end
-UnknownScript_0x58c85:
+.WallOpen:
opentext
writetext UnknownText_0x58ce1
waitbutton
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -63,13 +63,13 @@
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
- if_equal NUM_UNOWN, UnknownScript_0x591df
+ if_equal NUM_UNOWN, .PrinterAvailable
writetext UnknownText_0x59311
waitbutton
closetext
end
-UnknownScript_0x591df:
+.PrinterAvailable:
writetext UnknownText_0x5935f
waitbutton
closetext
@@ -79,29 +79,29 @@
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
- if_equal NUM_UNOWN, UnknownScript_0x5920b
+ if_equal 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
@@ -112,21 +112,21 @@
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
- if_equal NUM_UNOWN, UnknownScript_0x5922e
+ if_equal 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
@@ -135,16 +135,16 @@
MapRuinsOfAlphResearchCenterSignpost1Script:
opentext
checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
- iftrue UnknownScript_0x59241
+ iftrue .SkipChecking
checkcode VAR_UNOWNCOUNT
- if_equal NUM_UNOWN, UnknownScript_0x59247
-UnknownScript_0x59241:
+ if_equal NUM_UNOWN, .GotAllUnown
+.SkipChecking:
writetext UnknownText_0x597b6
waitbutton
closetext
end
-UnknownScript_0x59247:
+.GotAllUnown:
writetext UnknownText_0x597d9
waitbutton
closetext
@@ -153,16 +153,16 @@
MapRuinsOfAlphResearchCenterSignpost2Script:
opentext
checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
- iftrue UnknownScript_0x5925a
+ iftrue .SkipChecking
checkcode VAR_UNOWNCOUNT
- if_equal NUM_UNOWN, UnknownScript_0x59260
-UnknownScript_0x5925a:
+ if_equal NUM_UNOWN, .PrinterAvailable
+.SkipChecking:
writetext UnknownText_0x5980e
waitbutton
closetext
end
-UnknownScript_0x59260:
+.PrinterAvailable:
writetext UnknownText_0x5982d
waitbutton
special Special_UnownPrinter
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -24,13 +24,13 @@
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
@@ -40,13 +40,13 @@
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
@@ -62,13 +62,13 @@
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
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -98,11 +98,11 @@
playmusic MUSIC_ROCKET_ENCOUNTER
spriteface 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
@@ -109,7 +109,7 @@
reloadmapafterbattle
setevent EVENT_BEAT_ROCKET_EXECUTIVEM_4
opentext
- writetext UnknownText_0x6e548
+ writetext ExecutiveM4AfterText
waitbutton
closetext
applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e144
@@ -385,7 +385,7 @@
cont "the likes of you!"
done
-UnknownText_0x6e400:
+ExecutiveM4BeforeText:
text "What? Who are you?"
line "This is the office"
@@ -412,7 +412,7 @@
cont "place!"
done
-UnknownText_0x6e511:
+ExecutiveM4BeatenText:
text "I… I couldn't do a"
line "thing…"
@@ -420,7 +420,7 @@
line "forgive me…"
done
-UnknownText_0x6e548:
+ExecutiveM4AfterText:
text "No, I can't let"
line "this affect me."
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -37,11 +37,11 @@
blackoutmod VERMILION_CITY
end
-SailorScript_0x74dc4:
+VermilionPortSailorAtGangway:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
- iftrue UnknownScript_0x74e1a
+ iftrue VermilionPortAlreadyRodeScript
writetext UnknownText_0x74f06
waitbutton
closetext
@@ -72,41 +72,41 @@
warp FAST_SHIP_1F, 25, 1
end
-UnknownScript_0x74e1a:
+VermilionPortAlreadyRodeScript:
writetext UnknownText_0x74f31
waitbutton
closetext
end
-UnknownScript_0x74e20:
+VermilionPortWalkUpToShipScript:
spriteface VERMILIONPORT_SAILOR2, RIGHT
checkevent EVENT_GAVE_KURT_APRICORNS
- iftrue UnknownScript_0x74e86
+ iftrue .skip
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
- iftrue UnknownScript_0x74e86
+ iftrue .skip
spriteface PLAYER, LEFT
opentext
checkcode VAR_WEEKDAY
- if_equal MONDAY, UnknownScript_0x74e72
- if_equal TUESDAY, UnknownScript_0x74e72
- if_equal THURSDAY, UnknownScript_0x74e7c
- if_equal FRIDAY, UnknownScript_0x74e7c
- if_equal SATURDAY, UnknownScript_0x74e7c
+ if_equal MONDAY, .NextShipWednesday
+ if_equal TUESDAY, .NextShipWednesday
+ if_equal THURSDAY, .NextShipSunday
+ if_equal FRIDAY, .NextShipSunday
+ if_equal 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_RECEIVED_BALLS_FROM_KURT
applymovement PLAYER, MovementData_0x74ef8
- jump SailorScript_0x74dc4
+ jump VermilionPortSailorAtGangway
-UnknownScript_0x74e68:
+.NoTicket:
writetext UnknownText_0x74ff2
waitbutton
closetext
@@ -113,7 +113,7 @@
applymovement PLAYER, MovementData_0x74ef5
end
-UnknownScript_0x74e72:
+.NextShipWednesday:
writetext UnknownText_0x75059
waitbutton
closetext
@@ -120,7 +120,7 @@
applymovement PLAYER, MovementData_0x74ef5
end
-UnknownScript_0x74e7c:
+.NextShipSunday:
writetext UnknownText_0x75080
waitbutton
closetext
@@ -127,16 +127,16 @@
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
@@ -147,7 +147,7 @@
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
- iftrue UnknownScript_0x74e1a
+ iftrue VermilionPortAlreadyRodeScript
checkcode VAR_WEEKDAY
if_equal MONDAY, .NextShipWednesday
if_equal TUESDAY, .NextShipWednesday
@@ -156,17 +156,17 @@
if_equal 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_RECEIVED_BALLS_FROM_KURT
applymovement PLAYER, MovementData_0x74efe
- jump SailorScript_0x74dc4
+ jump VermilionPortSailorAtGangway
.NoTicket:
writetext UnknownText_0x74ff2
@@ -257,7 +257,7 @@
line "again!"
done
-UnknownText_0x74fc2:
+VermilionPortSSTicketText:
text "<PLAYER> flashed"
line "the S.S.TICKET."
@@ -309,7 +309,7 @@
.CoordEvents:
db 1
- coord_event 7, 11, 0, UnknownScript_0x74e20
+ coord_event 7, 11, 0, VermilionPortWalkUpToShipScript
.BGEvents:
db 1
@@ -317,6 +317,6 @@
.ObjectEvents:
db 3
- 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
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -21,7 +21,7 @@
.DummyScene1:
end
-UnknownScript_0x74492:
+VictoryRoadRival0:
moveobject VICTORYROAD_SILVER, 18, 11
spriteface PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
@@ -29,7 +29,7 @@
pause 15
appear VICTORYROAD_SILVER
applymovement VICTORYROAD_SILVER, MovementData_0x74539
- scall UnknownScript_0x744d4
+ scall VictoryRoadRivalNext
applymovement VICTORYROAD_SILVER, MovementData_0x7454c
disappear VICTORYROAD_SILVER
setscene 1
@@ -36,7 +36,7 @@
playmapmusic
end
-UnknownScript_0x744b5:
+VictoryRoadRival1:
spriteface PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
@@ -43,7 +43,7 @@
pause 15
appear VICTORYROAD_SILVER
applymovement VICTORYROAD_SILVER, MovementData_0x74542
- scall UnknownScript_0x744d4
+ scall VictoryRoadRivalNext
applymovement VICTORYROAD_SILVER, MovementData_0x74555
disappear VICTORYROAD_SILVER
setscene 1
@@ -50,48 +50,48 @@
playmapmusic
end
-UnknownScript_0x744d4:
+VictoryRoadRivalNext:
spriteface 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
@@ -163,7 +163,7 @@
step DOWN
step_end
-UnknownText_0x7455f:
+VictoryRoadRivalBeforeText:
text "Hold it."
para "…Are you going to"
@@ -189,7 +189,7 @@
line "I challenge you!"
done
-UnknownText_0x7463d:
+VictoryRoadRivalDefeatText:
text "…I couldn't win…"
para "I gave it every-"
@@ -205,7 +205,7 @@
line "said to me…"
done
-UnknownText_0x746ce:
+VictoryRoadRivalAfterText:
text "…I haven't given up"
line "on becoming the"
cont "greatest trainer…"
@@ -227,7 +227,7 @@
line "at it until then."
done
-UnknownText_0x747aa:
+VictoryRoadRivalVictoryText:
text "…Humph!"
para "When it comes down"
@@ -257,8 +257,8 @@
.CoordEvents:
db 2
- coord_event 12, 8, 0, UnknownScript_0x74492
- coord_event 13, 8, 0, UnknownScript_0x744b5
+ coord_event 12, 8, 0, VictoryRoadRival0
+ coord_event 13, 8, 0, VictoryRoadRival1
.BGEvents:
db 2