diff options
89 files changed, 350 insertions, 347 deletions
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 32d3b57d2..716c742f4 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -104,13 +104,13 @@ BurnedTowerB1FEusine: waitbutton closetext checkcode VAR_FACING - ifequal UP, .Movement + ifequal UP, .Movement2 applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1 - jump UnknownScript_0x18622a + jump .Finish -.Movement: +.Movement2: applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement2 -UnknownScript_0x18622a: +.Finish: disappear BURNEDTOWERB1F_EUSINE playsound SFX_EXIT_BUILDING waitsfx @@ -155,7 +155,8 @@ BurnedTowerSuicuneMovement2: remove_sliding step_end -MovementData_0x18624f: +BurnedTowerUnusedMovement: +; unreferenced set_sliding big_step DOWN remove_sliding diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index 39b452fe7..cdbadd700 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -9,14 +9,14 @@ CeladonDeptStore2F_MapScripts: db 0 ; callbacks -ClerkScript_0x70bad: +CeladonDeptStore2FClerk1Script: faceplayer opentext pokemart MARTTYPE_STANDARD, MART_CELADON_2F_1 closetext end -ClerkScript_0x70bb5: +CeladonDeptStore2FClerk2Script: faceplayer opentext pokemart MARTTYPE_STANDARD, MART_CELADON_2F_2 @@ -81,7 +81,7 @@ CeladonDeptStore2F_MapEvents: bg_event 3, 0, BGEVENT_READ, CeladonDeptStore2FElevatorButton db 4 ; object events - object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1 - object_event 14, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1 + object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FClerk1Script, -1 + object_event 14, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FClerk2Script, -1 object_event 5, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1 object_event 6, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 6424102cd..638ff3c34 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -10,7 +10,7 @@ CeladonDeptStore3F_MapScripts: db 0 ; callbacks -ClerkScript_0x70d29: +CeladonDeptStore3FClerkScript: faceplayer opentext pokemart MARTTYPE_STANDARD, MART_CELADON_3F @@ -107,7 +107,7 @@ CeladonDeptStore3F_MapEvents: bg_event 3, 0, BGEVENT_READ, CeladonDeptStore3FElevatorButton db 5 ; object events - object_event 7, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1 + object_event 7, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FClerkScript, -1 object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1 object_event 9, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1 object_event 10, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index f619e49d8..9e7dddc29 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -8,7 +8,7 @@ CeladonDeptStore4F_MapScripts: db 0 ; callbacks -ClerkScript_0x70f0d: +CeladonDeptStore4FClerkScript: faceplayer opentext pokemart MARTTYPE_STANDARD, MART_CELADON_4F @@ -63,6 +63,6 @@ CeladonDeptStore4F_MapEvents: bg_event 3, 0, BGEVENT_READ, CeladonDeptStore4FElevatorButton db 3 ; object events - object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1 + object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FClerkScript, -1 object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1 object_event 8, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index c276e1dad..2c5ae22f8 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -10,14 +10,14 @@ CeladonDeptStore5F_MapScripts: db 0 ; callbacks -ClerkScript_0x71004: +CeladonDeptStore5FClerk1Script: faceplayer opentext pokemart MARTTYPE_STANDARD, MART_CELADON_5F_1 closetext end -ClerkScript_0x7100c: +CeladonDeptStore5FClerk2Script: faceplayer opentext pokemart MARTTYPE_STANDARD, MART_CELADON_5F_2 @@ -84,8 +84,8 @@ CeladonDeptStore5F_MapEvents: bg_event 3, 0, BGEVENT_READ, CeladonDeptStore5FElevatorButton db 5 ; object events - object_event 7, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1 - object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1 + object_event 7, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FClerk1Script, -1 + object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FClerk2Script, -1 object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1 object_event 3, 4, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1 object_event 1, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1 diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index cc2ea2306..beab8cae4 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -141,8 +141,8 @@ CeladonGameCornerSodaCanScript: closetext end -MovementData_0x721cd: -; unused +CeladonGameCornerUnusedMovementData: +; unreferenced step RIGHT turn_head LEFT step_end diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 246b30a39..ae4b397a8 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -11,7 +11,7 @@ CeladonGym_MapScripts: db 0 ; callbacks -ErikaScript_0x72a6a: +CeladonGymErikaScript: faceplayer opentext checkflag ENGINE_RAINBOWBADGE @@ -279,7 +279,7 @@ CeladonGym_MapEvents: bg_event 6, 15, BGEVENT_READ, CeladonGymStatue db 6 ; object events - object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1 + object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGymErikaScript, -1 object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1 object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1 object_event 3, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1 diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 0fbe53d52..85097f378 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -10,10 +10,10 @@ CeladonPokecenter1F_MapScripts: db 0 ; callbacks -NurseScript_0x71e22: +CeladonPokecenter1FNurseScript: jumpstd pokecenternurse -GentlemanScript_0x71e25: +CeladonPokecenter1FGentlemanScript: jumpstd happinesschecknpc CeladonPokecenter1FCooltrainerFScript: @@ -156,8 +156,8 @@ CeladonPokecenter1F_MapEvents: db 0 ; bg events db 5 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x71e22, -1 - object_event 1, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FNurseScript, -1 + object_event 1, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FGentlemanScript, -1 object_event 0, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1 object_event 8, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1 object_event 4, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 7e5f62973..a5d2d9ea8 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -56,7 +56,7 @@ CeruleanGym_MapScripts: pause 15 end -MistyScript_0x188432: +CeruleanGymMistyScript: faceplayer opentext checkflag ENGINE_CASCADEBADGE @@ -376,7 +376,7 @@ CeruleanGym_MapEvents: db 6 ; object events object_event 4, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET - object_event 5, 3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event 5, 3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanGymMistyScript, EVENT_TRAINERS_IN_CERULEAN_GYM object_event 4, 6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM object_event 1, 9, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM object_event 8, 9, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index d8cfde177..c7bf9738e 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -8,21 +8,21 @@ CeruleanPokecenter1F_MapScripts: db 0 ; callbacks -NurseScript_0x18820f: +CeruleanPokecenter1FNurseScript: jumpstd pokecenternurse -SuperNerdScript_0x188212: +CeruleanPokecenter1FSuperNerdScript: special Mobile_DummyReturnFalse iftrue .mobile - jumptextfaceplayer UnknownText_0x188221 + jumptextfaceplayer CeruleanPokecenter1FSuperNerdText .mobile - jumptextfaceplayer UnknownText_0x18828c + jumptextfaceplayer CeruleanPokecenter1FSuperNerdText_Mobile CeruleanPokecenter1FGymGuyScript: jumptextfaceplayer CeruleanPokecenter1FGymGuyText -UnknownText_0x188221: +CeruleanPokecenter1FSuperNerdText: text "For battles, I'd" line "much rather use" @@ -34,7 +34,7 @@ UnknownText_0x188221: cont "caught #MON." done -UnknownText_0x18828c: +CeruleanPokecenter1FSuperNerdText_Mobile: text "Do you battle by" line "mobile phone?" @@ -73,6 +73,6 @@ CeruleanPokecenter1F_MapEvents: db 0 ; bg events db 3 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18820f, -1 - object_event 8, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FNurseScript, -1 + object_event 8, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FSuperNerdScript, -1 object_event 1, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 3181409f4..d1a3caea6 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -15,17 +15,17 @@ CeruleanTradeSpeechHouseGrannyScript: CeruleanTradeSpeechHouseGrampsScript: jumptextfaceplayer CeruleanTradeSpeechHouseGrampsText -RhydonScript_0x188139: +CeruleanTradeSpeechHouseRhydonScript: opentext - writetext UnknownText_0x18819c + writetext CeruleanTradeSpeechHouseRhydonText cry KANGASKHAN waitbutton closetext end -ZubatScript_0x188143: +CeruleanTradeSpeechHouseZubatScript: opentext - writetext UnknownText_0x1881b5 + writetext CeruleanTradeSpeechHouseZubatText cry ZUBAT waitbutton closetext @@ -42,12 +42,12 @@ CeruleanTradeSpeechHouseGrampsText: text "Ah… I'm so happy…" done -UnknownText_0x18819c: +CeruleanTradeSpeechHouseRhydonText: text "KANGASKHAN: Garu" line "garuu." done -UnknownText_0x1881b5: +CeruleanTradeSpeechHouseZubatText: text "ZUBAT: Zuba zubaa." done @@ -65,5 +65,5 @@ CeruleanTradeSpeechHouse_MapEvents: db 4 ; object events object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1 object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1 - object_event 5, 2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x188139, -1 - object_event 5, 6, SPRITE_ZUBAT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ZubatScript_0x188143, -1 + object_event 5, 2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseRhydonScript, -1 + object_event 5, 6, SPRITE_ZUBAT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseZubatScript, -1 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 3831a8f35..579ee70ac 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -110,7 +110,7 @@ CherrygroveSilverSceneNorth: turnobject PLAYER, RIGHT playmusic MUSIC_RIVAL_ENCOUNTER opentext - writetext UnknownText_0x19c4e2 + writetext CherrygroveRivalText_Seen waitbutton closetext checkevent EVENT_GOT_TOTODILE_FROM_ELM @@ -430,7 +430,7 @@ GuideGentNoText: line "when you like." done -UnknownText_0x19c4e2: +CherrygroveRivalText_Seen: text "<……> <……> <……>" para "You got a #MON" diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index f2f1f69b8..78ea3fc6c 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -7,16 +7,16 @@ CherrygroveEvolutionSpeechHouse_MapScripts: db 0 ; callbacks -YoungsterScript_0x196cb2: +CherrygroveEvolutionSpeechHouseYoungsterScript: opentext - writetext UnknownText_0x196cc3 + writetext CherrygroveEvolutionSpeechHouseYoungsterText waitbutton closetext end -LassScript_0x196cb9: +CherrygroveEvolutionSpeechHouseLassScript: opentext - writetext UnknownText_0x196cfc + writetext CherrygroveEvolutionSpeechHouseLassText waitbutton closetext end @@ -24,7 +24,7 @@ LassScript_0x196cb9: CherrygroveEvolutionSpeechHouseBookshelf: jumpstd magazinebookshelf -UnknownText_0x196cc3: +CherrygroveEvolutionSpeechHouseYoungsterText: text "#MON gain expe-" line "rience in battle" @@ -32,7 +32,7 @@ UnknownText_0x196cc3: line "form." done -UnknownText_0x196cfc: +CherrygroveEvolutionSpeechHouseLassText: text "#MON change?" para "I would be shocked" @@ -53,5 +53,5 @@ CherrygroveEvolutionSpeechHouse_MapEvents: bg_event 1, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf db 2 ; object events - object_event 3, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LassScript_0x196cb9, -1 - object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1 + object_event 3, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CherrygroveEvolutionSpeechHouseLassScript, -1 + object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveEvolutionSpeechHouseYoungsterScript, -1 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 94177e6c8..366df35e7 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -8,31 +8,31 @@ CherrygroveMart_MapScripts: db 0 ; callbacks -ClerkScript_0x19680a: +CherrygroveMartClerkScript: opentext checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - iftrue UnknownScript_0x196817 + iftrue .PokeBallsInStock pokemart MARTTYPE_STANDARD, MART_CHERRYGROVE closetext end -UnknownScript_0x196817: +.PokeBallsInStock: pokemart MARTTYPE_STANDARD, MART_CHERRYGROVE_DEX closetext end -CooltrainerMScript_0x19681d: +CherrygroveMartCooltrainerMScript: faceplayer opentext checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - iftrue UnknownScript_0x19682b - writetext UnknownText_0x196834 + iftrue .PokeBallsInStock + writetext CherrygroveMartCooltrainerMText waitbutton closetext end -UnknownScript_0x19682b: - writetext UnknownText_0x196873 +.PokeBallsInStock: + writetext CherrygroveMartCooltrainerMText_PokeBallsInStock waitbutton closetext end @@ -40,7 +40,7 @@ UnknownScript_0x19682b: CherrygroveMartYoungsterScript: jumptextfaceplayer CherrygroveMartYoungsterText -UnknownText_0x196834: +CherrygroveMartCooltrainerMText: text "They're fresh out" line "of # BALLS!" @@ -48,7 +48,7 @@ UnknownText_0x196834: line "more of them?" done -UnknownText_0x196873: +CherrygroveMartCooltrainerMText_PokeBallsInStock: text "# BALLS are in" line "stock! Now I can" cont "catch #MON!" @@ -81,6 +81,6 @@ CherrygroveMart_MapEvents: db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1 - object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveMartClerkScript, -1 + object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveMartCooltrainerMScript, -1 object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1 diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index 979f79361..cfd02430b 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -9,7 +9,7 @@ CherrygrovePokecenter1F_MapScripts: db 0 ; callbacks -NurseScript_0x19696d: +CherrygrovePokecenter1FNurseScript: jumpstd pokecenternurse CherrygrovePokecenter1FFisherScript: @@ -18,18 +18,18 @@ CherrygrovePokecenter1FFisherScript: CherrygrovePokecenter1FGentlemanScript: jumptextfaceplayer CherrygrovePokecenter1FGentlemanText -TeacherScript_0x196976: +CherrygrovePokecenter1FTeacherScript: faceplayer opentext checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - iftrue UnknownScript_0x196984 - writetext UnknownText_0x1969f1 + iftrue .CommCenterOpen + writetext CherrygrovePokecenter1FTeacherText waitbutton closetext end -UnknownScript_0x196984: - writetext UnknownText_0x196a46 +.CommCenterOpen: + writetext CherrygrovePokecenter1FTeacherText_CommCenterOpen waitbutton closetext end @@ -48,7 +48,7 @@ CherrygrovePokecenter1FGentlemanText: cont "to use." done -UnknownText_0x1969f1: +CherrygrovePokecenter1FTeacherText: text "The COMMUNICATION" line "CENTER upstairs" cont "was just built." @@ -57,7 +57,7 @@ UnknownText_0x1969f1: line "finishing it up." done -UnknownText_0x196a46: +CherrygrovePokecenter1FTeacherText_CommCenterOpen: text "The COMMUNICATION" line "CENTER upstairs" cont "was just built." @@ -79,7 +79,7 @@ CherrygrovePokecenter1F_MapEvents: 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_0x19696d, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FNurseScript, -1 object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1 object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1 - object_event 1, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x196976, -1 + object_event 1, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FTeacherScript, -1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 15bb6d7bb..9ed866dd6 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -40,11 +40,11 @@ CianwoodCitySuicuneAndEusine: showemote EMOTE_SHOCK, PLAYER, 15 pause 15 playsound SFX_WARP_FROM - applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00da + applymovement CIANWOODCITY_SUICUNE, CianwoodCitySuicuneApproachMovement turnobject PLAYER, DOWN pause 15 playsound SFX_WARP_FROM - applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0 + applymovement CIANWOODCITY_SUICUNE, CianwoodCitySuicuneDepartMovement disappear CIANWOODCITY_SUICUNE pause 10 setscene SCENE_CIANWOODCITY_NOTHING @@ -55,7 +55,7 @@ CianwoodCitySuicuneAndEusine: setevent EVENT_FOUGHT_EUSINE playmusic MUSIC_MYSTICALMAN_ENCOUNTER appear CIANWOODCITY_EUSINE - applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00e7 + applymovement CIANWOODCITY_EUSINE, CianwoodCityEusineApproachMovement opentext writetext EusineSuicuneText waitbutton @@ -71,7 +71,7 @@ CianwoodCitySuicuneAndEusine: writetext EusineAfterText waitbutton closetext - applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00ec + applymovement CIANWOODCITY_EUSINE, CianwoodCityEusineDepartMovement disappear CIANWOODCITY_EUSINE pause 20 special FadeOutMusic @@ -148,7 +148,7 @@ CianwoodCityHiddenRevive: CianwoodCityHiddenMaxEther: hiddenitem MAX_ETHER, EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER -MovementData_0x1a00da: +CianwoodCitySuicuneApproachMovement: set_sliding fast_jump_step DOWN fast_jump_step DOWN @@ -156,7 +156,7 @@ MovementData_0x1a00da: remove_sliding step_end -MovementData_0x1a00e0: +CianwoodCitySuicuneDepartMovement: set_sliding fast_jump_step RIGHT fast_jump_step UP @@ -165,14 +165,14 @@ MovementData_0x1a00e0: remove_sliding step_end -MovementData_0x1a00e7: +CianwoodCityEusineApproachMovement: step UP step UP step UP step UP step_end -MovementData_0x1a00ec: +CianwoodCityEusineDepartMovement: step DOWN step DOWN step DOWN diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 1f24dc448..db2aa74ee 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -14,7 +14,7 @@ CianwoodGym_MapScripts: db 0 ; callbacks -ChuckScript_0x9d60f: +CianwoodGymChuckScript: faceplayer opentext checkevent EVENT_BEAT_CHUCK @@ -317,7 +317,7 @@ CianwoodGym_MapEvents: bg_event 6, 15, BGEVENT_READ, CianwoodGymStatue db 9 ; object events - object_event 4, 1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1 + object_event 4, 1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CianwoodGymChuckScript, -1 object_event 2, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1 object_event 7, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1 object_event 3, 9, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltNob, -1 diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index 7c8bfcbbb..d59df9b9c 100644 --- a/maps/CianwoodPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -6,26 +6,26 @@ CianwoodPhotoStudio_MapScripts: db 0 ; callbacks -FishingGuruScript_0x9e0e0: +CianwoodPhotoStudioFishingGuruScript: faceplayer opentext - writetext UnknownText_0x9e0f9 + writetext CianwoodPhotoStudioFishingGuruText_Question yesorno - iffalse UnknownScript_0x9e0f3 - writetext UnknownText_0x9e142 + iffalse .Refused + writetext CianwoodPhotoStudioFishingGuruText_Yes waitbutton special PhotoStudio waitbutton closetext end -UnknownScript_0x9e0f3: - writetext UnknownText_0x9e156 +.Refused: + writetext CianwoodPhotoStudioFishingGuruText_No waitbutton closetext end -UnknownText_0x9e0f9: +CianwoodPhotoStudioFishingGuruText_Question: text "You have magnifi-" line "cent #MON with" cont "you." @@ -34,11 +34,11 @@ UnknownText_0x9e0f9: line "for a souvenir?" done -UnknownText_0x9e142: +CianwoodPhotoStudioFishingGuruText_Yes: text "OK! Big smile now!" done -UnknownText_0x9e156: +CianwoodPhotoStudioFishingGuruText_No: text "Oh, that's too" line "bad. I thought it" @@ -58,4 +58,4 @@ CianwoodPhotoStudio_MapEvents: db 0 ; bg events db 1 ; object events - object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1 + object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPhotoStudioFishingGuruScript, -1 diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index 52a7e8a7b..e5bc22c37 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -9,7 +9,7 @@ CianwoodPokecenter1F_MapScripts: db 0 ; callbacks -NurseScript_0x9dbcf: +CianwoodPokecenter1FNurseScript: jumpstd pokecenternurse CianwoodPokecenter1FLassScript: @@ -89,7 +89,8 @@ CianwoodGymGuyWinText: cont "looking at you!" done -UnknownText_0x9ddf2: +CianwoodPokecenter1FUnusedText1: +; unreferenced text "Don't you get the" line "urge to show off" @@ -103,7 +104,8 @@ UnknownText_0x9ddf2: line "in VIOLET." done -UnknownText_0x9de66: +CianwoodPokecenter1FUnusedText2: +; unreferenced text "I've been battling" line "my pal in VIOLET" @@ -142,7 +144,7 @@ CianwoodPokecenter1F_MapEvents: 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_0x9dbcf, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FNurseScript, -1 object_event 1, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1 object_event 5, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1 object_event 8, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1 diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index 16cfb0c51..9100f73b4 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -8,7 +8,7 @@ CinnabarPokecenter1F_MapScripts: db 0 ; callbacks -NurseScript_0x1ab32c: +CinnabarPokecenter1FNurseScript: jumpstd pokecenternurse CinnabarPokecenter1FCooltrainerFScript: @@ -45,6 +45,6 @@ CinnabarPokecenter1F_MapEvents: db 0 ; bg events db 3 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FNurseScript, -1 object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1 object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 7bc264807..f35fa487d 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -11,25 +11,25 @@ CopycatsHouse1F_MapScripts: CopycatsHouse1FPokefanMScript: jumptextfaceplayer CopycatsHouse1FPokefanMText -PokefanFScript_0x18ad16: +CopycatsHouse1FPokefanFScript: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x18ad24 - writetext UnknownText_0x18ad95 + iftrue .ReturnedMachinePart + writetext CopycatsHouse1FPokefanFText waitbutton closetext end -UnknownScript_0x18ad24: - writetext UnknownText_0x18add3 +.ReturnedMachinePart: + writetext CopycatsHouse1FPokefanFText_ReturnedMachinePart waitbutton closetext end -ClefairyScript_0x18ad2a: +CopycatsHouse1FBlisseyScript: opentext - writetext UnknownText_0x18ae4b + writetext CopycatsHouse1FBlisseyText cry BLISSEY waitbutton closetext @@ -46,7 +46,7 @@ CopycatsHouse1FPokefanMText: line "around here." done -UnknownText_0x18ad95: +CopycatsHouse1FPokefanFText: text "My daughter is so" line "self-centered…" @@ -54,7 +54,7 @@ UnknownText_0x18ad95: line "friends." done -UnknownText_0x18add3: +CopycatsHouse1FPokefanFText_ReturnedMachinePart: text "She recently lost" line "the # DOLL that" @@ -66,7 +66,7 @@ UnknownText_0x18add3: cont "better at mimicry…" done -UnknownText_0x18ae4b: +CopycatsHouse1FBlisseyText: text "BLISSEY: Bliisii!" done @@ -84,5 +84,5 @@ CopycatsHouse1F_MapEvents: db 3 ; object events object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1 - object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1 - object_event 6, 6, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1 + object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanFScript, -1 + object_event 6, 6, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FBlisseyScript, -1 diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm index 403e2f165..73eca15d4 100644 --- a/maps/DayOfWeekSiblingsHouse.asm +++ b/maps/DayOfWeekSiblingsHouse.asm @@ -6,28 +6,28 @@ DayOfWeekSiblingsHouse_MapScripts: db 0 ; callbacks -PokedexScript_0x7b1e4: +DayOfWeekSiblingsHousePokedexScript: opentext - writetext UnknownText_0x7b1f9 + writetext DayOfWeekSiblingsHousePokedexText1 yesorno - iffalse UnknownText_0x7b1f7 - writetext UnknownText_0x7b222 + iffalse .End + writetext DayOfWeekSiblingsHousePokedexText2 yesorno - iffalse UnknownText_0x7b1f7 - writetext UnknownText_0x7b2b9 + iffalse .End + writetext DayOfWeekSiblingsHousePokedexText3 waitbutton -UnknownText_0x7b1f7: +.End: closetext end -UnknownText_0x7b1f9: +DayOfWeekSiblingsHousePokedexText1: text "There's something" line "written here." para "Read it?" done -UnknownText_0x7b222: +DayOfWeekSiblingsHousePokedexText2: text "To my brothers and" line "sisters:" @@ -45,7 +45,7 @@ UnknownText_0x7b222: para "Keep reading?" done -UnknownText_0x7b2b9: +DayOfWeekSiblingsHousePokedexText3: text "Monday, MONICA" line "ROUTE 40" @@ -80,4 +80,4 @@ DayOfWeekSiblingsHouse_MapEvents: db 0 ; bg events db 1 ; object events - object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1 + object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayOfWeekSiblingsHousePokedexScript, -1 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 9ca05c6db..74a95d925 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -154,7 +154,7 @@ DragonShrine_MapScripts: writetext DragonShrineIUnderstandText waitbutton closetext - applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e0 + applymovement DRAGONSHRINE_CLAIR, DragonShrineClairTwoSlowStepsRightMovement opentext writetext DragonShrineHereRisingBadgeText waitbutton @@ -170,9 +170,9 @@ DragonShrine_MapScripts: writetext DragonShrineRisingBadgeExplanationText waitbutton closetext - applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2ce + applymovement DRAGONSHRINE_ELDER1, DragonShrineElderWalkAway1Movement turnobject DRAGONSHRINE_CLAIR, UP - applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2d1 + applymovement DRAGONSHRINE_ELDER1, DragonShrineElderWalkAway2Movement turnobject PLAYER, UP opentext writetext DragonShrineElderScoldsClairText @@ -182,7 +182,7 @@ DragonShrine_MapScripts: writetext DragonShrineSpeechlessText waitbutton closetext - applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e3 + applymovement DRAGONSHRINE_CLAIR, DragonShrineClairWalkOutMovement playsound SFX_ENTER_DOOR disappear DRAGONSHRINE_CLAIR waitsfx @@ -349,12 +349,12 @@ DragonShrineElderWalkToClairMovement: turn_head DOWN step_end -MovementData_0x18d2ce: +DragonShrineElderWalkAway1Movement: slow_step RIGHT slow_step RIGHT step_end -MovementData_0x18d2d1: +DragonShrineElderWalkAway2Movement: slow_step RIGHT turn_head DOWN step_end @@ -377,12 +377,12 @@ DragonShrineClairSlowStepLeftMovement: remove_fixed_facing step_end -MovementData_0x18d2e0: +DragonShrineClairTwoSlowStepsRightMovement: slow_step RIGHT slow_step RIGHT step_end -MovementData_0x18d2e3: +DragonShrineClairWalkOutMovement: step DOWN step DOWN step DOWN diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 173751924..918e82904 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -125,10 +125,9 @@ TrainerTwinsLeaandpia2: closetext end -PokeBallScript_0x18c95a: -; This whole script is written out rather than as an -; item fragment because it's left over from the GS -; event. +DragonsDenB1FDragonFangScript: +; This whole script is written out rather than as an itemball +; because it's left over from the GS event. giveitem DRAGON_FANG iffalse .BagFull disappear DRAGONSDENB1F_POKE_BALL1 @@ -151,7 +150,7 @@ PokeBallScript_0x18c95a: closetext end -SilverScript_0x18c97e: +DragonsDenB1FSilverScript: playmusic MUSIC_RIVAL_ENCOUNTER faceplayer opentext @@ -421,9 +420,9 @@ DragonsDenB1F_MapEvents: bg_event 31, 15, BGEVENT_ITEM, DragonsDenB1FHiddenMaxElixer db 9 ; object events - object_event 35, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG + object_event 35, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonsDenB1FDragonFangScript, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG object_event 14, 30, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR - object_event 20, 23, SPRITE_SILVER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN + object_event 20, 23, SPRITE_SILVER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonsDenB1FSilverScript, EVENT_RIVAL_DRAGONS_DEN object_event 20, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1 object_event 8, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1 object_event 4, 17, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 7969dad16..2a79baf65 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -21,7 +21,7 @@ EcruteakGym_MapScripts: .DummyScene: end -MortyScript_0x99d58: +EcruteakGymMortyScript: faceplayer opentext checkevent EVENT_BEAT_MORTY @@ -429,7 +429,7 @@ EcruteakGym_MapEvents: bg_event 6, 15, BGEVENT_READ, EcruteakGymStatue db 7 ; object events - object_event 5, 1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1 + object_event 5, 1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, EcruteakGymMortyScript, -1 object_event 2, 7, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1 object_event 3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1 object_event 7, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 2ea3cd494..13259932a 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -8,7 +8,7 @@ EcruteakMart_MapScripts: db 0 ; callbacks -ClerkScript_0x99c3b: +EcruteakMartClerkScript: opentext pokemart MARTTYPE_STANDARD, MART_ECRUTEAK closetext @@ -55,6 +55,6 @@ EcruteakMart_MapEvents: db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartClerkScript, -1 object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1 object_event 6, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 715e6b907..24fa2de71 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -154,7 +154,7 @@ PicnickerCindyScript: end .CindyAfterScript: - writetext UnknownText_0x19620c + writetext PicnickerCindyAfterText waitbutton closetext end @@ -188,7 +188,7 @@ CamperBarryScript: end .BarryAfterScript: - writetext UnknownText_0x19626b + writetext CamperBarryAfterText waitbutton closetext end @@ -334,7 +334,7 @@ PicnickerCindyBeatenText: line "I wanted to win!" done -UnknownText_0x19620c: +PicnickerCindyAfterText: text "You must be" line "getting tired." done @@ -351,7 +351,7 @@ CamperBarryBeatenText: line "right on! Dang!" done -UnknownText_0x19626b: +CamperBarryAfterText: text "Hey, you. Was my" line "disguise cute or" cont "what, huh?" diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index b2e819917..b57e8259d 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -8,7 +8,7 @@ FuchsiaMart_MapScripts: db 0 ; callbacks -ClerkScript_0x195ce8: +FuchsiaMartClerkScript: opentext pokemart MARTTYPE_STANDARD, MART_FUCHSIA closetext @@ -47,6 +47,6 @@ FuchsiaMart_MapEvents: db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaMartClerkScript, -1 object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1 object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1 diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index 3e05aa719..b05557046 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -13,7 +13,7 @@ FuchsiaPokecenter1F_MapScripts: .DummyScene: end -NurseScript_0x196459: +FuchsiaPokecenter1FNurseScript: jumpstd pokecenternurse FuchsiaPokecenter1FCooltrainerMScript: @@ -22,27 +22,27 @@ FuchsiaPokecenter1FCooltrainerMScript: FuchsiaPokecenter1FCooltrainerFScript: jumptextfaceplayer FuchsiaPokecenter1FCooltrainerFText -JanineImpersonatorScript_0x196462: +FuchsiaPokecenter1FJanineImpersonatorScript: faceplayer opentext - writetext UnknownText_0x19652e + writetext FuchsiaPokecenter1FJanineImpersonatorText1 waitbutton closetext - applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 + applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, FuchsiaPokecenter1FJanineImpersonatorSpinMovement faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE special LoadUsedSpritesGFX opentext - writetext UnknownText_0x19654e + writetext FuchsiaPokecenter1FJanineImpersonatorText2 waitbutton closetext - applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 + applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, FuchsiaPokecenter1FJanineImpersonatorSpinMovement faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS special LoadUsedSpritesGFX end -MovementData_0x196486: +FuchsiaPokecenter1FJanineImpersonatorSpinMovement: turn_head DOWN turn_head LEFT turn_head UP @@ -76,12 +76,12 @@ FuchsiaPokecenter1FCooltrainerFText: cont "looked identical." done -UnknownText_0x19652e: +FuchsiaPokecenter1FJanineImpersonatorText1: text "I'm JANINE! Hocus-" line "pocus… Poof!" done -UnknownText_0x19654e: +FuchsiaPokecenter1FJanineImpersonatorText2: text "See? I look just" line "like her now!" done @@ -99,7 +99,7 @@ FuchsiaPokecenter1F_MapEvents: db 0 ; bg events db 4 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FNurseScript, -1 object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1 object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1 - object_event 5, 3, SPRITE_JANINE_IMPERSONATOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1 + object_event 5, 3, SPRITE_JANINE_IMPERSONATOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FJanineImpersonatorScript, -1 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index 0569edd5f..b5ecca61c 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -10,14 +10,14 @@ GoldenrodDeptStore2F_MapScripts: db 0 ; callbacks -ClerkScript_0x55b5d: +GoldenrodDeptStore2FClerk1Script: faceplayer opentext pokemart MARTTYPE_STANDARD, MART_GOLDENROD_2F_1 closetext end -ClerkScript_0x55b65: +GoldenrodDeptStore2FClerk2Script: faceplayer opentext pokemart MARTTYPE_STANDARD, MART_GOLDENROD_2F_2 @@ -113,8 +113,8 @@ GoldenrodDeptStore2F_MapEvents: bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton db 5 ; object events - object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1 - object_event 13, 6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1 + object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FClerk1Script, -1 + object_event 13, 6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FClerk2Script, -1 object_event 9, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1 object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1 object_event 2, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 0be5d0a47..b4441f3e4 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -8,7 +8,7 @@ GoldenrodDeptStore3F_MapScripts: db 0 ; callbacks -ClerkScript_0x55db8: +GoldenrodDeptStore3FClerkScript: faceplayer opentext pokemart MARTTYPE_STANDARD, MART_GOLDENROD_3F @@ -69,6 +69,6 @@ GoldenrodDeptStore3F_MapEvents: bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton db 3 ; object events - object_event 6, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1 + object_event 6, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FClerkScript, -1 object_event 12, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1 object_event 2, 5, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 2b77d5ae1..c8acd9d01 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -9,7 +9,7 @@ GoldenrodDeptStore4F_MapScripts: db 0 ; callbacks -ClerkScript_0x55ee9: +GoldenrodDeptStore4FClerkScript: faceplayer opentext pokemart MARTTYPE_STANDARD, MART_GOLDENROD_4F @@ -90,7 +90,7 @@ GoldenrodDeptStore4F_MapEvents: bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton db 4 ; object events - object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1 + object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FClerkScript, -1 object_event 11, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1 object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1 object_event 5, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 4eccdfdbd..4734656b3 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -22,7 +22,7 @@ GoldenrodDeptStore5F_MapScripts: appear GOLDENRODDEPTSTORE5F_RECEPTIONIST return -ClerkScript_0x5609c: +GoldenrodDeptStore5FClerkScript: faceplayer opentext checkevent EVENT_GOT_TM02_HEADBUTT @@ -56,7 +56,7 @@ ClerkScript_0x5609c: closetext end -ReceptionistScript_0x560ce: +GoldenrodDeptStore5FReceptionistScript: faceplayer opentext checkcode VAR_WEEKDAY @@ -230,9 +230,9 @@ GoldenrodDeptStore5F_MapEvents: bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton db 6 ; object events - object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1 + object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FClerkScript, -1 object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1 object_event 6, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1 object_event 13, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FPokefanMScript, -1 object_event 9, 1, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Carrie, -1 - object_event 7, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY + object_event 7, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FReceptionistScript, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 660ac0f21..e9d5e9d37 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -5,7 +5,7 @@ GoldenrodDeptStoreElevator_MapScripts: GoldenrodDeptStoreElevatorScript: opentext - elevator Elevator_0x566e0 + elevator GoldenrodDeptStoreElevatorData closetext iffalse .Done pause 5 @@ -41,7 +41,7 @@ GoldenrodDeptStoreElevatorScript: .Done: end -Elevator_0x566e0: +GoldenrodDeptStoreElevatorData: db 7 ; floors elevfloor FLOOR_B1F, 2, GOLDENROD_DEPT_STORE_B1F elevfloor FLOOR_1F, 4, GOLDENROD_DEPT_STORE_1F diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index a41e2f9b0..53a7a8702 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -37,7 +37,7 @@ GoldenrodDeptStoreRoof_MapScripts: setevent EVENT_GOLDENROD_SALE_ON return -ClerkScript_0x5673f: +GoldenrodDeptStoreRoofClerkScript: opentext pokemart MARTTYPE_ROOFTOP, 0 closetext @@ -224,7 +224,7 @@ GoldenrodDeptStoreRoof_MapEvents: bg_event 3, 0, BGEVENT_UP, PokeDollVendingMachine db 8 ; object events - object_event 1, 4, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF + 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 3, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index cdf754bad..3b669ca43 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -19,7 +19,7 @@ GoldenrodGym_MapScripts: .DummyScene1: end -WhitneyScript_0x5400c: +GoldenrodGymWhitneyScript: faceplayer checkevent EVENT_BEAT_WHITNEY iftrue .FightDone @@ -392,7 +392,7 @@ GoldenrodGym_MapEvents: bg_event 4, 15, BGEVENT_READ, GoldenrodGymStatue db 6 ; object events - object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1 + object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymWhitneyScript, -1 object_event 9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1 object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1 object_event 0, 2, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1 diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 2009b79be..2dc916bb5 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -10,7 +10,7 @@ GoldenrodPokecenter1F_MapScripts: db 0 ; callbacks -NurseScript_0x60f91: +GoldenrodPokecenter1FNurseScript: jumpstd pokecenternurse GoldenrodPokecenter1F_GSBallSceneLeft: @@ -818,7 +818,7 @@ GoldenrodPokecenter1F_MapEvents: db 0 ; bg events db 5 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x60f91, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FNurseScript, -1 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 diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index b44f56b2d..bd3fb3516 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -134,10 +134,10 @@ PlateauRivalPostBattle: PlateauRivalScriptDone: end -NurseScript_0x18012c: +IndigoPlateauPokecenter1FNurseScript: jumpstd pokecenternurse -ClerkScript_0x18012f: +IndigoPlateauPokecenter1FClerkScript: opentext pokemart MARTTYPE_STANDARD, MART_INDIGO_PLATEAU closetext @@ -316,8 +316,8 @@ IndigoPlateauPokecenter1F_MapEvents: db 0 ; bg events db 6 ; object events - object_event 3, 7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18012c, -1 - object_event 11, 7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1 + object_event 3, 7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FNurseScript, -1 + object_event 11, 7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FClerkScript, -1 object_event 11, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1 object_event 16, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL object_event 1, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 3cc096d1d..ed85ed0ba 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -28,7 +28,7 @@ KarensRoom_MapScripts: return .KarensDoorLocksBehindYou: - applymovement PLAYER, KarensMovementData_0x18078e + applymovement PLAYER, KarensRoom_EnterMovement refreshscreen $86 playsound SFX_STRENGTH earthquake 80 @@ -71,7 +71,7 @@ KarenScript_AfterBattle: closetext end -KarensMovementData_0x18078e: +KarensRoom_EnterMovement: step UP step UP step UP diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 34c9f7b5d..4401e6197 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -28,7 +28,7 @@ KogasRoom_MapScripts: return .KogasDoorLocksBehindYou: - applymovement PLAYER, KogasMovementData_0x18078e + applymovement PLAYER, KogasRoom_EnterMovement refreshscreen $86 playsound SFX_STRENGTH earthquake 80 @@ -71,7 +71,7 @@ KogaScript_AfterBattle: closetext end -KogasMovementData_0x18078e: +KogasRoom_EnterMovement: step UP step UP step UP diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index b6cdcfb56..e06a9b89d 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -30,7 +30,7 @@ LancesRoom_MapScripts: return .LancesDoorLocksBehindYou: - applymovement PLAYER, LancesRoom_PlayerWalksInMovementData + applymovement PLAYER, LancesRoom_EnterMovement refreshscreen $86 playsound SFX_STRENGTH earthquake 80 @@ -128,7 +128,7 @@ LanceScript_0x180e7b: warpfacing UP, HALL_OF_FAME, 4, 13 end -LancesRoom_PlayerWalksInMovementData: +LancesRoom_EnterMovement: step UP step UP step UP diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index cd97dd8e8..b5c3de66c 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -8,7 +8,7 @@ LavenderMart_MapScripts: db 0 ; callbacks -ClerkScript_0x7eb1c: +LavenderMartClerkScript: opentext pokemart MARTTYPE_STANDARD, MART_LAVENDER closetext @@ -57,6 +57,6 @@ LavenderMart_MapEvents: db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartClerkScript, -1 object_event 6, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1 object_event 9, 2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1 diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index 84d2ec2ea..6031e9e80 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -9,7 +9,7 @@ LavenderPokecenter1F_MapScripts: db 0 ; callbacks -NurseScript_0x7e6a0: +LavenderPokecenter1FNurseScript: jumpstd pokecenternurse LavenderPokecenter1FGentlemanScript: @@ -18,18 +18,18 @@ LavenderPokecenter1FGentlemanScript: LavenderPokecenter1FTeacherScript: jumptextfaceplayer LavenderPokecenter1FTeacherText -YoungsterScript_0x7e6a9: +LavenderPokecenter1FYoungsterScript: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x7e6b7 - writetext UnknownText_0x7e779 + iftrue .ReturnedMachinePart + writetext LavenderPokecenter1FYoungsterText waitbutton closetext end -UnknownScript_0x7e6b7: - writetext UnknownText_0x7e7ed +.ReturnedMachinePart: + writetext LavenderPokecenter1FYoungsterText_ReturnedMachinePart waitbutton closetext end @@ -53,7 +53,7 @@ LavenderPokecenter1FTeacherText: cont "to tune into it." done -UnknownText_0x7e779: +LavenderPokecenter1FYoungsterText: text "If the POWER PLANT" line "isn't running, the" @@ -65,7 +65,7 @@ UnknownText_0x7e779: cont "can't broadcast…" done -UnknownText_0x7e7ed: +LavenderPokecenter1FYoungsterText_ReturnedMachinePart: text "The DIRECTOR of" line "the RADIO STATION" cont "sure was happy." @@ -91,7 +91,7 @@ LavenderPokecenter1F_MapEvents: 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_0x7e6a0, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FNurseScript, -1 object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1 object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1 - object_event 1, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1 + object_event 1, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FYoungsterScript, -1 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index de735549e..f578597f0 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -12,7 +12,7 @@ MahoganyGym_MapScripts: db 0 ; callbacks -PryceScript_0x199a9e: +MahoganyGymPryceScript: faceplayer opentext checkevent EVENT_BEAT_PRYCE @@ -384,7 +384,7 @@ MahoganyGym_MapEvents: bg_event 6, 15, BGEVENT_READ, MahoganyGymStatue db 7 ; object events - object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1 + object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MahoganyGymPryceScript, -1 object_event 4, 6, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1 object_event 0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1 object_event 9, 17, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1 diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index baced8e5c..caad5e049 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -9,7 +9,7 @@ MahoganyPokecenter1F_MapScripts: db 0 ; callbacks -NurseScript_0x19a356: +MahoganyPokecenter1FNurseScript: jumpstd pokecenternurse MahoganyPokecenter1FPokefanMScript: @@ -64,7 +64,7 @@ MahoganyPokecenter1F_MapEvents: 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_0x19a356, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FNurseScript, -1 object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1 object_event 1, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1 object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FCooltrainerFScript, -1 diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index fab7873ca..1a70e9606 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -95,7 +95,8 @@ ManiaScript: closetext end -UnknownScript_0x9d300: +ManiasHouseUnusedBookshelf: +; unused jumpstd picturebookshelf ManiaText_AskLookAfterShuckle: diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 27133cc36..536d3c6e8 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -7,7 +7,7 @@ OlivineGym_MapScripts: db 0 ; callbacks -JasmineScript_0x9c12f: +OlivineGymJasmineScript: faceplayer opentext checkevent EVENT_BEAT_JASMINE @@ -209,5 +209,5 @@ OlivineGym_MapEvents: bg_event 6, 13, BGEVENT_READ, OlivineGymStatue db 2 ; object events - object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE + object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymJasmineScript, EVENT_OLIVINE_GYM_JASMINE object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 4eb0c321d..062a3e2b6 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -106,7 +106,7 @@ TrainerSailorHuey: .HasProtein: opentext - writetext UnknownText_0x5b1b6 + writetext SailorHueyGiveProteinText waitbutton verbosegiveitem PROTEIN iffalse .PackFull @@ -193,7 +193,7 @@ GentlemanAlfredAfterBattleText: line "ordinary medicine." done -UnknownText_0x5b1b6: +SailorHueyGiveProteinText: text "Man! You're as" line "tough as ever!" diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index 3bc0774f3..f06aeebd4 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -8,7 +8,7 @@ OlivineMart_MapScripts: db 0 ; callbacks -ClerkScript_0x9cac7: +OlivineMartClerkScript: opentext pokemart MARTTYPE_STANDARD, MART_OLIVINE closetext @@ -55,6 +55,6 @@ OlivineMart_MapEvents: db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartClerkScript, -1 object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1 object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1 diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index 173c7a9b4..c1acd0fac 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -9,10 +9,10 @@ OlivinePokecenter1F_MapScripts: db 0 ; callbacks -NurseScript_0x9c002: +OlivinePokecenter1FNurseScript: jumpstd pokecenternurse -FishingGuruScript_0x9c005: +OlivinePokecenter1FFishingGuruScript: jumpstd happinesschecknpc OlivinePokecenter1FFisherScript: @@ -58,7 +58,7 @@ OlivinePokecenter1F_MapEvents: 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_0x9c002, -1 - object_event 8, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FNurseScript, -1 + object_event 8, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFishingGuruScript, -1 object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1 object_event 7, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FTeacherScript, -1 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 87e918d35..867c960fc 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -60,10 +60,10 @@ PewterCityPokecenterSign: PewterCityMartSign: jumpstd martsign -FruitTreeScript_0x18c03e: +PewterCityFruitTree1: fruittree FRUITTREE_PEWTER_CITY_1 -FruitTreeScript_0x18c040: +PewterCityFruitTree2: fruittree FRUITTREE_PEWTER_CITY_2 PewterCityCooltrainerFText: @@ -175,5 +175,5 @@ PewterCity_MapEvents: object_event 19, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1 object_event 14, 29, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1 object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1 - object_event 32, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1 - object_event 30, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1 + object_event 32, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterCityFruitTree1, -1 + object_event 30, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterCityFruitTree2, -1 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index d6a0f3998..e01352895 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -8,7 +8,7 @@ PewterGym_MapScripts: db 0 ; callbacks -BrockScript_0x1a2864: +PewterGymBrockScript: faceplayer opentext checkflag ENGINE_BOULDERBADGE @@ -220,6 +220,6 @@ PewterGym_MapEvents: bg_event 7, 11, BGEVENT_READ, PewterGymStatue db 3 ; object events - object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1 + object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PewterGymBrockScript, -1 object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1 object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1 diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index 1862f99b1..ad6df1593 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -8,7 +8,7 @@ PewterMart_MapScripts: db 0 ; callbacks -ClerkScript_0x1a2dcb: +PewterMartClerkScript: opentext pokemart MARTTYPE_STANDARD, MART_PEWTER closetext @@ -55,6 +55,6 @@ PewterMart_MapEvents: db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartClerkScript, -1 object_event 9, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1 object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1 diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index 14f1870c3..3ec7bf91f 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -10,7 +10,7 @@ PewterPokecenter1F_MapScripts: db 0 ; callbacks -NurseScript_0x1a2ee7: +PewterPokecenter1FNurseScript: jumpstd pokecenternurse PewterPokecenter1FTeacherScript: @@ -78,7 +78,7 @@ PewterPokecenter1F_MapEvents: db 0 ; bg events db 5 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FNurseScript, -1 object_event 8, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1 object_event 1, 3, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1 object_event 2, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FBugCatcherScript, -1 diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 93ad201b8..33b2f0fb0 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -587,7 +587,7 @@ Pokecenter2FLinkRecordSign: closetext end -OfficerScript_0x192c9a: +Pokecenter2FOfficerScript: faceplayer opentext checkevent EVENT_MYSTERY_GIFT_DELIVERY_GUY @@ -1040,4 +1040,4 @@ Pokecenter2F_MapEvents: object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1 object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1 object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1 - object_event 1, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY + object_event 1, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Pokecenter2FOfficerScript, EVENT_MYSTERY_GIFT_DELIVERY_GUY diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index e83a82177..b89ab315c 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -77,7 +77,7 @@ TrainerExecutivef1: end RadioTower5FRocketBossScene: - applymovement PLAYER, MovementData_0x60125 + applymovement PLAYER, RadioTower5FPlayerTwoStepsLeftMovement playmusic MUSIC_ROCKET_ENCOUNTER turnobject RADIOTOWER5F_ROCKET, RIGHT opentext @@ -185,7 +185,7 @@ RadioTower5FDirectorWalksOut: step UP step_end -MovementData_0x60125: +RadioTower5FPlayerTwoStepsLeftMovement: step LEFT step LEFT step_end diff --git a/maps/Route1.asm b/maps/Route1.asm index 7f7cf828b..fdae35d58 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -33,7 +33,7 @@ TrainerCooltrainerfQuinn: Route1Sign: jumptext Route1SignText -FruitTreeScript_0x1ac581: +Route1FruitTree: fruittree FRUITTREE_ROUTE_1 SchoolboyDannySeenText: @@ -91,4 +91,4 @@ Route1_MapEvents: db 3 ; object events object_event 4, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1 object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1 - object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1 + object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route1FruitTree, -1 diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index ecd56522d..82a6c73ad 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -9,24 +9,24 @@ Route10Pokecenter1F_MapScripts: db 0 ; callbacks -NurseScript_0x188bd4: +Route10Pokecenter1FNurseScript: jumpstd pokecenternurse Route10Pokecenter1FGentlemanScript: jumptextfaceplayer Route10Pokecenter1FGentlemanText -GymGuyScript_0x188bda: +Route10Pokecenter1FGymGuyScript: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x188be8 - writetext UnknownText_0x188c26 + iftrue .ReturnedMachinePart + writetext Route10Pokecenter1FGymGuyText waitbutton closetext end -UnknownScript_0x188be8: - writetext UnknownText_0x188c9e +.ReturnedMachinePart: + writetext Route10Pokecenter1FGymGuyText_ReturnedMachinePart waitbutton closetext end @@ -42,7 +42,7 @@ Route10Pokecenter1FGentlemanText: line "convenient." done -UnknownText_0x188c26: +Route10Pokecenter1FGymGuyText: text "The POWER PLANT's" line "MANAGER is looking" @@ -56,7 +56,7 @@ UnknownText_0x188c26: line "was stolen." done -UnknownText_0x188c9e: +Route10Pokecenter1FGymGuyText_ReturnedMachinePart: text "I hear TEAM ROCKET" line "got back together" @@ -91,7 +91,7 @@ Route10Pokecenter1F_MapEvents: 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_0x188bd4, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FNurseScript, -1 object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1 - object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1 + object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGymGuyScript, -1 object_event 1, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1 diff --git a/maps/Route11.asm b/maps/Route11.asm index e8f630af4..9620e8f0b 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -57,7 +57,7 @@ TrainerPsychicFidel: Route11Sign: jumptext Route11SignText -FruitTreeScript_0x68055: +Route11FruitTree: fruittree FRUITTREE_ROUTE_11 Route11HiddenRevive: @@ -159,4 +159,4 @@ Route11_MapEvents: object_event 20, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1 object_event 28, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1 object_event 8, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1 - object_event 32, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1 + object_event 32, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route11FruitTree, -1 diff --git a/maps/Route2.asm b/maps/Route2.asm index 826000634..2760b16eb 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -64,7 +64,7 @@ Route2Carbos: Route2Elixer: itemball ELIXER -FruitTreeScript_0x1ac306: +Route2FruitTree: fruittree FRUITTREE_ROUTE_2 Route2HiddenMaxEther: @@ -172,4 +172,4 @@ Route2_MapEvents: object_event 2, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION object_event 19, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS object_event 14, 50, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER - object_event 10, 14, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1 + object_event 10, 14, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route2FruitTree, -1 diff --git a/maps/Route26.asm b/maps/Route26.asm index 9e298d597..1d1f81534 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -246,7 +246,7 @@ TrainerFisherScott: Route26Sign: jumptext Route26SignText -FruitTreeScript_0x1a4ec2: +Route26FruitTree: fruittree FRUITTREE_ROUTE_26 Route26MaxElixer: @@ -430,5 +430,5 @@ Route26_MapEvents: object_event 5, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1 object_event 13, 79, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicRichard, -1 object_event 10, 92, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherScott, -1 - object_event 14, 54, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1 + object_event 14, 54, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route26FruitTree, -1 object_event 9, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 7d4571668..0b37334e3 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -8,34 +8,34 @@ Route32Pokecenter1F_MapScripts: db 0 ; callbacks -NurseScript_0x69b52: +Route32Pokecenter1FNurseScript: jumpstd pokecenternurse -FishingGuruScript_0x69b55: +Route32Pokecenter1FFishingGuruScript: faceplayer opentext checkevent EVENT_GOT_OLD_ROD - iftrue UnknownScript_0x69b7a - writetext UnknownText_0x69b83 + iftrue .GotOldRod + writetext Route32Pokecenter1FFishingGuruText_Question yesorno - iffalse UnknownScript_0x69b74 - writetext UnknownText_0x69be8 + iffalse .Refused + writetext Route32Pokecenter1FFishingGuruText_Yes buttonsound verbosegiveitem OLD_ROD - writetext UnknownText_0x69c1b + writetext Route32Pokecenter1FFishingGuruText_GiveOldRod waitbutton closetext setevent EVENT_GOT_OLD_ROD end -UnknownScript_0x69b74: - writetext UnknownText_0x69c6c +.Refused: + writetext Route32Pokecenter1FFishingGuruText_No waitbutton closetext end -UnknownScript_0x69b7a: - writetext UnknownText_0x69c8d +.GotOldRod: + writetext Route32Pokecenter1FFishingGuruText_After waitbutton closetext end @@ -43,7 +43,7 @@ UnknownScript_0x69b7a: Route32Pokecenter1FCooltrainerFScript: jumptextfaceplayer Route32Pokecenter1FCooltrainerFText -UnknownText_0x69b83: +Route32Pokecenter1FFishingGuruText_Question: text "This is a great" line "fishing spot." @@ -55,7 +55,7 @@ UnknownText_0x69b83: line "of my RODS?" done -UnknownText_0x69be8: +Route32Pokecenter1FFishingGuruText_Yes: text "Heh, that's good" line "to hear." @@ -63,7 +63,7 @@ UnknownText_0x69be8: line "angler too!" done -UnknownText_0x69c1b: +Route32Pokecenter1FFishingGuruText_GiveOldRod: text "Fishing is great!" para "If there's water," @@ -73,12 +73,12 @@ UnknownText_0x69c1b: line "your ROD." done -UnknownText_0x69c6c: +Route32Pokecenter1FFishingGuruText_No: text "Oh. That's rather" line "disappointing…" done -UnknownText_0x69c8d: +Route32Pokecenter1FFishingGuruText_After: text "Yo, kid. How are" line "they biting?" done @@ -105,6 +105,6 @@ Route32Pokecenter1F_MapEvents: db 0 ; bg events db 3 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1 - object_event 1, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FNurseScript, -1 + object_event 1, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FFishingGuruScript, -1 object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1 diff --git a/maps/Route33.asm b/maps/Route33.asm index 9fbecb775..eb88baaa6 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -139,7 +139,7 @@ TrainerHikerAnthony: Route33Sign: jumptext Route33SignText -Route33FruitTreeScript: +Route33FruitTree: fruittree FRUITTREE_ROUTE_33 HikerAnthony2SeenText: @@ -206,4 +206,4 @@ Route33_MapEvents: db 3 ; object events object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1 object_event 13, 16, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1 - object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1 + object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTree, -1 diff --git a/maps/Route35.asm b/maps/Route35.asm index 0b471f25f..48c05058d 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -271,7 +271,7 @@ Route35Sign: Route35TMRollout: itemball TM_ROLLOUT -FruitTreeScript_0x19ca7e: +Route35FruitTree: fruittree FRUITTREE_ROUTE_35 CamperIvanSeenText: @@ -484,5 +484,5 @@ Route35_MapEvents: object_event 16, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherArnie, -1 object_event 5, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1 object_event 5, 6, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TrainerOfficerDirk, -1 - object_event 2, 25, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1 + object_event 2, 25, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route35FruitTree, -1 object_event 13, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT diff --git a/maps/Route37.asm b/maps/Route37.asm index 8a5a2b8a5..98cf05d20 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -102,13 +102,13 @@ SunnyNotSundayScript: Route37Sign: jumptext Route37SignText -FruitTreeScript_0x1a8e09: +Route37FruitTree1: fruittree FRUITTREE_ROUTE_37_1 -FruitTreeScript_0x1a8e0b: +Route37FruitTree2: fruittree FRUITTREE_ROUTE_37_2 -FruitTreeScript_0x1a8e0d: +Route37FruitTree3: fruittree FRUITTREE_ROUTE_37_3 Route37HiddenEther: @@ -250,7 +250,7 @@ Route37_MapEvents: object_event 6, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1 object_event 7, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1 object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1 - object_event 13, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1 + object_event 13, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route37FruitTree1, -1 object_event 16, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY - object_event 16, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1 - object_event 15, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0d, -1 + object_event 16, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route37FruitTree2, -1 + object_event 15, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route37FruitTree3, -1 diff --git a/maps/Route38.asm b/maps/Route38.asm index 67fff4f30..d8cd9370b 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -317,7 +317,7 @@ Route38Sign: Route38TrainerTips: jumptext Route38TrainerTipsText -FruitTreeScript_0x1a1f33: +Route38FruitTree: fruittree FRUITTREE_ROUTE_38 BirdKeeperTobySeenText: @@ -489,5 +489,5 @@ Route38_MapEvents: object_event 12, 15, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1 object_event 19, 9, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1 object_event 24, 5, SPRITE_SAILOR, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1 - object_event 12, 10, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1 + object_event 12, 10, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route38FruitTree, -1 object_event 5, 8, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1 diff --git a/maps/Route39.asm b/maps/Route39.asm index 2321a7fb1..8a37655a2 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -174,7 +174,7 @@ MoomooFarmSign: Route39TrainerTips: jumptext Route39TrainerTipsText -FruitTreeScript_0x1a5bf4: +Route39FruitTree: fruittree FRUITTREE_ROUTE_39 Route39HiddenNugget: @@ -365,5 +365,5 @@ Route39_MapEvents: object_event 4, 15, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 object_event 8, 13, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 object_event 13, 7, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1 - object_event 9, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1 + object_event 9, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39FruitTree, -1 object_event 4, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerPokefanfJaime, -1 diff --git a/maps/Route42.asm b/maps/Route42.asm index b38bb0344..ff154b6c0 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -26,7 +26,7 @@ Route42SuicuneScript: showemote EMOTE_SHOCK, PLAYER, 15 pause 15 playsound SFX_WARP_FROM - applymovement ROUTE42_SUICUNE, MovementData_0x1a9356 + applymovement ROUTE42_SUICUNE, Route42SuicuneMovement disappear ROUTE42_SUICUNE pause 10 setscene SCENE_ROUTE42_NOTHING @@ -200,19 +200,19 @@ Route42UltraBall: Route42SuperPotion: itemball SUPER_POTION -FruitTreeScript_0x1a934d: +Route42FruitTree1: fruittree FRUITTREE_ROUTE_42_1 -FruitTreeScript_0x1a934f: +Route42FruitTree2: fruittree FRUITTREE_ROUTE_42_2 -FruitTreeScript_0x1a9351: +Route42FruitTree3: fruittree FRUITTREE_ROUTE_42_3 Route42HiddenMaxPotion: hiddenitem MAX_POTION, EVENT_ROUTE_42_HIDDEN_MAX_POTION -MovementData_0x1a9356: +Route42SuicuneMovement: set_sliding fast_jump_step UP fast_jump_step UP @@ -340,9 +340,9 @@ Route42_MapEvents: object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully, -1 object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 - object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 - object_event 28, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1 - object_event 29, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1 + object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route42FruitTree1, -1 + object_event 28, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route42FruitTree2, -1 + object_event 29, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route42FruitTree3, -1 object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL object_event 33, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION object_event 26, 16, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 diff --git a/maps/Route43.asm b/maps/Route43.asm index 00be8c258..ebb0e2371 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -316,7 +316,7 @@ Route43Sign2: Route43TrainerTips: jumptext Route43TrainerTipsText -FruitTreeScript_0x19d266: +Route43FruitTree: fruittree FRUITTREE_ROUTE_43 Route43MaxEther: @@ -522,5 +522,5 @@ Route43_MapEvents: object_event 4, 16, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerFisherMarvin, -1 object_event 9, 25, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany, -1 object_event 13, 40, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperSpencer, -1 - object_event 1, 26, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1 + object_event 1, 26, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route43FruitTree, -1 object_event 12, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER diff --git a/maps/Route44.asm b/maps/Route44.asm index 6e8146bc3..f5f9f24bf 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -303,7 +303,7 @@ Route44Sign1: Route44Sign2: jumptext Route44Sign2Text -FruitTreeScript_0x19da40: +Route44FruitTree: fruittree FRUITTREE_ROUTE_44 Route44MaxRevive: @@ -525,7 +525,7 @@ Route44_MapEvents: object_event 51, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperVance1, -1 object_event 41, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1 object_event 31, 14, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1 - object_event 9, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1 + object_event 9, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route44FruitTree, -1 object_event 30, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE object_event 45, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL diff --git a/maps/Route45.asm b/maps/Route45.asm index 73e392ea2..e26525441 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -294,7 +294,7 @@ Route45DummyScript: Route45Sign: jumptext Route45SignText -FruitTreeScript_0x19e294: +Route45FruitTree: fruittree FRUITTREE_ROUTE_45 Route45Nugget: @@ -549,7 +549,7 @@ Route45_MapEvents: object_event 11, 50, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltKenji, -1 object_event 17, 18, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1 object_event 5, 36, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1 - object_event 16, 82, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1 + object_event 16, 82, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route45FruitTree, -1 object_event 6, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET object_event 5, 66, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE object_event 6, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER diff --git a/maps/Route46.asm b/maps/Route46.asm index b11ee0b1a..4fc813c35 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -162,10 +162,10 @@ Route46Sign: Route46XSpeed: itemball X_SPEED -FruitTreeScript_0x1a978f: +Route46FruitTree1: fruittree FRUITTREE_ROUTE_46_1 -FruitTreeScript_0x1a9791: +Route46FruitTree2: fruittree FRUITTREE_ROUTE_46_2 HikerBaileySeenText: @@ -265,6 +265,6 @@ Route46_MapEvents: object_event 12, 19, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1 object_event 4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1 object_event 2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1 - object_event 7, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1 - object_event 8, 6, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1 + object_event 7, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route46FruitTree1, -1 + object_event 8, 6, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route46FruitTree2, -1 object_event 1, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED diff --git a/maps/Route8.asm b/maps/Route8.asm index 7454c9604..e3ce0b371 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -72,7 +72,7 @@ Route8LockedDoor: Route8UndergroundPathSign: jumptext Route8UndergroundPathSignText -FruitTreeScript_0x6c06c: +Route8FruitTree: fruittree FRUITTREE_ROUTE_8 BikerDwayneSeenText: @@ -189,4 +189,4 @@ Route8_MapEvents: object_event 10, 10, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1 object_event 23, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdSam, -1 object_event 31, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSupernerdTom, -1 - object_event 33, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1 + object_event 33, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route8FruitTree, -1 diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 5e1ef8abd..a42c2b20c 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -65,7 +65,7 @@ RuinsOfAlphAerodactylChamberPuzzle: reloadmappart playsound SFX_STRENGTH earthquake 80 - applymovement PLAYER, MovementData_0x58e4d + applymovement PLAYER, RuinsOfAlphAerodactylChamberSkyfallTopMovement playsound SFX_KINESIS waitsfx pause 20 @@ -103,7 +103,7 @@ RuinsOfAlphAerodactylChamberWallPatternRight: closetext end -MovementData_0x58e4d: +RuinsOfAlphAerodactylChamberSkyfallTopMovement: skyfall_top step_end diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index cd1ba99e9..0a8aeefc5 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -66,7 +66,7 @@ RuinsOfAlphHoOhChamberPuzzle: reloadmappart playsound SFX_STRENGTH earthquake 80 - applymovement PLAYER, MovementData_0x58610 + applymovement PLAYER, RuinsOfAlphHoOhChamberSkyfallTopMovement playsound SFX_KINESIS waitsfx pause 20 @@ -104,7 +104,7 @@ RuinsOfAlphHoOhChamberWallPatternRight: closetext end -MovementData_0x58610: +RuinsOfAlphHoOhChamberSkyfallTopMovement: skyfall_top step_end diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index 2bfc3d9ca..caa1a2873 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -73,7 +73,7 @@ RuinsOfAlphKabutoChamberPuzzle: reloadmappart playsound SFX_STRENGTH earthquake 80 - applymovement PLAYER, MovementData_0x587fe + applymovement PLAYER, RuinsOfAlphKabutoChamberSkyfallTopMovement playsound SFX_KINESIS waitsfx pause 20 @@ -141,7 +141,7 @@ RuinsOfAlphKabutoChamberWallPatternRight: closetext end -MovementData_0x587fe: +RuinsOfAlphKabutoChamberSkyfallTopMovement: skyfall_top step_end diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 3c20005fa..1a8387405 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -66,7 +66,7 @@ RuinsOfAlphOmanyteChamberPuzzle: reloadmappart playsound SFX_STRENGTH earthquake 80 - applymovement PLAYER, MovementData_0x58c8c + applymovement PLAYER, RuinsOfAlphOmanyteChamberSkyfallTopMovement playsound SFX_KINESIS waitsfx pause 20 @@ -104,7 +104,7 @@ RuinsOfAlphOmanyteChamberWallPatternRight: closetext end -MovementData_0x58c8c: +RuinsOfAlphOmanyteChamberSkyfallTopMovement: skyfall_top step_end diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 5f70785d2..c495d1104 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -11,7 +11,7 @@ SaffronGym_MapScripts: db 0 ; callbacks -SabrinaScript_0x189c2e: +SaffronGymSabrinaScript: faceplayer opentext checkflag ENGINE_MARSHBADGE @@ -331,7 +331,7 @@ SaffronGym_MapEvents: bg_event 8, 15, BGEVENT_READ, SaffronGymStatue db 6 ; object events - object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1 + object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronGymSabrinaScript, -1 object_event 17, 16, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1 object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1 object_event 3, 4, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1 diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index b86655188..55e078d89 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -8,7 +8,7 @@ SaffronMart_MapScripts: db 0 ; callbacks -ClerkScript_0x18a3bf: +SaffronMartClerkScript: opentext pokemart MARTTYPE_STANDARD, MART_SAFFRON closetext @@ -47,6 +47,6 @@ SaffronMart_MapEvents: db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMartClerkScript, -1 object_event 7, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1 object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1 diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 4a912f39f..fece1933d 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -11,7 +11,7 @@ SeafoamGym_MapScripts: .DummyScene: end -BlaineScript_0x1ab4fb: +SeafoamGymBlaineScript: faceplayer opentext checkflag ENGINE_VOLCANOBADGE @@ -166,5 +166,5 @@ SeafoamGym_MapEvents: db 0 ; bg events db 2 ; object events - object_event 5, 2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1 + object_event 5, 2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SeafoamGymBlaineScript, -1 object_event 6, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index de066c65e..7c293a36b 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -7,7 +7,7 @@ SilverCavePokecenter1F_MapScripts: db 0 ; callbacks -NurseScript_0x1ae59a: +SilverCavePokecenter1FNurseScript: jumpstd pokecenternurse SilverCavePokecenter1FGrannyScript: @@ -40,5 +40,5 @@ SilverCavePokecenter1F_MapEvents: db 0 ; bg events db 2 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FNurseScript, -1 object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 00974d624..aa81430a9 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -10,7 +10,7 @@ VermilionGym_MapScripts: db 0 ; callbacks -SurgeScript_0x1920a5: +VermilionGymSurgeScript: faceplayer opentext checkflag ENGINE_THUNDERBADGE @@ -287,7 +287,7 @@ VermilionGym_MapEvents: bg_event 6, 15, BGEVENT_READ, VermilionGymStatue db 5 ; object events - object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1 + object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, VermilionGymSurgeScript, -1 object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1 object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1 object_event 0, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 16a20d380..a258df7bf 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -8,7 +8,7 @@ VermilionMart_MapScripts: db 0 ; callbacks -ClerkScript_0x191f7e: +VermilionMartClerkScript: opentext pokemart MARTTYPE_STANDARD, MART_VERMILION closetext @@ -46,6 +46,6 @@ VermilionMart_MapEvents: db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMartClerkScript, -1 object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1 object_event 8, 6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1 diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index a157028c0..c5ab46c3d 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -9,21 +9,21 @@ VermilionPokecenter1F_MapScripts: db 0 ; callbacks -NurseScript_0x191603: +VermilionPokecenter1FNurseScript: jumpstd pokecenternurse -FishingGuruScript_0x191606: +VermilionPokecenter1FFishingGuruScript: faceplayer opentext checkevent EVENT_FOUGHT_SNORLAX - iftrue UnknownScript_0x191614 - writetext UnknownText_0x191620 + iftrue .FoughtSnorlax + writetext VermilionPokecenter1FFishingGuruText waitbutton closetext end -UnknownScript_0x191614: - writetext UnknownText_0x191698 +.FoughtSnorlax: + writetext VermilionPokecenter1FFishingGuruText_FoughtSnorlax waitbutton closetext end @@ -34,7 +34,7 @@ VermilionPokecenter1FSailorScript: VermilionPokecenter1FBugCatcherScript: jumptextfaceplayer VermilionPokecenter1FBugCatcherText -UnknownText_0x191620: +VermilionPokecenter1FFishingGuruText: text "A sleeping #MON" line "is lying in front" cont "of DIGLETT'S CAVE." @@ -46,7 +46,7 @@ UnknownText_0x191620: line "wake it up?" done -UnknownText_0x191698: +VermilionPokecenter1FFishingGuruText_FoughtSnorlax: text "There used to be a" line "sleeping #MON" @@ -87,7 +87,7 @@ VermilionPokecenter1F_MapEvents: 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_0x191603, -1 - object_event 7, 2, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FNurseScript, -1 + object_event 7, 2, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FFishingGuruScript, -1 object_event 6, 5, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1 object_event 1, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FBugCatcherScript, -1 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 024dbde82..966d1f4ae 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -92,7 +92,7 @@ VioletCityPPUp: VioletCityRareCandy: itemball RARE_CANDY -VioletCityFruitTreeScript: +VioletCityFruitTree: fruittree FRUITTREE_VIOLET_CITY VioletCityHiddenHyperPotion: @@ -307,6 +307,6 @@ VioletCity_MapEvents: object_event 24, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1 object_event 17, 20, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityGrampsScript, -1 object_event 5, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1 - object_event 14, 29, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1 + object_event 14, 29, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTree, -1 object_event 4, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP object_event 35, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 1e32e338a..21e588b1d 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -9,7 +9,7 @@ VioletGym_MapScripts: db 0 ; callbacks -FalknerScript_0x683c2: +VioletGymFalknerScript: faceplayer opentext checkevent EVENT_BEAT_FALKNER @@ -293,7 +293,7 @@ VioletGym_MapEvents: bg_event 6, 13, BGEVENT_READ, VioletGymStatue db 4 ; object events - object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1 + object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletGymFalknerScript, -1 object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1 object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1 object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index 80b7507c8..d3e4ce73c 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -8,7 +8,7 @@ VioletMart_MapScripts: db 0 ; callbacks -ClerkScript_0x68295: +VioletMartClerkScript: opentext pokemart MARTTYPE_STANDARD, MART_VIOLET closetext @@ -58,6 +58,6 @@ VioletMart_MapEvents: db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x68295, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartClerkScript, -1 object_event 7, 6, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1 object_event 5, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1 diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 29c73dbaf..6045fab29 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -8,7 +8,7 @@ ViridianMart_MapScripts: db 0 ; callbacks -ClerkScript_0x9b5e7: +ViridianMartClerkScript: opentext pokemart MARTTYPE_STANDARD, MART_VIRIDIAN closetext @@ -46,6 +46,6 @@ ViridianMart_MapEvents: db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartClerkScript, -1 object_event 7, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1 object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1 diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index de6288ed3..431bda180 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -9,21 +9,21 @@ ViridianPokecenter1F_MapScripts: db 0 ; callbacks -NurseScript_0x9b690: +ViridianPokecenter1FNurseScript: jumpstd pokecenternurse -CooltrainerMScript_0x9b693: +ViridianPokecenter1FCooltrainerMScript: faceplayer opentext checkevent EVENT_BLUE_IN_CINNABAR iftrue .BlueReturned - writetext UnknownText_0x9b6ad + writetext ViridianPokecenter1FCooltrainerMText waitbutton closetext end .BlueReturned: - writetext UnknownText_0x9b6f5 + writetext ViridianPokecenter1FCooltrainerMText_BlueReturned waitbutton closetext end @@ -34,7 +34,7 @@ ViridianPokecenter1FCooltrainerFScript: ViridianPokecenter1FBugCatcherScript: jumptextfaceplayer ViridianPokecenter1FBugCatcherText -UnknownText_0x9b6ad: +ViridianPokecenter1FCooltrainerMText: text "Where in the world" line "is VIRIDIAN's GYM" @@ -42,7 +42,7 @@ UnknownText_0x9b6ad: line "to challenge him." done -UnknownText_0x9b6f5: +ViridianPokecenter1FCooltrainerMText_BlueReturned: text "There are no GYM" line "TRAINERS at the" cont "VIRIDIAN GYM." @@ -82,7 +82,7 @@ ViridianPokecenter1F_MapEvents: 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_0x9b690, -1 - object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FNurseScript, -1 + object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerMScript, -1 object_event 5, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1 object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FBugCatcherScript, -1 |