ref: cad029f9366474fa2fe36fea6481be29a0990baa
parent: 0680bf99d30f8d290549ad5961985293f530acd9
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Thu Mar 1 08:18:51 EST 2018
Label more map scripts
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -51,7 +51,7 @@
closetext
end
-ReceptionistScript_0x9e3e2:
+BattleTower1FReceptionistScript:
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
special BattleTowerAction
ifequal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
@@ -244,7 +244,7 @@
waitbutton
jump Script_BattleTowerHopeToServeYouAgain
-YoungsterScript_0x9e55d:
+BattleTower1FYoungsterScript:
faceplayer
opentext
writetext Text_BattleTowerYoungster
@@ -253,13 +253,13 @@
turnobject BATTLETOWER1F_YOUNGSTER, RIGHT
end
-CooltrainerFScript_0x9e568:
+BattleTower1FCooltrainerFScript:
jumptextfaceplayer Text_BattleTowerCooltrainerF
-BugCatcherScript_0x9e56b:
+BattleTower1FBugCatcherScript:
jumptextfaceplayer Text_BattleTowerBugCatcher
-GrannyScript_0x9e56e:
+BattleTower1FGrannyScript:
jumptextfaceplayer Text_BattleTowerGranny
MovementData_BattleTower1FWalkToElevator:
@@ -805,8 +805,8 @@
bg_event 6, 6, BGEVENT_READ, BattleTower1FRulesSign
db 5 ; object events
- object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1
- object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1
- object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1
- object_event 1, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1
- object_event 14, 3, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1
+ object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTower1FReceptionistScript, -1
+ object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BattleTower1FYoungsterScript, -1
+ object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTower1FCooltrainerFScript, -1
+ object_event 1, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BattleTower1FBugCatcherScript, -1
+ object_event 14, 3, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTower1FGrannyScript, -1
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -9,7 +9,7 @@
db 0 ; callbacks
-CooltrainerMScript_0x71670:
+CeladonMansion3FCooltrainerMScript:
faceplayer
opentext
writetext UnknownText_0x716ce
@@ -33,7 +33,7 @@
setevent EVENT_ENABLE_DIPLOMA_PRINTING
end
-GymGuyScript_0x71696:
+CeladonMansion3FGymGuyScript:
faceplayer
opentext
checkevent EVENT_ENABLE_DIPLOMA_PRINTING
@@ -57,7 +57,8 @@
closetext
end
-UnknownScript_0x716b6:
+.CancelPrinting:
+; unused
writetext UnknownText_0x71863
waitbutton
closetext
@@ -205,7 +206,7 @@
bg_event 1, 3, BGEVENT_UP, CeladonMansion3FReferenceMaterial
db 4 ; object events
- object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1
- object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1
+ object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FCooltrainerMScript, -1
+ object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FGymGuyScript, -1
object_event 0, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1
object_event 0, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -6,7 +6,7 @@
db 0 ; callbacks
-PharmacistScript_0x71afd:
+CeladonMansionRoofHousePharmacistScript:
faceplayer
opentext
checkevent EVENT_GOT_TM03_CURSE
@@ -126,4 +126,4 @@
db 0 ; bg events
db 1 ; object events
- object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1
+ object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofHousePharmacistScript, -1
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -21,9 +21,9 @@
end
.GruntRunsOutScript:
- applymovement CERULEANGYM_ROCKET, MovementData_0x1884e3
+ applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsDownMovement
playsound SFX_TACKLE
- applymovement CERULEANGYM_ROCKET, MovementData_0x1884eb
+ applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsIntoYouMovement
playmusic MUSIC_ROCKET_ENCOUNTER
opentext
writetext UnknownText_0x1884fb
@@ -30,17 +30,17 @@
waitbutton
closetext
showemote EMOTE_SHOCK, CERULEANGYM_ROCKET, 15
- applymovement CERULEANGYM_ROCKET, MovementData_0x1884f7
+ applymovement CERULEANGYM_ROCKET, CeruleanGymGruntBacksAwayMovement
opentext
writetext UnknownText_0x188574
waitbutton
closetext
- applymovement CERULEANGYM_ROCKET, MovementData_0x1884f5
+ applymovement CERULEANGYM_ROCKET, CeruleanGymGruntMovesCloseMovement
opentext
writetext UnknownText_0x1885a5
waitbutton
closetext
- applymovement CERULEANGYM_ROCKET, MovementData_0x1884e8
+ applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsOutMovement
playsound SFX_EXIT_BUILDING
disappear CERULEANGYM_ROCKET
setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
@@ -161,7 +161,7 @@
trainertotext MISTY, MISTY1, MEM_BUFFER_1
jumpstd gymstatue2
-MovementData_0x1884e3:
+CeruleanGymGruntRunsDownMovement:
big_step DOWN
big_step DOWN
big_step DOWN
@@ -168,12 +168,12 @@
big_step DOWN
step_end
-MovementData_0x1884e8:
+CeruleanGymGruntRunsOutMovement:
big_step RIGHT
big_step DOWN
step_end
-MovementData_0x1884eb:
+CeruleanGymGruntRunsIntoYouMovement:
fix_facing
set_sliding
jump_step UP
@@ -185,11 +185,11 @@
step DOWN
step_end
-MovementData_0x1884f5:
+CeruleanGymGruntMovesCloseMovement:
big_step DOWN
step_end
-MovementData_0x1884f7:
+CeruleanGymGruntBacksAwayMovement:
fix_facing
slow_step UP
remove_fixed_facing
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -12,7 +12,7 @@
db 0 ; callbacks
AcademyEarl:
- applymovement EARLSPOKEMONACADEMY_EARL, MovementData_0x68b2d
+ applymovement EARLSPOKEMONACADEMY_EARL, AcademyEarlSpinMovement
faceplayer
opentext
writetext UnknownText_0x68b3b
@@ -145,7 +145,7 @@
AcademyBookshelf:
jumpstd difficultbookshelf
-MovementData_0x68b2d:
+AcademyEarlSpinMovement:
turn_head DOWN
turn_head LEFT
turn_head UP
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -80,14 +80,14 @@
jumpstd radiotowerrockets
EcruteakGymClosed:
- applymovement PLAYER, MovementData_0x99e5d
- applymovement ECRUTEAKGYM_GRAMPS, MovementData_0x99e63
+ applymovement PLAYER, EcruteakGymPlayerStepUpMovement
+ applymovement ECRUTEAKGYM_GRAMPS, EcruteakGymGrampsSlowStepDownMovement
opentext
writetext UnknownText_0x9a49c
waitbutton
closetext
follow PLAYER, ECRUTEAKGYM_GRAMPS
- applymovement PLAYER, MovementData_0x99e5f
+ applymovement PLAYER, EcruteakGymPlayerSlowStepDownMovement
stopfollow
special FadeOutPalettes
playsound SFX_ENTER_DOOR
@@ -163,17 +163,17 @@
trainertotext MORTY, MORTY1, MEM_BUFFER_1
jumpstd gymstatue2
-MovementData_0x99e5d:
+EcruteakGymPlayerStepUpMovement:
step UP
step_end
-MovementData_0x99e5f:
+EcruteakGymPlayerSlowStepDownMovement:
fix_facing
slow_step DOWN
remove_fixed_facing
step_end
-MovementData_0x99e63:
+EcruteakGymGrampsSlowStepDownMovement:
slow_step DOWN
step_end
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -152,7 +152,7 @@
writetext LabWhereGoingText
waitbutton
closetext
- applymovement PLAYER, MovementData_0x78f70
+ applymovement PLAYER, ElmsLab_CantLeaveMovement
end
CyndaquilPokeBallScript:
@@ -619,7 +619,7 @@
turn_head LEFT
step_end
-MovementData_0x78f70:
+ElmsLab_CantLeaveMovement:
step UP
step_end
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -40,7 +40,7 @@
setscene SCENE_DEFAULT
end
-SailorScript_0x75160:
+FastShip1FSailor1Script:
faceplayer
opentext
checkevent EVENT_FAST_SHIP_HAS_ARRIVED
@@ -47,13 +47,13 @@
iftrue .Arrived
checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
iftrue .Olivine
- writetext UnknownText_0x7523b
+ writetext FastShip1FSailor1Text_ToVermilion
waitbutton
closetext
end
.Olivine:
- writetext UnknownText_0x7529b
+ writetext FastShip1FSailor1Text_ToOlivine
waitbutton
closetext
end
@@ -61,7 +61,7 @@
.Arrived:
checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
iftrue ._Olivine
- writetext UnknownText_0x754be
+ writetext FastShip1FSailor1Text_InVermilion
waitbutton
closetext
scall .LetThePlayerOut
@@ -74,7 +74,7 @@
end
._Olivine:
- writetext UnknownText_0x7548d
+ writetext FastShip1FSailor1Text_InOlivine
waitbutton
closetext
scall .LetThePlayerOut
@@ -98,24 +98,24 @@
applymovement PLAYER, MovementData_0x75238
end
-SailorScript_0x751d0:
+FastShip1FSailor2Script:
faceplayer
opentext
checkevent EVENT_FAST_SHIP_FIRST_TIME
iftrue .Vermilion
- writetext UnknownText_0x752f9
+ writetext FastShip1FSailor2Text_FirstTime
waitbutton
closetext
end
.Vermilion:
- writetext UnknownText_0x7534f
+ writetext FastShip1FSailor2Text
waitbutton
closetext
end
-FastShip1FSailorScript:
- jumptextfaceplayer FastShip1FSailorText
+FastShip1FSailor3Script:
+ jumptextfaceplayer FastShip1FSailor3Text
WorriedGrandpaSceneRight:
moveobject FASTSHIP1F_GENTLEMAN, 20, 6
@@ -205,7 +205,7 @@
step UP
step_end
-UnknownText_0x7523b:
+FastShip1FSailor1Text_ToVermilion:
text "FAST SHIP S.S.AQUA"
line "is en route to"
cont "VERMILION CITY."
@@ -215,7 +215,7 @@
cont "we arrive."
done
-UnknownText_0x7529b:
+FastShip1FSailor1Text_ToOlivine:
text "FAST SHIP S.S.AQUA"
line "is en route to"
cont "OLIVINE CITY."
@@ -225,7 +225,7 @@
cont "we arrive."
done
-UnknownText_0x752f9:
+FastShip1FSailor2Text_FirstTime:
text "Here's your cabin."
para "If your #MON"
@@ -236,7 +236,7 @@
line "them."
done
-UnknownText_0x7534f:
+FastShip1FSailor2Text:
text "Here's your cabin."
para "You can heal your"
@@ -248,7 +248,7 @@
cont "you're sleeping."
done
-FastShip1FSailorText:
+FastShip1FSailor3Text:
text "The passengers are"
line "all trainers."
@@ -271,13 +271,13 @@
line "know!"
done
-UnknownText_0x7548d:
+FastShip1FSailor1Text_InOlivine:
text "FAST SHIP S.S.AQUA"
line "has arrived in"
cont "OLIVINE CITY."
done
-UnknownText_0x754be:
+FastShip1FSailor1Text_InVermilion:
text "FAST SHIP S.S.AQUA"
line "has arrived in"
cont "VERMILION CITY."
@@ -307,7 +307,7 @@
db 0 ; bg events
db 4 ; object events
- object_event 25, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x75160, -1
- object_event 14, 7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x751d0, -1
- object_event 22, 17, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailorScript, -1
+ object_event 25, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailor1Script, -1
+ object_event 14, 7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailor2Script, -1
+ object_event 22, 17, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailor3Script, -1
object_event 19, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -28,7 +28,7 @@
FastShipB1FSailorBlocksLeft:
checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
iftrue FastShipB1FAlreadyBlocked
- applymovement FASTSHIPB1F_SAILOR2, MovementData_0x76876
+ applymovement FASTSHIPB1F_SAILOR2, FashShipB1FSailorBlocksLeftMovement
moveobject FASTSHIPB1F_SAILOR1, 30, 6
appear FASTSHIPB1F_SAILOR1
pause 5
@@ -38,7 +38,7 @@
FastShipB1FSailorBlocksRight:
checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT
iftrue FastShipB1FAlreadyBlocked
- applymovement FASTSHIPB1F_SAILOR1, MovementData_0x76871
+ applymovement FASTSHIPB1F_SAILOR1, FashShipB1FSailorBlocksRightMovement
moveobject FASTSHIPB1F_SAILOR2, 31, 6
appear FASTSHIPB1F_SAILOR2
pause 5
@@ -48,7 +48,7 @@
FastShipB1FAlreadyBlocked:
end
-SailorScript_0x76767:
+FastShipB1FSailorScript:
faceplayer
opentext
checkevent EVENT_FAST_SHIP_FIRST_TIME
@@ -204,7 +204,7 @@
FashShipB1FTrashcan:
jumpstd trashcan
-MovementData_0x76871:
+FashShipB1FSailorBlocksRightMovement:
fix_facing
big_step RIGHT
remove_fixed_facing
@@ -211,7 +211,7 @@
turn_head DOWN
step_end
-MovementData_0x76876:
+FashShipB1FSailorBlocksLeftMovement:
fix_facing
big_step LEFT
remove_fixed_facing
@@ -461,8 +461,8 @@
bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan
db 12 ; object events
- object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
- object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
+ object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipB1FSailorScript, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
+ object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipB1FSailorScript, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
object_event 9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
object_event 26, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -12,19 +12,19 @@
db 0 ; scene scripts
db 2 ; callbacks
- callback MAPCALLBACK_TILES, UnknownScript_0x7d781
- callback MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac
+ callback MAPCALLBACK_TILES, .ClearBoxes
+ callback MAPCALLBACK_NEWMAP, .Unblock
-UnknownScript_0x7d781:
+.ClearBoxes:
checkevent EVENT_RECEIVED_CARD_KEY
- iftrue UnknownScript_0x7d78a
- jump UnknownScript_0x7d791
+ iftrue .GotCardKey
+ jump .Continue
-UnknownScript_0x7d78a:
+.GotCardKey:
changeblock 16, 4, $0d ; floor
- jump UnknownScript_0x7d791
+ jump .Continue
-UnknownScript_0x7d791:
+.Continue:
checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
iftrue .Layout2
checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
@@ -40,7 +40,7 @@
changeblock 10, 12, $0d ; floor
return
-UnknownScript_0x7d7ac:
+.Unblock:
clearevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
return
@@ -53,7 +53,7 @@
GoldenrodDeptStoreB1FBlackBelt3Script:
jumptextfaceplayer GoldenrodDeptStoreB1FBlackBelt3Text
-MachopScript_0x7d7b9:
+GoldenrodDeptStoreB1FMachopScript:
opentext
writetext UnknownText_0x7d8bb
cry MACHOKE
@@ -127,4 +127,4 @@
object_event 9, 10, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1
object_event 4, 8, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1
object_event 6, 13, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1
- object_event 7, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1
+ object_event 7, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FMachopScript, -1
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -46,7 +46,7 @@
GoldenrodDeptStoreRoofPokefanFScript:
jumptextfaceplayer GoldenrodDeptStoreRoofPokefanFText
-FisherScript_0x56749:
+GoldenrodDeptStoreRoofFisherScript:
faceplayer
opentext
writetext UnknownText_0x567d2
@@ -58,7 +58,7 @@
GoldenrodDeptStoreRoofTwinScript:
jumptextfaceplayer GoldenrodDeptStoreRoofTwinText
-SuperNerdScript_0x56757:
+GoldenrodDeptStoreRoofSuperNerdScript:
opentext
writetext UnknownText_0x56867
waitbutton
@@ -226,9 +226,9 @@
db 8 ; object events
object_event 1, 4, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofClerkScript, EVENT_GOLDENROD_SALE_OFF
object_event 10, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1
- object_event 2, 1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x56749, -1
+ object_event 2, 1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofFisherScript, -1
object_event 3, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON
- object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON
+ object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofSuperNerdScript, EVENT_GOLDENROD_SALE_ON
object_event 7, 0, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF
object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF
object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -8,51 +8,51 @@
db 0 ; callbacks
-TeacherScript_0x54953:
+GoldenrodHappinessRaterTeacherScript:
faceplayer
opentext
special GetFirstPokemonHappiness
- writetext UnknownText_0x549a3
+ writetext GoldenrodHappinessRaterTeacherText
buttonsound
- ifgreater 250 - 1, UnknownScript_0x54973
- ifgreater 200 - 1, UnknownScript_0x54979
- ifgreater 150 - 1, UnknownScript_0x5497f
- ifgreater 100 - 1, UnknownScript_0x54985
- ifgreater 50 - 1, UnknownScript_0x5498b
- jump UnknownScript_0x54991
+ ifgreater 250 - 1, .LovesYouALot
+ ifgreater 200 - 1, .ReallyTrustsYou
+ ifgreater 150 - 1, .SortOfHappy
+ ifgreater 100 - 1, .QuiteCute
+ ifgreater 50 - 1, .NotUsedToYou
+ jump .LooksMean
-UnknownScript_0x54973:
- writetext UnknownText_0x549fc
+.LovesYouALot:
+ writetext GoldenrodHappinessRatingText_LovesYouALot
waitbutton
closetext
end
-UnknownScript_0x54979:
- writetext UnknownText_0x54a2c
+.ReallyTrustsYou:
+ writetext GoldenrodHappinessRatingText_ReallyTrustsYou
waitbutton
closetext
end
-UnknownScript_0x5497f:
- writetext UnknownText_0x54a5a
+.SortOfHappy:
+ writetext GoldenrodHappinessRatingText_SortOfHappy
waitbutton
closetext
end
-UnknownScript_0x54985:
- writetext UnknownText_0x54a8e
+.QuiteCute:
+ writetext GoldenrodHappinessRatingText_QuiteCute
waitbutton
closetext
end
-UnknownScript_0x5498b:
- writetext UnknownText_0x54a9f
+.NotUsedToYou:
+ writetext GoldenrodHappinessRatingText_NotUsedToYou
waitbutton
closetext
end
-UnknownScript_0x54991:
- writetext UnknownText_0x54ad1
+.LooksMean:
+ writetext GoldenrodHappinessRatingText_LooksMean
waitbutton
closetext
end
@@ -69,7 +69,7 @@
HappinessRatersHouseRadio:
jumpstd radio2
-UnknownText_0x549a3:
+GoldenrodHappinessRaterTeacherText:
text "If you treat your"
line "#MON nicely,"
@@ -82,35 +82,35 @@
text "…"
done
-UnknownText_0x549fc:
+GoldenrodHappinessRatingText_LovesYouALot:
text "It looks really"
line "happy! It must"
cont "love you a lot."
done
-UnknownText_0x54a2c:
+GoldenrodHappinessRatingText_ReallyTrustsYou:
text "I get the feeling"
line "that it really"
cont "trusts you."
done
-UnknownText_0x54a5a:
+GoldenrodHappinessRatingText_SortOfHappy:
text "It's friendly to-"
line "ward you. It looks"
cont "sort of happy."
done
-UnknownText_0x54a8e:
+GoldenrodHappinessRatingText_QuiteCute:
text "It's quite cute."
done
-UnknownText_0x54a9f:
+GoldenrodHappinessRatingText_NotUsedToYou:
text "You should treat"
line "it better. It's"
cont "not used to you."
done
-UnknownText_0x54ad1:
+GoldenrodHappinessRatingText_LooksMean:
text "It doesn't seem to"
line "like you at all."
cont "It looks mean."
@@ -149,6 +149,6 @@
bg_event 7, 1, BGEVENT_READ, HappinessRatersHouseRadio
db 3 ; object events
- object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x54953, -1
+ object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTeacherScript, -1
object_event 5, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1
object_event 5, 6, SPRITE_TWIN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -11,7 +11,7 @@
.DummyScene:
end
-OfficerScript_0x550ec:
+GoldenrodMagnetTrainStationOfficerScript:
faceplayer
opentext
checkevent EVENT_RESTORED_POWER_TO_KANTO
@@ -177,5 +177,5 @@
db 0 ; bg events
db 2 ; object events
- object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1
+ object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationOfficerScript, -1
object_event 11, 14, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationGentlemanScript, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -83,7 +83,7 @@
GoldenrodPokecenter1FLassScript:
jumptextfaceplayer GoldenrodPokecenter1FLassText
-PokefanFScript_0x61024:
+GoldenrodPokecenter1FPokefanF:
faceplayer
opentext
writetext UnknownText_0x623fb
@@ -90,27 +90,27 @@
waitbutton
writetext UnknownText_0x6248c
yesorno
- iffalse UnknownScript_0x6104b
+ iffalse .NoEonMail
takeitem EON_MAIL
- iffalse UnknownScript_0x6104b
+ iffalse .NoEonMail
writetext UnknownText_0x62549
waitbutton
writetext UnknownText_0x624a4
waitbutton
verbosegiveitem REVIVE
- iffalse UnknownScript_0x61051
+ iffalse .NoRoom
writetext UnknownText_0x624e9
waitbutton
closetext
end
-UnknownScript_0x6104b:
+.NoEonMail:
writetext UnknownText_0x62509
waitbutton
closetext
end
-UnknownScript_0x61051:
+.NoRoom:
giveitem EON_MAIL
writetext UnknownText_0x6252a
waitbutton
@@ -822,4 +822,4 @@
object_event 16, 8, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
object_event 6, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1
object_event 1, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1
- object_event 7, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1
+ object_event 7, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FPokefanF, -1
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -152,7 +152,7 @@
closetext
end
-GrannyScript_0x7c132:
+BitterMerchantScript:
opentext
checkcode VAR_WEEKDAY
ifequal SUNDAY, .Open
@@ -164,7 +164,7 @@
closetext
end
-GrampsScript_0x7c146:
+BargainMerchantScript:
opentext
checkflag ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED
iftrue GoldenrodUndergroundScript_ShopClosed
@@ -239,10 +239,10 @@
writetext UnknownText_0x7c6d8
waitbutton
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iftrue UnknownScript_0x7c2bb
+ iftrue EitherHaircutBrotherScript_SlightlyHappier
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
- iftrue UnknownScript_0x7c2c4
- jump UnknownScript_0x7c2cd
+ iftrue EitherHaircutBrotherScript_Happier
+ jump EitherHaircutBrotherScript_MuchHappier
.Refused:
writetext UnknownText_0x7c6ea
@@ -322,10 +322,10 @@
writetext UnknownText_0x7c82a
waitbutton
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iftrue UnknownScript_0x7c2bb
+ iftrue EitherHaircutBrotherScript_SlightlyHappier
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
- iftrue UnknownScript_0x7c2c4
- jump UnknownScript_0x7c2cd
+ iftrue EitherHaircutBrotherScript_Happier
+ jump EitherHaircutBrotherScript_MuchHappier
.Refused:
writetext UnknownText_0x7c842
@@ -345,7 +345,7 @@
closetext
end
-UnknownScript_0x7c2bb:
+EitherHaircutBrotherScript_SlightlyHappier:
writetext HaircutBrosText_SlightlyHappier
special PlayCurMonCry
waitbutton
@@ -352,7 +352,7 @@
closetext
end
-UnknownScript_0x7c2c4:
+EitherHaircutBrotherScript_Happier:
writetext HaircutBrosText_Happier
special PlayCurMonCry
waitbutton
@@ -359,7 +359,7 @@
closetext
end
-UnknownScript_0x7c2cd:
+EitherHaircutBrotherScript_MuchHappier:
writetext HaircutBrosText_MuchHappier
special PlayCurMonCry
waitbutton
@@ -670,7 +670,7 @@
object_event 3, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1
object_event 2, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1
object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundCoinCase, EVENT_GOLDENROD_UNDERGROUND_COIN_CASE
- object_event 7, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_GOLDENROD_UNDERGROUND_GRAMPS
+ object_event 7, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BargainMerchantScript, EVENT_GOLDENROD_UNDERGROUND_GRAMPS
object_event 7, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER
object_event 7, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER
- object_event 7, 21, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_GOLDENROD_UNDERGROUND_GRANNY
+ object_event 7, 21, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BitterMerchantScript, EVENT_GOLDENROD_UNDERGROUND_GRANNY
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -110,10 +110,10 @@
.false14
return
-SuperNerdScript_0x7ca7a:
+GoldenrodUndergroundSwitchRoomEntrancesSuperNerdScript:
jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_SuperNerdText
-TeacherScript_0x7ca7d:
+GoldenrodUndergroundSwitchRoomEntrancesTeacherScript:
jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_TeacherText
UndergroundSilverScene1:
@@ -961,8 +961,8 @@
object_event 11, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 3, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 19, 12, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
- object_event 3, 27, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1
- object_event 19, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1
+ object_event 3, 27, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodUndergroundSwitchRoomEntrancesTeacherScript, -1
+ object_event 19, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodUndergroundSwitchRoomEntrancesSuperNerdScript, -1
object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL
object_event 23, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -66,7 +66,7 @@
closetext
end
-GentlemanScript_0x7d9bf:
+GoldenrodUndergroundWarehouseDirectorScript:
faceplayer
opentext
checkevent EVENT_RECEIVED_CARD_KEY
@@ -224,7 +224,7 @@
object_event 9, 8, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 14, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
- object_event 12, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+ object_event 12, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodUndergroundWarehouseDirectorScript, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 18, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseMaxEther, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER
object_event 13, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
object_event 2, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -32,7 +32,7 @@
.Done:
return
-KurtScript_0x18e178:
+Kurt1:
faceplayer
opentext
checkevent EVENT_KURT_GAVE_YOU_LURE_BALL
@@ -312,7 +312,7 @@
setmapscene AZALEA_TOWN, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
end
-KurtScript_0x18e3bd:
+Kurt2:
faceplayer
opentext
checkevent EVENT_GAVE_GS_BALL_TO_KURT
@@ -693,8 +693,8 @@
bg_event 4, 1, BGEVENT_READ, KurtsHouseCelebiStatue
db 5 ; object events
- object_event 3, 2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1
+ object_event 3, 2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Kurt1, EVENT_KURTS_HOUSE_KURT_1
object_event 5, 3, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1
object_event 6, 3, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE
- object_event 14, 3, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2
+ object_event 14, 3, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Kurt2, EVENT_KURTS_HOUSE_KURT_2
object_event 11, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -41,9 +41,9 @@
appear LAKEOFRAGE_WESLEY
return
-LanceScript_0x70022:
+LakeOfRageLanceScript:
checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE
- iftrue UnknownScript_0x70057
+ iftrue .AskAgainForHelp
opentext
writetext UnknownText_0x70157
buttonsound
@@ -50,8 +50,8 @@
faceplayer
writetext UnknownText_0x701b4
yesorno
- iffalse UnknownScript_0x7004e
-UnknownScript_0x70035:
+ iffalse .RefusedToHelp
+.AgreedToHelp:
writetext UnknownText_0x702c6
waitbutton
closetext
@@ -63,7 +63,7 @@
setmapscene MAHOGANY_MART_1F, SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS
end
-UnknownScript_0x7004e:
+.RefusedToHelp:
writetext UnknownText_0x70371
waitbutton
closetext
@@ -70,15 +70,15 @@
setevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE
end
-UnknownScript_0x70057:
+.AskAgainForHelp:
faceplayer
opentext
writetext UnknownText_0x703a5
yesorno
- iffalse UnknownScript_0x7004e
- jump UnknownScript_0x70035
+ iffalse .RefusedToHelp
+ jump .AgreedToHelp
-GyaradosScript_0x70063:
+RedGyarados:
opentext
writetext UnknownText_0x703cb
pause 15
@@ -87,9 +87,9 @@
loadwildmon GYARADOS, 30
writecode VAR_BATTLETYPE, BATTLETYPE_SHINY
startbattle
- ifequal $1, UnknownScript_0x7007a
+ ifequal $1, .NotBeaten
disappear LAKEOFRAGE_GYARADOS
-UnknownScript_0x7007a:
+.NotBeaten:
reloadmapafterbattle
opentext
giveitem RED_SCALE
@@ -103,18 +103,18 @@
appear LAKEOFRAGE_LANCE
end
-GrampsScript_0x7008e:
+LakeOfRageGrampsScript:
faceplayer
opentext
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
- iftrue UnknownScript_0x7009c
- writetext UnknownText_0x703f8
+ iftrue .ClearedRocketHideout
+ writetext LakeOfRageGrampsText
waitbutton
closetext
end
-UnknownScript_0x7009c:
- writetext UnknownText_0x70421
+.ClearedRocketHideout:
+ writetext LakeOfRageGrampsText_ClearedRocketHideout
waitbutton
closetext
end
@@ -319,7 +319,7 @@
line "RED SCALE."
done
-UnknownText_0x703f8:
+LakeOfRageGrampsText:
text "The GYARADOS are"
line "angry!"
@@ -326,7 +326,7 @@
para "It's a bad omen!"
done
-UnknownText_0x70421:
+LakeOfRageGrampsText_ClearedRocketHideout:
text "Hahah! The MAGI-"
line "KARP are biting!"
done
@@ -508,8 +508,8 @@
bg_event 35, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion
db 12 ; object events
- object_event 21, 28, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE
- object_event 20, 26, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7008e, -1
+ object_event 21, 28, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageLanceScript, EVENT_LAKE_OF_RAGE_LANCE
+ object_event 20, 26, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageGrampsScript, -1
object_event 36, 13, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1
object_event 25, 29, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageCooltrainerFScript, -1
object_event 30, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS
@@ -516,7 +516,7 @@
object_event 24, 26, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS
object_event 4, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS
object_event 36, 7, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS
- object_event 18, 22, SPRITE_GYARADOS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS
+ object_event 18, 22, SPRITE_GYARADOS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RedGyarados, EVENT_LAKE_OF_RAGE_RED_GYARADOS
object_event 4, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY
object_event 7, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER
object_event 35, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -6,90 +6,91 @@
db 0 ; callbacks
-FishingGuruScript_0x19a6ae:
+MagikarpLengthRaterScript:
faceplayer
opentext
checkevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
- iftrue UnknownScript_0x19a6fe
+ iftrue .GetReward
checkevent EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP
- iftrue UnknownScript_0x19a6e0
+ iftrue .AskedForMagikarp
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
- iftrue UnknownScript_0x19a6d7
+ iftrue .ClearedRocketHideout
checkevent EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP
- iftrue UnknownScript_0x19a6d1
- writetext UnknownText_0x19a72e
+ iftrue .ExplainedHistory
+ writetext MagikarpLengthRaterText_LakeOfRageHistory
waitbutton
closetext
setevent EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP
end
-UnknownScript_0x19a6d1:
- writetext UnknownText_0x19a84d
+.ExplainedHistory:
+ writetext MagikarpLengthRaterText_MenInBlack
waitbutton
closetext
end
-UnknownScript_0x19a6d7:
- writetext UnknownText_0x19a890
+.ClearedRocketHideout:
+ writetext MagikarpLengthRaterText_WorldsLargestMagikarp
waitbutton
closetext
setevent EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP
end
-UnknownScript_0x19a6e0:
+.AskedForMagikarp:
writebyte MAGIKARP
special FindPartyMonThatSpecies
- iffalse UnknownScript_0x19a6d7
- writetext UnknownText_0x19a93e
+ iffalse .ClearedRocketHideout
+ writetext MagikarpLengthRaterText_YouHaveAMagikarp
waitbutton
special CheckMagikarpLength
- ifequal MAGIKARPLENGTH_NOT_MAGIKARP, UnknownScript_0x19a71c
- ifequal MAGIKARPLENGTH_REFUSED, UnknownScript_0x19a722
- ifequal MAGIKARPLENGTH_TOO_SHORT, UnknownScript_0x19a716
+ ifequal MAGIKARPLENGTH_NOT_MAGIKARP, .NotMagikarp
+ ifequal MAGIKARPLENGTH_REFUSED, .Refused
+ ifequal MAGIKARPLENGTH_TOO_SHORT, .TooShort
; MAGIKARPLENGTH_BEAT_RECORD
- jump UnknownScript_0x19a6fe
+ jump .GetReward
-UnknownScript_0x19a6fe:
- writetext UnknownText_0x19a977
+.GetReward:
+ writetext MagikarpLengthRaterText_Memento
buttonsound
verbosegiveitem ELIXER
- iffalse UnknownScript_0x19a711
- writetext UnknownText_0x19a9c3
+ iffalse .NoRoom
+ writetext MagikarpLengthRaterText_Bonus
waitbutton
closetext
clearevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
end
-UnknownScript_0x19a711:
+.NoRoom:
closetext
setevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
end
-UnknownScript_0x19a716:
- writetext UnknownText_0x19aa01
+.TooShort:
+ writetext MagikarpLengthRaterText_TooShort
waitbutton
closetext
end
-UnknownScript_0x19a71c:
- writetext UnknownText_0x19aa5c
+.NotMagikarp:
+ writetext MagikarpLengthRaterText_NotMagikarp
waitbutton
closetext
end
-UnknownScript_0x19a722:
- writetext UnknownText_0x19aa79
+.Refused:
+ writetext MagikarpLengthRaterText_Refused
waitbutton
closetext
end
-UnknownScript_0x19a728:
- jumptext UnknownText_0x19aabc
+LakeOfRageMagikarpHouseUnusedRecordSign:
+; unused
+ jumptext LakeOfRageMagikarpHouseUnusedRecordText
MagikarpHouseBookshelf:
jumpstd difficultbookshelf
-UnknownText_0x19a72e:
+MagikarpLengthRaterText_LakeOfRageHistory:
text "LAKE OF RAGE is"
line "actually a crater"
@@ -118,7 +119,7 @@
line "what's happening."
done
-UnknownText_0x19a84d:
+MagikarpLengthRaterText_MenInBlack:
text "The LAKE hasn't"
line "been normal since"
@@ -126,7 +127,7 @@
line "black arrived."
done
-UnknownText_0x19a890:
+MagikarpLengthRaterText_WorldsLargestMagikarp:
text "LAKE OF RAGE is"
line "back to normal."
@@ -143,7 +144,7 @@
cont "you do."
done
-UnknownText_0x19a93e:
+MagikarpLengthRaterText_YouHaveAMagikarp:
text "Ah, you have a"
line "MAGIKARP! Let's"
@@ -151,7 +152,7 @@
line "baby is."
done
-UnknownText_0x19a977:
+MagikarpLengthRaterText_Memento:
text "Wow! This one is"
line "outstanding!"
@@ -162,7 +163,7 @@
line "memento!"
done
-UnknownText_0x19a9c3:
+MagikarpLengthRaterText_Bonus:
text "The record is the"
line "important thing."
@@ -170,7 +171,7 @@
line "a bonus!"
done
-UnknownText_0x19aa01:
+MagikarpLengthRaterText_TooShort:
text "Wow! This one is"
line "outstanding!"
@@ -181,12 +182,12 @@
line "before."
done
-UnknownText_0x19aa5c:
+MagikarpLengthRaterText_NotMagikarp:
text "What? That's not a"
line "MAGIKARP!"
done
-UnknownText_0x19aa79:
+MagikarpLengthRaterText_Refused:
text "Oh… So you didn't"
line "get one good"
@@ -194,7 +195,7 @@
line "Maybe next time."
done
-UnknownText_0x19aabc:
+LakeOfRageMagikarpHouseUnusedRecordText:
text "CURRENT RECORD"
para "@"
@@ -218,4 +219,4 @@
bg_event 1, 1, BGEVENT_READ, MagikarpHouseBookshelf
db 1 ; object events
- object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1
+ object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MagikarpLengthRaterScript, -1
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -19,7 +19,7 @@
LavRadioTower1FSuperNerd1Script:
jumptextfaceplayer LavRadioTower1FSuperNerd1Text
-GentlemanScript_0x7ee6c:
+LavRadioTower1FGentlemanScript:
faceplayer
opentext
checkflag ENGINE_EXPN_CARD
@@ -26,24 +26,24 @@
iftrue .GotExpnCard
checkevent EVENT_RETURNED_MACHINE_PART
iftrue .ReturnedMachinePart
- writetext UnknownText_0x7effb
+ writetext LavRadioTower1FGentlemanText
waitbutton
closetext
end
.ReturnedMachinePart:
- writetext UnknownText_0x7f0a1
+ writetext LavRadioTower1FGentlemanText_ReturnedMachinePart
buttonsound
stringtotext .expncardname, MEM_BUFFER_1
- scall .UnknownScript_0x7ee94
+ scall .receiveitem
setflag ENGINE_EXPN_CARD
.GotExpnCard:
- writetext UnknownText_0x7f141
+ writetext LavRadioTower1FGentlemanText_GotExpnCard
waitbutton
closetext
end
-.UnknownScript_0x7ee94:
+.receiveitem:
jumpstd receiveitem
end
@@ -111,7 +111,7 @@
cont "on good shows."
done
-UnknownText_0x7effb:
+LavRadioTower1FGentlemanText:
text "Oh, no, no, no!"
para "We've been off the"
@@ -129,7 +129,7 @@
para "I'll be ruined!"
done
-UnknownText_0x7f0a1:
+LavRadioTower1FGentlemanText_ReturnedMachinePart:
text "Ah! So you're the"
line "<PLAY_G> who solved"
@@ -146,7 +146,7 @@
line "as my thanks."
done
-UnknownText_0x7f141:
+LavRadioTower1FGentlemanText_GotExpnCard:
text "With that thing,"
line "you can tune into"
@@ -237,5 +237,5 @@
object_event 6, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1
object_event 15, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1
object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerd1Script, -1
- object_event 9, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1
+ object_event 9, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FGentlemanScript, -1
object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerd2Script, -1
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -103,7 +103,7 @@
waitsfx
end
-GrannyScript_0x6c3ee:
+MahogayMart1FGrannyScript:
faceplayer
opentext
pokemart MARTTYPE_STANDARD, MART_MAHOGANY_2
@@ -235,4 +235,4 @@
object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FBlackBeltScript, EVENT_TEAM_ROCKET_BASE_POPULATION
object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
object_event 3, 6, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
- object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS
+ object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FGrannyScript, EVENT_MAHOGANY_MART_OWNERS
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -22,7 +22,7 @@
setflag ENGINE_FLYPOINT_MAHOGANY
return
-UnknownScript_0x190013:
+MahoganyTownTryARageCandyBarScript:
showemote EMOTE_SHOCK, MAHOGANYTOWN_POKEFAN_M, 15
applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900a9
follow PLAYER, MAHOGANYTOWN_POKEFAN_M
@@ -29,74 +29,74 @@
applymovement PLAYER, MovementData_0x1900a7
stopfollow
turnobject PLAYER, RIGHT
- scall UnknownScript_0x19002f
+ scall RageCandyBarMerchantScript
applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900ad
end
-PokefanMScript_0x19002e:
+MahoganyTownPokefanMScript:
faceplayer
-UnknownScript_0x19002f:
+RageCandyBarMerchantScript:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
- iftrue UnknownScript_0x190039
- scall UnknownScript_0x190040
+ iftrue .ClearedRocketHideout
+ scall .SellRageCandyBars
end
-UnknownScript_0x190039:
+.ClearedRocketHideout:
opentext
- writetext UnknownText_0x1901a6
+ writetext RageCandyBarMerchantText_SoldOut
waitbutton
closetext
end
-UnknownScript_0x190040:
+.SellRageCandyBars:
opentext
- writetext UnknownText_0x1900b0
+ writetext RageCandyBarMerchantText_TryOne
special PlaceMoneyTopRight
yesorno
- iffalse UnknownScript_0x190072
+ iffalse .Refused
checkmoney YOUR_MONEY, 300
- ifequal HAVE_LESS, UnknownScript_0x19006c
+ ifequal HAVE_LESS, .NotEnoughMoney
giveitem RAGECANDYBAR
- iffalse UnknownScript_0x190078
+ iffalse .NoRoom
waitsfx
playsound SFX_TRANSACTION
takemoney YOUR_MONEY, 300
special PlaceMoneyTopRight
- writetext UnknownText_0x19014a
+ writetext RageCandyBarMerchantText_SavorIt
waitbutton
closetext
end
-UnknownScript_0x19006c:
- writetext UnknownText_0x19015b
+.NotEnoughMoney:
+ writetext RageCandyBarMerchantText_NotEnoughMoney
waitbutton
closetext
end
-UnknownScript_0x190072:
- writetext UnknownText_0x190178
+.Refused:
+ writetext RageCandyBarMerchantText_Refused
waitbutton
closetext
end
-UnknownScript_0x190078:
+.NoRoom:
writetext UnknownText_0x190188
waitbutton
closetext
end
-GrampsScript_0x19007e:
+MahoganyTownGrampsScript:
faceplayer
opentext
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
- iftrue UnknownScript_0x19008c
- writetext UnknownText_0x1901e5
+ iftrue .ClearedRocketHideout
+ writetext MahoganyTownGrampsText
waitbutton
closetext
end
-UnknownScript_0x19008c:
- writetext UnknownText_0x19021d
+.ClearedRocketHideout:
+ writetext MahoganyTownGrampsText_ClearedRocketHideout
waitbutton
closetext
end
@@ -138,7 +138,7 @@
turn_head DOWN
step_end
-UnknownText_0x1900b0:
+RageCandyBarMerchantText_TryOne:
text "Hiya, kid!"
para "I see you're new"
@@ -155,16 +155,16 @@
cont "¥300! Want one?"
done
-UnknownText_0x19014a:
+RageCandyBarMerchantText_SavorIt:
text "Good! Savor it!"
done
-UnknownText_0x19015b:
+RageCandyBarMerchantText_NotEnoughMoney:
text "You don't have"
line "enough money."
done
-UnknownText_0x190178:
+RageCandyBarMerchantText_Refused:
text "Oh, fine then…"
done
@@ -173,7 +173,7 @@
line "room for this."
done
-UnknownText_0x1901a6:
+RageCandyBarMerchantText_SoldOut:
text "RAGECANDYBAR's"
line "sold out."
@@ -182,13 +182,13 @@
cont "kiddo."
done
-UnknownText_0x1901e5:
+MahoganyTownGrampsText:
text "Are you off to see"
line "the GYARADOS ram-"
cont "page at the LAKE?"
done
-UnknownText_0x19021d:
+MahoganyTownGrampsText_ClearedRocketHideout:
text "MAGIKARP have"
line "returned to LAKE"
cont "OF RAGE."
@@ -253,8 +253,8 @@
warp_event 9, 1, ROUTE_43_MAHOGANY_GATE, 3
db 2 ; coord events
- coord_event 19, 8, SCENE_DEFAULT, UnknownScript_0x190013
- coord_event 19, 9, SCENE_DEFAULT, UnknownScript_0x190013
+ coord_event 19, 8, SCENE_DEFAULT, MahoganyTownTryARageCandyBarScript
+ coord_event 19, 9, SCENE_DEFAULT, MahoganyTownTryARageCandyBarScript
db 4 ; bg events
bg_event 1, 5, BGEVENT_READ, MahoganyTownSign
@@ -263,7 +263,7 @@
bg_event 16, 13, BGEVENT_READ, MahoganyTownPokecenterSign
db 4 ; object events
- object_event 19, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
- object_event 6, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1
+ object_event 19, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownPokefanMScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
+ object_event 6, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownGrampsScript, -1
object_event 6, 14, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
object_event 12, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownLassScript, EVENT_MAHOGANY_MART_OWNERS
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -6,7 +6,7 @@
db 0 ; callbacks
-FishingGuruScript_0x7f484:
+Route12SuperRodHouseFishingGuruScript:
faceplayer
opentext
checkevent EVENT_GOT_SUPER_ROD
@@ -89,4 +89,4 @@
db 0 ; bg events
db 1 ; object events
- object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1
+ object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route12SuperRodHouseFishingGuruScript, -1
--- a/maps/Route19FuchsiaGate.asm
+++ b/maps/Route19FuchsiaGate.asm
@@ -6,23 +6,23 @@
db 0 ; callbacks
-OfficerScript_0x1ab3f6:
+Route19FuchsiaGateOfficerScript:
faceplayer
opentext
checkevent EVENT_CINNABAR_ROCKS_CLEARED
iftrue .RocksCleared
- writetext UnknownText_0x1ab40a
+ writetext Route19FuchsiaGateOfficerText
waitbutton
closetext
end
.RocksCleared:
- writetext UnknownText_0x1ab48a
+ writetext Route19FuchsiaGateOfficerText_RocksCleared
waitbutton
closetext
end
-UnknownText_0x1ab40a:
+Route19FuchsiaGateOfficerText:
text "CINNABAR's volcano"
line "erupted."
@@ -35,7 +35,7 @@
cont "are safe…"
done
-UnknownText_0x1ab48a:
+Route19FuchsiaGateOfficerText_RocksCleared:
text "No CINNABAR citi-"
line "zens were injured"
@@ -57,4 +57,4 @@
db 0 ; bg events
db 1 ; object events
- object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1
+ object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route19FuchsiaGateOfficerScript, -1
--- a/maps/Route35GoldenrodGate.asm
+++ b/maps/Route35GoldenrodGate.asm
@@ -8,7 +8,7 @@
db 0 ; callbacks
-OfficerScript_0x69d37:
+RandyScript:
faceplayer
opentext
checkevent EVENT_GOT_HP_UP_FROM_RANDY
@@ -73,18 +73,18 @@
db 0
-PokefanFScript_0x69dc6:
+Route35GoldenrodGatePokefanFScript:
faceplayer
opentext
checkevent EVENT_FOUGHT_SUDOWOODO
- iftrue .aftersudowoodo
- writetext UnknownText_0x6a00a
+ iftrue .FoughtSudowoodo
+ writetext Route35GoldenrodGatePokefanFText
waitbutton
closetext
end
-.aftersudowoodo
- writetext UnknownText_0x6a09a
+.FoughtSudowoodo
+ writetext Route35GoldenrodGatePokefanFText_FoughtSudowoodo
waitbutton
closetext
end
@@ -159,7 +159,7 @@
cont "what'd I say?"
done
-UnknownText_0x6a00a:
+Route35GoldenrodGatePokefanFText:
text "A strange tree is"
line "blocking the road."
@@ -173,7 +173,7 @@
line "SQUIRTBOTTLE."
done
-UnknownText_0x6a09a:
+Route35GoldenrodGatePokefanFText_FoughtSudowoodo:
text "I like the #MON"
line "Lullaby they play"
cont "on the radio."
@@ -207,6 +207,6 @@
db 0 ; bg events
db 3 ; object events
- object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1
- object_event 6, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1
+ object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RandyScript, -1
+ object_event 6, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGatePokefanFScript, -1
object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -18,34 +18,34 @@
setflag ENGINE_FLYPOINT_SAFFRON
return
-LassScript_0x19932a:
+SaffronCityLass1Script:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue .ReturnedPart
- writetext UnknownText_0x19938d
+ iftrue .ReturnedMachinePart
+ writetext SaffronCityLass1Text
waitbutton
closetext
end
-.ReturnedPart:
- writetext UnknownText_0x19940d
+.ReturnedMachinePart:
+ writetext SaffronCityLass1Text_ReturnedMachinePart
waitbutton
closetext
end
-PokefanMScript_0x19933e:
+SaffronCityPokefanMScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue .ReturnedPart
- writetext UnknownText_0x199460
+ iftrue .ReturnedMachinePart
+ writetext SaffronCityPokefanMText
waitbutton
closetext
end
-.ReturnedPart:
- writetext UnknownText_0x1994ae
+.ReturnedMachinePart:
+ writetext SaffronCityPokefanMText_ReturnedMachinePart
waitbutton
closetext
end
@@ -56,18 +56,18 @@
SaffronCityCooltrainerFScript:
jumptextfaceplayer SaffronCityCooltrainerFText
-FisherScript_0x199358:
+SaffronCityFisherScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue .ReturnedPart
- writetext UnknownText_0x1995fc
+ iftrue .ReturnedMachinePart
+ writetext SaffronCityFisherText
waitbutton
closetext
end
-.ReturnedPart:
- writetext UnknownText_0x19964b
+.ReturnedMachinePart:
+ writetext SaffronCityFisherText_ReturnedMachinePart
waitbutton
closetext
end
@@ -78,8 +78,8 @@
SaffronCityYoungster2Script:
jumptextfaceplayer SaffronCityYoungster2Text
-SaffronCityLassScript:
- jumptextfaceplayer SaffronCityLassText
+SaffronCityLass2Script:
+ jumptextfaceplayer SaffronCityLass2Text
SaffronCitySign:
jumptext SaffronCitySignText
@@ -105,7 +105,7 @@
SaffronCityMartSign:
jumpstd martsign
-UnknownText_0x19938d:
+SaffronCityLass1Text:
text "A little girl who"
line "is an expert at"
@@ -119,7 +119,7 @@
line "It's confusing."
done
-UnknownText_0x19940d:
+SaffronCityLass1Text_ReturnedMachinePart:
text "The COPYCAT girl"
line "looked unhappy."
@@ -128,7 +128,7 @@
cont "DOLL--CLEFAIRY."
done
-UnknownText_0x199460:
+SaffronCityPokefanMText:
text "You came out from"
line "JOHTO?"
@@ -137,7 +137,7 @@
cont "TRAIN's running."
done
-UnknownText_0x1994ae:
+SaffronCityPokefanMText_ReturnedMachinePart:
text "You came out from"
line "JOHTO?"
@@ -173,7 +173,7 @@
line "that."
done
-UnknownText_0x1995fc:
+SaffronCityFisherText:
text "Chew… Chew…"
para "I hear there's big"
@@ -183,7 +183,7 @@
para "Chew… Chew…"
done
-UnknownText_0x19964b:
+SaffronCityFisherText_ReturnedMachinePart:
text "Chew… Chew…"
para "I hear there was"
@@ -213,7 +213,7 @@
line "over the place."
done
-SaffronCityLassText:
+SaffronCityLass2Text:
text "Our city was"
line "featured on a"
cont "radio program."
@@ -296,11 +296,11 @@
bg_event 26, 11, BGEVENT_READ, SaffronCityMartSign
db 8 ; object events
- object_event 7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LassScript_0x19932a, -1
- object_event 19, 30, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1
+ object_event 7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityLass1Script, -1
+ object_event 19, 30, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronCityPokefanMScript, -1
object_event 32, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1
object_event 20, 24, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerFScript, -1
- object_event 27, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x199358, -1
+ object_event 27, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityFisherScript, -1
object_event 15, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster1Script, -1
object_event 35, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster2Script, -1
- object_event 19, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityLassScript, -1
+ object_event 19, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityLass2Script, -1
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -13,7 +13,7 @@
.DummyScene:
end
-OfficerScript_0x18a81e:
+SaffronMagnetTrainStationOfficerScript:
faceplayer
opentext
checkevent EVENT_RESTORED_POWER_TO_KANTO
@@ -228,7 +228,7 @@
db 0 ; bg events
db 4 ; object events
- object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1
+ object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationOfficerScript, -1
object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationGymGuyScript, -1
object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
object_event 6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
--- a/maps/SaffronPokecenter1F.asm
+++ b/maps/SaffronPokecenter1F.asm
@@ -9,10 +9,10 @@
db 0 ; callbacks
-NurseScript_0x18a47d:
+SaffronPokecenter1FNurseScript:
jumpstd pokecenternurse
-TeacherScript_0x18a480:
+SaffronPokecenter1FTeacherScript:
special Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer UnknownText_0x18a4a3
@@ -20,7 +20,7 @@
.mobile
jumptextfaceplayer UnknownText_0x18a532
-FisherScript_0x18a48c:
+SaffronPokecenter1FFisherScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
@@ -122,7 +122,7 @@
db 0 ; bg events
db 4 ; object events
- object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1
- object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1
- object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1
+ object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FNurseScript, -1
+ object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FTeacherScript, -1
+ object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FFisherScript, -1
object_event 1, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -45,11 +45,11 @@
changeblock 14, 12, $07 ; floor
return
-UnknownScript_0x6cf95:
+RocketBaseBossFLeft:
moveobject TEAMROCKETBASEB2F_LANCE, 9, 13
jump UnknownScript_0x6cfac
-UnknownScript_0x6cf9c:
+RocketBaseBossFRight:
moveobject TEAMROCKETBASEB2F_ROCKET_GIRL, 21, 16
moveobject TEAMROCKETBASEB2F_ROCKET1, 21, 16
moveobject TEAMROCKETBASEB2F_DRAGON, 10, 13
@@ -140,11 +140,11 @@
applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d267
disappear TEAMROCKETBASEB2F_LANCE
-UnknownScript_0x6d075:
+RocketBaseCantLeaveScript:
applymovement PLAYER, MovementData_0x6d271
end
-UnknownScript_0x6d07a:
+RocketBaseLancesSideScript:
opentext
writetext UnknownText_0x6d7ea
waitbutton
@@ -919,13 +919,13 @@
db 9 ; coord events
coord_event 5, 14, SCENE_DEFAULT, LanceHealsScript1
coord_event 4, 13, SCENE_DEFAULT, LanceHealsScript2
- coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, UnknownScript_0x6cf95
- coord_event 15, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, UnknownScript_0x6cf9c
- coord_event 14, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d075
- coord_event 15, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d075
- coord_event 12, 3, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a
- coord_event 12, 10, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a
- coord_event 12, 11, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a
+ coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, RocketBaseBossFLeft
+ coord_event 15, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, RocketBaseBossFRight
+ coord_event 14, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseCantLeaveScript
+ coord_event 15, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseCantLeaveScript
+ coord_event 12, 3, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseLancesSideScript
+ coord_event 12, 10, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseLancesSideScript
+ coord_event 12, 11, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseLancesSideScript
db 23 ; bg events
bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -84,13 +84,13 @@
TeamRocketBaseB3FRocketScript:
jumptextfaceplayer TeamRocketBaseB3FRocketText
-UnknownScript_0x6e04b:
+RocketBaseBossLeft:
applymovement PLAYER, MovementData_0x6e133
- jump UnknownScript_0x6e056
+ jump RocketBaseBoss
-UnknownScript_0x6e052:
+RocketBaseBossRight:
applymovement PLAYER, MovementData_0x6e13a
-UnknownScript_0x6e056:
+RocketBaseBoss:
pause 30
showemote EMOTE_SHOCK, TEAMROCKETBASEB3F_ROCKET1, 15
playmusic MUSIC_ROCKET_ENCOUNTER
@@ -573,8 +573,8 @@
warp_event 27, 14, TEAM_ROCKET_BASE_B2F, 5
db 3 ; coord events
- coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e04b
- coord_event 11, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e052
+ coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, RocketBaseBossLeft
+ coord_event 11, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, RocketBaseBossRight
coord_event 8, 10, SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER, RocketBaseRival
db 10 ; bg events