summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--maps/NationalPark.asm134
-rw-r--r--maps/NationalParkBugContest.asm40
-rw-r--r--maps/PlayersHouse1F.asm96
-rw-r--r--maps/PokecomCenterAdminOfficeMobile.asm84
-rw-r--r--maps/PowerPlant.asm64
-rw-r--r--maps/Route35NationalParkGate.asm8
-rw-r--r--maps/Route36NationalParkGate.asm44
-rw-r--r--maps/RuinsOfAlphResearchCenter.asm12
-rw-r--r--maps/TeamRocketBaseB2F.asm12
9 files changed, 247 insertions, 247 deletions
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index 0f3716f24..1b87393f5 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -25,20 +25,20 @@ NationalParkLassScript:
NationalParkPokefanFScript:
jumptextfaceplayer NationalParkPokefanFText
-TeacherScript_0x5c008:
+NationalParkTeacher1Script:
faceplayer
opentext
checkevent EVENT_GOT_QUICK_CLAW
- iftrue UnknownScript_0x5c01d
- writetext UnknownText_0x5c265
+ iftrue .GotQuickClaw
+ writetext NationalParkTeacher1Text
buttonsound
verbosegiveitem QUICK_CLAW
- iffalse UnknownScript_0x5c021
+ iffalse .NoRoom
setevent EVENT_GOT_QUICK_CLAW
-UnknownScript_0x5c01d:
- writetext UnknownText_0x5c30d
+.GotQuickClaw:
+ writetext NationalParkTeacher1Text_GotQuickClaw
waitbutton
-UnknownScript_0x5c021:
+.NoRoom:
closetext
end
@@ -48,8 +48,8 @@ NationalParkYoungster1Script:
NationalParkYoungster2Script:
jumptextfaceplayer NationalParkYoungster2Text
-NationalParkTeacherScript:
- jumptextfaceplayer NationalParkTeacherText
+NationalParkTeacher2Script:
+ jumptextfaceplayer NationalParkTeacher2Text
NationalParkPersian:
faceplayer
@@ -60,10 +60,10 @@ NationalParkPersian:
closetext
end
-GameboyKidScript_0x5c037:
+NationalParkGameboyKidScript:
faceplayer
opentext
- writetext UnknownText_0x5c42a
+ writetext NationalParkGameboyKidText
waitbutton
closetext
turnobject NATIONALPARK_GAMEBOY_KID, DOWN
@@ -77,29 +77,29 @@ TrainerSchoolboyJack1:
endifjustbattled
opentext
checkflag ENGINE_JACK
- iftrue UnknownScript_0x5c088
+ iftrue .Rematch
checkcellnum PHONE_SCHOOLBOY_JACK
- iftrue UnknownScript_0x5c108
+ iftrue .NumberAccepted
checkevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER
- iftrue UnknownScript_0x5c071
+ iftrue .AskAgain
writetext UnknownText_0x5c4f3
buttonsound
setevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER
- scall UnknownScript_0x5c0fc
- jump UnknownScript_0x5c074
+ scall .AskNumber1
+ jump .RequestNumber
-UnknownScript_0x5c071:
- scall UnknownScript_0x5c100
-UnknownScript_0x5c074:
+.AskAgain:
+ scall .AskNumber2
+.RequestNumber:
askforphonenumber PHONE_SCHOOLBOY_JACK
- ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5c110
- ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5c10c
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0
- scall UnknownScript_0x5c104
- jump UnknownScript_0x5c108
+ scall .RegisteredNumber
+ jump .NumberAccepted
-UnknownScript_0x5c088:
- scall UnknownScript_0x5c114
+.Rematch:
+ scall .RematchStd
winlosstext SchoolboyJack1BeatenText, 0
copybytetovar wJackFightCount
ifequal 4, .Fight4
@@ -158,31 +158,31 @@ UnknownScript_0x5c088:
clearflag ENGINE_JACK
end
-UnknownScript_0x5c0fc:
+.AskNumber1:
jumpstd asknumber1m
end
-UnknownScript_0x5c100:
+.AskNumber2:
jumpstd asknumber2m
end
-UnknownScript_0x5c104:
+.RegisteredNumber:
jumpstd registerednumberm
end
-UnknownScript_0x5c108:
+.NumberAccepted:
jumpstd numberacceptedm
end
-UnknownScript_0x5c10c:
+.NumberDeclined:
jumpstd numberdeclinedm
end
-UnknownScript_0x5c110:
+.PhoneFull:
jumpstd phonefullm
end
-UnknownScript_0x5c114:
+.RematchStd:
jumpstd rematchm
end
@@ -205,74 +205,74 @@ TrainerPokefanfBeverly1:
endifjustbattled
opentext
checkflag ENGINE_BEVERLY_HAS_NUGGET
- iftrue UnknownScript_0x5c177
+ iftrue .GiveNugget
checkcellnum PHONE_POKEFAN_BEVERLY
- iftrue UnknownScript_0x5c19b
+ iftrue .NumberAccepted
checkpoke MARILL
- iffalse UnknownScript_0x5c189
+ iffalse .NoMarill
checkevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER
- iftrue UnknownScript_0x5c160
+ iftrue .AskAgain
writetext UnknownText_0x5c5bd
buttonsound
setevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER
- scall UnknownScript_0x5c18f
- jump UnknownScript_0x5c163
+ scall .AskNumber1
+ jump .RequestNumber
-UnknownScript_0x5c160:
- scall UnknownScript_0x5c193
-UnknownScript_0x5c163:
+.AskAgain:
+ scall .AskNumber2
+.RequestNumber:
askforphonenumber PHONE_POKEFAN_BEVERLY
- ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5c1a3
- ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5c19f
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext POKEFANF, BEVERLY1, MEM_BUFFER_0
- scall UnknownScript_0x5c197
- jump UnknownScript_0x5c19b
+ scall .RegisteredNumber
+ jump .NumberAccepted
-UnknownScript_0x5c177:
- scall UnknownScript_0x5c1a7
+.GiveNugget:
+ scall .Gift
verbosegiveitem NUGGET
- iffalse UnknownScript_0x5c186
+ iffalse .NoRoom
clearflag ENGINE_BEVERLY_HAS_NUGGET
- jump UnknownScript_0x5c19b
+ jump .NumberAccepted
-UnknownScript_0x5c186:
- jump UnknownScript_0x5c1ab
+.NoRoom:
+ jump .PackFull
-UnknownScript_0x5c189:
+.NoMarill:
writetext UnknownText_0x5c68a
waitbutton
closetext
end
-UnknownScript_0x5c18f:
+.AskNumber1:
jumpstd asknumber1f
end
-UnknownScript_0x5c193:
+.AskNumber2:
jumpstd asknumber2f
end
-UnknownScript_0x5c197:
+.RegisteredNumber:
jumpstd registerednumberf
end
-UnknownScript_0x5c19b:
+.NumberAccepted:
jumpstd numberacceptedf
end
-UnknownScript_0x5c19f:
+.NumberDeclined:
jumpstd numberdeclinedf
end
-UnknownScript_0x5c1a3:
+.PhoneFull:
jumpstd phonefullf
end
-UnknownScript_0x5c1a7:
+.Gift:
jumpstd giftf
end
-UnknownScript_0x5c1ab:
+.PackFull:
jumpstd packfullf
end
@@ -322,7 +322,7 @@ NationalParkPokefanFText:
cont "It cheers me up."
done
-UnknownText_0x5c265:
+NationalParkTeacher1Text:
text "Pay attention,"
line "please!"
@@ -342,7 +342,7 @@ UnknownText_0x5c265:
line "this."
done
-UnknownText_0x5c30d:
+NationalParkTeacher1Text_GotQuickClaw:
text "Let a #MON hold"
line "that QUICK CLAW."
@@ -363,7 +363,7 @@ NationalParkYoungster2Text:
cont "sticker if I win."
done
-NationalParkTeacherText:
+NationalParkTeacher2Text:
text "I take walks in"
line "the PARK, but I"
@@ -378,7 +378,7 @@ NationalParkPersianText:
text "PERSIAN: Fufushaa!"
done
-UnknownText_0x5c42a:
+NationalParkGameboyKidText:
text "I'm printing out"
line "my #DEX."
@@ -531,15 +531,15 @@ NationalPark_MapEvents:
db 14 ; object events
object_event 15, 24, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkLassScript, -1
object_event 14, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1
- object_event 27, 40, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1
+ object_event 27, 40, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkTeacher1Script, -1
object_event 11, 41, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster1Script, -1
object_event 10, 41, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster2Script, -1
- object_event 17, 41, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkTeacherScript, -1
+ object_event 17, 41, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkTeacher2Script, -1
object_event 26, 40, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPersian, -1
object_event 27, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1
object_event 18, 29, SPRITE_POKEFAN_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1
object_event 16, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1
object_event 8, 14, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassKrise, -1
object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
- object_event 26, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1
+ object_event 26, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkGameboyKidScript, -1
object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG
diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm
index 23839636b..bf2911e3a 100644
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -17,7 +17,7 @@ NationalParkBugContest_MapScripts:
db 0 ; callbacks
-YoungsterScript_0x5c8ec:
+BugCatchingContestant1AScript:
faceplayer
opentext
writetext UnknownText_0x5c94c
@@ -25,7 +25,7 @@ YoungsterScript_0x5c8ec:
closetext
end
-YoungsterScript_0x5c8f4:
+BugCatchingContestant2AScript:
faceplayer
opentext
writetext UnknownText_0x5c973
@@ -33,7 +33,7 @@ YoungsterScript_0x5c8f4:
closetext
end
-RockerScript_0x5c8fc:
+BugCatchingContestant3AScript:
faceplayer
opentext
writetext UnknownText_0x5c9a3
@@ -41,7 +41,7 @@ RockerScript_0x5c8fc:
closetext
end
-PokefanMScript_0x5c904:
+BugCatchingContestant4AScript:
faceplayer
opentext
writetext UnknownText_0x5c9cc
@@ -49,7 +49,7 @@ PokefanMScript_0x5c904:
closetext
end
-YoungsterScript_0x5c90c:
+BugCatchingContestant5AScript:
faceplayer
opentext
writetext UnknownText_0x5ca15
@@ -57,7 +57,7 @@ YoungsterScript_0x5c90c:
closetext
end
-YoungsterScript_0x5c914:
+BugCatchingContestant6AScript:
faceplayer
opentext
writetext UnknownText_0x5ca52
@@ -65,7 +65,7 @@ YoungsterScript_0x5c914:
closetext
end
-LassScript_0x5c91c:
+BugCatchingContestant7AScript:
faceplayer
opentext
writetext UnknownText_0x5ca8f
@@ -73,7 +73,7 @@ LassScript_0x5c91c:
closetext
end
-YoungsterScript_0x5c924:
+BugCatchingContestant8AScript:
faceplayer
opentext
writetext UnknownText_0x5cac8
@@ -81,7 +81,7 @@ YoungsterScript_0x5c924:
closetext
end
-YoungsterScript_0x5c92c:
+BugCatchingContestant9AScript:
faceplayer
opentext
writetext UnknownText_0x5cb25
@@ -89,7 +89,7 @@ YoungsterScript_0x5c92c:
closetext
end
-YoungsterScript_0x5c934:
+BugCatchingContestant10AScript:
faceplayer
opentext
writetext UnknownText_0x5cb64
@@ -236,15 +236,15 @@ NationalParkBugContest_MapEvents:
bg_event 12, 4, BGEVENT_READ, NationalParkBugContestTrainerTipsSign
db 12 ; object events
- object_event 19, 29, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A
- object_event 28, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A
- object_event 9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A
- object_event 7, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A
- object_event 23, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A
- object_event 27, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A
- object_event 7, 23, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A
- object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A
- object_event 16, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A
- object_event 17, 34, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A
+ object_event 19, 29, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant1AScript, EVENT_BUG_CATCHING_CONTESTANT_1A
+ object_event 28, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant2AScript, EVENT_BUG_CATCHING_CONTESTANT_2A
+ object_event 9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant3AScript, EVENT_BUG_CATCHING_CONTESTANT_3A
+ object_event 7, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant4AScript, EVENT_BUG_CATCHING_CONTESTANT_4A
+ object_event 23, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant5AScript, EVENT_BUG_CATCHING_CONTESTANT_5A
+ object_event 27, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant6AScript, EVENT_BUG_CATCHING_CONTESTANT_6A
+ object_event 7, 23, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant7AScript, EVENT_BUG_CATCHING_CONTESTANT_7A
+ object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant8AScript, EVENT_BUG_CATCHING_CONTESTANT_8A
+ object_event 16, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant9AScript, EVENT_BUG_CATCHING_CONTESTANT_9A
+ object_event 17, 34, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant10AScript, EVENT_BUG_CATCHING_CONTESTANT_10A
object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index 397981e54..d82ae9d86 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -18,26 +18,26 @@ PlayersHouse1F_MapScripts:
.DummyScene1:
end
-UnknownScript_0x7a4d8:
+MeetMomLeftScript:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
-UnknownScript_0x7a4db:
+MeetMomRightScript:
playmusic MUSIC_MOM
showemote EMOTE_SHOCK, PLAYERSHOUSE1F_MOM1, 15
turnobject PLAYER, LEFT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iffalse UnknownScript_0x7a4f2
+ iffalse .OnRight
applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fc
- jump UnknownScript_0x7a4f6
+ jump MeetMomScript
-UnknownScript_0x7a4f2:
+.OnRight:
applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fe
-UnknownScript_0x7a4f6:
+MeetMomScript:
opentext
writetext UnknownText_0x7a604
buttonsound
stringtotext GearName, MEM_BUFFER_1
- scall UnknownScript_0x7a57e
+ scall PlayersHouse1FReceiveItemStd
setflag ENGINE_POKEGEAR
setflag ENGINE_PHONE_CARD
addcellnum PHONE_MOM
@@ -47,103 +47,103 @@ UnknownScript_0x7a4f6:
writetext UnknownText_0x7a6bd
buttonsound
special SetDayOfWeek
-UnknownScript_0x7a519:
+.SetDayOfWeek:
writetext UnknownText_0x7a742
yesorno
- iffalse UnknownScript_0x7a52a
+ iffalse .WrongDay
special InitialSetDSTFlag
yesorno
- iffalse UnknownScript_0x7a519
- jump UnknownScript_0x7a531
+ iffalse .SetDayOfWeek
+ jump .DayOfWeekDone
-UnknownScript_0x7a52a:
+.WrongDay:
special InitialClearDSTFlag
yesorno
- iffalse UnknownScript_0x7a519
-UnknownScript_0x7a531:
+ iffalse .SetDayOfWeek
+.DayOfWeekDone:
writetext UnknownText_0x7a763
yesorno
- iffalse UnknownScript_0x7a542
- jump UnknownScript_0x7a53b
+ iffalse .ExplainPhone
+ jump .KnowPhone
-UnknownScript_0x7a53b:
+.KnowPhone:
writetext UnknownText_0x7a7cb
buttonsound
- jump UnknownScript_0x7a549
+ jump .FinishPhone
-UnknownScript_0x7a542:
+.ExplainPhone:
writetext UnknownText_0x7a807
buttonsound
- jump UnknownScript_0x7a549
+ jump .FinishPhone
-UnknownScript_0x7a549:
+.FinishPhone:
writetext UnknownText_0x7a850
waitbutton
closetext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iftrue UnknownScript_0x7a55d
+ iftrue .FromRight
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
- iffalse UnknownScript_0x7a564
- jump UnknownScript_0x7a56b
+ iffalse .FromLeft
+ jump .Finish
-UnknownScript_0x7a55d:
+.FromRight:
applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a600
- jump UnknownScript_0x7a56b
+ jump .Finish
-UnknownScript_0x7a564:
+.FromLeft:
applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a602
- jump UnknownScript_0x7a56b
+ jump .Finish
-UnknownScript_0x7a56b:
+.Finish:
special RestartMapMusic
turnobject PLAYERSHOUSE1F_MOM1, LEFT
end
-UnknownScript_0x7a572:
+MeetMomTalkedScript:
playmusic MUSIC_MOM
- jump UnknownScript_0x7a4f6
+ jump MeetMomScript
GearName:
db "#GEAR@"
-UnknownScript_0x7a57e:
+PlayersHouse1FReceiveItemStd:
jumpstd receiveitem
end
-MomScript_0x7a582:
+MomScript:
faceplayer
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
checkscene
- iffalse UnknownScript_0x7a572 ; SCENE_DEFAULT
+ iffalse MeetMomTalkedScript ; SCENE_DEFAULT
opentext
checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM
- iftrue UnknownScript_0x7a5af
+ iftrue .FirstTimeBanking
checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
- iftrue UnknownScript_0x7a5b8
+ iftrue .BankOfMom
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
- iftrue UnknownScript_0x7a5b5
+ iftrue .GaveMysteryEgg
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
- iftrue UnknownScript_0x7a5a9
+ iftrue .GotAPokemon
writetext UnknownText_0x7a8b5
waitbutton
closetext
end
-UnknownScript_0x7a5a9:
+.GotAPokemon:
writetext UnknownText_0x7a8e5
waitbutton
closetext
end
-UnknownScript_0x7a5af:
+.FirstTimeBanking:
writetext UnknownText_0x7a957
waitbutton
closetext
end
-UnknownScript_0x7a5b5:
+.GaveMysteryEgg:
setevent EVENT_FIRST_TIME_BANKING_WITH_MOM
-UnknownScript_0x7a5b8:
+.BankOfMom:
setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
special BankOfMom
waitbutton
@@ -392,8 +392,8 @@ PlayersHouse1F_MapEvents:
warp_event 9, 0, PLAYERS_HOUSE_2F, 1
db 2 ; coord events
- coord_event 8, 4, SCENE_DEFAULT, UnknownScript_0x7a4d8
- coord_event 9, 4, SCENE_DEFAULT, UnknownScript_0x7a4db
+ coord_event 8, 4, SCENE_DEFAULT, MeetMomLeftScript
+ coord_event 9, 4, SCENE_DEFAULT, MeetMomRightScript
db 4 ; bg events
bg_event 0, 1, BGEVENT_READ, StoveScript
@@ -402,8 +402,8 @@ PlayersHouse1F_MapEvents:
bg_event 4, 1, BGEVENT_READ, TVScript
db 5 ; object events
- object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_1
- object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
- object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
- object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
+ object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_1
+ object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_2
+ object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_2
+ object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_2
object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
diff --git a/maps/PokecomCenterAdminOfficeMobile.asm b/maps/PokecomCenterAdminOfficeMobile.asm
index 901f278b6..3c0b3c6c5 100644
--- a/maps/PokecomCenterAdminOfficeMobile.asm
+++ b/maps/PokecomCenterAdminOfficeMobile.asm
@@ -17,36 +17,36 @@ PokecomCenterAdminOfficeMobileScientist2Script:
PokecomCenterAdminOfficeMobileScientist3Script:
jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist3Text
-PokecomCenterAdminOfficeMobileSignpost0Script:
+PokecomCenterAdminOfficeMobileComputer1:
opentext
- writetext UnknownText_0x627ee
+ writetext PokecomCenterAdminOfficeMobileComputer1Text
waitbutton
-UnknownScript_0x625df:
+.loop:
reloadmappart
- loadmenu MenuHeader_0x62602
+ loadmenu .Computer1MenuHeader
verticalmenu
closewindow
- ifequal 1, UnknownScript_0x625f0
- ifequal 2, UnknownScript_0x625f8
- jump UnknownScript_0x62600
+ ifequal 1, .PokeComClub
+ ifequal 2, .MobileCenter
+ jump .Quit
-UnknownScript_0x625f0:
+.PokeComClub:
opentext
- writetext UnknownText_0x62828
+ writetext PokecomCenterAdminOfficeMobileComputer1Text_PokeComClub
waitbutton
- jump UnknownScript_0x625df
+ jump .loop
-UnknownScript_0x625f8:
+.MobileCenter:
opentext
- writetext UnknownText_0x628f4
+ writetext PokecomCenterAdminOfficeMobileComputer1Text_MobileCenter
waitbutton
- jump UnknownScript_0x625df
+ jump .loop
-UnknownScript_0x62600:
+.Quit:
closetext
end
-MenuHeader_0x62602:
+.Computer1MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 15, 8
dw .MenuData
@@ -59,36 +59,36 @@ MenuHeader_0x62602:
db "モバイルセンター@" ; MOBILE CENTER
db "やめる@" ; QUIT
-PokecomCenterAdminOfficeMobileSignpost1Script:
+PokecomCenterAdminOfficeMobileComputer2:
opentext
- writetext UnknownText_0x62989
+ writetext PokecomCenterAdminOfficeMobileComputer2Text
waitbutton
-UnknownScript_0x62629:
+.loop:
reloadmappart
- loadmenu MenuHeader_0x6264c
+ loadmenu .Computer2MenuHeader
verticalmenu
closewindow
- ifequal 1, UnknownScript_0x6263a
- ifequal 2, UnknownScript_0x62642
- jump UnknownScript_0x6264a
+ ifequal 1, .UsePhone
+ ifequal 2, .DontUsePhone
+ jump .Quit
-UnknownScript_0x6263a:
+.UsePhone:
opentext
- writetext UnknownText_0x629ae
+ writetext PokecomCenterAdminOfficeMobileComputer2Text_UsePhone
waitbutton
- jump UnknownScript_0x62629
+ jump .loop
-UnknownScript_0x62642:
+.DontUsePhone:
opentext
- writetext UnknownText_0x62a5a
+ writetext PokecomCenterAdminOfficeMobileComputer2Text_DontUsePhone
waitbutton
- jump UnknownScript_0x62629
+ jump .loop
-UnknownScript_0x6264a:
+.Quit:
closetext
end
-MenuHeader_0x6264c:
+.Computer2MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 15, 8
dw .MenuData
@@ -101,8 +101,8 @@ MenuHeader_0x6264c:
db "でんわ<GA>つながらないとき@" ; Don't use phone
db "やめる@" ; QUIT
-PokecomCenterAdminOfficeMobileSignpost2Script:
- jumptext UnknownText_0x62b26
+PokecomCenterAdminOfficeMobileComputer3:
+ jumptext PokecomCenterAdminOfficeMobileComputer3Text
PokecomCenterAdminOfficeMobileScientist1Text:
text "#COM CENTER and"
@@ -144,7 +144,7 @@ PokecomCenterAdminOfficeMobileScientist3Text:
cont "less technology."
done
-UnknownText_0x627ee:
+PokecomCenterAdminOfficeMobileComputer1Text:
text "It's a notice"
line "about where MOBILE"
@@ -152,7 +152,7 @@ UnknownText_0x627ee:
line "used…"
done
-UnknownText_0x62828:
+PokecomCenterAdminOfficeMobileComputer1Text_PokeComClub:
text "There's a #COM"
line "CLUB upstairs in"
@@ -174,7 +174,7 @@ UnknownText_0x62828:
cont "you."
done
-UnknownText_0x628f4:
+PokecomCenterAdminOfficeMobileComputer1Text_MobileCenter:
text "To use the TRADE"
line "CORNER or read the"
@@ -189,13 +189,13 @@ UnknownText_0x628f4:
line "connecting there."
done
-UnknownText_0x62989:
+PokecomCenterAdminOfficeMobileComputer2Text:
text "It's a notice"
line "about using the"
cont "phone…"
done
-UnknownText_0x629ae:
+PokecomCenterAdminOfficeMobileComputer2Text_UsePhone:
text "Please ensure that"
line "your phone and"
@@ -211,7 +211,7 @@ UnknownText_0x629ae:
cont "while linking."
done
-UnknownText_0x62a5a:
+PokecomCenterAdminOfficeMobileComputer2Text_DontUsePhone:
text "If the server is"
line "busy, it may not"
@@ -232,7 +232,7 @@ UnknownText_0x62a5a:
cont "instructions."
done
-UnknownText_0x62b26:
+PokecomCenterAdminOfficeMobileComputer3Text:
text "The ADMINISTRATION"
line "OFFICE received an"
cont "e-mail. It says…"
@@ -270,9 +270,9 @@ PokecomCenterAdminOfficeMobile_MapEvents:
db 0 ; coord events
db 3 ; bg events
- bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost0Script
- bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost1Script
- bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost2Script
+ bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer1
+ bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer2
+ bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer3
db 3 ; object events
object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist1Script, -1
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index 73b1b0aed..3678d5dfa 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -43,89 +43,89 @@ PowerPlantGuardPhoneScript:
setscene SCENE_POWERPLANT_NOTHING
end
-OfficerScript_0x188df5:
+PowerPlantOfficerScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x188e0f
+ iftrue .ReturnedMachinePart
checkevent EVENT_MET_MANAGER_AT_POWER_PLANT
- iftrue UnknownScript_0x188e09
+ iftrue .MetManager
writetext UnknownText_0x188ee0
waitbutton
closetext
end
-UnknownScript_0x188e09:
+.MetManager:
writetext UnknownText_0x188f7f
waitbutton
closetext
end
-UnknownScript_0x188e0f:
+.ReturnedMachinePart:
writetext UnknownText_0x188fa2
waitbutton
closetext
end
-GymGuyScript_0x188e15:
+PowerPlantGymGuy1Script:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x188e23
+ iftrue .ReturnedMachinePart
writetext UnknownText_0x188fcf
waitbutton
closetext
end
-UnknownScript_0x188e23:
+.ReturnedMachinePart:
writetext UnknownText_0x189038
waitbutton
closetext
end
-GymGuyScript_0x188e29:
+PowerPlantGymGuy2Script:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x188e37
+ iftrue .ReturnedMachinePart
writetext UnknownText_0x189079
waitbutton
closetext
end
-UnknownScript_0x188e37:
+.ReturnedMachinePart:
writetext UnknownText_0x1890ef
waitbutton
closetext
end
-OfficerScript_0x188e3d:
+PowerPlantGymGuy3Script:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x188e4b
+ iftrue .ReturnedMachinePart
writetext UnknownText_0x18910e
waitbutton
closetext
end
-UnknownScript_0x188e4b:
+.ReturnedMachinePart:
writetext UnknownText_0x18917f
waitbutton
closetext
end
-GymGuyScript_0x188e51:
+PowerPlantGymGuy4Script:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x188e5f
+ iftrue .ReturnedMachinePart
writetext UnknownText_0x1891c2
waitbutton
closetext
end
-UnknownScript_0x188e5f:
+.ReturnedMachinePart:
writetext UnknownText_0x189225
waitbutton
closetext
@@ -135,11 +135,11 @@ PowerPlantManager:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x188eac
+ iftrue .ReturnedMachinePart
checkitem MACHINE_PART
- iftrue UnknownScript_0x188e93
+ iftrue .FoundMachinePart
checkevent EVENT_MET_MANAGER_AT_POWER_PLANT
- iftrue UnknownScript_0x188e8d
+ iftrue .MetManager
writetext UnknownText_0x189264
waitbutton
closetext
@@ -150,13 +150,13 @@ PowerPlantManager:
setscene SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL
end
-UnknownScript_0x188e8d:
+.MetManager:
writetext UnknownText_0x189308
waitbutton
closetext
end
-UnknownScript_0x188e93:
+.FoundMachinePart:
writetext UnknownText_0x18936e
buttonsound
takeitem MACHINE_PART
@@ -166,21 +166,21 @@ UnknownScript_0x188e93:
setevent EVENT_ROUTE_24_ROCKET
setevent EVENT_RESTORED_POWER_TO_KANTO
clearevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
-UnknownScript_0x188eac:
+.ReturnedMachinePart:
checkevent EVENT_GOT_TM07_ZAP_CANNON
- iftrue UnknownScript_0x188ec5
+ iftrue .GotZapCannon
writetext UnknownText_0x1893c4
buttonsound
verbosegiveitem TM_ZAP_CANNON
- iffalse UnknownScript_0x188ec3
+ iffalse .NoRoom
setevent EVENT_GOT_TM07_ZAP_CANNON
writetext UnknownText_0x1893f4
waitbutton
-UnknownScript_0x188ec3:
+.NoRoom:
closetext
end
-UnknownScript_0x188ec5:
+.GotZapCannon:
writetext UnknownText_0x189475
waitbutton
closetext
@@ -401,10 +401,10 @@ PowerPlant_MapEvents:
bg_event 1, 1, BGEVENT_READ, PowerPlantBookshelf
db 7 ; object events
- object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1
- object_event 2, 9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1
- object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1
- object_event 9, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1
- object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1
+ object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantOfficerScript, -1
+ object_event 2, 9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy1Script, -1
+ object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy2Script, -1
+ object_event 9, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy3Script, -1
+ object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy4Script, -1
object_event 14, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PowerPlantManager, -1
object_event 5, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index 8f8ade07c..d45bc862b 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -77,7 +77,7 @@ Route35NationalParkGate_MapScripts:
warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47
end
-OfficerScript_0x6a204:
+Route35OfficerScriptContest:
checkcode VAR_WEEKDAY
ifequal SUNDAY, Route35NationalParkGate_NoContestToday
ifequal MONDAY, Route35NationalParkGate_NoContestToday
@@ -187,7 +187,7 @@ Route35NationalParkGate_ContestIsOver:
Route35NationalParkGate_NoContestToday:
jumptextfaceplayer UnknownText_0x6a894
-OfficerScript_0x6a2ca:
+Route35NationalParkGateOfficerScript:
faceplayer
opentext
checkflag ENGINE_DAILY_BUG_CONTEST
@@ -450,6 +450,6 @@ Route35NationalParkGate_MapEvents:
bg_event 5, 0, BGEVENT_READ, BugCatchingContestExplanationSign
db 3 ; object events
- object_event 2, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
+ object_event 2, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35OfficerScriptContest, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER
- object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
+ object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateOfficerScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 2a88893ce..a1f387f08 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -289,7 +289,7 @@ Route36Officer_ContestHasConcluded:
_ContestNotOn:
jumptextfaceplayer UnknownText_0x6b370
-OfficerScript_0x6acf4:
+Route36NationalParkGateOfficerScript:
faceplayer
opentext
checkflag ENGINE_DAILY_BUG_CONTEST
@@ -303,7 +303,7 @@ Route36ParkGate_DayToText:
jumpstd daytotext
end
-YoungsterScript_0x6ad06:
+BugCatchingContestant1BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -319,7 +319,7 @@ YoungsterScript_0x6ad06:
closetext
end
-YoungsterScript_0x6ad1a:
+BugCatchingContestant2BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -335,7 +335,7 @@ YoungsterScript_0x6ad1a:
closetext
end
-RockerScript_0x6ad2e:
+BugCatchingContestant3BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -351,7 +351,7 @@ RockerScript_0x6ad2e:
closetext
end
-PokefanMScript_0x6ad42:
+BugCatchingContestant4BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -367,7 +367,7 @@ PokefanMScript_0x6ad42:
closetext
end
-YoungsterScript_0x6ad56:
+BugCatchingContestant5BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -383,7 +383,7 @@ YoungsterScript_0x6ad56:
closetext
end
-YoungsterScript_0x6ad6a:
+BugCatchingContestant6BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -399,7 +399,7 @@ YoungsterScript_0x6ad6a:
closetext
end
-LassScript_0x6ad7e:
+BugCatchingContestant7BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -415,7 +415,7 @@ LassScript_0x6ad7e:
closetext
end
-YoungsterScript_0x6ad92:
+BugCatchingContestant8BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -431,7 +431,7 @@ YoungsterScript_0x6ad92:
closetext
end
-YoungsterScript_0x6ada6:
+BugCatchingContestant9BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -447,7 +447,7 @@ YoungsterScript_0x6ada6:
closetext
end
-YoungsterScript_0x6adba:
+BugCatchingContestant10BScript:
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -863,14 +863,14 @@ Route36NationalParkGate_MapEvents:
db 12 ; object events
object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
- object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B
- object_event 4, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B
- object_event 2, 6, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B
- object_event 6, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B
- object_event 2, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B
- object_event 5, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B
- object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B
- object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B
- object_event 6, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B
- object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B
- object_event 3, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
+ object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant1BScript, EVENT_BUG_CATCHING_CONTESTANT_1B
+ object_event 4, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant2BScript, EVENT_BUG_CATCHING_CONTESTANT_2B
+ object_event 2, 6, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant3BScript, EVENT_BUG_CATCHING_CONTESTANT_3B
+ object_event 6, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant4BScript, EVENT_BUG_CATCHING_CONTESTANT_4B
+ object_event 2, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant5BScript, EVENT_BUG_CATCHING_CONTESTANT_5B
+ object_event 5, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant6BScript, EVENT_BUG_CATCHING_CONTESTANT_6B
+ object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant7BScript, EVENT_BUG_CATCHING_CONTESTANT_7B
+ object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant8BScript, EVENT_BUG_CATCHING_CONTESTANT_8B
+ object_event 6, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant9BScript, EVENT_BUG_CATCHING_CONTESTANT_9B
+ object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant10BScript, EVENT_BUG_CATCHING_CONTESTANT_10B
+ object_event 3, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36NationalParkGateOfficerScript, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 7f1d93fbf..53729ab5a 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -57,7 +57,7 @@ RuinsOfAlphResearchCenter_MapScripts:
special RestartMapMusic
end
-ScientistScript_0x591d1:
+RuinsOfAlphResearchCenterScientist3Script:
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
@@ -73,7 +73,7 @@ ScientistScript_0x591d1:
closetext
end
-ScientistScript_0x591e5:
+RuinsOfAlphResearchCenterScientist1Script:
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
@@ -106,7 +106,7 @@ ScientistScript_0x591e5:
clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
end
-ScientistScript_0x59214:
+RuinsOfAlphResearchCenterScientist2Script:
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
@@ -406,6 +406,6 @@ RuinsOfAlphResearchCenter_MapEvents:
bg_event 7, 1, BGEVENT_READ, RuinsOfAlphResearchCenterPrinter
db 3 ; object events
- object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1
- object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1
- object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
+ object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphResearchCenterScientist1Script, -1
+ object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphResearchCenterScientist2Script, -1
+ object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphResearchCenterScientist3Script, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 45965ebd3..9b05d82e0 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -47,14 +47,14 @@ TeamRocketBaseB2F_MapScripts:
RocketBaseBossFLeft:
moveobject TEAMROCKETBASEB2F_LANCE, 9, 13
- jump UnknownScript_0x6cfac
+ jump RocketBaseBossFScript
RocketBaseBossFRight:
moveobject TEAMROCKETBASEB2F_ROCKET_GIRL, 21, 16
moveobject TEAMROCKETBASEB2F_ROCKET1, 21, 16
moveobject TEAMROCKETBASEB2F_DRAGON, 10, 13
moveobject TEAMROCKETBASEB2F_LANCE, 10, 13
-UnknownScript_0x6cfac:
+RocketBaseBossFScript:
appear TEAMROCKETBASEB2F_ROCKET_GIRL
appear TEAMROCKETBASEB2F_ROCKET1
opentext
@@ -235,7 +235,7 @@ RocketElectrode1:
reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d28c
- jump UnknownScript_0x6d184
+ jump RocketBaseElectrodeScript
RocketElectrode2:
cry ELECTRODE
@@ -253,7 +253,7 @@ RocketElectrode2:
reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d299
- jump UnknownScript_0x6d184
+ jump RocketBaseElectrodeScript
RocketElectrode3:
cry ELECTRODE
@@ -271,13 +271,13 @@ RocketElectrode3:
reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d2a4
- jump UnknownScript_0x6d184
+ jump RocketBaseElectrodeScript
TeamRocketBaseB2FReloadMap:
reloadmapafterbattle
end
-UnknownScript_0x6d184:
+RocketBaseElectrodeScript:
moveobject TEAMROCKETBASEB2F_LANCE, 18, 6
appear TEAMROCKETBASEB2F_LANCE
applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 10:57:15 +0000