diff options
Diffstat (limited to 'maps')
442 files changed, 9999 insertions, 10310 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 982ade9b4..54f9432d1 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -8,13 +8,13 @@ const_value set 2 const AZALEAGYM_GYM_GUY AzaleaGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -BugsyScript: +AzaleaGymBugsyScript: faceplayer opentext checkevent EVENT_BEAT_BUGSY @@ -33,7 +33,7 @@ BugsyScript: waitsfx setflag ENGINE_HIVEBADGE checkcode VAR_BADGES - scall AzaleaGymTriggerRockets + scall AzaleaGymActivateRockets .FightDone: checkevent EVENT_GOT_TM49_FURY_CUTTER iftrue .GotFuryCutter @@ -58,7 +58,7 @@ BugsyScript: closetext end -AzaleaGymTriggerRockets: +AzaleaGymActivateRockets: if_equal 7, .RadioTowerRockets if_equal 6, .GoldenrodRockets end @@ -370,20 +370,20 @@ AzaleaGym_MapEventHeader: warp_def $f, $4, 5, AZALEA_TOWN warp_def $f, $5, 5, AZALEA_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 13, 3, SIGNPOST_READ, AzaleaGymStatue - signpost 13, 6, SIGNPOST_READ, AzaleaGymStatue + bg_event 13, 3, BGEVENT_READ, AzaleaGymStatue + bg_event 13, 6, BGEVENT_READ, AzaleaGymStatue -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BugsyScript, -1 - person_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerBug_catcherbenny, -1 - person_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherAl, -1 - person_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1 - person_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1 - person_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1 - person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1 + object_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1 + object_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBug_catcherbenny, -1 + object_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherAl, -1 + object_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1 + object_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1 + object_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1 + object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index ed88a0fd1..01abee35a 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -4,25 +4,25 @@ const_value set 2 const AZALEAMART_BUG_CATCHER AzaleaMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -ClerkScript_0x18e040: +AzaleaMartClerkScript: opentext pokemart MARTTYPE_STANDARD, MART_AZALEA closetext end -CooltrainerMScript_0x18e047: - jumptextfaceplayer UnknownText_0x18e04d +AzaleaMartCooltrainerMScript: + jumptextfaceplayer AzaleaMartCooltrainerMText -BugCatcherScript_0x18e04a: - jumptextfaceplayer UnknownText_0x18e0b6 +AzaleaMartBugCatcherScript: + jumptextfaceplayer AzaleaMartBugCatcherText -UnknownText_0x18e04d: +AzaleaMartCooltrainerMText: text "There's no GREAT" line "BALL here. #" @@ -34,7 +34,7 @@ UnknownText_0x18e04d: cont "his custom BALLS." done -UnknownText_0x18e0b6: +AzaleaMartBugCatcherText: text "A GREAT BALL is" line "better for catch-" cont "ing #MON than a" @@ -54,14 +54,14 @@ AzaleaMart_MapEventHeader: warp_def $7, $2, 3, AZALEA_TOWN warp_def $7, $3, 3, AZALEA_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x18e040, -1 - person_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x18e047, -1 - person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x18e04a, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1 + object_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1 + object_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1 diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm deleted file mode 100644 index 617db23a4..000000000 --- a/maps/AzaleaPokeCenter1F.asm +++ /dev/null @@ -1,102 +0,0 @@ -const_value set 2 - const AZALEAPOKECENTER1F_NURSE - const AZALEAPOKECENTER1F_GENTLEMAN - const AZALEAPOKECENTER1F_FISHING_GURU - const AZALEAPOKECENTER1F_POKEFAN_F - -AzaleaPokeCenter1F_MapScriptHeader: -.MapTriggers: - db 1 - - ; triggers - dw UnknownScript_0x18db27, 0 - -.MapCallbacks: - db 0 - -UnknownScript_0x18db27: - end - -NurseScript_0x18db28: - jumpstd pokecenternurse - -GentlemanScript_0x18db2b: - jumptextfaceplayer UnknownText_0x18db34 - -FishingGuruScript_0x18db2e: - jumptextfaceplayer UnknownText_0x18dbee - -PokefanFScript_0x18db31: - jumptextfaceplayer UnknownText_0x18dc19 - -UnknownText_0x18db34: - text "Do your #MON" - line "know HM moves?" - - para "Those moves can" - line "be used even if" - - para "your #MON has" - line "fainted." - done - -UnknownText_0x18db88: - text "This BILL guy" - line "created the system" - - para "for storing" - line "#MON in a PC." - - para "BILL's PC can" - line "store up to 20" - cont "#MON per BOX." - done - -UnknownText_0x18dbee: - text "BILL's PC can" - line "store up to 20" - cont "#MON per BOX." - done - -UnknownText_0x18dc19: - text "Do you know about" - line "APRICORNS?" - - para "Crack one open," - line "hollow it out and" - - para "fit it with a" - line "special device." - - para "Then you can catch" - line "#MON with it." - - para "Before # BALLS" - line "were invented," - - para "everyone used" - line "APRICORNS." - done - -AzaleaPokeCenter1F_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def $7, $3, 1, AZALEA_TOWN - warp_def $7, $4, 1, AZALEA_TOWN - warp_def $7, $0, 1, POKECENTER_2F - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18db28, -1 - person_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x18db2b, -1 - person_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x18db2e, -1 - person_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x18db31, -1 diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm new file mode 100644 index 000000000..f369c3bff --- /dev/null +++ b/maps/AzaleaPokecenter1F.asm @@ -0,0 +1,100 @@ +const_value set 2 + const AZALEAPOKECENTER1F_NURSE + const AZALEAPOKECENTER1F_GENTLEMAN + const AZALEAPOKECENTER1F_FISHING_GURU + const AZALEAPOKECENTER1F_POKEFAN_F + +AzaleaPokecenter1F_MapScriptHeader: +.SceneScripts: + db 1 + scene_script .DummyScene + +.MapCallbacks: + db 0 + +.DummyScene: + end + +AzaleaPokecenter1FNurseScript: + jumpstd pokecenternurse + +AzaleaPokecenter1FGentlemanScript: + jumptextfaceplayer AzaleaPokecenter1FGentlemanText + +AzaleaPokecenter1FFishingGuruScript: + jumptextfaceplayer AzaleaPokecenter1FFishingGuruText + +AzaleaPokecenter1FPokefanFScript: + jumptextfaceplayer AzaleaPokecenter1FPokefanFText + +AzaleaPokecenter1FGentlemanText: + text "Do your #MON" + line "know HM moves?" + + para "Those moves can" + line "be used even if" + + para "your #MON has" + line "fainted." + done + +AzaleaPokecenter1FUnusedText: + text "This BILL guy" + line "created the system" + + para "for storing" + line "#MON in a PC." + + para "BILL's PC can" + line "store up to 20" + cont "#MON per BOX." + done + +AzaleaPokecenter1FFishingGuruText: + text "BILL's PC can" + line "store up to 20" + cont "#MON per BOX." + done + +AzaleaPokecenter1FPokefanFText: + text "Do you know about" + line "APRICORNS?" + + para "Crack one open," + line "hollow it out and" + + para "fit it with a" + line "special device." + + para "Then you can catch" + line "#MON with it." + + para "Before # BALLS" + line "were invented," + + para "everyone used" + line "APRICORNS." + done + +AzaleaPokecenter1F_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 3 + warp_def $7, $3, 1, AZALEA_TOWN + warp_def $7, $4, 1, AZALEA_TOWN + warp_def $7, $0, 1, POKECENTER_2F + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 4 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1 + object_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1 + object_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1 + object_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 769067421..cf576d81d 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -13,35 +13,31 @@ const_value set 2 const AZALEATOWN_KURT_OUTSIDE AzaleaTown_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + scene_script .DummyScene0 + scene_script .DummyScene1 + scene_script .DummyScene2 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .Flypoint -.Trigger0: +.DummyScene0: end -.Trigger1: +.DummyScene1: end -.Trigger2: +.DummyScene2: end .Flypoint: setflag ENGINE_FLYPOINT_AZALEA return -AzaleaTownRivalBattleTrigger1: - moveperson AZALEATOWN_SILVER, $b, $b +AzaleaTownRivalBattleScene1: + moveobject AZALEATOWN_SILVER, $b, $b spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -51,7 +47,7 @@ AzaleaTownRivalBattleTrigger1: spriteface PLAYER, DOWN jump AzaleaTownRivalBattleScript -AzaleaTownRivalBattleTrigger2: +AzaleaTownRivalBattleScene2: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -72,7 +68,7 @@ AzaleaTownRivalBattleScript: iftrue .Chikorita winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText setlasttalked AZALEATOWN_SILVER - loadtrainer RIVAL1, RIVAL1_6 + loadtrainer RIVAL1, RIVAL1_2_TOTODILE startbattle dontrestartmapmusic reloadmapafterbattle @@ -81,7 +77,7 @@ AzaleaTownRivalBattleScript: .Totodile: winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText setlasttalked AZALEATOWN_SILVER - loadtrainer RIVAL1, RIVAL1_4 + loadtrainer RIVAL1, RIVAL1_2_CHIKORITA startbattle dontrestartmapmusic reloadmapafterbattle @@ -90,7 +86,7 @@ AzaleaTownRivalBattleScript: .Chikorita: winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText setlasttalked AZALEATOWN_SILVER - loadtrainer RIVAL1, RIVAL1_5 + loadtrainer RIVAL1, RIVAL1_2_CYNDAQUIL startbattle dontrestartmapmusic reloadmapafterbattle @@ -106,16 +102,16 @@ AzaleaTownRivalBattleScript: applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement playsound SFX_EXIT_BUILDING disappear AZALEATOWN_SILVER - dotrigger $0 + setscene $0 waitsfx playmapmusic end AzaleaTownRocket1Script: - jumptextfaceplayer GoodSamaritanRocketText + jumptextfaceplayer AzaleaTownRocket1Text AzaleaTownRocket2Script: - jumptextfaceplayer TastySlowpokeTailRocketText + jumptextfaceplayer AzaleaTownRocket2Text AzaleaTownGrampsScript: faceplayer @@ -159,29 +155,29 @@ WoosterScript: closetext end -AzaleaTown_CelebiEventScript: - applymovement PLAYER, Movement_PlayerWalksOutOfKurtsHouse +AzaleaTownCelebiScene: + applymovement PLAYER, AzaleaTownPlayerLeavesKurtsHouseMovement opentext - writetext IlexForestIsRestlessText + writetext AzaleaTownKurtText1 buttonsound spriteface AZALEATOWN_KURT_OUTSIDE, RIGHT - writetext HeresTheGSBallBackText + writetext AzaleaTownKurtText2 buttonsound - writetext PleaseInvestigateIlexForestText + writetext AzaleaTownKurtText3 waitbutton verbosegiveitem GS_BALL spriteface AZALEATOWN_KURT_OUTSIDE, LEFT setflag ENGINE_HAVE_EXAMINED_GS_BALL clearevent EVENT_ILEX_FOREST_LASS setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS - dotrigger $0 + setscene $0 closetext end AzaleaTownKurtScript: faceplayer opentext - writetext PleaseInvestigateIlexForestText + writetext AzaleaTownKurtText3 waitbutton spriteface AZALEATOWN_KURT_OUTSIDE, LEFT closetext @@ -205,7 +201,7 @@ CharcoalKilnSign: AzaleaTownIlextForestSign: jumptext AzaleaTownIlexForestSignText -AzaleaTownPokeCenterSign: +AzaleaTownPokecenterSign: jumpstd pokecentersign AzaleaTownMartSign: @@ -217,7 +213,6 @@ WhiteApricornTree: AzaleaTownHiddenFullHeal: dwb EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL - AzaleaTownRivalBattleApproachMovement1: step LEFT step LEFT @@ -244,7 +239,7 @@ AzaleaTownRivalBattleExitMovement: step LEFT step_end -Movement_PlayerWalksOutOfKurtsHouse: +AzaleaTownPlayerLeavesKurtsHouseMovement: step LEFT step LEFT step UP @@ -314,7 +309,7 @@ AzaleaTownRivalLossText: line "you were lying." done -GoodSamaritanRocketText: +AzaleaTownRocket1Text: text "It's unsafe to go" line "in there, so I'm" cont "standing guard." @@ -323,7 +318,7 @@ GoodSamaritanRocketText: line "Samaritan?" done -TastySlowpokeTailRocketText: +AzaleaTownRocket2Text: text "Do you know about" line "SLOWPOKETAIL? I" cont "heard it's tasty!" @@ -392,19 +387,19 @@ WoosterText: text "WOOSTER: Gugyoo…" done -IlexForestIsRestlessText: +AzaleaTownKurtText1: text "ILEX FOREST is" line "restless!" para "What is going on?" done -HeresTheGSBallBackText: +AzaleaTownKurtText2: text "<PLAYER>, here's" line "your GS BALL back!" done -PleaseInvestigateIlexForestText: +AzaleaTownKurtText3: text "Could you go see" line "why ILEX FOREST is" cont "so restless?" @@ -475,35 +470,35 @@ AzaleaTown_MapEventHeader: warp_def $a, $2, 3, ILEX_FOREST_AZALEA_GATE warp_def $b, $2, 4, ILEX_FOREST_AZALEA_GATE -.XYTriggers: +.CoordEvents: db 3 - xy_trigger 1, $a, $5, $0, AzaleaTownRivalBattleTrigger1, $0, $0 - xy_trigger 1, $b, $5, $0, AzaleaTownRivalBattleTrigger2, $0, $0 - xy_trigger 2, $6, $9, $0, AzaleaTown_CelebiEventScript, $0, $0 + coord_event 1, $a, $5, AzaleaTownRivalBattleScene1 + coord_event 1, $b, $5, AzaleaTownRivalBattleScene2 + coord_event 2, $6, $9, AzaleaTownCelebiScene -.Signposts: +.BGEvents: db 9 - signpost 9, 19, SIGNPOST_READ, AzaleaTownSign - signpost 9, 10, SIGNPOST_READ, KurtsHouseSign - signpost 15, 14, SIGNPOST_READ, AzaleaGymSign - signpost 7, 29, SIGNPOST_READ, SlowpokeWellSign - signpost 13, 19, SIGNPOST_READ, CharcoalKilnSign - signpost 9, 16, SIGNPOST_READ, AzaleaTownPokeCenterSign - signpost 5, 22, SIGNPOST_READ, AzaleaTownMartSign - signpost 9, 3, SIGNPOST_READ, AzaleaTownIlextForestSign - signpost 6, 31, SIGNPOST_ITEM, AzaleaTownHiddenFullHeal - -.PersonEvents: + bg_event 9, 19, BGEVENT_READ, AzaleaTownSign + bg_event 9, 10, BGEVENT_READ, KurtsHouseSign + bg_event 15, 14, BGEVENT_READ, AzaleaGymSign + bg_event 7, 29, BGEVENT_READ, SlowpokeWellSign + bg_event 13, 19, BGEVENT_READ, CharcoalKilnSign + bg_event 9, 16, BGEVENT_READ, AzaleaTownPokecenterSign + bg_event 5, 22, BGEVENT_READ, AzaleaTownMartSign + bg_event 9, 3, BGEVENT_READ, AzaleaTownIlextForestSign + bg_event 6, 31, BGEVENT_ITEM, AzaleaTownHiddenFullHeal + +.ObjectEvents: db 12 - person_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET - person_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1 - person_event SPRITE_TEACHER, 13, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1 - person_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1 - person_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - person_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - person_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - person_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - person_event SPRITE_FRUIT_TREE, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WhiteApricornTree, -1 - person_event SPRITE_AZALEA_ROCKET, 10, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN - person_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS - person_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT + object_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET + object_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1 + object_event SPRITE_TEACHER, 13, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1 + object_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1 + object_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event SPRITE_FRUIT_TREE, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1 + object_event SPRITE_AZALEA_ROCKET, 10, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN + object_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS + object_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 6cf6bdd50..ad7708c96 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -6,17 +6,15 @@ const_value set 2 const BATTLETOWER1F_GRANNY BattleTower1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .Scene0 + scene_script .Scene1 .MapCallbacks: db 0 -.Trigger0: +.Scene0: writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS special BattleTowerAction iffalse .SkipEverything @@ -40,8 +38,8 @@ BattleTower1F_MapScriptHeader: writebyte BATTLETOWERACTION_06 special BattleTowerAction .SkipEverything: - dotrigger $1 -.Trigger1: + setscene $1 +.Scene1: end MapBattleTower1FSignpost0Script: @@ -62,7 +60,7 @@ ReceptionistScript_0x9e3e2: opentext writetext Text_BattleTowerWelcomesYou buttonsound - writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [s1_be4f] + writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags] special BattleTowerAction if_not_equal $0, Script_Menu_ChallengeExplanationCancel jump Script_BattleTowerIntroductionYesNo @@ -83,11 +81,11 @@ Script_ChooseChallenge: ; 0x9e40f writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel - dotrigger $0 + setscene $0 special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel - dotrigger $1 - writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [s1_be4f] + setscene $1 + writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags] special BattleTowerAction special BattleTowerRoomMenu if_equal $a, Script_Menu_ChallengeExplanationCancel @@ -107,9 +105,9 @@ Script_ResumeBattleTowerChallenge: special BattleTowerAction Script_WalkToBattleTowerElevator: musicfadeout MUSIC_NONE, 8 - domaptrigger BATTLE_TOWER_BATTLE_ROOM, $0 - domaptrigger BATTLE_TOWER_ELEVATOR, $0 - domaptrigger BATTLE_TOWER_HALLWAY, $0 + setmapscene BATTLE_TOWER_BATTLE_ROOM, $0 + setmapscene BATTLE_TOWER_ELEVATOR, $0 + setmapscene BATTLE_TOWER_HALLWAY, $0 follow BATTLETOWER1F_RECEPTIONIST, PLAYER applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator writebyte BATTLETOWERACTION_0A @@ -210,10 +208,10 @@ continue: writetext Text_SaveBeforeReentry yesorno iffalse Script_Menu_ChallengeExplanationCancel - dotrigger $0 + setscene $0 special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel - dotrigger $1 + setscene $1 writebyte BATTLETOWERACTION_06 special BattleTowerAction writebyte BATTLETOWERACTION_12 @@ -805,17 +803,17 @@ BattleTower1F_MapEventHeader: warp_def $9, $8, 4, BATTLE_TOWER_OUTSIDE warp_def $0, $7, 1, BATTLE_TOWER_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 6, 6, SIGNPOST_READ, MapBattleTower1FSignpost0Script + bg_event 6, 6, BGEVENT_READ, MapBattleTower1FSignpost0Script -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_RECEPTIONIST, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1 - person_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1 - person_event SPRITE_COOLTRAINER_F, 9, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1 - person_event SPRITE_BUG_CATCHER, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1 - person_event SPRITE_GRANNY, 3, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1 + object_event SPRITE_RECEPTIONIST, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1 + object_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1 + object_event SPRITE_COOLTRAINER_F, 9, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1 + object_event SPRITE_BUG_CATCHER, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1 + object_event SPRITE_GRANNY, 3, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 8626a0021..ffc4237f9 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -3,12 +3,10 @@ const_value set 2 const BATTLETOWERBATTLEROOM_RECEPTIONIST BattleTowerBattleRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw .EnterBattleRoom, 0 - dw .DummyTrigger, 0 + scene_script .EnterBattleRoom + scene_script .DummyScene .MapCallbacks: db 0 @@ -16,8 +14,8 @@ BattleTowerBattleRoom_MapScriptHeader: .EnterBattleRoom: ; 0x9f419 disappear BATTLETOWERBATTLEROOM_YOUNGSTER priorityjump Script_BattleRoom - dotrigger $1 -.DummyTrigger: + setscene $1 +.DummyScene: end Script_BattleRoom: ; 0x9f421 @@ -151,13 +149,13 @@ BattleTowerBattleRoom_MapEventHeader: warp_def $7, $3, 4, BATTLE_TOWER_HALLWAY warp_def $7, $4, 4, BATTLE_TOWER_HALLWAY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_YOUNGSTER, 0, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER - person_event SPRITE_RECEPTIONIST, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event SPRITE_YOUNGSTER, 0, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER + object_event SPRITE_RECEPTIONIST, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 2ae68654c..c2d51f5fc 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -2,21 +2,19 @@ const_value set 2 const BATTLETOWERELEVATOR_RECEPTIONIST BattleTowerElevator_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .Scene0 + scene_script .Scene1 .MapCallbacks: db 0 -.Trigger0: +.Scene0: priorityjump .RideElevator - dotrigger $1 + setscene $1 -.Trigger1: +.Scene1: end .RideElevator: @@ -55,12 +53,12 @@ BattleTowerElevator_MapEventHeader: warp_def $3, $1, 1, BATTLE_TOWER_HALLWAY warp_def $3, $2, 1, BATTLE_TOWER_HALLWAY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 + object_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 03424a977..dc60a0440 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -2,20 +2,18 @@ const_value set 2 const BATTLETOWERHALLWAY_RECEPTIONIST BattleTowerHallway_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .Scene0 + scene_script .Scene1 .MapCallbacks: db 0 -.Trigger0: +.Scene0: priorityjump .ChooseBattleRoom - dotrigger $1 -.Trigger1: + setscene $1 +.Scene1: end .ChooseBattleRoom: @@ -70,7 +68,7 @@ BattleTowerHallway_MapScriptHeader: jump .EnterBattleRoom .EnterBattleRoom: ; 0x9f61f - faceperson PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST + faceobject PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST opentext writetext Text_PleaseStepThisWay waitbutton @@ -93,12 +91,12 @@ BattleTowerHallway_MapEventHeader: warp_def $0, $d, 1, BATTLE_TOWER_BATTLE_ROOM warp_def $0, $f, 1, BATTLE_TOWER_BATTLE_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_RECEPTIONIST, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1 + object_event SPRITE_RECEPTIONIST, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index eeb4bf93b..9cf15d915 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -5,13 +5,11 @@ const_value set 2 const BATTLETOWEROUTSIDE_LASS BattleTowerOutside_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 2 - - ; callbacks dbw MAPCALLBACK_TILES, .Callback1 dbw MAPCALLBACK_OBJECTS, .Callback2 @@ -139,16 +137,16 @@ BattleTowerOutside_MapEventHeader: warp_def $9, $8, 1, BATTLE_TOWER_1F warp_def $9, $9, 2, BATTLE_TOWER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 10, 10, SIGNPOST_READ, MapBattleTowerOutsideSignpost0Script + bg_event 10, 10, BGEVENT_READ, MapBattleTowerOutsideSignpost0Script -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 - person_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1 - person_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR - person_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 + object_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1 + object_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + object_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/BetaAlphRuinUnsolvedPuzzleRoom.blk b/maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk index a3aa06bd6..a3aa06bd6 100644 --- a/maps/BetaAlphRuinUnsolvedPuzzleRoom.blk +++ b/maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk diff --git a/maps/BetaSsAquaInsideCutOut.blk b/maps/BetaSSAquaInsideCutOut.blk index b385b0198..b385b0198 100644 --- a/maps/BetaSsAquaInsideCutOut.blk +++ b/maps/BetaSSAquaInsideCutOut.blk diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 9a0aae54b..b8afadd08 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const BILLSHOUSE_GRAMPS BillsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -362,12 +362,12 @@ BillsHouse_MapEventHeader: warp_def $7, $2, 1, ROUTE_25 warp_def $7, $3, 1, ROUTE_25 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BillsGrandpa, -1 + object_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index cc9abdda9..d0a52c88c 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -10,13 +10,11 @@ const_value set 2 const BLACKTHORNCITY_COOLTRAINER_F2 BlackthornCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 2 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_OBJECTS, .Santos @@ -140,7 +138,7 @@ DragonDensSign: BlackthornCityTrainerTips: jumptext BlackthornCityTrainerTipsText -BlackthornCityPokeCenterSign: +BlackthornCityPokecenterSign: jumpstd pokecentersign BlackthornCityMartSign: @@ -329,27 +327,27 @@ BlackthornCity_MapEventHeader: warp_def $9, $24, 2, ICE_PATH_1F warp_def $1, $14, 1, DRAGONS_DEN_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 7 - signpost 24, 34, SIGNPOST_READ, BlackthornCitySign - signpost 13, 17, SIGNPOST_READ, BlackthornGymSign - signpost 31, 7, SIGNPOST_READ, MoveDeletersHouseSign - signpost 3, 21, SIGNPOST_READ, DragonDensSign - signpost 25, 5, SIGNPOST_READ, BlackthornCityTrainerTips - signpost 29, 16, SIGNPOST_READ, BlackthornCityMartSign - signpost 29, 22, SIGNPOST_READ, BlackthornCityPokeCenterSign - -.PersonEvents: + bg_event 24, 34, BGEVENT_READ, BlackthornCitySign + bg_event 13, 17, BGEVENT_READ, BlackthornGymSign + bg_event 31, 7, BGEVENT_READ, MoveDeletersHouseSign + bg_event 3, 21, BGEVENT_READ, DragonDensSign + bg_event 25, 5, BGEVENT_READ, BlackthornCityTrainerTips + bg_event 29, 16, BGEVENT_READ, BlackthornCityMartSign + bg_event 29, 22, BGEVENT_READ, BlackthornCityPokecenterSign + +.ObjectEvents: db 9 - person_event SPRITE_SUPER_NERD, 12, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM - person_event SPRITE_SUPER_NERD, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM - person_event SPRITE_GRAMPS, 2, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN - person_event SPRITE_GRAMPS, 2, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN - person_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1 - person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1 - person_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornYoungsterScript, -1 - person_event SPRITE_YOUNGSTER, 20, 22, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY - person_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1 + object_event SPRITE_SUPER_NERD, 12, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM + object_event SPRITE_SUPER_NERD, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM + object_event SPRITE_GRAMPS, 2, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN + object_event SPRITE_GRAMPS, 2, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN + object_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1 + object_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1 + object_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornYoungsterScript, -1 + object_event SPRITE_YOUNGSTER, 20, 22, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY + object_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 333f05129..3c2619988 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -3,30 +3,32 @@ const_value set 2 const BLACKTHORNDRAGONSPEECHHOUSE_EKANS BlackthornDragonSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -GrannyScript_0x195949: - jumptextfaceplayer UnknownText_0x19595c +BlackthornDragonSpeechHouseGrannyScript: + jumptextfaceplayer BlackthornDragonSpeechHouseGrannyText -Dratini: +BlackthornDragonSpeechHouseDratiniScript: opentext - writetext DratiniText + writetext BlackthornDragonSpeechHouseDratiniText cry DRATINI waitbutton closetext end ; unused +BlackthornDragonSpeechHousePictureBookshelf: jumpstd picturebookshelf ; unused +BlackthornDragonSpeechHouseMagazineBookshelf: jumpstd magazinebookshelf -UnknownText_0x19595c: +BlackthornDragonSpeechHouseGrannyText: text "A clan of trainers" line "who can freely" @@ -41,7 +43,7 @@ UnknownText_0x19595c: line "this town." done -DratiniText: +BlackthornDragonSpeechHouseDratiniText: text "DRATINI: Draa!" done @@ -54,13 +56,13 @@ BlackthornDragonSpeechHouse_MapEventHeader: warp_def $7, $2, 2, BLACKTHORN_CITY warp_def $7, $3, 2, BLACKTHORN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x195949, -1 - person_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Dratini, -1 + object_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1 + object_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1 diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index 9bd9522d4..98b67537b 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const BLACKTHORNEMYSHOUSE_EMY BlackthornEmysHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -11,7 +11,7 @@ BlackthornEmysHouse_MapScriptHeader: Emy: faceplayer opentext - trade $3 + trade NPCTRADE_EMY waitbutton closetext end @@ -28,14 +28,14 @@ BlackthornEmysHouse_MapEventHeader: warp_def $7, $2, 3, BLACKTHORN_CITY warp_def $7, $3, 3, BLACKTHORN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, EmysHouseBookshelf - signpost 1, 1, SIGNPOST_READ, EmysHouseBookshelf + bg_event 1, 0, BGEVENT_READ, EmysHouseBookshelf + bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_LASS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, Emy, -1 + object_event SPRITE_LASS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index b36e7ef67..714ea46d3 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -6,13 +6,11 @@ const_value set 2 const BLACKTHORNGYM1F_GYM_GUY BlackthornGym1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_TILES, .Boulders .Boulders: @@ -95,34 +93,34 @@ BlackthornGymClairScript: end TrainerCooltrainermPaul: - trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, CooltrainermPaulScript + trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, .Script -CooltrainermPaulScript: +.Script: end_if_just_battled opentext - writetext CooltrainermPaulAfterText + writetext CooltrainermPaulAfterBattleText waitbutton closetext end TrainerCooltrainermMike: - trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, CooltrainermMikeScript + trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, .Script -CooltrainermMikeScript: +.Script: end_if_just_battled opentext - writetext CooltrainermMikeAfterText + writetext CooltrainermMikeAfterBattleText waitbutton closetext end TrainerCooltrainerfLola: - trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, CooltrainerfLolaScript + trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, .Script -CooltrainerfLolaScript: +.Script: end_if_just_battled opentext - writetext CooltrainerfLolaAfterText + writetext CooltrainerfLolaAfterBattleText waitbutton closetext end @@ -300,7 +298,7 @@ CooltrainermPaulBeatenText: line "lost?" done -CooltrainermPaulAfterText: +CooltrainermPaulAfterBattleText: text "LANCE told you" line "that he'd like to" @@ -318,7 +316,7 @@ CooltrainermMikeBeatenText: text "That's odd." done -CooltrainermMikeAfterText: +CooltrainermMikeAfterBattleText: text "I know my short-" line "comings now." @@ -344,7 +342,7 @@ CooltrainerfLolaBeatenText: text "Way to go!" done -CooltrainerfLolaAfterText: +CooltrainerfLolaAfterBattleText: text "Dragons are weak" line "against dragon-" cont "type moves." @@ -402,18 +400,18 @@ BlackthornGym1F_MapEventHeader: warp_def $7, $7, 4, BLACKTHORN_GYM_2F warp_def $6, $7, 5, BLACKTHORN_GYM_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 15, 3, SIGNPOST_READ, BlackthornGymStatue - signpost 15, 6, SIGNPOST_READ, BlackthornGymStatue + bg_event 15, 3, BGEVENT_READ, BlackthornGymStatue + bg_event 15, 6, BGEVENT_READ, BlackthornGymStatue -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_CLAIR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornGymClairScript, -1 - person_event SPRITE_COOLTRAINER_M, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermMike, -1 - person_event SPRITE_COOLTRAINER_M, 14, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1 - person_event SPRITE_COOLTRAINER_F, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1 - person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1 + object_event SPRITE_CLAIR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1 + object_event SPRITE_COOLTRAINER_M, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1 + object_event SPRITE_COOLTRAINER_M, 14, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1 + object_event SPRITE_COOLTRAINER_F, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1 + object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index eeff34d3e..a9ee60bef 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -9,13 +9,11 @@ const_value set 2 const BLACKTHORNGYM2F_BOULDER6 BlackthornGym2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_CMDQUEUE, .Boulders .Boulders: @@ -63,23 +61,23 @@ BlackthornGymBoulder: jumpstd strengthboulder TrainerCooltrainermCody: - trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, CooltrainermCodyScript + trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script -CooltrainermCodyScript: +.Script: end_if_just_battled opentext - writetext CooltrainermCodyAfterText + writetext CooltrainermCodyAfterBattleText waitbutton closetext end TrainerCooltrainerfFran: - trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, CooltrainerfFranScript + trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, .Script -CooltrainerfFranScript: +.Script: end_if_just_battled opentext - writetext CooltrainerfFranAfterText + writetext CooltrainerfFranAfterBattleText waitbutton closetext end @@ -95,7 +93,7 @@ CooltrainermCodyBeatenText: line "had a dragon!" done -CooltrainermCodyAfterText: +CooltrainermCodyAfterBattleText: text "Members of our" line "dragon-user clan" @@ -119,7 +117,7 @@ CooltrainerfFranBeatenText: text "Awww… I lost…" done -CooltrainerfFranAfterText: +CooltrainerfFranAfterBattleText: text "Uh-oh… CLAIR is" line "going to be mad…" done @@ -141,19 +139,19 @@ BlackthornGym2F_MapEventHeader: warp_def $7, $8, 6, BLACKTHORN_GYM_1F ; hole warp_def $3, $8, 7, BLACKTHORN_GYM_1F ; hole -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_COOLTRAINER_M, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermCody, -1 - person_event SPRITE_COOLTRAINER_F, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1 - person_event SPRITE_BOULDER, 2, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 - person_event SPRITE_BOULDER, 3, 2, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2 - person_event SPRITE_BOULDER, 16, 6, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3 - person_event SPRITE_BOULDER, 3, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 - person_event SPRITE_BOULDER, 1, 6, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 - person_event SPRITE_BOULDER, 14, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 + object_event SPRITE_COOLTRAINER_M, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1 + object_event SPRITE_COOLTRAINER_F, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1 + object_event SPRITE_BOULDER, 2, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 + object_event SPRITE_BOULDER, 3, 2, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2 + object_event SPRITE_BOULDER, 16, 6, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3 + object_event SPRITE_BOULDER, 3, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 + object_event SPRITE_BOULDER, 1, 6, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 + object_event SPRITE_BOULDER, 14, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index e78bd8a74..ac350c45d 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -4,25 +4,25 @@ const_value set 2 const BLACKTHORNMART_BLACK_BELT BlackthornMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -ClerkScript_0x195a5d: +BlackthornMartClerkScript: opentext pokemart MARTTYPE_STANDARD, MART_BLACKTHORN closetext end -CooltrainerMScript_0x195a64: - jumptextfaceplayer UnknownText_0x195a6a +BlackthornMartCooltrainerMScript: + jumptextfaceplayer BlackthornMartCooltrainerMText -BlackBeltScript_0x195a67: - jumptextfaceplayer UnknownText_0x195ae9 +BlackthornMartBlackBeltScript: + jumptextfaceplayer BlackthornMartBlackBeltText -UnknownText_0x195a6a: +BlackthornMartCooltrainerMText: text "You can't buy MAX" line "REVIVE, but it" @@ -36,7 +36,7 @@ UnknownText_0x195a6a: line "needed for moves." done -UnknownText_0x195ae9: +BlackthornMartBlackBeltText: text "MAX REPEL keeps" line "weak #MON away" cont "from you." @@ -55,14 +55,14 @@ BlackthornMart_MapEventHeader: warp_def $7, $2, 4, BLACKTHORN_CITY warp_def $7, $3, 4, BLACKTHORN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x195a5d, -1 - person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x195a64, -1 - person_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x195a67, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1 + object_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1 + object_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1 diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokeCenter1F.asm deleted file mode 100644 index 32085c67f..000000000 --- a/maps/BlackthornPokeCenter1F.asm +++ /dev/null @@ -1,73 +0,0 @@ -const_value set 2 - const BLACKTHORNPOKECENTER1F_NURSE - const BLACKTHORNPOKECENTER1F_GENTLEMAN - const BLACKTHORNPOKECENTER1F_TWIN - const BLACKTHORNPOKECENTER1F_COOLTRAINER_M - -BlackthornPokeCenter1F_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -NurseScript_0x195b79: - jumpstd pokecenternurse - -GentlemanScript_0x195b7c: - jumptextfaceplayer UnknownText_0x195b85 - -TwinScript_0x195b7f: - jumptextfaceplayer UnknownText_0x195bfd - -CooltrainerMScript_0x195b82: - jumpstd happinesschecknpc - -UnknownText_0x195b85: - text "Deep inside far-" - line "off INDIGO PLATEAU" - - para "is the #MON" - line "LEAGUE." - - para "I hear the best" - line "trainers gather" - - para "there from around" - line "the country." - done - -UnknownText_0x195bfd: - text "There was this" - line "move I just had" - - para "to teach my #-" - line "MON." - - para "So I got the MOVE" - line "DELETER to make it" - cont "forget an HM move." - done - -BlackthornPokeCenter1F_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def $7, $3, 5, BLACKTHORN_CITY - warp_def $7, $4, 5, BLACKTHORN_CITY - warp_def $7, $0, 1, POKECENTER_2F - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x195b79, -1 - person_event SPRITE_GENTLEMAN, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x195b7c, -1 - person_event SPRITE_TWIN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x195b7f, -1 - person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x195b82, -1 diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm new file mode 100644 index 000000000..3f6c76ffe --- /dev/null +++ b/maps/BlackthornPokecenter1F.asm @@ -0,0 +1,73 @@ +const_value set 2 + const BLACKTHORNPOKECENTER1F_NURSE + const BLACKTHORNPOKECENTER1F_GENTLEMAN + const BLACKTHORNPOKECENTER1F_TWIN + const BLACKTHORNPOKECENTER1F_COOLTRAINER_M + +BlackthornPokecenter1F_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +BlackthornPokecenter1FNurseScript: + jumpstd pokecenternurse + +BlackthornPokecenter1FGentlemanScript: + jumptextfaceplayer BlackthornPokecenter1FGentlemanText + +BlackthornPokecenter1FTwinScript: + jumptextfaceplayer BlackthornPokecenter1FTwinText + +BlackthornPokecenter1FCooltrainerMScript: + jumpstd happinesschecknpc + +BlackthornPokecenter1FGentlemanText: + text "Deep inside far-" + line "off INDIGO PLATEAU" + + para "is the #MON" + line "LEAGUE." + + para "I hear the best" + line "trainers gather" + + para "there from around" + line "the country." + done + +BlackthornPokecenter1FTwinText: + text "There was this" + line "move I just had" + + para "to teach my #-" + line "MON." + + para "So I got the MOVE" + line "DELETER to make it" + cont "forget an HM move." + done + +BlackthornPokecenter1F_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 3 + warp_def $7, $3, 5, BLACKTHORN_CITY + warp_def $7, $4, 5, BLACKTHORN_CITY + warp_def $7, $0, 1, POKECENTER_2F + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 4 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1 + object_event SPRITE_GENTLEMAN, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1 + object_event SPRITE_TWIN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1 + object_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FCooltrainerMScript, -1 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 72cd935fc..367b255b8 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -2,35 +2,35 @@ const_value set 2 const BLUESHOUSE_DAISY BluesHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -DaisyScript_0x19b0d0: +DaisyScript: faceplayer opentext checkcode VAR_HOUR - if_equal $f, UnknownScript_0x19b0de - writetext UnknownText_0x19b130 + if_equal 15, .ThreePM + writetext DaisyHelloText waitbutton closetext end -UnknownScript_0x19b0de: +.ThreePM: checkflag ENGINE_TEA_IN_BLUES_HOUSE - iftrue UnknownScript_0x19b11e - writetext UnknownText_0x19b1b6 + iftrue .AlreadyGroomedMon + writetext DaisyOfferGroomingText yesorno - iffalse UnknownScript_0x19b124 - writetext UnknownText_0x19b244 + iffalse .Refused + writetext DaisyWhichMonText waitbutton special Special_DaisyMassage - if_equal 0, UnknownScript_0x19b124 - if_equal 1, UnknownScript_0x19b12a + if_equal 0, .Refused + if_equal 1, .CantGroomEgg setflag ENGINE_TEA_IN_BLUES_HOUSE - writetext UnknownText_0x19b266 + writetext DaisyAlrightText waitbutton closetext special FadeOutPalettes @@ -39,33 +39,33 @@ UnknownScript_0x19b0de: special FadeInPalettes special RestartMapMusic opentext - writetext UnknownText_0x19b296 + writetext GroomedMonLooksContentText special PlayCurMonCry buttonsound - writetext UnknownText_0x19b2aa + writetext DaisyAllDoneText waitbutton closetext end -UnknownScript_0x19b11e: - writetext UnknownText_0x19b2fa +.AlreadyGroomedMon: + writetext DaisyAlreadyGroomedText waitbutton closetext end -UnknownScript_0x19b124: - writetext UnknownText_0x19b334 +.Refused: + writetext DaisyRefusedText waitbutton closetext end -UnknownScript_0x19b12a: - writetext UnknownText_0x19b377 +.CantGroomEgg: + writetext DaisyCantGroomEggText waitbutton closetext end -UnknownText_0x19b130: +DaisyHelloText: text "DAISY: Hi! My kid" line "brother is the GYM" @@ -79,7 +79,7 @@ UnknownText_0x19b130: line "for the trainers." done -UnknownText_0x19b1b6: +DaisyOfferGroomingText: text "DAISY: Hi! Good" line "timing. I'm about" cont "to have some tea." @@ -94,24 +94,24 @@ UnknownText_0x19b1b6: line "to groom one?" done -UnknownText_0x19b244: +DaisyWhichMonText: text "DAISY: Which one" line "should I groom?" done -UnknownText_0x19b266: +DaisyAlrightText: text "DAISY: OK, I'll" line "get it looking" cont "nice in no time." done -UnknownText_0x19b296: +GroomedMonLooksContentText: text_from_ram StringBuffer3 text " looks" line "content." done -UnknownText_0x19b2aa: +DaisyAllDoneText: text "DAISY: There you" line "go! All done." @@ -122,7 +122,7 @@ UnknownText_0x19b2aa: line "#MON." done -UnknownText_0x19b2fa: +DaisyAlreadyGroomedText: text "DAISY: I always" line "have tea around" @@ -130,7 +130,7 @@ UnknownText_0x19b2fa: line "join me." done -UnknownText_0x19b334: +DaisyRefusedText: text "DAISY: You don't" line "want to have one" @@ -138,7 +138,7 @@ UnknownText_0x19b334: line "just have tea." done -UnknownText_0x19b377: +DaisyCantGroomEggText: text "DAISY: Oh, sorry." line "I honestly can't" cont "groom an EGG." @@ -153,12 +153,12 @@ BluesHouse_MapEventHeader: warp_def $7, $2, 2, PALLET_TOWN warp_def $7, $3, 2, PALLET_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_DAISY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaisyScript_0x19b0d0, -1 + object_event SPRITE_DAISY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index ba1e8c3c8..8ac5547de 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -2,25 +2,20 @@ const_value set 2 const BRUNOSROOM_BRUNO BrunosRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + scene_script .LockDoor + scene_script .DummyScene .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .BrunosRoomDoors -.Trigger0: +.LockDoor: priorityjump .BrunosDoorLocksBehindYou end -.Trigger1: +.DummyScene: end .BrunosRoomDoors: @@ -42,7 +37,7 @@ BrunosRoom_MapScriptHeader: changeblock $4, $e, $2a reloadmappart closetext - dotrigger $1 + setscene $1 setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -140,12 +135,12 @@ BrunosRoom_MapEventHeader: warp_def $2, $4, 1, KARENS_ROOM warp_def $2, $5, 2, KARENS_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BrunoScript_Battle, -1 + object_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 369d89b02..25adf9358 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -6,29 +6,24 @@ const_value set 2 const BURNEDTOWER1F_POKE_BALL BurnedTower1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + scene_script .EusineScene + scene_script .DummyScene1 + scene_script .DummyScene2 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .HoleAndLadder -.Trigger0: - priorityjump .EusineTrigger +.EusineScene: + priorityjump .MeetEusine end -.Trigger1: +.DummyScene1: end -.Trigger2: +.DummyScene2: end .HoleAndLadder: @@ -42,7 +37,7 @@ BurnedTower1F_MapScriptHeader: .Done: return -.EusineTrigger: +.MeetEusine: spriteface BURNEDTOWER1F_EUSINE, DOWN showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15 applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement @@ -50,8 +45,8 @@ BurnedTower1F_MapScriptHeader: writetext BurnedTower1FEusineIntroText waitbutton closetext - moveperson BURNEDTOWER1F_EUSINE, $9, $e - dotrigger $1 + moveobject BURNEDTOWER1F_EUSINE, $9, $e + setscene $1 end BurnedTowerRivalBattleScript: @@ -73,7 +68,7 @@ BurnedTowerRivalBattleScript: iftrue .chikorita winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText setlasttalked BURNEDTOWER1F_SILVER - loadtrainer RIVAL1, RIVAL1_9 + loadtrainer RIVAL1, RIVAL1_3_TOTODILE startbattle dontrestartmapmusic reloadmapafterbattle @@ -82,7 +77,7 @@ BurnedTowerRivalBattleScript: .totodile winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText setlasttalked BURNEDTOWER1F_SILVER - loadtrainer RIVAL1, RIVAL1_7 + loadtrainer RIVAL1, RIVAL1_3_CHIKORITA startbattle dontrestartmapmusic reloadmapafterbattle @@ -91,7 +86,7 @@ BurnedTowerRivalBattleScript: .chikorita winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText setlasttalked BURNEDTOWER1F_SILVER - loadtrainer RIVAL1, RIVAL1_8 + loadtrainer RIVAL1, RIVAL1_3_CYNDAQUIL startbattle dontrestartmapmusic reloadmapafterbattle @@ -103,7 +98,7 @@ BurnedTowerRivalBattleScript: writetext BurnedTowerSilver_AfterText1 waitbutton closetext - dotrigger $2 + setscene $2 setevent EVENT_RIVAL_BURNED_TOWER special Special_FadeOutMusic pause 15 @@ -305,19 +300,19 @@ BurnedTower1F_MapEventHeader: warp_def $e, $f, 5, BURNED_TOWER_B1F warp_def $f, $7, 6, BURNED_TOWER_B1F -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 1, $9, $b, $0, BurnedTowerRivalBattleScript, $0, $0 + coord_event 1, $9, $b, BurnedTowerRivalBattleScript -.Signposts: +.BGEvents: db 2 - signpost 7, 8, SIGNPOST_ITEM, BurnedTower1FHiddenEther - signpost 11, 13, SIGNPOST_ITEM, BurnedTower1FHiddenUltraBall + bg_event 7, 8, BGEVENT_ITEM, BurnedTower1FHiddenEther + bg_event 11, 13, BGEVENT_ITEM, BurnedTower1FHiddenUltraBall -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_ROCK, 4, 15, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BurnedTower1FRock, -1 - person_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE - person_event SPRITE_SILVER, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER - person_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY - person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP + object_event SPRITE_ROCK, 4, 15, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1 + object_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE + object_event SPRITE_SILVER, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER + object_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY + object_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index ece68f7df..0946a43d8 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -10,27 +10,22 @@ const_value set 2 const BURNEDTOWERB1F_EUSINE BurnedTowerB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .LadderCallback - ; callbacks - - dbw MAPCALLBACK_TILES, BurnedTowerB1FLadderCallback - -.Trigger0: +.DummyScene0: end -.Trigger1: +.DummyScene1: end -BurnedTowerB1FLadderCallback: +.LadderCallback: checkevent EVENT_RELEASED_THE_BEASTS iftrue .NoChange changeblock $6, $e, $2 @@ -86,11 +81,11 @@ ReleaseTheBeasts: disappear BURNEDTOWERB1F_SUICUNE1 waitsfx special RestartMapMusic - dotrigger $1 + setscene $1 setevent EVENT_RELEASED_THE_BEASTS special InitRoamMons - domaptrigger ECRUTEAK_GYM, $1 - domaptrigger CIANWOOD_CITY, $1 + setmapscene ECRUTEAK_GYM, $1 + setmapscene CIANWOOD_CITY, $1 clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY setevent EVENT_ECRUTEAK_GYM_GRAMPS clearevent EVENT_ECRUTEAK_CITY_GRAMPS @@ -101,7 +96,7 @@ ReleaseTheBeasts: changeblock $6, $e, $1b reloadmappart closetext - dotrigger $1 + setscene $1 end BurnedTowerB1FEusine: @@ -253,21 +248,21 @@ BurnedTowerB1F_MapEventHeader: warp_def $e, $11, 12, BURNED_TOWER_1F warp_def $f, $7, 14, BURNED_TOWER_1F -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $6, $a, $0, ReleaseTheBeasts, $0, $0 + coord_event 0, $6, $a, ReleaseTheBeasts -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_BOULDER, 8, 17, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1 - person_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 - person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 - person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 - person_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 - person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 - person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 - person_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE - person_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER + object_event SPRITE_BOULDER, 8, 17, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1 + object_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + object_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + object_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + object_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + object_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + object_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + object_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE + object_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 11b768765..7751c69ff 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -6,7 +6,7 @@ const_value set 2 const CELADONCAFE_TEACHER CeladonCafe_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -216,18 +216,18 @@ CeladonCafe_MapEventHeader: warp_def $7, $6, 9, CELADON_CITY warp_def $7, $7, 9, CELADON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 5, SIGNPOST_READ, EatathonContestPoster - signpost 1, 7, SIGNPOST_READ, CeladonCafeTrashcan + bg_event 0, 5, BGEVENT_READ, EatathonContestPoster + bg_event 1, 7, BGEVENT_READ, CeladonCafeTrashcan -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_SUPER_NERD, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, CeladonCafeChef, -1 - person_event SPRITE_FISHER, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonCafeFisher1, -1 - person_event SPRITE_FISHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCafeFisher2, -1 - person_event SPRITE_FISHER, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonCafeFisher3, -1 - person_event SPRITE_TEACHER, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonCafeTeacher, -1 + object_event SPRITE_SUPER_NERD, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1 + object_event SPRITE_FISHER, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1 + object_event SPRITE_FISHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1 + object_event SPRITE_FISHER, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher3, -1 + object_event SPRITE_TEACHER, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeTeacher, -1 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 461b558ff..680875e42 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -10,21 +10,19 @@ const_value set 2 const CELADONCITY_LASS CeladonCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_CELADON return -FisherScript_0x1a9f43: - jumptextfaceplayer UnknownText_0x1a9f7d +CeladonCityFisherScript: + jumptextfaceplayer CeladonCityFisherText CeladonCityPoliwrath: opentext @@ -34,26 +32,26 @@ CeladonCityPoliwrath: closetext end -TeacherScript_0x1a9f50: - jumptextfaceplayer UnknownText_0x1a9fde +CeladonCityTeacher1Script: + jumptextfaceplayer CeladonCityTeacher1Text -GrampsScript_0x1a9f53: - jumptextfaceplayer UnknownText_0x1aa043 +CeladonCityGramps1Script: + jumptextfaceplayer CeladonCityGramps1Text -GrampsScript_0x1a9f56: - jumptextfaceplayer UnknownText_0x1aa0dc +CeladonCityGramps2Script: + jumptextfaceplayer CeladonCityGramps2Text -YoungsterScript_0x1a9f59: - jumptextfaceplayer UnknownText_0x1aa115 +CeladonCityYoungster1Script: + jumptextfaceplayer CeladonCityYoungster1Text -YoungsterScript_0x1a9f5c: - jumptextfaceplayer UnknownText_0x1aa155 +CeladonCityYoungster2Script: + jumptextfaceplayer CeladonCityYoungster2Text -TeacherScript_0x1a9f5f: - jumptextfaceplayer UnknownText_0x1aa1bd +CeladonCityTeacher2Script: + jumptextfaceplayer CeladonCityTeacher2Text -LassScript_0x1a9f62: - jumptextfaceplayer UnknownText_0x1aa306 +CeladonCityLassScript: + jumptextfaceplayer CeladonCityLassText CeladonCitySign: jumptext CeladonCitySignText @@ -73,13 +71,13 @@ CeladonCityGameCornerSign: CeladonCityTrainerTips: jumptext CeladonCityTrainerTipsText -CeladonCityPokeCenterSign: +CeladonCityPokecenterSign: jumpstd pokecentersign CeladonCityHiddenPpUp: dwb EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP -UnknownText_0x1a9f7d: +CeladonCityFisherText: text "This POLIWRATH is" line "my partner." @@ -92,7 +90,7 @@ CeladonCityPoliwrathText: text "POLIWRATH: Croak!" done -UnknownText_0x1a9fde: +CeladonCityTeacher1Text: text "I lost at the slot" line "machines again…" @@ -103,7 +101,7 @@ UnknownText_0x1a9fde: line "them out too." done -UnknownText_0x1aa043: +CeladonCityGramps1Text: text "GRIMER have been" line "appearing lately." @@ -118,7 +116,7 @@ UnknownText_0x1aa043: cont "a serious problem…" done -UnknownText_0x1aa0dc: +CeladonCityGramps2Text: text "Nihihi! This GYM" line "is great! Only" @@ -126,7 +124,7 @@ UnknownText_0x1aa0dc: line "here!" done -UnknownText_0x1aa115: +CeladonCityYoungster1Text: text "Want to know a" line "secret?" @@ -135,7 +133,7 @@ UnknownText_0x1aa115: cont "door." done -UnknownText_0x1aa155: +CeladonCityYoungster2Text: text "They're holding an" line "eating contest at" cont "the restaurant." @@ -145,7 +143,7 @@ UnknownText_0x1aa155: cont "feel bloated…" done -UnknownText_0x1aa1bd: +CeladonCityTeacher2Text: text "CELADON DEPT.STORE" line "has the biggest" @@ -162,8 +160,8 @@ UnknownText_0x1aa1bd: line "a sales clerk." done -; possibly unused -UnknownText_0x1aa25b: +; unused +CeladonCityUnusedPokeComCenterText: text "I love being" line "surrounded by tall" cont "buildings!" @@ -181,7 +179,7 @@ UnknownText_0x1aa25b: line "KANTO…" done -UnknownText_0x1aa306: +CeladonCityLassText: text "Looking at the" line "ground while I was" @@ -252,28 +250,28 @@ CeladonCity_MapEventHeader: warp_def $1d, $a, 1, CELADON_GYM warp_def $1d, $19, 1, CELADON_CAFE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 8 - signpost 21, 23, SIGNPOST_READ, CeladonCitySign - signpost 31, 11, SIGNPOST_READ, CeladonGymSign - signpost 9, 6, SIGNPOST_READ, CeladonCityDeptStoreSign - signpost 9, 13, SIGNPOST_READ, CeladonCityMansionSign - signpost 21, 19, SIGNPOST_READ, CeladonCityGameCornerSign - signpost 21, 29, SIGNPOST_READ, CeladonCityTrainerTips - signpost 9, 30, SIGNPOST_READ, CeladonCityPokeCenterSign - signpost 21, 37, SIGNPOST_ITEM, CeladonCityHiddenPpUp - -.PersonEvents: + bg_event 21, 23, BGEVENT_READ, CeladonCitySign + bg_event 31, 11, BGEVENT_READ, CeladonGymSign + bg_event 9, 6, BGEVENT_READ, CeladonCityDeptStoreSign + bg_event 9, 13, BGEVENT_READ, CeladonCityMansionSign + bg_event 21, 19, BGEVENT_READ, CeladonCityGameCornerSign + bg_event 21, 29, BGEVENT_READ, CeladonCityTrainerTips + bg_event 9, 30, BGEVENT_READ, CeladonCityPokecenterSign + bg_event 21, 37, BGEVENT_ITEM, CeladonCityHiddenPpUp + +.ObjectEvents: db 9 - person_event SPRITE_FISHER, 11, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a9f43, -1 - person_event SPRITE_POLIWAG, 11, 27, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1 - person_event SPRITE_TEACHER, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a9f50, -1 - person_event SPRITE_GRAMPS, 16, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9f53, -1 - person_event SPRITE_GRAMPS, 31, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9f56, -1 - person_event SPRITE_YOUNGSTER, 13, 18, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a9f59, -1 - person_event SPRITE_YOUNGSTER, 33, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a9f5c, -1 - person_event SPRITE_TEACHER, 14, 6, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a9f5f, -1 - person_event SPRITE_LASS, 22, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, LassScript_0x1a9f62, -1 + object_event SPRITE_FISHER, 11, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityFisherScript, -1 + object_event SPRITE_POLIWAG, 11, 27, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1 + object_event SPRITE_TEACHER, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1 + object_event SPRITE_GRAMPS, 16, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps1Script, -1 + object_event SPRITE_GRAMPS, 31, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1 + object_event SPRITE_YOUNGSTER, 13, 18, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster1Script, -1 + object_event SPRITE_YOUNGSTER, 33, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster2Script, -1 + object_event SPRITE_TEACHER, 14, 6, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1 + object_event SPRITE_LASS, 22, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityLassScript, -1 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 0abf50524..6a1a7e358 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -4,20 +4,20 @@ const_value set 2 const CELADONDEPTSTORE1F_TEACHER CeladonDeptStore1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -ReceptionistScript_0x709e0: - jumptextfaceplayer UnknownText_0x709ef +CeladonDeptStore1FReceptionistScript: + jumptextfaceplayer CeladonDeptStore1FReceptionistText -GentlemanScript_0x709e3: - jumptextfaceplayer UnknownText_0x70a35 +CeladonDeptStore1FGentlemanScript: + jumptextfaceplayer CeladonDeptStore1FGentlemanText -TeacherScript_0x709e6: - jumptextfaceplayer UnknownText_0x70aa9 +CeladonDeptStore1FTeacherScript: + jumptextfaceplayer CeladonDeptStore1FTeacherText CeladonDeptStore1FDirectory: jumptext CeladonDeptStore1FDirectoryText @@ -25,7 +25,7 @@ CeladonDeptStore1FDirectory: CeladonDeptStore1FElevatorButton: jumpstd elevatorbutton -UnknownText_0x709ef: +CeladonDeptStore1FReceptionistText: text "Hello! Welcome to" line "CELADON DEPT." cont "STORE!" @@ -34,7 +34,7 @@ UnknownText_0x709ef: line "on the wall." done -UnknownText_0x70a35: +CeladonDeptStore1FGentlemanText: text "This DEPT.STORE is" line "part of the same" @@ -46,7 +46,7 @@ UnknownText_0x70a35: cont "same time." done -UnknownText_0x70aa9: +CeladonDeptStore1FTeacherText: text "This is my first" line "time here." @@ -84,16 +84,16 @@ CeladonDeptStore1F_MapEventHeader: warp_def $0, $f, 2, CELADON_DEPT_STORE_2F warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, CeladonDeptStore1FDirectory - signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton + bg_event 0, 14, BGEVENT_READ, CeladonDeptStore1FDirectory + bg_event 0, 3, BGEVENT_READ, CeladonDeptStore1FElevatorButton -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x709e0, -1 - person_event SPRITE_GENTLEMAN, 4, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x709e3, -1 - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x709e6, -1 + object_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1 + object_event SPRITE_GENTLEMAN, 4, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1 + object_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index cd93776ab..916b89efb 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -5,7 +5,7 @@ const_value set 2 const CELADONDEPTSTORE2F_YOUNGSTER CeladonDeptStore2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -25,11 +25,11 @@ ClerkScript_0x70bb5: closetext end -PokefanMScript_0x70bbd: - jumptextfaceplayer UnknownText_0x70bc9 +CeladonDeptStore2FPokefanMScript: + jumptextfaceplayer CeladonDeptStore2FPokefanMText -YoungsterScript_0x70bc0: - jumptextfaceplayer UnknownText_0x70c3e +CeladonDeptStore2FYoungsterScript: + jumptextfaceplayer CeladonDeptStore2FYoungsterText CeladonDeptStore2FDirectory: jumptext CeladonDeptStore2FDirectoryText @@ -37,7 +37,7 @@ CeladonDeptStore2FDirectory: CeladonDeptStore2FElevatorButton: jumpstd elevatorbutton -UnknownText_0x70bc9: +CeladonDeptStore2FPokefanMText: text "I just recently" line "became a trainer." @@ -49,7 +49,7 @@ UnknownText_0x70bc9: cont "convenient items." done -UnknownText_0x70c3e: +CeladonDeptStore2FYoungsterText: text "My dad's having a" line "hard time learning" @@ -78,17 +78,17 @@ CeladonDeptStore2F_MapEventHeader: warp_def $0, $f, 3, CELADON_DEPT_STORE_1F warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, CeladonDeptStore2FDirectory - signpost 0, 3, SIGNPOST_READ, CeladonDeptStore2FElevatorButton + bg_event 0, 14, BGEVENT_READ, CeladonDeptStore2FDirectory + bg_event 0, 3, BGEVENT_READ, CeladonDeptStore2FElevatorButton -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1 - person_event SPRITE_CLERK, 5, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1 - person_event SPRITE_POKEFAN_M, 2, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x70bbd, -1 - person_event SPRITE_YOUNGSTER, 2, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x70bc0, -1 + object_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1 + object_event SPRITE_CLERK, 5, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1 + object_event SPRITE_POKEFAN_M, 2, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1 + object_event SPRITE_YOUNGSTER, 2, 6, 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 b40fddf50..38510ec1a 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -6,7 +6,7 @@ const_value set 2 const CELADONDEPTSTORE3F_SUPER_NERD CeladonDeptStore3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -19,29 +19,29 @@ ClerkScript_0x70d29: closetext end -YoungsterScript_0x70d31: - jumptextfaceplayer UnknownText_0x70d53 +CeladonDeptStore3FYoungsterScript: + jumptextfaceplayer CeladonDeptStore3FYoungsterText -GameboyKidScript_0x70d34: +CeladonDeptStore3FGameboyKid1Script: faceplayer opentext - writetext UnknownText_0x70d86 + writetext CeladonDeptStore3FGameboyKid1Text waitbutton closetext spriteface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN end -GameboyKidScript_0x70d3f: +CeladonDeptStore3FGameboyKid2Script: faceplayer opentext - writetext UnknownText_0x70dc7 + writetext CeladonDeptStore3FGameboyKid2Text waitbutton closetext spriteface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN end -SuperNerdScript_0x70d4a: - jumptextfaceplayer UnknownText_0x70e61 +CeladonDeptStore3FSuperNerdScript: + jumptextfaceplayer CeladonDeptStore3FSuperNerdText CeladonDeptStore3FElevatorButton: jumpstd elevatorbutton @@ -49,7 +49,7 @@ CeladonDeptStore3FElevatorButton: CeladonDeptStore3FDirectory: jumptext CeladonDeptStore3FDirectoryText -UnknownText_0x70d53: +CeladonDeptStore3FYoungsterText: text "I can't decide" line "which #MON I" @@ -57,7 +57,7 @@ UnknownText_0x70d53: line "on…" done -UnknownText_0x70d86: +CeladonDeptStore3FGameboyKid1Text: text "Uh-oh! I traded my" line "#MON without" @@ -65,7 +65,7 @@ UnknownText_0x70d86: line "GRADE from it." done -UnknownText_0x70dc7: +CeladonDeptStore3FGameboyKid2Text: text "Yeah! I'm finally" line "getting a PORYGON!" @@ -82,7 +82,7 @@ UnknownText_0x70dc7: cont "ferent #MON!" done -UnknownText_0x70e61: +CeladonDeptStore3FSuperNerdText: text "The TM SHOP sells" line "some rare moves." done @@ -104,18 +104,18 @@ CeladonDeptStore3F_MapEventHeader: warp_def $0, $f, 2, CELADON_DEPT_STORE_4F warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, CeladonDeptStore3FDirectory - signpost 0, 3, SIGNPOST_READ, CeladonDeptStore3FElevatorButton + bg_event 0, 14, BGEVENT_READ, CeladonDeptStore3FDirectory + bg_event 0, 3, BGEVENT_READ, CeladonDeptStore3FElevatorButton -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_CLERK, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1 - person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x70d31, -1 - person_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x70d34, -1 - person_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x70d3f, -1 - person_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x70d4a, -1 + object_event SPRITE_CLERK, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1 + object_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1 + object_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1 + object_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1 + object_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index b3cb00655..fe3942113 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -4,7 +4,7 @@ const_value set 2 const CELADONDEPTSTORE4F_YOUNGSTER CeladonDeptStore4F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -17,11 +17,11 @@ ClerkScript_0x70f0d: closetext end -SuperNerdScript_0x70f15: - jumptextfaceplayer UnknownText_0x70f21 +CeladonDeptStore4FSuperNerdScript: + jumptextfaceplayer CeladonDeptStore4FSuperNerdText -YoungsterScript_0x70f18: - jumptextfaceplayer UnknownText_0x70f55 +CeladonDeptStore4FYoungsterScript: + jumptextfaceplayer CeladonDeptStore4FYoungsterText CeladonDeptStore4FDirectory: jumptext CeladonDeptStore4FDirectoryText @@ -29,13 +29,13 @@ CeladonDeptStore4FDirectory: CeladonDeptStore4FElevatorButton: jumpstd elevatorbutton -UnknownText_0x70f21: +CeladonDeptStore4FSuperNerdText: text "I'm here to buy" line "SURF MAIL to send" cont "to my girlfriend." done -UnknownText_0x70f55: +CeladonDeptStore4FYoungsterText: text "This is the only" line "place where you" @@ -60,16 +60,16 @@ CeladonDeptStore4F_MapEventHeader: warp_def $0, $f, 2, CELADON_DEPT_STORE_3F warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, CeladonDeptStore4FDirectory - signpost 0, 3, SIGNPOST_READ, CeladonDeptStore4FElevatorButton + bg_event 0, 14, BGEVENT_READ, CeladonDeptStore4FDirectory + bg_event 0, 3, BGEVENT_READ, CeladonDeptStore4FElevatorButton -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1 - person_event SPRITE_SUPER_NERD, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x70f15, -1 - person_event SPRITE_YOUNGSTER, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x70f18, -1 + object_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1 + object_event SPRITE_SUPER_NERD, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1 + object_event SPRITE_YOUNGSTER, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index a49c573d1..eda2ec693 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -6,7 +6,7 @@ const_value set 2 const CELADONDEPTSTORE5F_TEACHER CeladonDeptStore5F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -26,14 +26,14 @@ ClerkScript_0x7100c: closetext end -GentlemanScript_0x71014: - jumptextfaceplayer UnknownText_0x71023 +CeladonDeptStore5FGentlemanScript: + jumptextfaceplayer CeladonDeptStore5FGentlemanText -SailorScript_0x71017: - jumptextfaceplayer UnknownText_0x71072 +CeladonDeptStore5FSailorScript: + jumptextfaceplayer CeladonDeptStore5FSailorText -TeacherScript_0x7101a: - jumptextfaceplayer UnknownText_0x710b6 +CeladonDeptStore5FTeacherScript: + jumptextfaceplayer CeladonDeptStore5FTeacherText CeladonDeptStore5FDirectory: jumptext CeladonDeptStore5FDirectoryText @@ -41,7 +41,7 @@ CeladonDeptStore5FDirectory: CeladonDeptStore5FElevatorButton: jumpstd elevatorbutton -UnknownText_0x71023: +CeladonDeptStore5FGentlemanText: text "I want to buy some" line "items that raise" @@ -50,7 +50,7 @@ UnknownText_0x71023: cont "enough money…" done -UnknownText_0x71072: +CeladonDeptStore5FSailorText: text "I want PP UP, so I" line "can raise the PP" @@ -58,7 +58,7 @@ UnknownText_0x71072: line "can't buy it…" done -UnknownText_0x710b6: +CeladonDeptStore5FTeacherText: text "Using items on" line "them makes #-" cont "MON happy." @@ -81,18 +81,18 @@ CeladonDeptStore5F_MapEventHeader: warp_def $0, $f, 1, CELADON_DEPT_STORE_6F warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, CeladonDeptStore5FDirectory - signpost 0, 3, SIGNPOST_READ, CeladonDeptStore5FElevatorButton + bg_event 0, 14, BGEVENT_READ, CeladonDeptStore5FDirectory + bg_event 0, 3, BGEVENT_READ, CeladonDeptStore5FElevatorButton -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_CLERK, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x71004, -1 - person_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1 - person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x71014, -1 - person_event SPRITE_SAILOR, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x71017, -1 - person_event SPRITE_TEACHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7101a, -1 + object_event SPRITE_CLERK, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1 + object_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1 + object_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1 + object_event SPRITE_SAILOR, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1 + object_event SPRITE_TEACHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index a82e45f11..256b8541f 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -3,27 +3,24 @@ const_value set 2 const CELADONDEPTSTORE6F_YOUNGSTER CeladonDeptStore6F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .Callback .Callback: changeblock $c, $0, $3 return -SuperNerdScript_0x7117a: - jumptextfaceplayer UnknownText_0x712c7 +CeladonDeptStore6FSuperNerdScript: + jumptextfaceplayer CeladonDeptStore6FSuperNerdText -YoungsterScript_0x7117d: - jumptextfaceplayer UnknownText_0x71310 +CeladonDeptStore6FYoungsterScript: + jumptextfaceplayer CeladonDeptStore6FYoungsterText -CeladonVendingMachine: +CeladonDeptStore6FVendingMachine: opentext writetext CeladonVendingText .Start: @@ -101,7 +98,8 @@ CeladonVendingMachine: CeladonDeptStore6FDirectory: jumptext CeladonDeptStore6FDirectoryText -UnknownScript_0x7124d: +; unused +CeladonDeptStore6FElevatorButton: jumpstd elevatorbutton CeladonVendingText: @@ -128,7 +126,7 @@ CeladonVendingNoSpaceText: line "room for stuff…" done -UnknownText_0x712c7: +CeladonDeptStore6FSuperNerdText: text "A vending machine" line "with a prize rou-" cont "lette…" @@ -137,7 +135,7 @@ UnknownText_0x712c7: line "those anymore." done -UnknownText_0x71310: +CeladonDeptStore6FYoungsterText: text "Aww! There's no" line "games here!" @@ -158,19 +156,19 @@ CeladonDeptStore6F_MapEventHeader: warp_def $0, $f, 2, CELADON_DEPT_STORE_5F warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 0, 14, SIGNPOST_READ, CeladonDeptStore6FDirectory - signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton - signpost 1, 8, SIGNPOST_UP, CeladonVendingMachine - signpost 1, 9, SIGNPOST_UP, CeladonVendingMachine - signpost 1, 10, SIGNPOST_UP, CeladonVendingMachine - signpost 1, 11, SIGNPOST_UP, CeladonVendingMachine - -.PersonEvents: + bg_event 0, 14, BGEVENT_READ, CeladonDeptStore6FDirectory + bg_event 0, 3, BGEVENT_READ, CeladonDeptStore1FElevatorButton + bg_event 1, 8, BGEVENT_UP, CeladonDeptStore6FVendingMachine + bg_event 1, 9, BGEVENT_UP, CeladonDeptStore6FVendingMachine + bg_event 1, 10, BGEVENT_UP, CeladonDeptStore6FVendingMachine + bg_event 1, 11, BGEVENT_UP, CeladonDeptStore6FVendingMachine + +.ObjectEvents: db 2 - person_event SPRITE_SUPER_NERD, 2, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7117a, -1 - person_event SPRITE_YOUNGSTER, 5, 12, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x7117d, -1 + object_event SPRITE_SUPER_NERD, 2, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1 + object_event SPRITE_YOUNGSTER, 5, 12, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1 diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index 47c20b9b3..44c37ae9f 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -1,49 +1,47 @@ CeladonDeptStoreElevator_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -MapCeladonDeptStoreElevatorSignpost0Script: +CeladonDeptStoreElevatorScript: opentext - elevator Elevator_0x713be + elevator CeladonDeptStoreElevatorData closetext - iffalse UnknownScript_0x713bd + iffalse .Done pause 5 playsound SFX_ELEVATOR earthquake 60 waitsfx -UnknownScript_0x713bd: +.Done: end - -Elevator_0x713be: +CeladonDeptStoreElevatorData: db 6 ; floors - elevfloor _1F, 4, CELADON_DEPT_STORE_1F - elevfloor _2F, 3, CELADON_DEPT_STORE_2F - elevfloor _3F, 3, CELADON_DEPT_STORE_3F - elevfloor _4F, 3, CELADON_DEPT_STORE_4F - elevfloor _5F, 3, CELADON_DEPT_STORE_5F - elevfloor _6F, 2, CELADON_DEPT_STORE_6F + elevfloor FLOOR_1F, 4, CELADON_DEPT_STORE_1F + elevfloor FLOOR_2F, 3, CELADON_DEPT_STORE_2F + elevfloor FLOOR_3F, 3, CELADON_DEPT_STORE_3F + elevfloor FLOOR_4F, 3, CELADON_DEPT_STORE_4F + elevfloor FLOOR_5F, 3, CELADON_DEPT_STORE_5F + elevfloor FLOOR_6F, 2, CELADON_DEPT_STORE_6F db $ff ; end - CeladonDeptStoreElevator_MapEventHeader: ; filler db 0, 0 .Warps: db 2 - warp_def $3, $1, 255, CELADON_DEPT_STORE_1F - warp_def $3, $2, 255, CELADON_DEPT_STORE_1F + warp_def $3, $1, -1, CELADON_DEPT_STORE_1F + warp_def $3, $2, -1, CELADON_DEPT_STORE_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 0, 3, SIGNPOST_READ, MapCeladonDeptStoreElevatorSignpost0Script + bg_event 0, 3, BGEVENT_READ, CeladonDeptStoreElevatorScript -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index b44c66dcc..d5e17050b 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -10,83 +10,83 @@ const_value set 2 const CELADONGAMECORNER_GRAMPS CeladonGameCorner_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -ClerkScript_0x7211d: +CeladonGameCornerClerkScript: jumpstd gamecornercoinvendor -ReceptionistScript_0x72120: - jumptextfaceplayer UnknownText_0x721d0 +CeladonGameCornerReceptionistScript: + jumptextfaceplayer CeladonGameCornerReceptionistText -PokefanMScript_0x72123: +CeladonGameCornerPokefanMScript: faceplayer opentext - writetext UnknownText_0x72215 + writetext CeladonGameCornerPokefanMText waitbutton closetext spriteface CELADONGAMECORNER_POKEFAN_M, LEFT end -TeacherScript_0x7212e: +CeladonGameCornerTeacherScript: faceplayer opentext - writetext UnknownText_0x72242 + writetext CeladonGameCornerTeacherText waitbutton closetext spriteface CELADONGAMECORNER_TEACHER, RIGHT end -FishingGuruScript_0x72139: +CeladonGameCornerFishingGuruScript: faceplayer opentext - writetext UnknownText_0x72295 + writetext CeladonGameCornerFishingGuruText waitbutton closetext spriteface CELADONGAMECORNER_FISHING_GURU, RIGHT end -FisherScript_0x72144: +CeladonGameCornerFisherScript: faceplayer opentext checkevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON - iftrue .UnknownScript_0x72169 - writetext UnknownText_0x722dc + iftrue .GotCoins + writetext CeladonGameCornerFisherText1 buttonsound checkitem COIN_CASE - iffalse UnknownScript_0x7217b - checkcoins 9998 - if_equal $0, UnknownScript_0x72184 + iffalse .NoCoinCase + checkcoins MAX_COINS - 1 + if_equal $0, .FullCoinCase stringtotext .coinname, $1 - scall .UnknownScript_0x72172 + scall .GiveCoins givecoins 18 setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON -.UnknownScript_0x72169: - writetext UnknownText_0x72345 +.GotCoins: + writetext CeladonGameCornerFisherText2 waitbutton closetext spriteface LAST_TALKED, LEFT end -.UnknownScript_0x72172: +.GiveCoins: jumpstd receiveitem end .coinname db "COIN@" -UnknownScript_0x7217b: - writetext UnknownText_0x7238a +.NoCoinCase: + writetext CeladonGameCornerFisherNoCoinCaseText waitbutton closetext spriteface LAST_TALKED, LEFT end -UnknownScript_0x72184: - writetext UnknownText_0x723d9 +.FullCoinCase: + writetext CeladonGameCornerFisherFullCoinCaseText waitbutton closetext spriteface LAST_TALKED, LEFT @@ -95,45 +95,45 @@ UnknownScript_0x72184: CeladonGymGuyScript: jumptextfaceplayer CeladonGymGuyText -GrampsScript_0x72190: +CeladonGameCornerGrampsScript: faceplayer opentext - writetext UnknownText_0x724ad + writetext CeladonGameCornerGrampsText waitbutton closetext spriteface CELADONGAMECORNER_GRAMPS, LEFT end -MapCeladonGameCornerSignpost36Script: - jumptext UnknownText_0x724f3 +CeladonGameCornerPoster1Script: + jumptext CeladonGameCornerPoster1Text -MapCeladonGameCornerSignpost37Script: - jumptext UnknownText_0x72521 +CeladonGameCornerPoster2Script: + jumptext CeladonGameCornerPoster2Text -MapCeladonGameCornerSignpost35Script: +CeladonGameCornerLuckySlotMachineScript: random $6 - if_equal $0, MapCeladonGameCornerSignpost16Script + if_equal $0, CeladonGameCornerSlotMachineScript refreshscreen $0 writebyte $0 special Special_SlotMachine closetext end -MapCeladonGameCornerSignpost16Script: +CeladonGameCornerSlotMachineScript: refreshscreen $0 writebyte $1 special Special_SlotMachine closetext end -MapCeladonGameCornerSignpost11Script: +CeladonGameCornerCardFlipScript: refreshscreen $0 special Special_CardFlip closetext end -MapCeladonGameCornerSignpost32Script: - jumptext UnknownText_0x7254f +CeladonGameCornerLighterScript: + jumptext CeladonGameCornerLighterText MapCeladonGameCornerSignpost9Script: opentext @@ -149,7 +149,7 @@ MovementData_0x721cd: turn_head LEFT step_end -UnknownText_0x721d0: +CeladonGameCornerReceptionistText: text "Welcome!" para "You may exchange" @@ -159,13 +159,13 @@ UnknownText_0x721d0: line "next door." done -UnknownText_0x72215: +CeladonGameCornerPokefanMText: text "The slot machines" line "are all state of" cont "the art." done -UnknownText_0x72242: +CeladonGameCornerTeacherText: text "It's this machine" line "I want." @@ -176,7 +176,7 @@ UnknownText_0x72242: line "today." done -UnknownText_0x72295: +CeladonGameCornerFishingGuruText: text "I think this slot" line "machine will pay" cont "out…" @@ -185,7 +185,7 @@ UnknownText_0x72295: line "among machines." done -UnknownText_0x722dc: +CeladonGameCornerFisherText1: text "Gahahaha!" para "The coins just" @@ -198,7 +198,7 @@ UnknownText_0x722dc: line "with you!" done -UnknownText_0x72345: +CeladonGameCornerFisherText2: text "Gahahaha!" para "It makes me feel" @@ -208,7 +208,7 @@ UnknownText_0x72345: line "people!" done -UnknownText_0x7238a: +CeladonGameCornerFisherNoCoinCaseText: text "Hey, you don't" line "have a COIN CASE." @@ -217,7 +217,7 @@ UnknownText_0x7238a: cont "coins, kid?" done -UnknownText_0x723d9: +CeladonGameCornerFisherFullCoinCaseText: text "Hey, your COIN" line "CASE is full, kid." @@ -241,7 +241,7 @@ CeladonGymGuyText: line "enough coins yet…" done -UnknownText_0x724ad: +CeladonGameCornerGrampsText: text "Hmmm… The odds are" line "surely better for" @@ -249,7 +249,7 @@ UnknownText_0x724ad: line "but… What to do?" done -UnknownText_0x724f3: +CeladonGameCornerPoster1Text: text "Hey!" para "Underneath this" @@ -258,7 +258,7 @@ UnknownText_0x724f3: para "There's nothing!" done -UnknownText_0x72521: +CeladonGameCornerPoster2Text: text "Hey!" para "Underneath this" @@ -267,7 +267,7 @@ UnknownText_0x72521: para "There's nothing!" done -UnknownText_0x7254f: +CeladonGameCornerLighterText: text "There's a lighter" line "here." done @@ -290,58 +290,58 @@ CeladonGameCorner_MapEventHeader: warp_def $d, $e, 6, CELADON_CITY warp_def $d, $f, 6, CELADON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 38 - signpost 6, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 7, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 8, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 9, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 10, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 11, 1, SIGNPOST_LEFT, MapCeladonGameCornerSignpost11Script - signpost 6, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 7, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 8, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 9, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost9Script - signpost 10, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 11, 6, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost11Script - signpost 6, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 7, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 8, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 9, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 10, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost16Script - signpost 11, 7, SIGNPOST_LEFT, MapCeladonGameCornerSignpost35Script - signpost 6, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 7, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 8, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 9, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 10, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 11, 12, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost35Script - signpost 6, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 7, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 8, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 9, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 10, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 11, 13, SIGNPOST_LEFT, MapCeladonGameCornerSignpost35Script - signpost 6, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 7, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 8, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost32Script - signpost 9, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 10, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 11, 18, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost35Script - signpost 0, 15, SIGNPOST_READ, MapCeladonGameCornerSignpost36Script - signpost 0, 9, SIGNPOST_READ, MapCeladonGameCornerSignpost37Script - -.PersonEvents: + bg_event 6, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 7, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 8, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 9, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 10, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 11, 1, BGEVENT_LEFT, CeladonGameCornerCardFlipScript + bg_event 6, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 7, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 8, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 9, 6, BGEVENT_READ, MapCeladonGameCornerSignpost9Script + bg_event 10, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 11, 6, BGEVENT_RIGHT, CeladonGameCornerCardFlipScript + bg_event 6, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 8, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 9, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 10, 7, BGEVENT_READ, CeladonGameCornerSlotMachineScript + bg_event 11, 7, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript + bg_event 6, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 8, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 9, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 10, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 11, 12, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript + bg_event 6, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 8, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 9, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 10, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 11, 13, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript + bg_event 6, 18, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 18, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 8, 18, BGEVENT_READ, CeladonGameCornerLighterScript + bg_event 9, 18, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 10, 18, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 11, 18, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript + bg_event 0, 15, BGEVENT_READ, CeladonGameCornerPoster1Script + bg_event 0, 9, BGEVENT_READ, CeladonGameCornerPoster2Script + +.ObjectEvents: db 9 - person_event SPRITE_CLERK, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7211d, -1 - person_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x72120, -1 - person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x72123, -1 - person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7212e, -1 - person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x72139, -1 - person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, 2, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 - person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, 4, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 - person_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CeladonGymGuyScript, -1 - person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x72190, -1 + object_event SPRITE_CLERK, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1 + object_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1 + object_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1 + object_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1 + object_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1 + object_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 + object_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 + object_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGymGuyScript, -1 + object_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 4dd5de28b..d40f3eecc 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -3,7 +3,7 @@ const_value set 2 const CELADONGAMECORNERPRIZEROOM_PHARMACIST CeladonGameCornerPrizeRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -47,10 +47,10 @@ CeladonPrizeRoom_tmcounterloop: .psychic checkcoins 3500 if_equal $2, CeladonPrizeRoom_notenoughcoins - itemtotext TM_PSYCHIC, $0 + itemtotext TM_PSYCHIC_M, $0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel - giveitem TM_PSYCHIC + giveitem TM_PSYCHIC_M iffalse CeladonPrizeRoom_notenoughroom takecoins 3500 jump CeladonPrizeRoom_purchased @@ -278,15 +278,15 @@ CeladonGameCornerPrizeRoom_MapEventHeader: warp_def $5, $2, 7, CELADON_CITY warp_def $5, $3, 7, CELADON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 2, SIGNPOST_READ, GoldenrodGameCornerTMVendor - signpost 1, 4, SIGNPOST_READ, GoldenrodGameCornerPokemonVendor + bg_event 1, 2, BGEVENT_READ, GoldenrodGameCornerTMVendor + bg_event 1, 4, BGEVENT_READ, GoldenrodGameCornerPokemonVendor -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_GENTLEMAN, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1 - person_event SPRITE_PHARMACIST, 4, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1 + object_event SPRITE_GENTLEMAN, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1 + object_event SPRITE_PHARMACIST, 4, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 411d109f7..4cff86dfc 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -7,7 +7,7 @@ const_value set 2 const CELADONGYM_TWIN2 CeladonGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -50,56 +50,56 @@ UnknownScript_0x72aae: end TrainerLassMichelle: - trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, LassMichelleScript + trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, .Script -LassMichelleScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x72e30 + writetext LassMichelleAfterBattleText waitbutton closetext end TrainerPicnickerTanya: - trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, PicnickerTanyaScript + trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, .Script -PicnickerTanyaScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x72e8e + writetext PicnickerTanyaAfterBattleText waitbutton closetext end TrainerBeautyJulia: - trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, BeautyJuliaScript + trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, .Script -BeautyJuliaScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x72f01 + writetext BeautyJuliaAfterBattleText waitbutton closetext end TrainerTwinsJoandzoe1: - trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, TwinsJoandzoe1Script + trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script -TwinsJoandzoe1Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x72f70 + writetext TwinsJoandzoe1AfterBattleText waitbutton closetext end TrainerTwinsJoandzoe2: - trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, TwinsJoandzoe2Script + trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script -TwinsJoandzoe2Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x72fc0 + writetext TwinsJoandzoe2AfterBattleText waitbutton closetext end @@ -199,7 +199,7 @@ LassMichelleBeatenText: text "Oh, bleah!" done -UnknownText_0x72e30: +LassMichelleAfterBattleText: text "I just got care-" line "less, that's all!" done @@ -214,7 +214,7 @@ PicnickerTanyaBeatenText: text "Oh, that's it?" done -UnknownText_0x72e8e: +PicnickerTanyaAfterBattleText: text "Oh, look at all" line "your BADGES. No" @@ -232,7 +232,7 @@ BeautyJuliaBeatenText: text "How annoying!" done -UnknownText_0x72f01: +BeautyJuliaAfterBattleText: text "How do I go about" line "becoming ladylike" cont "like ERIKA?" @@ -248,7 +248,7 @@ TwinsJoandzoe1BeatenText: text "Oh… We lost…" done -UnknownText_0x72f70: +TwinsJoandzoe1AfterBattleText: text "ERIKA will get you" line "back for us!" done @@ -262,7 +262,7 @@ TwinsJoandzoe2BeatenText: text "We couldn't win…" done -UnknownText_0x72fc0: +TwinsJoandzoe2AfterBattleText: text "ERIKA is much," line "much stronger!" done @@ -276,19 +276,19 @@ CeladonGym_MapEventHeader: warp_def $11, $4, 8, CELADON_CITY warp_def $11, $5, 8, CELADON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 15, 3, SIGNPOST_READ, CeladonGymStatue - signpost 15, 6, SIGNPOST_READ, CeladonGymStatue + bg_event 15, 3, BGEVENT_READ, CeladonGymStatue + bg_event 15, 6, BGEVENT_READ, CeladonGymStatue -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_ERIKA, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1 - person_event SPRITE_LASS, 8, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerLassMichelle, -1 - person_event SPRITE_LASS, 8, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerTanya, -1 - person_event SPRITE_BUENA, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerBeautyJulia, -1 - person_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1 - person_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1 + object_event SPRITE_ERIKA, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1 + object_event SPRITE_LASS, 8, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1 + object_event SPRITE_LASS, 8, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1 + object_event SPRITE_BUENA, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1 + object_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1 + object_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index e06fe71cc..452ba96e8 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -5,7 +5,7 @@ const_value set 2 const CELADONMANSION1F_GROWLITHE2 CeladonMansion1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -86,18 +86,18 @@ CeladonMansion1F_MapEventHeader: warp_def $0, $0, 1, CELADON_MANSION_2F warp_def $0, $7, 4, CELADON_MANSION_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 8, 5, SIGNPOST_UP, CeladonMansionManagersSuiteSign - signpost 3, 0, SIGNPOST_READ, CeladonMansion1fBookshelf - signpost 3, 2, SIGNPOST_READ, CeladonMansion1fBookshelf + bg_event 8, 5, BGEVENT_UP, CeladonMansionManagersSuiteSign + bg_event 3, 0, BGEVENT_READ, CeladonMansion1fBookshelf + bg_event 3, 2, BGEVENT_READ, CeladonMansion1fBookshelf -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonMansionManager, -1 - person_event SPRITE_GROWLITHE, 6, 2, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1 - person_event SPRITE_CLEFAIRY, 4, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1 - person_event SPRITE_GROWLITHE, 4, 4, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1 + object_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1 + object_event SPRITE_GROWLITHE, 6, 2, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1 + object_event SPRITE_CLEFAIRY, 4, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1 + object_event SPRITE_GROWLITHE, 4, 4, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1 diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index fbe54d617..d63ef1be6 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -1,5 +1,5 @@ CeladonMansion2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -60,14 +60,14 @@ CeladonMansion2F_MapEventHeader: warp_def $0, $6, 3, CELADON_MANSION_3F warp_def $0, $7, 5, CELADON_MANSION_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 3, 0, SIGNPOST_READ, CeladonMansion2FComputer - signpost 8, 5, SIGNPOST_UP, CeladonMansion2FSign - signpost 3, 2, SIGNPOST_READ, CeladonMansion2FBookshelf + bg_event 3, 0, BGEVENT_READ, CeladonMansion2FComputer + bg_event 8, 5, BGEVENT_UP, CeladonMansion2FSign + bg_event 3, 2, BGEVENT_READ, CeladonMansion2FBookshelf -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 10ba88dfe..dfa41c582 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -5,7 +5,7 @@ const_value set 2 const CELADONMANSION3F_FISHER CeladonMansion3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -65,11 +65,11 @@ UnknownScript_0x716b6: closetext end -SuperNerdScript_0x716bc: - jumptextfaceplayer UnknownText_0x71895 +CeladonMansion3FSuperNerdScript: + jumptextfaceplayer CeladonMansion3FSuperNerdText -FisherScript_0x716bf: - jumptextfaceplayer UnknownText_0x718ca +CeladonMansion3FFisherScript: + jumptextfaceplayer CeladonMansion3FFisherText MapCeladonMansion3FSignpost0Script: jumptext UnknownText_0x7190b @@ -145,7 +145,7 @@ UnknownText_0x71863: cont "cel printing." done -UnknownText_0x71895: +CeladonMansion3FSuperNerdText: text "Who, me? I'm the" line "PROGRAMMER." @@ -153,7 +153,7 @@ UnknownText_0x71895: line "machines!" done -UnknownText_0x718ca: +CeladonMansion3FFisherText: text "Aren't the TWINS" line "adorable?" @@ -200,19 +200,19 @@ CeladonMansion3F_MapEventHeader: warp_def $0, $6, 3, CELADON_MANSION_2F warp_def $0, $7, 2, CELADON_MANSION_ROOF -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 8, 5, SIGNPOST_UP, MapCeladonMansion3FSignpost0Script - signpost 3, 4, SIGNPOST_UP, MapCeladonMansion3FSignpost1Script - signpost 6, 1, SIGNPOST_UP, MapCeladonMansion3FSignpost2Script - signpost 3, 1, SIGNPOST_UP, MapCeladonMansion3FSignpost3Script + bg_event 8, 5, BGEVENT_UP, MapCeladonMansion3FSignpost0Script + bg_event 3, 4, BGEVENT_UP, MapCeladonMansion3FSignpost1Script + bg_event 6, 1, BGEVENT_UP, MapCeladonMansion3FSignpost2Script + bg_event 3, 1, BGEVENT_UP, MapCeladonMansion3FSignpost3Script -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_COOLTRAINER_M, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1 - person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1 - person_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x716bc, -1 - person_event SPRITE_FISHER, 4, 0, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x716bf, -1 + object_event SPRITE_COOLTRAINER_M, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1 + object_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1 + object_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1 + object_event SPRITE_FISHER, 4, 0, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 3ea8d275b..8458a9d87 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -2,19 +2,19 @@ const_value set 2 const CELADONMANSIONROOF_FISHER CeladonMansionRoof_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -FisherScript_0x71a39: - jumptextfaceplayer UnknownText_0x71a3f +CeladonMansionRoofFisherScript: + jumptextfaceplayer CeladonMansionRoofFisherText MapCeladonMansionRoofSignpost0Script: jumptext UnknownText_0x71aa1 -UnknownText_0x71a3f: +CeladonMansionRoofFisherText: text "High places--I do" line "love them so!" @@ -43,13 +43,13 @@ CeladonMansionRoof_MapEventHeader: warp_def $1, $6, 4, CELADON_MANSION_3F warp_def $5, $2, 1, CELADON_MANSION_ROOF_HOUSE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 1, 6, SIGNPOST_LEFT, MapCeladonMansionRoofSignpost0Script + bg_event 1, 6, BGEVENT_LEFT, MapCeladonMansionRoofSignpost0Script -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHER, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x71a39, -1 + object_event SPRITE_FISHER, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 84a0cb069..4cb750df7 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const CELADONMANSIONROOFHOUSE_PHARMACIST CeladonMansionRoofHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -125,12 +125,12 @@ CeladonMansionRoofHouse_MapEventHeader: warp_def $7, $2, 3, CELADON_MANSION_ROOF warp_def $7, $3, 3, CELADON_MANSION_ROOF -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_PHARMACIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1 + object_event SPRITE_PHARMACIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1 diff --git a/maps/CeladonPokeCenter2FBeta.asm b/maps/CeladonPokeCenter2FBeta.asm deleted file mode 100644 index 9c8d25332..000000000 --- a/maps/CeladonPokeCenter2FBeta.asm +++ /dev/null @@ -1,23 +0,0 @@ -CeladonPokeCenter2FBeta_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -CeladonPokeCenter2FBeta_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def $7, $0, 3, CELADON_POKECENTER_1F - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 0 diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokecenter1F.asm index 9bd47c4fc..32fdf2010 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -5,8 +5,8 @@ const_value set 2 const CELADONPOKECENTER1F_COOLTRAINER_F const CELADONPOKECENTER1F_EUSINE -CeladonPokeCenter1F_MapScriptHeader: -.MapTriggers: +CeladonPokecenter1F_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: @@ -18,11 +18,11 @@ NurseScript_0x71e22: GentlemanScript_0x71e25: jumpstd happinesschecknpc -CooltrainerFScript_0x71e28: - jumptextfaceplayer UnknownText_0x71e70 +CeladonPokecenter1FCooltrainerFScript: + jumptextfaceplayer CeladonPokecenter1FCooltrainerFText -PharmacistScript_0x71e2b: - jumptextfaceplayer UnknownText_0x71ec1 +CeladonPokecenter1FPharmacistScript: + jumptextfaceplayer CeladonPokecenter1FPharmacistText CeladonEusine: faceplayer @@ -72,7 +72,7 @@ CeladonEusine: step DOWN step_end -UnknownText_0x71e70: +CeladonPokecenter1FCooltrainerFText: text "ERIKA is a master" line "of grass #MON." @@ -81,7 +81,7 @@ UnknownText_0x71e70: cont "watch yourself." done -UnknownText_0x71ec1: +CeladonPokecenter1FPharmacistText: text "TEAM ROCKET's" line "hideout is in the" @@ -145,7 +145,7 @@ NoBeastsText: line "you, <PLAYER>!" done -CeladonPokeCenter1F_MapEventHeader: +CeladonPokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -155,16 +155,16 @@ CeladonPokeCenter1F_MapEventHeader: warp_def $7, $4, 5, CELADON_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x71e22, -1 - person_event SPRITE_GENTLEMAN, 5, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1 - person_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x71e2b, -1 - person_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x71e28, -1 - person_event SPRITE_SUPER_NERD, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x71e22, -1 + object_event SPRITE_GENTLEMAN, 5, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1 + object_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1 + object_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1 + object_event SPRITE_SUPER_NERD, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH diff --git a/maps/CeladonPokecenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm new file mode 100644 index 000000000..10a192b93 --- /dev/null +++ b/maps/CeladonPokecenter2FBeta.asm @@ -0,0 +1,23 @@ +CeladonPokecenter2FBeta_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +CeladonPokecenter2FBeta_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 1 + warp_def $7, $0, 3, CELADON_POKECENTER_1F + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 0 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 47afa867a..fc0bd60f6 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -7,37 +7,35 @@ const_value set 2 const CERULEANCITY_YOUNGSTER CeruleanCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_CERULEAN return -CooltrainerMScript_0x184009: +CeruleanCityCooltrainerMScript: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x184017 - writetext UnknownText_0x1840bc + iftrue .ReturnedMachinePart + writetext CeruleanCityCooltrainerMText1 waitbutton closetext end -UnknownScript_0x184017: - writetext UnknownText_0x184144 +.ReturnedMachinePart: + writetext CeruleanCityCooltrainerMText2 waitbutton closetext end -SuperNerdScript_0x18401d: - jumptextfaceplayer UnknownText_0x1841a8 +CeruleanCitySuperNerdScript: + jumptextfaceplayer CeruleanCitySuperNerdText CeruleanCitySlowbro: opentext @@ -47,15 +45,15 @@ CeruleanCitySlowbro: closetext end -CooltrainerFScript_0x18402a: +CeruleanCityCooltrainerFScript: faceplayer opentext - writetext UnknownText_0x1841fa + writetext CeruleanCityCooltrainerFText1 waitbutton closetext spriteface CERULEANCITY_COOLTRAINER_F, LEFT opentext - writetext UnknownText_0x184229 + writetext CeruleanCityCooltrainerFText2 waitbutton closetext opentext @@ -64,41 +62,41 @@ CooltrainerFScript_0x18402a: waitbutton closetext opentext - writetext UnknownText_0x18424b + writetext CeruleanCityCooltrainerFText3 waitbutton closetext end -FisherScript_0x18404a: +CeruleanCityFisherScript: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x184058 + iftrue .ReturnedMachinePart checkevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM - iftrue UnknownScript_0x18405e -UnknownScript_0x184058: - writetext UnknownText_0x18424e + iftrue .MetCeruleanRocket +.ReturnedMachinePart: + writetext CeruleanCityFisherText waitbutton closetext end -UnknownScript_0x18405e: - writetext UnknownText_0x184275 +.MetCeruleanRocket: + writetext CeruleanCityFisherRocketTipText waitbutton closetext end -YoungsterScript_0x184064: +CeruleanCityYoungsterScript: faceplayer opentext - writetext UnknownText_0x1842a9 + writetext CeruleanCityYoungsterText1 waitbutton closetext checkevent EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY - iffalse UnknownScript_0x184072 + iffalse .BerserkGenePingsItemfinder end -UnknownScript_0x184072: +.BerserkGenePingsItemfinder: waitsfx playsound SFX_SECOND_PART_OF_ITEMFINDER waitsfx @@ -119,7 +117,7 @@ UnknownScript_0x184072: showemote EMOTE_SHOCK, CERULEANCITY_YOUNGSTER, 15 spriteface CERULEANCITY_YOUNGSTER, LEFT opentext - writetext UnknownText_0x1842ee + writetext CeruleanCityYoungsterText2 waitbutton closetext end @@ -142,7 +140,7 @@ CeruleanCapeSign: CeruleanLockedDoor: jumptext CeruleanLockedDoorText -CeruleanCityPokeCenterSign: +CeruleanCityPokecenterSign: jumpstd pokecentersign CeruleanCityMartSign: @@ -151,7 +149,7 @@ CeruleanCityMartSign: CeruleanCityHiddenBerserkGene: dwb EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE -UnknownText_0x1840bc: +CeruleanCityCooltrainerMText1: text "KANTO's POWER" line "PLANT?" @@ -166,7 +164,7 @@ UnknownText_0x1840bc: cont "some sort there." done -UnknownText_0x184144: +CeruleanCityCooltrainerMText2: text "You're collecting" line "every single kind" cont "of #MON?" @@ -176,7 +174,7 @@ UnknownText_0x184144: cont "it sounds fun too." done -UnknownText_0x1841a8: +CeruleanCitySuperNerdText: text "The CAPE in the" line "north is a good" @@ -188,34 +186,34 @@ CeruleanCitySlowbroText: text "SLOWBRO: Yarah?" done -UnknownText_0x1841fa: +CeruleanCityCooltrainerFText1: text "My SLOWBRO and I" line "make an awesome" cont "combination!" done -UnknownText_0x184229: +CeruleanCityCooltrainerFText2: text "SLOWBRO, show me" line "your CONFUSION!" done -UnknownText_0x18424b: +CeruleanCityCooltrainerFText3: text "…" done -UnknownText_0x18424e: +CeruleanCityFisherText: text "I'm a huge fan of" line "CERULEAN GYM's" cont "MISTY." done -UnknownText_0x184275: +CeruleanCityFisherRocketTipText: text "I saw this shady" line "guy go off toward" cont "CERULEAN's CAPE." done -UnknownText_0x1842a9: +CeruleanCityYoungsterText1: text "There used to be a" line "cave here that had" @@ -223,7 +221,7 @@ UnknownText_0x1842a9: line "#MON in it." done -UnknownText_0x1842ee: +CeruleanCityYoungsterText2: text "Ayuh?" para "My ITEMFINDER is" @@ -290,26 +288,26 @@ CeruleanCity_MapEventHeader: warp_def $17, $1e, 1, CERULEAN_GYM warp_def $1d, $19, 2, CERULEAN_MART -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 9 - signpost 23, 23, SIGNPOST_READ, CeruleanCitySign - signpost 25, 27, SIGNPOST_READ, CeruleanGymSign - signpost 29, 11, SIGNPOST_READ, CeruleanBikeShopSign - signpost 17, 25, SIGNPOST_READ, CeruleanPoliceSign - signpost 7, 23, SIGNPOST_READ, CeruleanCapeSign - signpost 29, 14, SIGNPOST_READ, CeruleanLockedDoor - signpost 21, 20, SIGNPOST_READ, CeruleanCityPokeCenterSign - signpost 29, 26, SIGNPOST_READ, CeruleanCityMartSign - signpost 12, 2, SIGNPOST_ITEM, CeruleanCityHiddenBerserkGene - -.PersonEvents: + bg_event 23, 23, BGEVENT_READ, CeruleanCitySign + bg_event 25, 27, BGEVENT_READ, CeruleanGymSign + bg_event 29, 11, BGEVENT_READ, CeruleanBikeShopSign + bg_event 17, 25, BGEVENT_READ, CeruleanPoliceSign + bg_event 7, 23, BGEVENT_READ, CeruleanCapeSign + bg_event 29, 14, BGEVENT_READ, CeruleanLockedDoor + bg_event 21, 20, BGEVENT_READ, CeruleanCityPokecenterSign + bg_event 29, 26, BGEVENT_READ, CeruleanCityMartSign + bg_event 12, 2, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene + +.ObjectEvents: db 6 - person_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x184009, -1 - person_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x18401d, -1 - person_event SPRITE_SLOWPOKE, 24, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1 - person_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x18402a, -1 - person_event SPRITE_FISHER, 26, 30, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x18404a, -1 - person_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x184064, -1 + object_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1 + object_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCitySuperNerdScript, -1 + object_event SPRITE_SLOWPOKE, 24, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1 + object_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerFScript, -1 + object_event SPRITE_FISHER, 26, 30, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityFisherScript, -1 + object_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index a91a3cc9d..b014199b7 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -7,24 +7,22 @@ const_value set 2 const CERULEANGYM_GYM_GUY CeruleanGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x1883d9, 0 - dw UnknownScript_0x1883da, 0 + scene_script .DummyScene0 + scene_script .GruntRunsOut .MapCallbacks: db 0 -UnknownScript_0x1883d9: +.DummyScene0: end -UnknownScript_0x1883da: - priorityjump UnknownScript_0x1883de +.GruntRunsOut: + priorityjump .GruntRunsOutScript end -UnknownScript_0x1883de: +.GruntRunsOutScript: applymovement CERULEANGYM_ROCKET, MovementData_0x1884e3 playsound SFX_TACKLE applymovement CERULEANGYM_ROCKET, MovementData_0x1884eb @@ -50,9 +48,9 @@ UnknownScript_0x1883de: setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM clearevent EVENT_ROUTE_24_ROCKET clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND - dotrigger $0 - domaptrigger ROUTE_25, $1 - domaptrigger POWER_PLANT, $0 + setscene $0 + setmapscene ROUTE_25, $1 + setmapscene POWER_PLANT, $0 waitsfx special RestartMapMusic pause 15 @@ -88,34 +86,34 @@ MistyScript_0x188432: end TrainerSwimmerfDiana: - trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, SwimmerfDianaScript + trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, .Script -SwimmerfDianaScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x188856 + writetext SwimmerfDianaAfterBattleText waitbutton closetext end TrainerSwimmerfBriana: - trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, SwimmerfBrianaScript + trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, .Script -SwimmerfBrianaScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1888c0 + writetext SwimmerfBrianaAfterBattleText waitbutton closetext end TrainerSwimmermParker: - trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, SwimmermParkerScript + trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script -SwimmermParkerScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x188943 + writetext SwimmermParkerAfterBattleText waitbutton closetext end @@ -299,7 +297,7 @@ SwimmerfDianaBeatenText: line "the winner!" done -UnknownText_0x188856: +SwimmerfDianaAfterBattleText: text "I'll be swimming" line "quietly." done @@ -315,7 +313,7 @@ SwimmerfBrianaBeatenText: line "disposed of me…" done -UnknownText_0x1888c0: +SwimmerfBrianaAfterBattleText: text "Don't be too smug" line "about beating me." @@ -335,7 +333,7 @@ SwimmermParkerBeatenText: text "This can't be…" done -UnknownText_0x188943: +SwimmermParkerAfterBattleText: text "MISTY has gotten" line "much better in the" cont "past few years." @@ -374,20 +372,20 @@ CeruleanGym_MapEventHeader: warp_def $f, $4, 5, CERULEAN_CITY warp_def $f, $5, 5, CERULEAN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 8, 3, SIGNPOST_ITEM, CeruleanGymHiddenMachinePart - signpost 13, 2, SIGNPOST_READ, CeruleanGymStatue1 - signpost 13, 6, SIGNPOST_READ, CeruleanGymStatue2 + bg_event 8, 3, BGEVENT_ITEM, CeruleanGymHiddenMachinePart + bg_event 13, 2, BGEVENT_READ, CeruleanGymStatue1 + bg_event 13, 6, BGEVENT_READ, CeruleanGymStatue2 -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_ROCKET, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET - person_event SPRITE_MISTY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_SWIMMER_GIRL, 6, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_SWIMMER_GIRL, 9, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_SWIMMER_GUY, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event SPRITE_ROCKET, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET + object_event SPRITE_MISTY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event SPRITE_SWIMMER_GIRL, 6, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event SPRITE_SWIMMER_GIRL, 9, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event SPRITE_SWIMMER_GUY, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index c6cdd60ac..92c40682f 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -2,16 +2,16 @@ const_value set 2 const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M CeruleanGymBadgeSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -PokefanMScript_0x188002: - jumptextfaceplayer UnknownText_0x188005 +CeruleanGymBadgeSpeechHousePokefanMScript: + jumptextfaceplayer CeruleanGymBadgeSpeechHousePokefanMText -UnknownText_0x188005: +CeruleanGymBadgeSpeechHousePokefanMText: text "Are you collecting" line "KANTO GYM BADGES?" done @@ -25,12 +25,12 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader: warp_def $7, $2, 1, CERULEAN_CITY warp_def $7, $3, 1, CERULEAN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x188002, -1 + object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index abbab5b5a..b2674dd46 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -4,7 +4,7 @@ const_value set 2 const CERULEANMART_COOLTRAINER_F CeruleanMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -54,14 +54,14 @@ CeruleanMart_MapEventHeader: warp_def $7, $2, 6, CERULEAN_CITY warp_def $7, $3, 6, CERULEAN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1 - person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1 - person_event SPRITE_COOLTRAINER_F, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1 + object_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1 + object_event SPRITE_COOLTRAINER_F, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1 diff --git a/maps/CeruleanPokeCenter2FBeta.asm b/maps/CeruleanPokeCenter2FBeta.asm deleted file mode 100644 index 4479a484f..000000000 --- a/maps/CeruleanPokeCenter2FBeta.asm +++ /dev/null @@ -1,23 +0,0 @@ -CeruleanPokeCenter2FBeta_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -CeruleanPokeCenter2FBeta_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def $7, $0, 1, CERULEAN_POKECENTER_1F - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 0 diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokecenter1F.asm index 2705fc418..83e64fca5 100644 --- a/maps/CeruleanPokeCenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -3,8 +3,8 @@ const_value set 2 const CERULEANPOKECENTER1F_SUPER_NERD const CERULEANPOKECENTER1F_GYM_GUY -CeruleanPokeCenter1F_MapScriptHeader: -.MapTriggers: +CeruleanPokecenter1F_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: @@ -21,8 +21,8 @@ SuperNerdScript_0x188212: .mobile jumptextfaceplayer UnknownText_0x18828c -GymGuyScript_0x18821e: - jumptextfaceplayer UnknownText_0x1882ff +CeruleanPokecenter1FGymGuyScript: + jumptextfaceplayer CeruleanPokecenter1FGymGuyText UnknownText_0x188221: text "For battles, I'd" @@ -48,7 +48,7 @@ UnknownText_0x18828c: cont "nerve wracking." done -UnknownText_0x1882ff: +CeruleanPokecenter1FGymGuyText: text "The MAGNET TRAIN" line "travels at over" @@ -62,7 +62,7 @@ UnknownText_0x1882ff: line "JOHTO accessible." done -CeruleanPokeCenter1F_MapEventHeader: +CeruleanPokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -72,14 +72,14 @@ CeruleanPokeCenter1F_MapEventHeader: warp_def $7, $4, 4, CERULEAN_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18820f, -1 - person_event SPRITE_SUPER_NERD, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1 - person_event SPRITE_GYM_GUY, 5, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x18821e, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18820f, -1 + object_event SPRITE_SUPER_NERD, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1 + object_event SPRITE_GYM_GUY, 5, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1 diff --git a/maps/CeruleanPokecenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm new file mode 100644 index 000000000..ba25a36b3 --- /dev/null +++ b/maps/CeruleanPokecenter2FBeta.asm @@ -0,0 +1,23 @@ +CeruleanPokecenter2FBeta_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +CeruleanPokecenter2FBeta_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 1 + warp_def $7, $0, 1, CERULEAN_POKECENTER_1F + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 0 diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 2787899b7..8e3271e4e 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -4,17 +4,17 @@ const_value set 2 const CERULEANPOLICESTATION_DIGLETT CeruleanPoliceStation_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -FishingGuruScript_0x18804a: - jumptextfaceplayer UnknownText_0x18805a +CeruleanPoliceStationFishingGuruScript: + jumptextfaceplayer CeruleanPoliceStationFishingGuruText -PokefanFScript_0x18804d: - jumptextfaceplayer UnknownText_0x1880c3 +CeruleanPoliceStationPokefanFScript: + jumptextfaceplayer CeruleanPoliceStationPokefanFText CeruleanDiglett: opentext @@ -24,7 +24,7 @@ CeruleanDiglett: closetext end -UnknownText_0x18805a: +CeruleanPoliceStationFishingGuruText: text "I heard that some" line "shady character is" cont "skulking about." @@ -34,7 +34,7 @@ UnknownText_0x18805a: cont "to be a thief." done -UnknownText_0x1880c3: +CeruleanPoliceStationPokefanFText: text "We were held up by" line "robbers before." done @@ -52,14 +52,14 @@ CeruleanPoliceStation_MapEventHeader: warp_def $7, $2, 2, CERULEAN_CITY warp_def $7, $3, 2, CERULEAN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x18804a, -1 - person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x18804d, -1 - person_event SPRITE_DIGLETT, 5, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, CeruleanDiglett, -1 + object_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1 + object_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1 + object_event SPRITE_DIGLETT, 5, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index f499d8c1f..16c043862 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -5,17 +5,17 @@ const_value set 2 const CERULEANTRADESPEECHHOUSE_ZUBAT CeruleanTradeSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -GrannyScript_0x188133: - jumptextfaceplayer UnknownText_0x18814d +CeruleanTradeSpeechHouseGrannyScript: + jumptextfaceplayer CeruleanTradeSpeechHouseGrannyText -GrampsScript_0x188136: - jumptextfaceplayer UnknownText_0x18818a +CeruleanTradeSpeechHouseGrampsScript: + jumptextfaceplayer CeruleanTradeSpeechHouseGrampsText RhydonScript_0x188139: opentext @@ -33,14 +33,14 @@ ZubatScript_0x188143: closetext end -UnknownText_0x18814d: +CeruleanTradeSpeechHouseGrannyText: text "My husband lives" line "happily with #-" cont "MON he got through" cont "trades." done -UnknownText_0x18818a: +CeruleanTradeSpeechHouseGrampsText: text "Ah… I'm so happy…" done @@ -62,15 +62,15 @@ CeruleanTradeSpeechHouse_MapEventHeader: warp_def $7, $2, 3, CERULEAN_CITY warp_def $7, $3, 3, CERULEAN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GrannyScript_0x188133, -1 - person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x188136, -1 - person_event SPRITE_RHYDON, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, RhydonScript_0x188139, -1 - person_event SPRITE_ZUBAT, 6, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ZubatScript_0x188143, -1 + object_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1 + object_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1 + object_event SPRITE_RHYDON, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x188139, -1 + object_event SPRITE_ZUBAT, 6, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ZubatScript_0x188143, -1 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 8abeb8c1b..cfad6ab1d 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -4,7 +4,7 @@ const_value set 2 const CHARCOALKILN_MOLTRES CharcoalKiln_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -157,17 +157,17 @@ CharcoalKiln_MapEventHeader: warp_def $7, $2, 2, AZALEA_TOWN warp_def $7, $3, 2, AZALEA_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 0, SIGNPOST_READ, CharcoalKilnBookshelf - signpost 1, 1, SIGNPOST_READ, CharcoalKilnBookshelf - signpost 1, 7, SIGNPOST_READ, CharcoalKilnRadio + bg_event 1, 0, BGEVENT_READ, CharcoalKilnBookshelf + bg_event 1, 1, BGEVENT_READ, CharcoalKilnBookshelf + bg_event 1, 7, BGEVENT_READ, CharcoalKilnRadio -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS - person_event SPRITE_YOUNGSTER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE - person_event SPRITE_MOLTRES, 6, 5, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D + object_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS + object_event SPRITE_YOUNGSTER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE + object_event SPRITE_MOLTRES, 6, 5, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 5b0db50f2..0b6f01283 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -6,23 +6,19 @@ const_value set 2 const CHERRYGROVECITY_FISHER CherrygroveCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0: +.DummyScene0: end -.Trigger1: +.DummyScene1: end .FlyPoint: @@ -44,7 +40,7 @@ CherrygroveCityGuideGent: follow CHERRYGROVECITY_GRAMPS, PLAYER applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement1 opentext - writetext GuideGentPokeCenterText + writetext GuideGentPokecenterText waitbutton closetext applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement2 @@ -104,9 +100,9 @@ CherrygroveCityGuideGent: closetext end -CherrygroveSilverTriggerSouth: - moveperson CHERRYGROVECITY_SILVER, $27, $7 -CherrygroveSilverTriggerNorth: +CherrygroveSilverSceneSouth: + moveobject CHERRYGROVECITY_SILVER, $27, $7 +CherrygroveSilverSceneNorth: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -125,7 +121,7 @@ CherrygroveSilverTriggerNorth: iftrue .Chikorita winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText setlasttalked CHERRYGROVECITY_SILVER - loadtrainer RIVAL1, RIVAL1_3 + loadtrainer RIVAL1, RIVAL1_1_TOTODILE writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle dontrestartmapmusic @@ -136,7 +132,7 @@ CherrygroveSilverTriggerNorth: .Totodile: winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText setlasttalked CHERRYGROVECITY_SILVER - loadtrainer RIVAL1, RIVAL1_1 + loadtrainer RIVAL1, RIVAL1_1_CHIKORITA writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle dontrestartmapmusic @@ -147,7 +143,7 @@ CherrygroveSilverTriggerNorth: .Chikorita: winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText setlasttalked CHERRYGROVECITY_SILVER - loadtrainer RIVAL1, RIVAL1_2 + loadtrainer RIVAL1, RIVAL1_1_CYNDAQUIL writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle dontrestartmapmusic @@ -175,7 +171,7 @@ CherrygroveSilverTriggerNorth: spriteface PLAYER, LEFT applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft disappear CHERRYGROVECITY_SILVER - dotrigger $0 + setscene $0 special HealParty playmapmusic end @@ -235,7 +231,7 @@ CherrygroveCitySign: GuideGentsHouseSign: jumptext GuideGentsHouseSignText -CherrygroveCityPokeCenterSign: +CherrygroveCityPokecenterSign: jumpstd pokecentersign CherrygroveCityMartSign: @@ -358,7 +354,7 @@ GuideGentTourText1: line "Follow me!" done -GuideGentPokeCenterText: +GuideGentPokecenterText: text "This is a #MON" line "CENTER. They heal" @@ -562,22 +558,22 @@ CherrygroveCity_MapEventHeader: warp_def $9, $19, 1, GUIDE_GENTS_HOUSE warp_def $b, $1f, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 1, $6, $21, $0, CherrygroveSilverTriggerNorth, $0, $0 - xy_trigger 1, $7, $21, $0, CherrygroveSilverTriggerSouth, $0, $0 + coord_event 1, $6, $21, CherrygroveSilverSceneNorth + coord_event 1, $7, $21, CherrygroveSilverSceneSouth -.Signposts: +.BGEvents: db 4 - signpost 8, 30, SIGNPOST_READ, CherrygroveCitySign - signpost 9, 23, SIGNPOST_READ, GuideGentsHouseSign - signpost 3, 24, SIGNPOST_READ, CherrygroveCityMartSign - signpost 3, 30, SIGNPOST_READ, CherrygroveCityPokeCenterSign + bg_event 8, 30, BGEVENT_READ, CherrygroveCitySign + bg_event 9, 23, BGEVENT_READ, GuideGentsHouseSign + bg_event 3, 24, BGEVENT_READ, CherrygroveCityMartSign + bg_event 3, 30, BGEVENT_READ, CherrygroveCityPokecenterSign -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_GRAMPS, 6, 32, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE - person_event SPRITE_SILVER, 6, 39, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY - person_event SPRITE_TEACHER, 12, 27, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1 - person_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1 - person_event SPRITE_FISHER, 12, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, MysticWaterGuy, -1 + object_event SPRITE_GRAMPS, 6, 32, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE + object_event SPRITE_SILVER, 6, 39, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY + object_event SPRITE_TEACHER, 12, 27, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1 + object_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1 + object_event SPRITE_FISHER, 12, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MysticWaterGuy, -1 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index b737313f9..411e77d09 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER CherrygroveEvolutionSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -50,15 +50,15 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader: warp_def $7, $2, 5, CHERRYGROVE_CITY warp_def $7, $3, 5, CHERRYGROVE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, CherrygroveEvolutionSpeechHouseBookshelf - signpost 1, 1, SIGNPOST_READ, CherrygroveEvolutionSpeechHouseBookshelf + bg_event 1, 0, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_LASS, 5, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x196cb9, -1 - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1 + object_event SPRITE_LASS, 5, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LassScript_0x196cb9, -1 + object_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index c556d8cb7..409624fe1 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -3,22 +3,22 @@ const_value set 2 const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER CherrygroveGymSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -PokefanMScript_0x196ae1: - jumptextfaceplayer UnknownText_0x196aea +CherrygroveGymSpeechHousePokefanMScript: + jumptextfaceplayer CherrygroveGymSpeechHousePokefanMText -BugCatcherScript_0x196ae4: - jumptextfaceplayer UnknownText_0x196b65 +CherrygroveGymSpeechHouseBugCatcherScript: + jumptextfaceplayer CherrygroveGymSpeechHouseBugCatcherText CherrygroveGymSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x196aea: +CherrygroveGymSpeechHousePokefanMText: text "You're trying to" line "see how good you" @@ -32,7 +32,7 @@ UnknownText_0x196aea: line "collect BADGES." done -UnknownText_0x196b65: +CherrygroveGymSpeechHouseBugCatcherText: text "When I get older," line "I'm going to be a" cont "GYM LEADER!" @@ -53,15 +53,15 @@ CherrygroveGymSpeechHouse_MapEventHeader: warp_def $7, $2, 3, CHERRYGROVE_CITY warp_def $7, $3, 3, CHERRYGROVE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, CherrygroveGymSpeechHouseBookshelf - signpost 1, 1, SIGNPOST_READ, CherrygroveGymSpeechHouseBookshelf + bg_event 1, 0, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x196ae1, -1 - person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x196ae4, -1 + object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1 + object_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index fe8a733eb..e835dbee2 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -4,7 +4,7 @@ const_value set 2 const CHERRYGROVEMART_YOUNGSTER CherrygroveMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -39,8 +39,8 @@ UnknownScript_0x19682b: closetext end -YoungsterScript_0x196831: - jumptextfaceplayer UnknownText_0x1968a0 +CherrygroveMartYoungsterScript: + jumptextfaceplayer CherrygroveMartYoungsterText UnknownText_0x196834: text "They're fresh out" @@ -56,7 +56,7 @@ UnknownText_0x196873: cont "catch #MON!" done -UnknownText_0x1968a0: +CherrygroveMartYoungsterText: text "When I was walking" line "in the grass, a" @@ -80,14 +80,14 @@ CherrygroveMart_MapEventHeader: warp_def $7, $2, 1, CHERRYGROVE_CITY warp_def $7, $3, 1, CHERRYGROVE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1 - person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1 - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x196831, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1 + object_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1 + object_event SPRITE_YOUNGSTER, 5, 2, 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 d3056b177..f9b111012 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -4,8 +4,8 @@ const_value set 2 const CHERRYGROVEPOKECENTER1F_GENTLEMAN const CHERRYGROVEPOKECENTER1F_TEACHER -CherrygrovePokeCenter1F_MapScriptHeader: -.MapTriggers: +CherrygrovePokecenter1F_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: @@ -14,11 +14,11 @@ CherrygrovePokeCenter1F_MapScriptHeader: NurseScript_0x19696d: jumpstd pokecenternurse -FisherScript_0x196970: - jumptextfaceplayer UnknownText_0x19698a +CherrygrovePokecenter1FFisherScript: + jumptextfaceplayer CherrygrovePokecenter1FFisherText -GentlemanScript_0x196973: - jumptextfaceplayer UnknownText_0x1969c8 +CherrygrovePokecenter1FGentlemanScript: + jumptextfaceplayer CherrygrovePokecenter1FGentlemanText TeacherScript_0x196976: faceplayer @@ -36,7 +36,7 @@ UnknownScript_0x196984: closetext end -UnknownText_0x19698a: +CherrygrovePokecenter1FFisherText: text "It's great. I can" line "store any number" @@ -44,7 +44,7 @@ UnknownText_0x19698a: line "it's all free." done -UnknownText_0x1969c8: +CherrygrovePokecenter1FGentlemanText: text "That PC is free" line "for any trainer" cont "to use." @@ -68,7 +68,7 @@ UnknownText_0x196a46: line "there already!" done -CherrygrovePokeCenter1F_MapEventHeader: +CherrygrovePokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -78,15 +78,15 @@ CherrygrovePokeCenter1F_MapEventHeader: warp_def $7, $4, 2, CHERRYGROVE_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x19696d, -1 - person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x196970, -1 - person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x196973, -1 - person_event SPRITE_TEACHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x196976, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19696d, -1 + object_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1 + object_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1 + object_event SPRITE_TEACHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x196976, -1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index c6b2d8d28..23ea94742 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -13,23 +13,19 @@ const_value set 2 const CIANWOODCITY_SUICUNE CianwoodCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPointAndSuicune -.Trigger0: +.DummyScene0: end -.Trigger1: +.DummyScene1: end .FlyPointAndSuicune: @@ -53,9 +49,9 @@ CianwoodCitySuicuneAndEusine: applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0 disappear CIANWOODCITY_SUICUNE pause 10 - dotrigger $0 + setscene $0 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42 - domaptrigger ROUTE_42, $1 + setmapscene ROUTE_42, $1 checkevent EVENT_FOUGHT_EUSINE iftrue .Done setevent EVENT_FOUGHT_EUSINE @@ -124,8 +120,8 @@ CianwoodCityPokefanM: CianwoodCityLass: jumptextfaceplayer CianwoodCityLassText -UnknownScript_0x1a00bc: - jumptextfaceplayer UnknownText_0x1a03cc +CianwoodCityUnknownScript: + jumptextfaceplayer CianwoodCityUnknownText CianwoodCitySign: jumptext CianwoodCitySignText @@ -142,7 +138,7 @@ CianwoodPhotoStudioSign: CianwoodPokeSeerSign: jumptext CianwoodPokeSeerSignText -CianwoodPokeCenterSign: +CianwoodPokecenterSign: jumpstd pokecentersign CianwoodCityRock: @@ -271,7 +267,7 @@ CianwoodCityLassText: done ; possibly unused -UnknownText_0x1a03cc: +CianwoodCityUnknownText: text "There are several" line "islands between" cont "here and OLIVINE." @@ -398,32 +394,32 @@ CianwoodCity_MapEventHeader: warp_def $25, $f, 1, CIANWOOD_LUGIA_SPEECH_HOUSE warp_def $11, $5, 1, POKE_SEERS_HOUSE -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 1, $10, $b, $0, CianwoodCitySuicuneAndEusine, $0, $0 + coord_event 1, $10, $b, CianwoodCitySuicuneAndEusine -.Signposts: +.BGEvents: db 8 - signpost 34, 20, SIGNPOST_READ, CianwoodCitySign - signpost 45, 7, SIGNPOST_READ, CianwoodGymSign - signpost 43, 24, SIGNPOST_READ, CianwoodPokeCenterSign - signpost 47, 19, SIGNPOST_READ, CianwoodPharmacySign - signpost 32, 8, SIGNPOST_READ, CianwoodPhotoStudioSign - signpost 24, 8, SIGNPOST_READ, CianwoodPokeSeerSign - signpost 19, 4, SIGNPOST_ITEM, CianwoodCityHiddenRevive - signpost 29, 5, SIGNPOST_ITEM, CianwoodCityHiddenMaxEther - -.PersonEvents: + bg_event 34, 20, BGEVENT_READ, CianwoodCitySign + bg_event 45, 7, BGEVENT_READ, CianwoodGymSign + bg_event 43, 24, BGEVENT_READ, CianwoodPokecenterSign + bg_event 47, 19, BGEVENT_READ, CianwoodPharmacySign + bg_event 32, 8, BGEVENT_READ, CianwoodPhotoStudioSign + bg_event 24, 8, BGEVENT_READ, CianwoodPokeSeerSign + bg_event 19, 4, BGEVENT_ITEM, CianwoodCityHiddenRevive + bg_event 29, 5, BGEVENT_ITEM, CianwoodCityHiddenMaxEther + +.ObjectEvents: db 12 - person_event SPRITE_STANDING_YOUNGSTER, 37, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CianwoodCityYoungster, -1 - person_event SPRITE_POKEFAN_M, 33, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1 - person_event SPRITE_LASS, 42, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityLass, -1 - person_event SPRITE_ROCK, 16, 8, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 17, 9, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 25, 4, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 29, 5, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 27, 10, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 19, 4, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 - person_event SPRITE_POKEFAN_F, 46, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityChucksWife, -1 - person_event SPRITE_SUPER_NERD, 21, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE - person_event SPRITE_SUICUNE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY + object_event SPRITE_STANDING_YOUNGSTER, 37, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodCityYoungster, -1 + object_event SPRITE_POKEFAN_M, 33, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1 + object_event SPRITE_LASS, 42, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityLass, -1 + object_event SPRITE_ROCK, 16, 8, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event SPRITE_ROCK, 17, 9, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event SPRITE_ROCK, 25, 4, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event SPRITE_ROCK, 29, 5, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event SPRITE_ROCK, 27, 10, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event SPRITE_ROCK, 19, 4, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event SPRITE_POKEFAN_F, 46, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityChucksWife, -1 + object_event SPRITE_SUPER_NERD, 21, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE + object_event SPRITE_SUICUNE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index 026050f6a..0a901ff28 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -2,7 +2,7 @@ const_value set 2 const CIANWOODCITYPHOTOSTUDIO_FISHING_GURU CianwoodCityPhotoStudio_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -57,12 +57,12 @@ CianwoodCityPhotoStudio_MapEventHeader: warp_def $7, $2, 5, CIANWOOD_CITY warp_def $7, $3, 5, CIANWOOD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1 + object_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 6e7f508ec..34c6df728 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -10,7 +10,7 @@ const_value set 2 const CIANWOODGYM_BOULDER4 CianwoodGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -50,7 +50,7 @@ ChuckScript_0x9d60f: waitsfx setflag ENGINE_STORMBADGE checkcode VAR_BADGES - scall CianwoodGymTriggerRockets + scall CianwoodGymActivateRockets .FightDone: checkevent EVENT_GOT_TM01_DYNAMICPUNCH iftrue .AlreadyGotTM @@ -75,7 +75,7 @@ ChuckScript_0x9d60f: closetext end -CianwoodGymTriggerRockets: +CianwoodGymActivateRockets: if_equal 7, .RadioTowerRockets if_equal 6, .GoldenrodRockets end @@ -314,22 +314,22 @@ CianwoodGym_MapEventHeader: warp_def $11, $4, 2, CIANWOOD_CITY warp_def $11, $5, 2, CIANWOOD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 15, 3, SIGNPOST_READ, CianwoodGymStatue - signpost 15, 6, SIGNPOST_READ, CianwoodGymStatue + bg_event 15, 3, BGEVENT_READ, CianwoodGymStatue + bg_event 15, 6, BGEVENT_READ, CianwoodGymStatue -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_CHUCK, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1 - person_event SPRITE_BLACK_BELT, 12, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1 - person_event SPRITE_BLACK_BELT, 12, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBlackbeltLao, -1 - person_event SPRITE_BLACK_BELT, 9, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerBlackbeltNob, -1 - person_event SPRITE_BLACK_BELT, 5, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerBlackbeltLung, -1 - person_event SPRITE_BOULDER, 1, 5, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 - person_event SPRITE_BOULDER, 7, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 - person_event SPRITE_BOULDER, 7, 4, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 - person_event SPRITE_BOULDER, 7, 5, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 + object_event SPRITE_CHUCK, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1 + object_event SPRITE_BLACK_BELT, 12, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1 + object_event SPRITE_BLACK_BELT, 12, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1 + object_event SPRITE_BLACK_BELT, 9, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltNob, -1 + object_event SPRITE_BLACK_BELT, 5, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBlackbeltLung, -1 + object_event SPRITE_BOULDER, 1, 5, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 + object_event SPRITE_BOULDER, 7, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 + object_event SPRITE_BOULDER, 7, 4, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 + object_event SPRITE_BOULDER, 7, 5, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 0ab10dd82..2457ef435 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -4,25 +4,25 @@ const_value set 2 const CIANWOODLUGIASPEECHHOUSE_TWIN CianwoodLugiaSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -TeacherScript_0x9e1b0: - jumptextfaceplayer UnknownText_0x9e1bc +CianwoodLugiaSpeechHouseTeacherScript: + jumptextfaceplayer CianwoodLugiaSpeechHouseTeacherText -LassScript_0x9e1b3: - jumptextfaceplayer UnknownText_0x9e23f +CianwoodLugiaSpeechHouseLassScript: + jumptextfaceplayer CianwoodLugiaSpeechHouseLassText -TwinScript_0x9e1b6: - jumptextfaceplayer UnknownText_0x9e2a9 +CianwoodLugiaSpeechHouseTwinScript: + jumptextfaceplayer CianwoodLugiaSpeechHouseTwinText CianwoodLugiaSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x9e1bc: +CianwoodLugiaSpeechHouseTeacherText: text "You came from" line "OLIVINE?" @@ -36,7 +36,7 @@ UnknownText_0x9e1bc: cont "them." done -UnknownText_0x9e23f: +CianwoodLugiaSpeechHouseLassText: text "I heard that you" line "can only see it if" @@ -48,7 +48,7 @@ UnknownText_0x9e23f: cont "creature." done -UnknownText_0x9e2a9: +CianwoodLugiaSpeechHouseTwinText: text "I've heard that" line "the whirlpools" @@ -70,16 +70,16 @@ CianwoodLugiaSpeechHouse_MapEventHeader: warp_def $7, $2, 6, CIANWOOD_CITY warp_def $7, $3, 6, CIANWOOD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, CianwoodLugiaSpeechHouseBookshelf - signpost 1, 1, SIGNPOST_READ, CianwoodLugiaSpeechHouseBookshelf + bg_event 1, 0, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x9e1b0, -1 - person_event SPRITE_LASS, 5, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x9e1b3, -1 - person_event SPRITE_TWIN, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TwinScript_0x9e1b6, -1 + object_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1 + object_event SPRITE_LASS, 5, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1 + object_event SPRITE_TWIN, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 2a3f49c9d..4a6cf826e 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -2,16 +2,14 @@ const_value set 2 const CIANWOODPHARMACY_PHARMACIST CianwoodPharmacy_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - - ; triggers - dw CianwoodPharmacyTrigger, 0 + scene_script .DummyScene .MapCallbacks: db 0 -CianwoodPharmacyTrigger: +.DummyScene: end CianwoodPharmacist: @@ -83,14 +81,14 @@ CianwoodPharmacy_MapEventHeader: warp_def $7, $2, 4, CIANWOOD_CITY warp_def $7, $3, 4, CIANWOOD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, CianwoodPharmacyBookshelf - signpost 1, 1, SIGNPOST_READ, CianwoodPharmacyBookshelf + bg_event 1, 0, BGEVENT_READ, CianwoodPharmacyBookshelf + bg_event 1, 1, BGEVENT_READ, CianwoodPharmacyBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_PHARMACIST, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CianwoodPharmacist, -1 + object_event SPRITE_PHARMACIST, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1 diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokecenter1F.asm index 7cd5818d5..ab39de7ca 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -4,8 +4,8 @@ const_value set 2 const CIANWOODPOKECENTER1F_GYM_GUY const CIANWOODPOKECENTER1F_SUPER_NERD -CianwoodPokeCenter1F_MapScriptHeader: -.MapTriggers: +CianwoodPokecenter1F_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: @@ -14,8 +14,8 @@ CianwoodPokeCenter1F_MapScriptHeader: NurseScript_0x9dbcf: jumpstd pokecenternurse -LassScript_0x9dbd2: - jumptextfaceplayer UnknownText_0x9dbed +CianwoodPokecenter1FLassScript: + jumptextfaceplayer CianwoodPokecenter1FLassText CianwoodGymGuyScript: faceplayer @@ -34,10 +34,10 @@ CianwoodGymGuyScript: closetext end -SuperNerdScript_0x9dbea: - jumptextfaceplayer UnknownText_0x9ded7 +CianwoodPokecenter1FSuperNerdScript: + jumptextfaceplayer CianwoodPokecenter1FSuperNerdText -UnknownText_0x9dbed: +CianwoodPokecenter1FLassText: text "Did you meet the" line "#MANIAC?" @@ -117,7 +117,7 @@ UnknownText_0x9de66: cont "gotta crank it up!" done -UnknownText_0x9ded7: +CianwoodPokecenter1FSuperNerdText: text "I love showing off" line "the #MON that" @@ -131,7 +131,7 @@ UnknownText_0x9ded7: line "off my #MON!" done -CianwoodPokeCenter1F_MapEventHeader: +CianwoodPokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -141,15 +141,15 @@ CianwoodPokeCenter1F_MapEventHeader: warp_def $7, $4, 3, CIANWOOD_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1 - person_event SPRITE_LASS, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x9dbd2, -1 - person_event SPRITE_GYM_GUY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1 - person_event SPRITE_SUPER_NERD, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x9dbea, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1 + object_event SPRITE_LASS, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1 + object_event SPRITE_GYM_GUY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1 + object_event SPRITE_SUPER_NERD, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 62e79ad4f..f5723a4fd 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -2,13 +2,11 @@ const_value set 2 const CINNABARISLAND_BLUE CinnabarIsland_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -33,7 +31,7 @@ CinnabarIslandGymSign: CinnabarIslandSign: jumptext CinnabarIslandSignText -CinnabarIslandPokeCenterSign: +CinnabarIslandPokecenterSign: jumpstd pokecentersign CinnabarIslandHiddenRareCandy: @@ -137,16 +135,16 @@ CinnabarIsland_MapEventHeader: db 1 warp_def $b, $b, 1, CINNABAR_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 11, 12, SIGNPOST_READ, CinnabarIslandPokeCenterSign - signpost 11, 9, SIGNPOST_READ, CinnabarIslandGymSign - signpost 7, 7, SIGNPOST_READ, CinnabarIslandSign - signpost 1, 9, SIGNPOST_ITEM, CinnabarIslandHiddenRareCandy + bg_event 11, 12, BGEVENT_READ, CinnabarIslandPokecenterSign + bg_event 11, 9, BGEVENT_READ, CinnabarIslandGymSign + bg_event 7, 7, BGEVENT_READ, CinnabarIslandSign + bg_event 1, 9, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_BLUE, 6, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR + object_event SPRITE_BLUE, 6, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokeCenter1F.asm deleted file mode 100644 index a97aae5c6..000000000 --- a/maps/CinnabarPokeCenter1F.asm +++ /dev/null @@ -1,57 +0,0 @@ -const_value set 2 - const CINNABARPOKECENTER1F_NURSE - const CINNABARPOKECENTER1F_COOLTRAINER_F - const CINNABARPOKECENTER1F_FISHER - -CinnabarPokeCenter1F_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -NurseScript_0x1ab32c: - jumpstd pokecenternurse - -CooltrainerFScript_0x1ab32f: - jumptextfaceplayer UnknownText_0x1ab335 - -FisherScript_0x1ab332: - jumptextfaceplayer UnknownText_0x1ab37f - -UnknownText_0x1ab335: - text "CINNABAR GYM's" - line "BLAINE apparently" - - para "lives alone in the" - line "SEAFOAM ISLANDS" - cont "cave…" - done - -UnknownText_0x1ab37f: - text "It's been a year" - line "since the volcano" - cont "erupted." - done - -CinnabarPokeCenter1F_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def $7, $3, 1, CINNABAR_ISLAND - warp_def $7, $4, 1, CINNABAR_ISLAND - warp_def $7, $0, 1, POKECENTER_2F - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 3 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1 - person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1ab32f, -1 - person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1ab332, -1 diff --git a/maps/CinnabarPokeCenter2FBeta.asm b/maps/CinnabarPokeCenter2FBeta.asm deleted file mode 100644 index fb9d96b7a..000000000 --- a/maps/CinnabarPokeCenter2FBeta.asm +++ /dev/null @@ -1,23 +0,0 @@ -CinnabarPokeCenter2FBeta_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -CinnabarPokeCenter2FBeta_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def $7, $0, 3, CINNABAR_POKECENTER_1F - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 0 diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm new file mode 100644 index 000000000..a079b8df0 --- /dev/null +++ b/maps/CinnabarPokecenter1F.asm @@ -0,0 +1,57 @@ +const_value set 2 + const CINNABARPOKECENTER1F_NURSE + const CINNABARPOKECENTER1F_COOLTRAINER_F + const CINNABARPOKECENTER1F_FISHER + +CinnabarPokecenter1F_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +NurseScript_0x1ab32c: + jumpstd pokecenternurse + +CinnabarPokecenter1FCooltrainerFScript: + jumptextfaceplayer CinnabarPokecenter1FCooltrainerFText + +CinnabarPokecenter1FFisherScript: + jumptextfaceplayer CinnabarPokecenter1FFisherText + +CinnabarPokecenter1FCooltrainerFText: + text "CINNABAR GYM's" + line "BLAINE apparently" + + para "lives alone in the" + line "SEAFOAM ISLANDS" + cont "cave…" + done + +CinnabarPokecenter1FFisherText: + text "It's been a year" + line "since the volcano" + cont "erupted." + done + +CinnabarPokecenter1F_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 3 + warp_def $7, $3, 1, CINNABAR_ISLAND + warp_def $7, $4, 1, CINNABAR_ISLAND + warp_def $7, $0, 1, POKECENTER_2F + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 3 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1 + object_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1 + object_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1 diff --git a/maps/CinnabarPokecenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm new file mode 100644 index 000000000..3ef9d77c7 --- /dev/null +++ b/maps/CinnabarPokecenter2FBeta.asm @@ -0,0 +1,23 @@ +CinnabarPokecenter2FBeta_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +CinnabarPokecenter2FBeta_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 1 + warp_def $7, $0, 3, CINNABAR_POKECENTER_1F + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 0 diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 25794f5c0..b17f10d30 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -3,34 +3,28 @@ const_value set 2 const COLOSSEUM_CHRIS2 Colosseum_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + scene_script .InitializeColosseum + scene_script .DummyScene1 + scene_script .DummyScene2 .MapCallbacks: db 2 + dbw MAPCALLBACK_OBJECTS, .SetWhichChris + dbw MAPCALLBACK_NEWMAP, .PreparePokecenter2F - ; callbacks - - dbw MAPCALLBACK_OBJECTS, ColosseumScript_SetWhichChris - - dbw MAPCALLBACK_NEWMAP, ColosseumScript_InitializeCB - -.Trigger0: - priorityjump ColosseumScript_Initialize +.InitializeColosseum: + priorityjump .InitializeAndPreparePokecenter2F end -.Trigger1: +.DummyScene1: end -.Trigger2: +.DummyScene2: end -ColosseumScript_SetWhichChris: +.SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 disappear COLOSSEUM_CHRIS2 @@ -42,13 +36,13 @@ ColosseumScript_SetWhichChris: appear COLOSSEUM_CHRIS2 return -ColosseumScript_InitializeCB: - domaptrigger POKECENTER_2F, $2 +.PreparePokecenter2F: + setmapscene POKECENTER_2F, $2 return -ColosseumScript_Initialize: - dotrigger $1 - domaptrigger POKECENTER_2F, $2 +.InitializeAndPreparePokecenter2F: + setscene $1 + setmapscene POKECENTER_2F, $2 end MapColosseumSignpost1Script: @@ -77,15 +71,15 @@ Colosseum_MapEventHeader: warp_def $7, $4, 3, POKECENTER_2F warp_def $7, $5, 3, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 4, 4, SIGNPOST_RIGHT, MapColosseumSignpost1Script - signpost 4, 5, SIGNPOST_LEFT, MapColosseumSignpost1Script + bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script + bg_event 4, 5, BGEVENT_LEFT, MapColosseumSignpost1Script -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT + object_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS + object_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index cf8bd771c..e1df41b43 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -4,14 +4,14 @@ const_value set 2 const COPYCATSHOUSE1F_CLEFAIRY CopycatsHouse1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -PokefanMScript_0x18ad13: - jumptextfaceplayer UnknownText_0x18ad34 +CopycatsHouse1FPokefanMScript: + jumptextfaceplayer CopycatsHouse1FPokefanMText PokefanFScript_0x18ad16: faceplayer @@ -37,7 +37,7 @@ ClefairyScript_0x18ad2a: closetext end -UnknownText_0x18ad34: +CopycatsHouse1FPokefanMText: text "My daughter likes" line "to mimic people." @@ -82,14 +82,14 @@ CopycatsHouse1F_MapEventHeader: warp_def $7, $3, 8, SAFFRON_CITY warp_def $0, $2, 1, COPYCATS_HOUSE_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x18ad13, -1 - person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1 - person_event SPRITE_CLEFAIRY, 6, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1 + object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1 + object_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1 + object_event SPRITE_CLEFAIRY, 6, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 41689241d..73fe945e5 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -7,14 +7,11 @@ const_value set 2 const COPYCATSHOUSE2F_COPYCAT2 ; if player is female CopycatsHouse2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Callback .Callback: @@ -371,19 +368,19 @@ CopycatsHouse2F_MapEventHeader: db 1 warp_def $0, $3, 3, COPYCATS_HOUSE_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, CopycatsHouse2FBookshelf - signpost 1, 1, SIGNPOST_READ, CopycatsHouse2FBookshelf + bg_event 1, 0, BGEVENT_READ, CopycatsHouse2FBookshelf + bg_event 1, 1, BGEVENT_READ, CopycatsHouse2FBookshelf -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1 - person_event SPRITE_MOLTRES, 4, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, CopycatsDodrio, -1 - person_event SPRITE_FAIRY, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL - person_event SPRITE_MONSTER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 - person_event SPRITE_BIRD, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 - person_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2 + object_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1 + object_event SPRITE_MOLTRES, 4, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CopycatsDodrio, -1 + object_event SPRITE_FAIRY, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL + object_event SPRITE_MONSTER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 + object_event SPRITE_BIRD, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 + object_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2 diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index d4a647207..58184be24 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -10,63 +10,63 @@ const_value set 2 const DANCETHEATRE_GRANNY DanceTheatre_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerKimono_girlNaoko2: - trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, 0, Kimono_girlNaoko2Script + trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, 0, .Script -Kimono_girlNaoko2Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x99579 + writetext Kimono_girlNaoko2AfterBattleText waitbutton closetext end TrainerKimono_girlSayo: - trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, 0, Kimono_girlSayoScript + trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, 0, .Script -Kimono_girlSayoScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x9960b + writetext Kimono_girlSayoAfterBattleText waitbutton closetext end TrainerKimono_girlZuki: - trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, 0, Kimono_girlZukiScript + trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, 0, .Script -Kimono_girlZukiScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x99688 + writetext Kimono_girlZukiAfterBattleText waitbutton closetext end TrainerKimono_girlKuni: - trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, 0, Kimono_girlKuniScript + trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, 0, .Script -Kimono_girlKuniScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x99714 + writetext Kimono_girlKuniAfterBattleText waitbutton closetext end TrainerKimono_girlMiki: - trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, 0, Kimono_girlMikiScript + trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, 0, .Script -Kimono_girlMikiScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x997a8 + writetext Kimono_girlMikiAfterBattleText waitbutton closetext end @@ -128,11 +128,11 @@ RhydonScript_0x9951b: closetext end -CooltrainerMScript_0x99525: - jumptextfaceplayer UnknownText_0x99a24 +DanceTheatreCooltrainerMScript: + jumptextfaceplayer DanceTheatreCooltrainerMText -GrannyScript_0x99528: - jumptextfaceplayer UnknownText_0x99aaa +DanceTheatreGrannyScript: + jumptextfaceplayer DanceTheatreGrannyText MapDanceTheatreSignpost1Script: jumptext UnknownText_0x99b79 @@ -148,7 +148,7 @@ Kimono_girlNaoko2BeatenText: line "strong." done -UnknownText_0x99579: +Kimono_girlNaoko2AfterBattleText: text "I enjoyed that" line "bout. I would like" cont "to see you again." @@ -167,7 +167,7 @@ Kimono_girlSayoBeatenText: line "I almost had you." done -UnknownText_0x9960b: +Kimono_girlSayoAfterBattleText: text "Rhythm is impor-" line "tant for both" @@ -188,7 +188,7 @@ Kimono_girlZukiBeatenText: line "#MON left…" done -UnknownText_0x99688: +Kimono_girlZukiAfterBattleText: text "I put a different" line "flower in my bar-" cont "rette every month." @@ -205,7 +205,7 @@ Kimono_girlKuniBeatenText: line "than you look." done -UnknownText_0x99714: +Kimono_girlKuniAfterBattleText: text "I trained a lot," line "so I thought I was" @@ -224,7 +224,7 @@ Kimono_girlMikiBeatenText: line "at #MON too." done -UnknownText_0x997a8: +Kimono_girlMikiAfterBattleText: text "I can keep dancing" line "because there are" @@ -298,7 +298,7 @@ UnknownText_0x99a0a: line "gugogooh!" done -UnknownText_0x99a24: +DanceTheatreCooltrainerMText: text "That man's always" line "with his RHYDON." @@ -312,7 +312,7 @@ UnknownText_0x99a24: cont "#MON?" done -UnknownText_0x99aaa: +DanceTheatreGrannyText: text "The KIMONO GIRLS" line "are so beautiful…" @@ -346,22 +346,22 @@ DanceTheatre_MapEventHeader: warp_def $d, $5, 8, ECRUTEAK_CITY warp_def $d, $6, 8, ECRUTEAK_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 6, 5, SIGNPOST_UP, MapDanceTheatreSignpost1Script - signpost 6, 6, SIGNPOST_UP, MapDanceTheatreSignpost1Script + bg_event 6, 5, BGEVENT_UP, MapDanceTheatreSignpost1Script + bg_event 6, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_KIMONO_GIRL, 2, 0, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 0, TrainerKimono_girlNaoko2, -1 - person_event SPRITE_KIMONO_GIRL, 1, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 0, TrainerKimono_girlSayo, -1 - person_event SPRITE_KIMONO_GIRL, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, TrainerKimono_girlZuki, -1 - person_event SPRITE_KIMONO_GIRL, 1, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 0, TrainerKimono_girlKuni, -1 - person_event SPRITE_KIMONO_GIRL, 2, 11, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 0, TrainerKimono_girlMiki, -1 - person_event SPRITE_GENTLEMAN, 10, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x994c6, -1 - person_event SPRITE_RHYDON, 8, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, RhydonScript_0x9951b, -1 - person_event SPRITE_COOLTRAINER_M, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x99525, -1 - person_event SPRITE_GRANNY, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x99528, -1 + object_event SPRITE_KIMONO_GIRL, 2, 0, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimono_girlNaoko2, -1 + object_event SPRITE_KIMONO_GIRL, 1, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimono_girlSayo, -1 + object_event SPRITE_KIMONO_GIRL, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimono_girlZuki, -1 + object_event SPRITE_KIMONO_GIRL, 1, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimono_girlKuni, -1 + object_event SPRITE_KIMONO_GIRL, 2, 11, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimono_girlMiki, -1 + object_event SPRITE_GENTLEMAN, 10, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x994c6, -1 + object_event SPRITE_RHYDON, 8, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9951b, -1 + object_event SPRITE_COOLTRAINER_M, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DanceTheatreCooltrainerMScript, -1 + object_event SPRITE_GRANNY, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index ead75b1d8..e003d2951 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -4,26 +4,26 @@ const_value set 2 const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2 DarkCaveBlackthornEntrance_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -PharmacistScript_0x18c720: +DarkCaveBlackthornEntrancePharmacistScript: faceplayer opentext checkevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE - iftrue UnknownScript_0x18c735 - writetext UnknownText_0x18c73f + iftrue .GotBlackglasses + writetext DarkCaveBlackthornEntrancePharmacistText1 buttonsound verbosegiveitem BLACKGLASSES - iffalse UnknownScript_0x18c739 + iffalse .PackFull setevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE -UnknownScript_0x18c735: - writetext UnknownText_0x18c80c +.GotBlackglasses: + writetext DarkCaveBlackthornEntrancePharmacistText2 waitbutton -UnknownScript_0x18c739: +.PackFull: closetext end @@ -33,7 +33,7 @@ DarkCaveBlackthornEntranceRevive: DarkCaveBlackthornEntranceTMSnore: itemball TM_SNORE -UnknownText_0x18c73f: +DarkCaveBlackthornEntrancePharmacistText1: text "Whoa! You startled" line "me there!" @@ -55,7 +55,7 @@ UnknownText_0x18c73f: cont "you saw me, OK?" done -UnknownText_0x18c80c: +DarkCaveBlackthornEntrancePharmacistText2: text "BLACKGLASSES ups" line "the power of dark-" cont "type moves." @@ -70,14 +70,14 @@ DarkCaveBlackthornEntrance_MapEventHeader: warp_def $3, $17, 1, ROUTE_45 warp_def $19, $3, 2, DARK_CAVE_VIOLET_ENTRANCE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_PHARMACIST, 3, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x18c720, -1 - person_event SPRITE_POKE_BALL, 24, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE - person_event SPRITE_POKE_BALL, 22, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE + object_event SPRITE_PHARMACIST, 3, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1 + object_event SPRITE_POKE_BALL, 24, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE + object_event SPRITE_POKE_BALL, 22, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index b9c5c5380..03ab3b072 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -9,7 +9,7 @@ const_value set 2 const DARKCAVEVIOLETENTRANCE_POKE_BALL4 DarkCaveVioletEntrance_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -44,20 +44,20 @@ DarkCaveVioletEntrance_MapEventHeader: warp_def $1, $11, 2, DARK_CAVE_BLACKTHORN_ENTRANCE warp_def $21, $23, 3, ROUTE_46 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 3, 26, SIGNPOST_ITEM, DarkCaveVioletEntranceHiddenElixer + bg_event 3, 26, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_POKE_BALL, 8, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION - person_event SPRITE_ROCK, 14, 16, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_ROCK, 6, 27, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_ROCK, 14, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_ROCK, 31, 36, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_POKE_BALL, 22, 36, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntranceFullHeal, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL - person_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION - person_event SPRITE_POKE_BALL, 28, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT + object_event SPRITE_POKE_BALL, 8, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION + object_event SPRITE_ROCK, 14, 16, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 + object_event SPRITE_ROCK, 6, 27, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 + object_event SPRITE_ROCK, 14, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 + object_event SPRITE_ROCK, 31, 36, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 + object_event SPRITE_POKE_BALL, 22, 36, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceFullHeal, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL + object_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION + object_event SPRITE_POKE_BALL, 28, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 1eb84e034..fc7865f98 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -3,26 +3,23 @@ const_value set 2 const DAYCARE_GRANNY DayCare_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: - checkflag ENGINE_DAYCARE_MAN_HAS_EGG - iftrue .PutDaycareManOutside - clearevent EVENT_DAYCARE_MAN_IN_DAYCARE - setevent EVENT_DAYCARE_MAN_ON_ROUTE_34 + checkflag ENGINE_DAY_CARE_MAN_HAS_EGG + iftrue .PutDayCareManOutside + clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE + setevent EVENT_DAY_CARE_MAN_ON_ROUTE_34 return -.PutDaycareManOutside: - setevent EVENT_DAYCARE_MAN_IN_DAYCARE - clearevent EVENT_DAYCARE_MAN_ON_ROUTE_34 +.PutDayCareManOutside: + setevent EVENT_DAY_CARE_MAN_IN_DAY_CARE + clearevent EVENT_DAY_CARE_MAN_ON_ROUTE_34 return DayCareManScript_Inside: @@ -62,7 +59,7 @@ DayCareManScript_Inside: DayCareLadyScript: faceplayer opentext - checkflag ENGINE_DAYCARE_MAN_HAS_EGG + checkflag ENGINE_DAY_CARE_MAN_HAS_EGG iftrue .HusbandWasLookingForYou special Special_DayCareLady waitbutton @@ -169,15 +166,15 @@ DayCare_MapEventHeader: warp_def $7, $2, 5, ROUTE_34 warp_def $7, $3, 5, ROUTE_34 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, DayCareBookshelf - signpost 1, 1, SIGNPOST_READ, DayCareBookshelf + bg_event 1, 0, BGEVENT_READ, DayCareBookshelf + bg_event 1, 1, BGEVENT_READ, DayCareBookshelf -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAYCARE_MAN_IN_DAYCARE - person_event SPRITE_GRANNY, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, DayCareLadyScript, -1 + object_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE + object_event SPRITE_GRANNY, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DayCareLadyScript, -1 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 88aa1e90b..53c3f73dd 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -2,20 +2,20 @@ const_value set 2 const DIGLETTSCAVE_POKEFAN_M DiglettsCave_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -PokefanMScript_0x74002: - jumptextfaceplayer UnknownText_0x74008 +DiglettsCavePokefanMScript: + jumptextfaceplayer DiglettsCavePokefanMText DiglettsCaveHiddenMaxRevive: dwb EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE -UnknownText_0x74008: +DiglettsCavePokefanMText: text "A bunch of DIGLETT" line "popped out of the" @@ -36,13 +36,13 @@ DiglettsCave_MapEventHeader: warp_def $21, $11, 2, DIGLETTS_CAVE warp_def $3, $3, 4, DIGLETTS_CAVE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 11, 6, SIGNPOST_ITEM, DiglettsCaveHiddenMaxRevive + bg_event 11, 6, BGEVENT_ITEM, DiglettsCaveHiddenMaxRevive -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKEFAN_M, 31, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x74002, -1 + object_event SPRITE_POKEFAN_M, 31, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index ebd833ccd..0e805f230 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -5,24 +5,22 @@ const_value set 2 const DRAGONSHRINE_CLAIR DragonShrine_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .DragonShrineTest + scene_script .DummyScene .MapCallbacks: db 0 -.Trigger0: - priorityjump DragonShrineTestScript +.DragonShrineTest: + priorityjump .DragonShrineTestScript end -.Trigger1: +.DummyScene: end -DragonShrineTestScript: +.DragonShrineTestScript: applymovement PLAYER, MovementData_0x18d2bf applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c7 opentext @@ -167,8 +165,8 @@ DragonShrineTestScript: waitsfx special RestartMapMusic specialphonecall SPECIALCALL_MASTERBALL - dotrigger $1 - domaptrigger DRAGONS_DEN_B1F, $1 + setscene $1 + setmapscene DRAGONS_DEN_B1F, $1 writetext UnknownText_0x18d9f2 buttonsound writetext UnknownText_0x18da0b @@ -272,10 +270,10 @@ MenuDataHeader_0x18d215: db $40 ; flags db 04, 08 ; start coords db 11, 19 ; end coords - dw MenuData2_0x18d21d + dw .MenuData2 db 1 ; default option -MenuData2_0x18d21d: +.MenuData2: db $81 ; flags db 3 ; items db "Pal@" @@ -287,10 +285,10 @@ MenuDataHeader_0x18d234: db $40 ; flags db 04, 09 ; start coords db 11, 19 ; end coords - dw MenuData2_0x18d23c + dw .MenuData2 db 1 ; default option -MenuData2_0x18d23c: +.MenuData2: db $81 ; flags db 3 ; items db "Strategy@" @@ -302,10 +300,10 @@ MenuDataHeader_0x18d258: db $40 ; flags db 04, 05 ; start coords db 11, 19 ; end coords - dw MenuData2_0x18d260 + dw .MenuData2 db 1 ; default option -MenuData2_0x18d260: +.MenuData2: db $81 ; flags db 3 ; items db "Weak person@" @@ -317,10 +315,10 @@ MenuDataHeader_0x18d283: db $40 ; flags db 04, 08 ; start coords db 11, 19 ; end coords - dw MenuData2_0x18d28b + dw .MenuData2 db 1 ; default option -MenuData2_0x18d28b: +.MenuData2: db $81 ; flags db 3 ; items db "Love@" @@ -332,10 +330,10 @@ MenuDataHeader_0x18d2a5: db $40 ; flags db 04, 12 ; start coords db 11, 19 ; end coords - dw MenuData2_0x18d2ad + dw .MenuData2 db 1 ; default option -MenuData2_0x18d2ad: +.MenuData2: db $81 ; flags db 3 ; items db "Tough@" @@ -679,15 +677,15 @@ DragonShrine_MapEventHeader: warp_def $9, $4, 2, DRAGONS_DEN_B1F warp_def $9, $5, 2, DRAGONS_DEN_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_ELDER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_ELDER, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_ELDER, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_CLAIR, 8, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR + object_event SPRITE_ELDER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS + object_event SPRITE_ELDER, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS + object_event SPRITE_ELDER, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS + object_event SPRITE_CLAIR, 8, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index aaadae4d4..46f6a30a5 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -1,5 +1,5 @@ DragonsDen1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,11 +16,11 @@ DragonsDen1F_MapEventHeader: warp_def $f, $5, 1, DRAGONS_DEN_B1F warp_def $d, $5, 2, DRAGONS_DEN_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 3a93fc87d..c638132f5 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -10,24 +10,19 @@ const_value set 2 const DRAGONSDENB1F_POKE_BALL3 DragonsDenB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .CheckSilver -.Trigger0: +.DummyScene0: end -.Trigger1: +.DummyScene1: end .CheckSilver: @@ -47,7 +42,7 @@ DragonsDenB1F_MapScriptHeader: appear DRAGONSDENB1F_SILVER return -DragonsDenB1F_ClairTrigger: +DragonsDenB1F_ClairScene: appear DRAGONSDENB1F_CLAIR opentext writetext ClairText_Wait @@ -85,49 +80,49 @@ DragonsDenB1F_ClairTrigger: pause 30 special RestartMapMusic disappear DRAGONSDENB1F_CLAIR - dotrigger $0 + setscene $0 end TrainerCooltrainermDarin: - trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, CooltrainermDarinScript + trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, .Script -CooltrainermDarinScript: +.Script: end_if_just_battled opentext - writetext CooltrainermDarinAfterText + writetext CooltrainermDarinAfterBattleText waitbutton closetext end TrainerCooltrainerfCara: - trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, CooltrainerfCaraScript + trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, .Script -CooltrainerfCaraScript: +.Script: end_if_just_battled opentext - writetext CooltrainerfCaraAfterText + writetext CooltrainerfCaraAfterBattleText waitbutton closetext end TrainerTwinsLeaandpia1: - trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, TwinsLeaandpia1Script + trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, .Script -TwinsLeaandpia1Script: +.Script: end_if_just_battled opentext - writetext TrinsLeaandpia1AfterText + writetext TwinsLeaandpia1AfterBattleText waitbutton closetext end TrainerTwinsLeaandpia2: - trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, TwinsLeaandpia2Script + trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, .Script -TwinsLeaandpia2Script: +.Script: end_if_just_battled opentext - writetext TrinsLeaandpia2AfterText + writetext TwinsLeaandpia2AfterBattleText waitbutton closetext end @@ -332,7 +327,7 @@ CooltrainermDarinBeatenText: text "S-strong!" done -CooltrainermDarinAfterText: +CooltrainermDarinAfterBattleText: text "The SHRINE ahead" line "is home to the" @@ -352,7 +347,7 @@ CooltrainerfCaraBeatenText: text "Oh yikes, I lost!" done -CooltrainerfCaraAfterText: +CooltrainerfCaraAfterBattleText: text "Soon I'm going to" line "get permission" @@ -378,7 +373,7 @@ TwinsLeaandpia1BeatenText: text "Ouchies." done -TrinsLeaandpia1AfterText: +TwinsLeaandpia1AfterBattleText: text "It was like having" line "to battle LANCE." done @@ -391,7 +386,7 @@ TwinsLeaandpia2BeatenText: text "Meanie." done -TrinsLeaandpia2AfterText: +TwinsLeaandpia2AfterBattleText: text "We'll tell on you." para "MASTER will be" @@ -420,25 +415,25 @@ DragonsDenB1F_MapEventHeader: warp_def $3, $14, 3, DRAGONS_DEN_1F warp_def $1d, $13, 1, DRAGON_SHRINE -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 1, $1e, $13, $0, DragonsDenB1F_ClairTrigger, $0, $0 + coord_event 1, $1e, $13, DragonsDenB1F_ClairScene -.Signposts: +.BGEvents: db 4 - signpost 24, 18, SIGNPOST_READ, MapDragonsDenB1FSignpost0Script - signpost 29, 33, SIGNPOST_ITEM, DragonsDenB1FHiddenRevive - signpost 17, 21, SIGNPOST_ITEM, DragonsDenB1FHiddenMaxPotion - signpost 15, 31, SIGNPOST_ITEM, DragonsDenB1FHiddenMaxElixer + bg_event 24, 18, BGEVENT_READ, MapDragonsDenB1FSignpost0Script + bg_event 29, 33, BGEVENT_ITEM, DragonsDenB1FHiddenRevive + bg_event 17, 21, BGEVENT_ITEM, DragonsDenB1FHiddenMaxPotion + bg_event 15, 31, BGEVENT_ITEM, DragonsDenB1FHiddenMaxElixer -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_POKE_BALL, 16, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG - person_event SPRITE_CLAIR, 30, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR - person_event SPRITE_SILVER, 23, 20, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN - person_event SPRITE_COOLTRAINER_M, 8, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1 - person_event SPRITE_COOLTRAINER_F, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1 - person_event SPRITE_TWIN, 17, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1 - person_event SPRITE_TWIN, 18, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1 - person_event SPRITE_POKE_BALL, 4, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DragonsDenB1FCalcium, EVENT_DRAGONS_DEN_B1F_CALCIUM - person_event SPRITE_POKE_BALL, 20, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER + object_event SPRITE_POKE_BALL, 16, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG + object_event SPRITE_CLAIR, 30, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR + object_event SPRITE_SILVER, 23, 20, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN + object_event SPRITE_COOLTRAINER_M, 8, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1 + object_event SPRITE_COOLTRAINER_F, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1 + object_event SPRITE_TWIN, 17, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1 + object_event SPRITE_TWIN, 18, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1 + object_event SPRITE_POKE_BALL, 4, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FCalcium, EVENT_DRAGONS_DEN_B1F_CALCIUM + object_event SPRITE_POKE_BALL, 20, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index a43e652a8..7da92ec0f 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -7,7 +7,7 @@ const_value set 2 const EARLSPOKEMONACADEMY_POKEDEX EarlsPokemonAcademy_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -38,35 +38,35 @@ AcademyEarl: closetext end -YoungsterScript_0x68a83: - jumptextfaceplayer UnknownText_0x68d80 +EarlsPokemonAcademyYoungster1Script: + jumptextfaceplayer EarlsPokemonAcademyYoungster1Text -GameboyKidScript_0x68a86: +EarlsPokemonAcademyGameboyKid1Script: faceplayer opentext - writetext UnknownText_0x68dda + writetext EarlsPokemonAcademyGameboyKid1Text waitbutton closetext spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN end -GameboyKidScript_0x68a91: +EarlsPokemonAcademyGameboyKid2Script: faceplayer opentext - writetext UnknownText_0x68e07 + writetext EarlsPokemonAcademyGameboyKid2Text waitbutton closetext spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN end -YoungsterScript_0x68a9c: - jumptextfaceplayer UnknownText_0x68e39 +EarlsPokemonAcademyYoungster2Script: + jumptextfaceplayer EarlsPokemonAcademyYoungster2Text AcademyBlackboard: opentext writetext AcademyBlackboardText .Loop: - loadmenudata .MenuHeader + loadmenudata .BlackboardMenuData _2dmenu closewindow if_equal $1, .Poison @@ -102,14 +102,14 @@ AcademyBlackboard: waitbutton jump .Loop -.MenuHeader: +.BlackboardMenuData: db $40 ; flags db 00, 00 ; start coords db 08, 11 ; end coords - dw .Data + dw .MenuData2 db 1 ; default option -.Data: +.MenuData2: db $80 ; flags dn 3, 2 ; rows, columns db 5 ; spacing @@ -231,7 +231,7 @@ UnknownText_0x68d31: line "you must be!" done -UnknownText_0x68d80: +EarlsPokemonAcademyYoungster1Text: text "I'm taking notes" line "of the teacher's" cont "lecture." @@ -241,19 +241,19 @@ UnknownText_0x68d80: cont "blackboard too." done -UnknownText_0x68dda: +EarlsPokemonAcademyGameboyKid1Text: text "I traded my best" line "#MON to the" cont "guy beside me." done -UnknownText_0x68e07: +EarlsPokemonAcademyGameboyKid2Text: text "Huh? The #MON I" line "just got is hold-" cont "ing something!" done -UnknownText_0x68e39: +EarlsPokemonAcademyYoungster2Text: text "A #MON holding" line "a BERRY will heal" cont "itself in battle." @@ -421,21 +421,21 @@ EarlsPokemonAcademy_MapEventHeader: warp_def $f, $3, 3, VIOLET_CITY warp_def $f, $4, 3, VIOLET_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 1, 0, SIGNPOST_READ, AcademyBookshelf - signpost 1, 1, SIGNPOST_READ, AcademyBookshelf - signpost 0, 3, SIGNPOST_READ, AcademyBlackboard - signpost 0, 4, SIGNPOST_READ, AcademyBlackboard + bg_event 1, 0, BGEVENT_READ, AcademyBookshelf + bg_event 1, 1, BGEVENT_READ, AcademyBookshelf + bg_event 0, 3, BGEVENT_READ, AcademyBlackboard + bg_event 0, 4, BGEVENT_READ, AcademyBlackboard -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_FISHER, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x68a83, -1 - person_event SPRITE_GAMEBOY_KID, 11, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x68a86, -1 - person_event SPRITE_GAMEBOY_KID, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x68a91, -1 - person_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x68a9c, -1 - person_event SPRITE_POKEDEX, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AcademyNotebook, -1 + object_event SPRITE_FISHER, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL + object_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1 + object_event SPRITE_GAMEBOY_KID, 11, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1 + object_event SPRITE_GAMEBOY_KID, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid2Script, -1 + object_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster2Script, -1 + object_event SPRITE_POKEDEX, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AcademyNotebook, -1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index b15850d2e..9e359419b 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -8,30 +8,28 @@ const_value set 2 const ECRUTEAKCITY_GRAMPS3 EcruteakCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_ECRUTEAK return -GrampsScript_0x1a4009: - jumptextfaceplayer UnknownText_0x1a4105 +EcruteakCityGramps1Script: + jumptextfaceplayer EcruteakCityGramps1Text -GrampsScript_0x1a400c: - jumptextfaceplayer UnknownText_0x1a4147 +EcruteakCityGramps2Script: + jumptextfaceplayer EcruteakCityGramps2Text -GrampsScript_0x1a400f: - jumptextfaceplayer UnknownText_0x1a43cb +EcruteakCityGramps3Script: + jumptextfaceplayer EcruteakCityGramps3Text -LassScript_0x1a4012: - jumptextfaceplayer UnknownText_0x1a41db +EcruteakCityLassScript: + jumptextfaceplayer EcruteakCityLassText LassScript_0x1a4015: faceplayer @@ -65,8 +63,8 @@ UnknownScript_0x1a4037: closetext end -YoungsterScript_0x1a403d: - jumptextfaceplayer UnknownText_0x1a4386 +EcruteakCityYoungsterScript: + jumptextfaceplayer EcruteakCityYoungsterText EcruteakCitySign: jumptext EcruteakCitySignText @@ -83,7 +81,7 @@ EcruteakDanceTheaterSign: BurnedTowerSign: jumptext BurnedTowerSignText -EcruteakCityPokeCenterSign: +EcruteakCityPokecenterSign: jumpstd pokecentersign EcruteakCityMartSign: @@ -113,7 +111,7 @@ UnusedMissingDaughterText: line "do…?" done -UnknownText_0x1a4105: +EcruteakCityGramps1Text: text "ECRUTEAK used to" line "have two towers:" @@ -121,7 +119,7 @@ UnknownText_0x1a4105: line "east and west." done -UnknownText_0x1a4147: +EcruteakCityGramps2Text: text "Ah, child." line "Have you learned" @@ -136,7 +134,7 @@ UnknownText_0x1a4147: cont "nice, I hear." done -UnknownText_0x1a41db: +EcruteakCityLassText: text "I'm going to prac-" line "tice at the DANCE" @@ -183,7 +181,7 @@ UnknownText_0x1a4325: cont "night again." done -UnknownText_0x1a4386: +EcruteakCityYoungsterText: text "I hear #MON are" line "rampaging at the" @@ -191,7 +189,7 @@ UnknownText_0x1a4386: line "like to see that." done -UnknownText_0x1a43cb: +EcruteakCityGramps3Text: text "In the distant" line "past…" @@ -283,26 +281,26 @@ EcruteakCity_MapEventHeader: warp_def $12, $0, 3, ROUTE_38_ECRUTEAK_GATE warp_def $13, $0, 4, ROUTE_38_ECRUTEAK_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 8 - signpost 21, 15, SIGNPOST_READ, EcruteakCitySign - signpost 10, 38, SIGNPOST_READ, TinTowerSign - signpost 28, 8, SIGNPOST_READ, EcruteakGymSign - signpost 21, 21, SIGNPOST_READ, EcruteakDanceTheaterSign - signpost 10, 2, SIGNPOST_READ, BurnedTowerSign - signpost 27, 24, SIGNPOST_READ, EcruteakCityPokeCenterSign - signpost 21, 30, SIGNPOST_READ, EcruteakCityMartSign - signpost 14, 23, SIGNPOST_ITEM, EcruteakCityHiddenHyperPotion - -.PersonEvents: + bg_event 21, 15, BGEVENT_READ, EcruteakCitySign + bg_event 10, 38, BGEVENT_READ, TinTowerSign + bg_event 28, 8, BGEVENT_READ, EcruteakGymSign + bg_event 21, 21, BGEVENT_READ, EcruteakDanceTheaterSign + bg_event 10, 2, BGEVENT_READ, BurnedTowerSign + bg_event 27, 24, BGEVENT_READ, EcruteakCityPokecenterSign + bg_event 21, 30, BGEVENT_READ, EcruteakCityMartSign + bg_event 14, 23, BGEVENT_ITEM, EcruteakCityHiddenHyperPotion + +.ObjectEvents: db 7 - person_event SPRITE_GRAMPS, 15, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a4009, -1 - person_event SPRITE_GRAMPS, 21, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a400c, -1 - person_event SPRITE_LASS, 29, 21, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x1a4012, -1 - person_event SPRITE_LASS, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1a4015, -1 - person_event SPRITE_FISHER, 22, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1 - person_event SPRITE_YOUNGSTER, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a403d, -1 - person_event SPRITE_GRAMPS, 7, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a400f, EVENT_ECRUTEAK_CITY_GRAMPS + object_event SPRITE_GRAMPS, 15, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1 + object_event SPRITE_GRAMPS, 21, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1 + object_event SPRITE_LASS, 29, 21, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLassScript, -1 + object_event SPRITE_LASS, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1a4015, -1 + object_event SPRITE_FISHER, 22, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1 + object_event SPRITE_YOUNGSTER, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakCityYoungsterScript, -1 + object_event SPRITE_GRAMPS, 7, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index b01e9af81..6f54bb4bd 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -8,21 +8,19 @@ const_value set 2 const ECRUTEAKGYM_GRAMPS EcruteakGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x99d53, 0 - dw UnknownScript_0x99d57, 0 + scene_script .ForcedToLeave + scene_script .DummyScene .MapCallbacks: db 0 -UnknownScript_0x99d53: +.ForcedToLeave: priorityjump EcruteakGymClosed end -UnknownScript_0x99d57: +.DummyScene: end MortyScript_0x99d58: @@ -44,8 +42,8 @@ MortyScript_0x99d58: waitsfx setflag ENGINE_FOGBADGE checkcode VAR_BADGES - scall EcruteakGymTriggerRockets - domaptrigger ECRUTEAK_HOUSE, $1 + scall EcruteakGymActivateRockets + setmapscene ECRUTEAK_HOUSE, $1 setevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_RANG_CLEAR_BELL_2 .FightDone: @@ -72,7 +70,7 @@ MortyScript_0x99d58: closetext end -EcruteakGymTriggerRockets: +EcruteakGymActivateRockets: if_equal 7, .RadioTowerRockets if_equal 6, .GoldenrodRockets end @@ -100,45 +98,45 @@ EcruteakGymClosed: end TrainerSageJeffrey: - trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, SageJeffreyScript + trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, .Script -SageJeffreyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x9a263 + writetext SageJeffreyAfterBattleText waitbutton closetext end TrainerSagePing: - trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, 0, SagePingScript + trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, 0, .Script -SagePingScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x9a2b7 + writetext SagePingAfterBattleText waitbutton closetext end TrainerMediumMartha: - trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, MediumMarthaScript + trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, .Script -MediumMarthaScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x9a318 + writetext MediumMarthaAfterBattleText waitbutton closetext end TrainerMediumGrace: - trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, MediumGraceScript + trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, .Script -MediumGraceScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x9a38a + writetext MediumGraceAfterBattleText waitbutton closetext end @@ -297,7 +295,7 @@ SageJeffreyBeatenText: line "experienced both." done -UnknownText_0x9a263: +SageJeffreyAfterBattleText: text "Where did #MON" line "come from?" done @@ -312,7 +310,7 @@ SagePingBeatenText: text "Ah! Well done!" done -UnknownText_0x9a2b7: +SagePingAfterBattleText: text "We use only ghost-" line "type #MON." @@ -329,7 +327,7 @@ MediumMarthaBeatenText: text "I, I, I lost!" done -UnknownText_0x9a318: +MediumMarthaAfterBattleText: text "The one who wants" line "to win most--will!" done @@ -346,7 +344,7 @@ MediumGraceBeatenText: text "Wha-what?" done -UnknownText_0x9a38a: +MediumGraceAfterBattleText: text "Fine. I shall tell" line "you the secret of" @@ -428,20 +426,20 @@ EcruteakGym_MapEventHeader: warp_def $c, $7, 3, ECRUTEAK_GYM warp_def $d, $7, 3, ECRUTEAK_GYM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 15, 3, SIGNPOST_READ, EcruteakGymStatue - signpost 15, 6, SIGNPOST_READ, EcruteakGymStatue + bg_event 15, 3, BGEVENT_READ, EcruteakGymStatue + bg_event 15, 6, BGEVENT_READ, EcruteakGymStatue -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_MORTY, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, MortyScript_0x99d58, -1 - person_event SPRITE_SAGE, 7, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerSageJeffrey, -1 - person_event SPRITE_SAGE, 13, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSagePing, -1 - person_event SPRITE_GRANNY, 5, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerMediumMartha, -1 - person_event SPRITE_GRANNY, 9, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerMediumGrace, -1 - person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1 - person_event SPRITE_GRAMPS, 14, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS + object_event SPRITE_MORTY, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1 + object_event SPRITE_SAGE, 7, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1 + object_event SPRITE_SAGE, 13, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1 + object_event SPRITE_GRANNY, 5, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1 + object_event SPRITE_GRANNY, 9, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumGrace, -1 + object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1 + object_event SPRITE_GRAMPS, 14, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 2b795ebd6..5cf1efc2a 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -5,24 +5,19 @@ const_value set 2 const ECRUTEAKHOUSE_GRAMPS EcruteakHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .InitializeSages -.Trigger0: +.DummyScene0: end -.Trigger1: +.DummyScene1: end .InitializeSages: @@ -40,7 +35,7 @@ EcruteakHouse_MapScriptHeader: setevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE checkitem CLEAR_BELL iftrue .NoClearBell - dotrigger $0 + setscene $0 .NoClearBell: return @@ -48,27 +43,27 @@ EcruteakHouse_MapScriptHeader: clearevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE return -EcruteakHouse_XYTrigger1: +EcruteakHouse_CoordEvent1: checkevent EVENT_RANG_CLEAR_BELL_2 - iftrue EcruteakHouse_XYTrigger_DontMove + iftrue EcruteakHouse_CoordEvent_DontMove applymovement ECRUTEAKHOUSE_SAGE2, MovementData_0x980c7 - moveperson ECRUTEAKHOUSE_SAGE1, $4, $6 + moveobject ECRUTEAKHOUSE_SAGE1, $4, $6 appear ECRUTEAKHOUSE_SAGE1 pause 5 disappear ECRUTEAKHOUSE_SAGE2 end -EcruteakHouse_XYTrigger2: +EcruteakHouse_CoordEvent2: checkevent EVENT_RANG_CLEAR_BELL_1 - iftrue EcruteakHouse_XYTrigger_DontMove + iftrue EcruteakHouse_CoordEvent_DontMove applymovement ECRUTEAKHOUSE_SAGE1, MovementData_0x980cc - moveperson ECRUTEAKHOUSE_SAGE2, $5, $6 + moveobject ECRUTEAKHOUSE_SAGE2, $5, $6 appear ECRUTEAKHOUSE_SAGE2 pause 5 disappear ECRUTEAKHOUSE_SAGE1 end -EcruteakHouse_XYTrigger_DontMove: +EcruteakHouse_CoordEvent_DontMove: end SageScript_0x98062: @@ -105,7 +100,7 @@ SageScript_0x98062: writetext UnknownText_0x98250 waitbutton closetext - dotrigger $1 + setscene $1 setevent EVENT_RANG_CLEAR_BELL_2 clearevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_GAVE_KURT_APRICORNS @@ -139,8 +134,8 @@ SageScript_0x980b0: closetext end -GrampsScript_0x980c4: - jumptextfaceplayer UnknownText_0x984ab +EcruteakHouseGrampsScript: + jumptextfaceplayer EcruteakHouseGrampsText MovementData_0x980c7: fix_facing @@ -271,7 +266,7 @@ UnknownText_0x9846f: line "to the top!" done -UnknownText_0x984ab: +EcruteakHouseGrampsText: text "Two towers…" line "Two #MON…" @@ -294,17 +289,17 @@ EcruteakHouse_MapEventHeader: warp_def $f, $11, 3, ECRUTEAK_HOUSE warp_def $3, $11, 3, WISE_TRIOS_ROOM -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $7, $4, $0, EcruteakHouse_XYTrigger1, $0, $0 - xy_trigger 0, $7, $5, $0, EcruteakHouse_XYTrigger2, $0, $0 + coord_event 0, $7, $4, EcruteakHouse_CoordEvent1 + coord_event 0, $7, $5, EcruteakHouse_CoordEvent2 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_SAGE, 6, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 - person_event SPRITE_SAGE, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 - person_event SPRITE_SAGE, 9, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE - person_event SPRITE_GRAMPS, 11, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x980c4, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + object_event SPRITE_SAGE, 6, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 + object_event SPRITE_SAGE, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 + object_event SPRITE_SAGE, 9, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + object_event SPRITE_GRAMPS, 11, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHouseGrampsScript, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index f053c9442..0188ce31c 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const ECRUTEAKITEMFINDERHOUSE_POKEDEX EcruteakItemfinderHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -171,14 +171,14 @@ EcruteakItemfinderHouse_MapEventHeader: warp_def $7, $3, 11, ECRUTEAK_CITY warp_def $7, $4, 11, ECRUTEAK_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 1, 2, SIGNPOST_READ, ItemFinderHouseRadio + bg_event 1, 2, BGEVENT_READ, ItemFinderHouseRadio -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_COOLTRAINER_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9a5fb, -1 - person_event SPRITE_POKEDEX, 3, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokedexScript_0x9a620, -1 + object_event SPRITE_COOLTRAINER_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9a5fb, -1 + object_event SPRITE_POKEDEX, 3, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x9a620, -1 diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 4307a19c9..57f06d99e 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -3,22 +3,22 @@ const_value set 2 const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER EcruteakLugiaSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -GrampsScript_0x99334: - jumptextfaceplayer UnknownText_0x9933d +EcruteakLugiaSpeechHouseGrampsScript: + jumptextfaceplayer EcruteakLugiaSpeechHouseGrampsText -YoungsterScript_0x99337: - jumptextfaceplayer UnknownText_0x993ec +EcruteakLugiaSpeechHouseYoungsterScript: + jumptextfaceplayer EcruteakLugiaSpeechHouseYoungsterText LugiaSpeechHouseRadio: jumpstd radio2 -UnknownText_0x9933d: +EcruteakLugiaSpeechHouseGrampsText: text "This happened when" line "I was young." @@ -36,7 +36,7 @@ UnknownText_0x9933d: line "and a dragon." done -UnknownText_0x993ec: +EcruteakLugiaSpeechHouseYoungsterText: text "Is there really a" line "#MON that big?" @@ -53,14 +53,14 @@ EcruteakLugiaSpeechHouse_MapEventHeader: warp_def $7, $3, 7, ECRUTEAK_CITY warp_def $7, $4, 7, ECRUTEAK_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 1, 2, SIGNPOST_READ, LugiaSpeechHouseRadio + bg_event 1, 2, BGEVENT_READ, LugiaSpeechHouseRadio -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x99334, -1 - person_event SPRITE_YOUNGSTER, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x99337, -1 + object_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1 + object_event SPRITE_YOUNGSTER, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 052b4c40d..b41c4a2d3 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -4,7 +4,7 @@ const_value set 2 const ECRUTEAKMART_GRANNY EcruteakMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,13 +16,13 @@ ClerkScript_0x99c3b: closetext end -SuperNerdScript_0x99c42: - jumptextfaceplayer UnknownText_0x99c48 +EcruteakMartSuperNerdScript: + jumptextfaceplayer EcruteakMartSuperNerdText -GrannyScript_0x99c45: - jumptextfaceplayer UnknownText_0x99cd5 +EcruteakMartGrannyScript: + jumptextfaceplayer EcruteakMartGrannyText -UnknownText_0x99c48: +EcruteakMartSuperNerdText: text "My EEVEE evolved" line "into an ESPEON." @@ -37,7 +37,7 @@ UnknownText_0x99c48: line "same way…" done -UnknownText_0x99cd5: +EcruteakMartGrannyText: text "If you use REVIVE," line "a #MON that's" @@ -54,14 +54,14 @@ EcruteakMart_MapEventHeader: warp_def $7, $2, 9, ECRUTEAK_CITY warp_def $7, $3, 9, ECRUTEAK_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1 - person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x99c42, -1 - person_event SPRITE_GRANNY, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x99c45, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1 + object_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1 + object_event SPRITE_GRANNY, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1 diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokecenter1F.asm index dc578d2e0..c680fece0 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -5,22 +5,20 @@ const_value set 2 const ECRUTEAKPOKECENTER1F_GYM_GUY const ECRUTEAKPOKECENTER1F_BILL -EcruteakPokeCenter1F_MapScriptHeader: -.MapTriggers: +EcruteakPokecenter1F_MapScriptHeader: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .MeetBill + scene_script .DummyScene .MapCallbacks: db 0 -.Trigger0: +.MeetBill: priorityjump .BillActivatesTimeCapsule end -.Trigger1: +.DummyScene: end .BillActivatesTimeCapsule: @@ -28,8 +26,8 @@ EcruteakPokeCenter1F_MapScriptHeader: playsound SFX_EXIT_BUILDING appear ECRUTEAKPOKECENTER1F_BILL waitsfx - applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokeCenter1FBillMovement1 - applymovement PLAYER, EcruteakPokeCenter1FPlayerMovement1 + applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement1 + applymovement PLAYER, EcruteakPokecenter1FPlayerMovement1 spriteface ECRUTEAKPOKECENTER1F_NURSE, UP pause 10 spriteface ECRUTEAKPOKECENTER1F_NURSE, DOWN @@ -41,42 +39,42 @@ EcruteakPokeCenter1F_MapScriptHeader: spriteface ECRUTEAKPOKECENTER1F_BILL, DOWN pause 10 opentext - writetext EcruteakPokeCenter1F_BillText1 + writetext EcruteakPokecenter1F_BillText1 buttonsound jump .PointlessJump .PointlessJump: - writetext EcruteakPokeCenter1F_BillText2 + writetext EcruteakPokecenter1F_BillText2 waitbutton closetext spriteface PLAYER, DOWN - applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokeCenter1FBillMovement2 + applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement2 playsound SFX_EXIT_BUILDING disappear ECRUTEAKPOKECENTER1F_BILL clearevent EVENT_MET_BILL setflag ENGINE_TIME_CAPSULE - dotrigger $1 + setscene $1 waitsfx end -EcruteakPokeCenter1FNurseScript: +EcruteakPokecenter1FNurseScript: jumpstd pokecenternurse -EcruteakPokeCenter1FPokefanMScript: +EcruteakPokecenter1FPokefanMScript: special Mobile_DummyReturnFalse iftrue .mobile - jumptextfaceplayer EcruteakPokeCenter1FPokefanMText + jumptextfaceplayer EcruteakPokecenter1FPokefanMText .mobile - jumptextfaceplayer EcruteakPokeCenter1FPokefanMTextMobile + jumptextfaceplayer EcruteakPokecenter1FPokefanMTextMobile -EcruteakPokeCenter1FCooltrainerFScript: - jumptextfaceplayer EcruteakPokeCenter1FCooltrainerFText +EcruteakPokecenter1FCooltrainerFScript: + jumptextfaceplayer EcruteakPokecenter1FCooltrainerFText -EcruteakPokeCenter1FGymGuyScript: - jumptextfaceplayer EcruteakPokeCenter1FGymGuyText +EcruteakPokecenter1FGymGuyScript: + jumptextfaceplayer EcruteakPokecenter1FGymGuyText -EcruteakPokeCenter1FBillMovement1: +EcruteakPokecenter1FBillMovement1: step UP step UP step UP @@ -87,7 +85,7 @@ EcruteakPokeCenter1FBillMovement1: turn_head UP step_end -EcruteakPokeCenter1FBillMovement2: +EcruteakPokecenter1FBillMovement2: step RIGHT step DOWN step DOWN @@ -95,13 +93,13 @@ EcruteakPokeCenter1FBillMovement2: step DOWN step_end -EcruteakPokeCenter1FPlayerMovement1: +EcruteakPokecenter1FPlayerMovement1: step UP step UP step UP step_end -EcruteakPokeCenter1F_BillText1: +EcruteakPokecenter1F_BillText1: text "Hi, I'm BILL. And" line "who are you?" @@ -110,7 +108,7 @@ EcruteakPokeCenter1F_BillText1: cont "right time." done -EcruteakPokeCenter1F_BillText2: +EcruteakPokecenter1F_BillText2: text "I just finished" line "adjustments on my" cont "TIME CAPSULE." @@ -164,7 +162,7 @@ EcruteakPokeCenter1F_BillText2: para "Buh-bye!" done -EcruteakPokeCenter1FPokefanMText: +EcruteakPokecenter1FPokefanMText: text "The way the KIMONO" line "GIRLS dance is" @@ -173,7 +171,7 @@ EcruteakPokeCenter1FPokefanMText: cont "use their #MON." done -EcruteakPokeCenter1FPokefanMTextMobile: +EcruteakPokecenter1FPokefanMTextMobile: text "You must be hoping" line "to battle more" @@ -189,7 +187,7 @@ EcruteakPokeCenter1FPokefanMTextMobile: line "OLIVINE CITY." done -EcruteakPokeCenter1FCooltrainerFText: +EcruteakPokecenter1FCooltrainerFText: text "MORTY, the GYM" line "LEADER, is soooo" cont "cool." @@ -198,7 +196,7 @@ EcruteakPokeCenter1FCooltrainerFText: line "really tough too." done -EcruteakPokeCenter1FGymGuyText: +EcruteakPokecenter1FGymGuyText: text "LAKE OF RAGE…" para "The appearance of" @@ -208,7 +206,7 @@ EcruteakPokeCenter1FGymGuyText: line "acy. I know it!" done -EcruteakPokeCenter1F_MapEventHeader: +EcruteakPokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -218,16 +216,16 @@ EcruteakPokeCenter1F_MapEventHeader: warp_def $7, $4, 6, ECRUTEAK_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokeCenter1FNurseScript, -1 - person_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokeCenter1FPokefanMScript, -1 - person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokeCenter1FCooltrainerFScript, -1 - person_event SPRITE_GYM_GUY, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, EcruteakPokeCenter1FGymGuyScript, -1 - person_event SPRITE_BILL, 7, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1 + object_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1 + object_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1 + object_event SPRITE_GYM_GUY, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FGymGuyScript, -1 + object_event SPRITE_BILL, 7, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 2c5403b42..c8dcb1b29 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const ELMSHOUSE_ELMS_SON ElmsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -92,16 +92,16 @@ ElmsHouse_MapEventHeader: warp_def $7, $2, 4, NEW_BARK_TOWN warp_def $7, $3, 4, NEW_BARK_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 0, SIGNPOST_READ, ElmsHousePC - signpost 1, 6, SIGNPOST_READ, ElmsHouseBookshelf - signpost 1, 7, SIGNPOST_READ, ElmsHouseBookshelf + bg_event 1, 0, BGEVENT_READ, ElmsHousePC + bg_event 1, 6, BGEVENT_READ, ElmsHouseBookshelf + bg_event 1, 7, BGEVENT_READ, ElmsHouseBookshelf -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_TEACHER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ElmsWife, -1 - person_event SPRITE_BUG_CATCHER, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ElmsSon, -1 + object_event SPRITE_TEACHER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1 + object_event SPRITE_BUG_CATCHER, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index c49c522fc..631969785 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -7,63 +7,58 @@ const_value set 2 const ELMSLAB_OFFICER ElmsLab_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 6 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 - maptrigger .Trigger3 - maptrigger .Trigger4 - maptrigger .Trigger5 + scene_script .MeetElm + scene_script .DummyScene1 + scene_script .DummyScene2 + scene_script .DummyScene3 + scene_script .DummyScene4 + scene_script .DummyScene5 .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .MoveElmCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, .Callback_MoveElm - -.Trigger0: - priorityjump ElmsLab_AutowalkUpToElm +.MeetElm: + priorityjump .WalkUpToElm end -.Trigger1: +.DummyScene1: end -.Trigger2: +.DummyScene2: end -.Trigger3: +.DummyScene3: end -.Trigger4: +.DummyScene4: end -.Trigger5: +.DummyScene5: end -.Callback_MoveElm: - checktriggers +.MoveElmCallback: + checkscene iftrue .Skip - moveperson ELMSLAB_ELM, $3, $4 + moveobject ELMSLAB_ELM, $3, $4 .Skip: return -ElmsLab_AutowalkUpToElm: +.WalkUpToElm: applymovement PLAYER, ElmsLab_WalkUpToElmMovement showemote EMOTE_SHOCK, ELMSLAB_ELM, 15 spriteface ELMSLAB_ELM, RIGHT opentext writetext ElmText_Intro -ElmsLab_RefuseLoop: +.MustSayYes: yesorno - iftrue ElmsLab_ElmGetsEmail + iftrue .ElmGetsEmail writetext ElmText_Refused - jump ElmsLab_RefuseLoop + jump .MustSayYes -ElmsLab_ElmGetsEmail: +.ElmGetsEmail: writetext ElmText_Accepted buttonsound writetext ElmText_ResearchAmbitions @@ -89,7 +84,7 @@ ElmsLab_ElmGetsEmail: opentext writetext ElmText_ChooseAPokemon waitbutton - dotrigger $1 + setscene $1 closetext end @@ -279,8 +274,8 @@ ElmDirectionsScript: closetext setevent EVENT_GOT_A_POKEMON_FROM_ELM setevent EVENT_RIVAL_CHERRYGROVE_CITY - dotrigger $5 - domaptrigger NEW_BARK_TOWN, $1 + setscene $5 + setmapscene NEW_BARK_TOWN, $1 end ElmDescribesMrPokemonScript: @@ -346,13 +341,13 @@ ElmAfterTheftScript: buttonsound setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM setflag ENGINE_BUG_CONTEST_ON - domaptrigger ROUTE_29, $1 + setmapscene ROUTE_29, $1 clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY setevent EVENT_ROUTE_30_BATTLE writetext ElmAfterTheftText6 waitbutton closetext - dotrigger $6 + setscene $6 end ElmStudyingEggScript: @@ -484,7 +479,7 @@ AideScript_GivePotions: writetext AideText_AlwaysBusy waitbutton closetext - dotrigger $2 + setscene $2 end AideScript_WalkBalls1: @@ -512,7 +507,7 @@ AideScript_GiveYouBalls: buttonsound itemnotify closetext - dotrigger $2 + setscene $2 end AideScript_ReceiveTheBalls: @@ -567,7 +562,7 @@ CopScript: closetext applymovement ELMSLAB_OFFICER, OfficerLeavesMovement disappear ELMSLAB_OFFICER - dotrigger $2 + setscene $2 end ElmsLabWindow: @@ -1384,41 +1379,41 @@ ElmsLab_MapEventHeader: warp_def $b, $4, 1, NEW_BARK_TOWN warp_def $b, $5, 1, NEW_BARK_TOWN -.XYTriggers: +.CoordEvents: db 8 - xy_trigger 1, $6, $4, $0, LabTryToLeaveScript, $0, $0 - xy_trigger 1, $6, $5, $0, LabTryToLeaveScript, $0, $0 - xy_trigger 3, $5, $4, $0, MeetCopScript, $0, $0 - xy_trigger 3, $5, $5, $0, MeetCopScript2, $0, $0 - xy_trigger 5, $8, $4, $0, AideScript_WalkPotions1, $0, $0 - xy_trigger 5, $8, $5, $0, AideScript_WalkPotions2, $0, $0 - xy_trigger 6, $8, $4, $0, AideScript_WalkBalls1, $0, $0 - xy_trigger 6, $8, $5, $0, AideScript_WalkBalls2, $0, $0 - -.Signposts: + coord_event 1, $6, $4, LabTryToLeaveScript + coord_event 1, $6, $5, LabTryToLeaveScript + coord_event 3, $5, $4, MeetCopScript + coord_event 3, $5, $5, MeetCopScript2 + coord_event 5, $8, $4, AideScript_WalkPotions1 + coord_event 5, $8, $5, AideScript_WalkPotions2 + coord_event 6, $8, $4, AideScript_WalkBalls1 + coord_event 6, $8, $5, AideScript_WalkBalls2 + +.BGEvents: db 16 - signpost 1, 2, SIGNPOST_READ, ElmsLabHealingMachine - signpost 1, 6, SIGNPOST_READ, ElmsLabBookshelf - signpost 1, 7, SIGNPOST_READ, ElmsLabBookshelf - signpost 1, 8, SIGNPOST_READ, ElmsLabBookshelf - signpost 1, 9, SIGNPOST_READ, ElmsLabBookshelf - signpost 7, 0, SIGNPOST_READ, ElmsLabTravelTip1 - signpost 7, 1, SIGNPOST_READ, ElmsLabTravelTip2 - signpost 7, 2, SIGNPOST_READ, ElmsLabTravelTip3 - signpost 7, 3, SIGNPOST_READ, ElmsLabTravelTip4 - signpost 7, 6, SIGNPOST_READ, ElmsLabBookshelf - signpost 7, 7, SIGNPOST_READ, ElmsLabBookshelf - signpost 7, 8, SIGNPOST_READ, ElmsLabBookshelf - signpost 7, 9, SIGNPOST_READ, ElmsLabBookshelf - signpost 3, 9, SIGNPOST_READ, ElmsLabTrashcan - signpost 0, 5, SIGNPOST_READ, ElmsLabWindow - signpost 5, 3, SIGNPOST_DOWN, ElmsLabPC - -.PersonEvents: + bg_event 1, 2, BGEVENT_READ, ElmsLabHealingMachine + bg_event 1, 6, BGEVENT_READ, ElmsLabBookshelf + bg_event 1, 7, BGEVENT_READ, ElmsLabBookshelf + bg_event 1, 8, BGEVENT_READ, ElmsLabBookshelf + bg_event 1, 9, BGEVENT_READ, ElmsLabBookshelf + bg_event 7, 0, BGEVENT_READ, ElmsLabTravelTip1 + bg_event 7, 1, BGEVENT_READ, ElmsLabTravelTip2 + bg_event 7, 2, BGEVENT_READ, ElmsLabTravelTip3 + bg_event 7, 3, BGEVENT_READ, ElmsLabTravelTip4 + bg_event 7, 6, BGEVENT_READ, ElmsLabBookshelf + bg_event 7, 7, BGEVENT_READ, ElmsLabBookshelf + bg_event 7, 8, BGEVENT_READ, ElmsLabBookshelf + bg_event 7, 9, BGEVENT_READ, ElmsLabBookshelf + bg_event 3, 9, BGEVENT_READ, ElmsLabTrashcan + bg_event 0, 5, BGEVENT_READ, ElmsLabWindow + bg_event 5, 3, BGEVENT_DOWN, ElmsLabPC + +.ObjectEvents: db 6 - person_event SPRITE_ELM, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ProfElmScript, -1 - person_event SPRITE_SCIENTIST, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB - person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB - person_event SPRITE_POKE_BALL, 3, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB - person_event SPRITE_POKE_BALL, 3, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB - person_event SPRITE_OFFICER, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB + object_event SPRITE_ELM, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1 + object_event SPRITE_SCIENTIST, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB + object_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB + object_event SPRITE_POKE_BALL, 3, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB + object_event SPRITE_POKE_BALL, 3, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB + object_event SPRITE_OFFICER, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 3440cd848..f2e4337c3 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -5,28 +5,26 @@ const_value set 2 const FASTSHIP1F_GENTLEMAN FastShip1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + scene_script .DummyScene0 + scene_script .EnterFastShip + scene_script .DummyScene2 .MapCallbacks: db 0 -.Trigger0: +.DummyScene0: end -.Trigger1: - priorityjump .PriorityJump2 +.EnterFastShip: + priorityjump .EnterFastShipScript end -.Trigger2: +.DummyScene2: end -.PriorityJump2: +.EnterFastShipScript: applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e applymovement PLAYER, MovementData_0x75217 applymovement FASTSHIP1F_SAILOR1, MovementData_0x75211 @@ -37,11 +35,11 @@ FastShip1F_MapScriptHeader: clearevent EVENT_FAST_SHIP_HAS_ARRIVED checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue .SkipGrandpa - dotrigger $2 + setscene $2 end .SkipGrandpa: - dotrigger $0 + setscene $0 end SailorScript_0x75160: @@ -73,7 +71,7 @@ SailorScript_0x75160: special FadeOutPalettes waitsfx setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - domaptrigger VERMILION_PORT, $1 + setmapscene VERMILION_PORT, $1 warp VERMILION_PORT, $7, $11 end @@ -86,7 +84,7 @@ SailorScript_0x75160: special FadeOutPalettes waitsfx setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY - domaptrigger OLIVINE_PORT, $1 + setmapscene OLIVINE_PORT, $1 warp OLIVINE_PORT, $7, $17 end @@ -118,13 +116,13 @@ SailorScript_0x751d0: closetext end -SailorScript_0x751e4: - jumptextfaceplayer UnknownText_0x753c0 +FastShip1FSailorScript: + jumptextfaceplayer FastShip1FSailorText -WorriedGrandpaTriggerRight: - moveperson FASTSHIP1F_GENTLEMAN, $14, $6 +WorriedGrandpaSceneRight: + moveobject FASTSHIP1F_GENTLEMAN, $14, $6 -WorriedGrandpaTriggerLeft: +WorriedGrandpaSceneLeft: appear FASTSHIP1F_GENTLEMAN applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x7521b playsound SFX_TACKLE @@ -137,7 +135,7 @@ WorriedGrandpaTriggerLeft: spriteface PLAYER, RIGHT applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222 disappear FASTSHIP1F_GENTLEMAN - dotrigger $0 + setscene $0 end MovementData_0x7520e: @@ -252,7 +250,7 @@ UnknownText_0x7534f: cont "you're sleeping." done -UnknownText_0x753c0: +FastShip1FSailorText: text "The passengers are" line "all trainers." @@ -306,17 +304,17 @@ FastShip1F_MapEventHeader: warp_def $c, $6, 1, FAST_SHIP_B1F warp_def $e, $1e, 2, FAST_SHIP_B1F -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 2, $6, $18, $0, WorriedGrandpaTriggerLeft, $0, $0 - xy_trigger 2, $6, $19, $0, WorriedGrandpaTriggerRight, $0, $0 + coord_event 2, $6, $18, WorriedGrandpaSceneLeft + coord_event 2, $6, $19, WorriedGrandpaSceneRight -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_SAILOR, 2, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x75160, -1 - person_event SPRITE_SAILOR, 7, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x751d0, -1 - person_event SPRITE_SAILOR, 17, 22, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x751e4, -1 - person_event SPRITE_GENTLEMAN, 6, 19, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN + object_event SPRITE_SAILOR, 2, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x75160, -1 + object_event SPRITE_SAILOR, 7, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x751d0, -1 + object_event SPRITE_SAILOR, 17, 22, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailorScript, -1 + object_event SPRITE_GENTLEMAN, 6, 19, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 4a4d3a87c..73c8838db 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -13,27 +13,25 @@ const_value set 2 const FASTSHIPB1F_YOUNGSTER2 FastShipB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x7673a, 0 - dw UnknownScript_0x7673b, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -UnknownScript_0x7673a: +.DummyScene0: end -UnknownScript_0x7673b: +.DummyScene1: end UnknownScript_0x7673c: checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT iftrue UnknownScript_0x76766 applymovement FASTSHIPB1F_SAILOR2, MovementData_0x76876 - moveperson FASTSHIPB1F_SAILOR1, $1e, $6 + moveobject FASTSHIPB1F_SAILOR1, $1e, $6 appear FASTSHIPB1F_SAILOR1 pause 5 disappear FASTSHIPB1F_SAILOR2 @@ -43,7 +41,7 @@ UnknownScript_0x76751: checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT iftrue UnknownScript_0x76766 applymovement FASTSHIPB1F_SAILOR1, MovementData_0x76871 - moveperson FASTSHIPB1F_SAILOR2, $1f, $6 + moveobject FASTSHIPB1F_SAILOR2, $1f, $6 appear FASTSHIPB1F_SAILOR2 pause 5 disappear FASTSHIPB1F_SAILOR1 @@ -96,111 +94,111 @@ UnknownScript_0x767a0: end TrainerSailorJeff: - trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, SailorJeffScript + trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, .Script -SailorJeffScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x76a38 + writetext SailorJeffAfterBattleText waitbutton closetext end TrainerPicnickerDebra: - trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, PicnickerDebraScript + trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, .Script -PicnickerDebraScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x76a99 + writetext PicnickerDebraAfterBattleText waitbutton closetext end TrainerJugglerFritz: - trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, JugglerFritzScript + trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, .Script -JugglerFritzScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x76b02 + writetext JugglerFritzAfterBattleText waitbutton closetext end TrainerSailorGarrett: - trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, SailorGarrettScript + trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, .Script -SailorGarrettScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x76b7a + writetext SailorGarrettAfterBattleText waitbutton closetext end TrainerFisherJonah: - trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, FisherJonahScript + trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, .Script -FisherJonahScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x76c22 + writetext FisherJonahAfterBattleText waitbutton closetext end TrainerBlackbeltWai: - trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, BlackbeltWaiScript + trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, .Script -BlackbeltWaiScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x76c9e + writetext BlackbeltWaiAfterBattleText waitbutton closetext end TrainerSailorKenneth: - trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, SailorKennethScript + trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, .Script -SailorKennethScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x76d5f + writetext SailorKennethAfterBattleText waitbutton closetext end TrainerTeacherShirley: - trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, TeacherShirleyScript + trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, .Script -TeacherShirleyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x76de1 + writetext TeacherShirleyAfterBattleText waitbutton closetext end TrainerSchoolboyNate: - trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, SchoolboyNateScript + trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, .Script -SchoolboyNateScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x76e3d + writetext SchoolboyNateAfterBattleText waitbutton closetext end TrainerSchoolboyRicky: - trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, SchoolboyRickyScript + trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, .Script -SchoolboyRickyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x76eb6 + writetext SchoolboyRickyAfterBattleText waitbutton closetext end @@ -278,7 +276,7 @@ SailorJeffBeatenText: line "break's over!" done -UnknownText_0x76a38: +SailorJeffAfterBattleText: text "I guess I can't" line "win if I don't get" cont "serious." @@ -294,7 +292,7 @@ PicnickerDebraBeatenText: line "strong!" done -UnknownText_0x76a99: +PicnickerDebraAfterBattleText: text "SAFFRON, CELADON…" line "I hear there are" @@ -312,7 +310,7 @@ JugglerFritzBeatenText: line "more…" done -UnknownText_0x76b02: +JugglerFritzAfterBattleText: text "No more ships for" line "me. Next time," @@ -330,7 +328,7 @@ SailorGarrettBeatenText: line "field…" done -UnknownText_0x76b7a: +SailorGarrettAfterBattleText: text "We get different" line "passengers from" @@ -352,7 +350,7 @@ FisherJonahBeatenText: line "anymore…" done -UnknownText_0x76c22: +FisherJonahAfterBattleText: text "I plan to fish off" line "VERMILION's pier." done @@ -370,7 +368,7 @@ BlackbeltWaiBeatenText: line "over!" done -UnknownText_0x76c9e: +BlackbeltWaiAfterBattleText: text "I couldn't find" line "the KARATE KING in" cont "JOHTO." @@ -393,7 +391,7 @@ SailorKennethBeatenText: line "ing is obvious…" done -UnknownText_0x76d5f: +SailorKennethAfterBattleText: text "Eight BADGES!" line "They must prove" @@ -413,7 +411,7 @@ TeacherShirleyBeatenText: text "Aaack!" done -UnknownText_0x76de1: +TeacherShirleyAfterBattleText: text "We're on a field" line "trip to the RUINS" cont "outside VIOLET." @@ -428,7 +426,7 @@ SchoolboyNateBeatenText: text "Yaargh!" done -UnknownText_0x76e3d: +SchoolboyNateAfterBattleText: text "Radios pick up" line "strange signals" cont "inside the RUINS." @@ -444,7 +442,7 @@ SchoolboyRickyBeatenText: text "I was done in!" done -UnknownText_0x76eb6: +SchoolboyRickyAfterBattleText: text "I read that there" line "are four of those" cont "stone panels." @@ -459,26 +457,26 @@ FastShipB1F_MapEventHeader: warp_def $b, $5, 11, FAST_SHIP_1F warp_def $d, $1f, 12, FAST_SHIP_1F -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $7, $1e, $0, UnknownScript_0x7673c, $0, $0 - xy_trigger 0, $7, $1f, $0, UnknownScript_0x76751, $0, $0 + coord_event 0, $7, $1e, UnknownScript_0x7673c + coord_event 0, $7, $1f, UnknownScript_0x76751 -.Signposts: +.BGEvents: db 1 - signpost 9, 27, SIGNPOST_READ, FashShipB1FTrashcan + bg_event 9, 27, BGEVENT_READ, FashShipB1FTrashcan -.PersonEvents: +.ObjectEvents: db 12 - person_event SPRITE_SAILOR, 6, 30, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT - person_event SPRITE_SAILOR, 6, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT - person_event SPRITE_SAILOR, 11, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_SUPER_NERD, 9, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_SAILOR, 4, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_FISHER, 8, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_BLACK_BELT, 11, 15, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_SAILOR, 4, 23, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_TEACHER, 11, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_YOUNGSTER, 11, 14, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_SAILOR, 6, 30, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT + object_event SPRITE_SAILOR, 6, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT + object_event SPRITE_SAILOR, 11, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event SPRITE_SUPER_NERD, 9, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event SPRITE_SAILOR, 4, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_FISHER, 8, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_BLACK_BELT, 11, 15, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_SAILOR, 4, 23, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_TEACHER, 11, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_YOUNGSTER, 11, 14, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 9c7960201..013b2ad17 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -8,74 +8,74 @@ const_value set 2 const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST FastShipCabins_NNW_NNE_NE_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerCooltrainermSean: - trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, CooltrainermSeanScript + trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script -CooltrainermSeanScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x7567b + writetext CooltrainermSeanAfterBattleText waitbutton closetext end TrainerCooltrainerfCarol: - trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, CooltrainerfCarolScript + trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, .Script -CooltrainerfCarolScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x756f7 + writetext CooltrainerfCarolAfterBattleText waitbutton closetext end TrainerPokemaniacEthan: - trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, PokemaniacEthanScript + trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, .Script -PokemaniacEthanScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x7574b + writetext PokemaniacEthanAfterBattleText waitbutton closetext end TrainerHikerNoland: - trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, HikerNolandScript + trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, .Script -HikerNolandScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x757d4 + writetext HikerNolandAfterBattleText waitbutton closetext end TrainerGentlemanEdward: - trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, GentlemanEdwardScript + trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, .Script -GentlemanEdwardScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x75937 + writetext GentlemanEdwardAfterBattleText waitbutton closetext end TrainerBurglarCorey: - trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, BurglarCoreyScript + trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, .Script -BurglarCoreyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x75996 + writetext BurglarCoreyAfterBattleText waitbutton closetext end @@ -98,7 +98,7 @@ SailorScript_0x755f1: waitbutton closetext setevent EVENT_FAST_SHIP_LAZY_SAILOR - domaptrigger FAST_SHIP_B1F, $1 + setmapscene FAST_SHIP_B1F, $1 checkcode VAR_FACING if_equal $3, UnknownScript_0x75629 applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637 @@ -142,7 +142,7 @@ CooltrainermSeanBeatenText: text "I wanted to win!" done -UnknownText_0x7567b: +CooltrainermSeanAfterBattleText: text "Trainers from" line "JOHTO can battle" @@ -160,7 +160,7 @@ CooltrainerfCarolBeatenText: line "ent between us?" done -UnknownText_0x756f7: +CooltrainerfCarolAfterBattleText: text "I'm going to beat" line "you someday!" done @@ -175,7 +175,7 @@ PokemaniacEthanBeatenText: text "Gyaaaah!" done -UnknownText_0x7574b: +PokemaniacEthanAfterBattleText: text "LILY's nice, but" line "MARY's the best!" @@ -194,7 +194,7 @@ HikerNolandBeatenText: line "handle!" done -UnknownText_0x757d4: +HikerNolandAfterBattleText: text "I wonder if there" line "are any mountains" @@ -240,7 +240,7 @@ GentlemanEdwardBeatenText: line "it…" done -UnknownText_0x75937: +GentlemanEdwardAfterBattleText: text "I give up." line "You don't have to" @@ -258,7 +258,7 @@ BurglarCoreyBeatenText: line "I lost!" done -UnknownText_0x75996: +BurglarCoreyAfterBattleText: text "I found a pretty" line "coin here." @@ -276,21 +276,21 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader: warp_def $c, $2, 3, FAST_SHIP_1F warp_def $18, $2, 4, FAST_SHIP_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 13, 6, SIGNPOST_READ, FastShipCabins_NNW_NNE_NETrashcan - signpost 19, 7, SIGNPOST_READ, FastShipCabins_NNW_NNE_NETrashcan - signpost 31, 7, SIGNPOST_READ, FastShipCabins_NNW_NNE_NETrashcan + bg_event 13, 6, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan + bg_event 19, 7, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan + bg_event 31, 7, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_COOLTRAINER_M, 3, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_COOLTRAINER_F, 5, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_SUPER_NERD, 5, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_POKEFAN_M, 17, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_SAILOR, 26, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR - person_event SPRITE_GENTLEMAN, 30, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_PHARMACIST, 30, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_COOLTRAINER_M, 3, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_COOLTRAINER_F, 5, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_SUPER_NERD, 5, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_POKEFAN_M, 17, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event SPRITE_SAILOR, 26, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR + object_event SPRITE_GENTLEMAN, 30, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_PHARMACIST, 30, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 9b8aeac85..f3435833c 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -12,7 +12,7 @@ const_value set 2 const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2 FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -52,7 +52,7 @@ TwinScript_0x75ebb: special Special_ReloadSpritesNoPalettes disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2 applymovement PLAYER, MovementData_0x76004 - moveperson FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, $3, $13 + moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, $3, $13 appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 spriteface PLAYER, UP spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP @@ -81,7 +81,7 @@ UnknownScript_0x75f09: writetext UnknownText_0x76143 buttonsound setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - domaptrigger FAST_SHIP_1F, $0 + setmapscene FAST_SHIP_1F, $0 jump UnknownScript_0x75f37 GentlemanScript_0x75f1f: @@ -94,7 +94,7 @@ GentlemanScript_0x75f1f: writetext UnknownText_0x760ae waitbutton closetext - domaptrigger FAST_SHIP_1F, $0 + setmapscene FAST_SHIP_1F, $0 end UnknownScript_0x75f37: @@ -141,78 +141,78 @@ TwinScript_0x75f6d: end TrainerPokefanmColin: - trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, PokefanmColinScript + trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, .Script -PokefanmColinScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x7635b + writetext PokefanmColinAfterBattleText waitbutton closetext end TrainerTwinsMegandpeg1: - trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, TwinsMegandpeg1Script + trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, .Script -TwinsMegandpeg1Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x763c2 + writetext TwinsMegandpeg1AfterBattleText waitbutton closetext end TrainerTwinsMegandpeg2: - trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, TwinsMegandpeg2Script + trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, .Script -TwinsMegandpeg2Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x76428 + writetext TwinsMegandpeg2AfterBattleText waitbutton closetext end TrainerPsychicRodney: - trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, PsychicRodneyScript + trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, .Script -PsychicRodneyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x76497 + writetext PsychicRodneyAfterBattleText waitbutton closetext end TrainerPokefanmJeremy: - trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, PokefanmJeremyScript + trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, .Script -PokefanmJeremyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x7651c + writetext PokefanmJeremyAfterBattleText waitbutton closetext end TrainerPokefanfGeorgia: - trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, PokefanfGeorgiaScript + trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, .Script -PokefanfGeorgiaScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x76596 + writetext PokefanfGeorgiaAfterBattleText waitbutton closetext end TrainerSupernerdShawn: - trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, SupernerdShawnScript + trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, .Script -SupernerdShawnScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x7660f + writetext SupernerdShawnAfterBattleText waitbutton closetext end @@ -347,7 +347,7 @@ PokefanmColinBeatenText: text "You're strong!" done -UnknownText_0x7635b: +PokefanmColinAfterBattleText: text "You're traveling" line "all alone?" @@ -365,7 +365,7 @@ TwinsMegandpeg1BeatenText: text "Oh! We lost!" done -UnknownText_0x763c2: +TwinsMegandpeg1AfterBattleText: text "Baby is a rude" line "name to call us" cont "girls!" @@ -382,7 +382,7 @@ TwinsMegandpeg2BeatenText: text "Oh! We lost!" done -UnknownText_0x76428: +TwinsMegandpeg2AfterBattleText: text "Sometimes, kids" line "are smarter than" cont "grown-ups!" @@ -399,7 +399,7 @@ PsychicRodneyBeatenText: line "thing!" done -UnknownText_0x76497: +PsychicRodneyAfterBattleText: text "I get it. You can" line "hear JOHTO's radio" cont "on the FAST SHIP." @@ -416,7 +416,7 @@ PokefanmJeremyBeatenText: line "ful #MON!" done -UnknownText_0x7651c: +PokefanmJeremyAfterBattleText: text "I must go to the" line "#MON SALON and" cont "fix them up nice!" @@ -433,7 +433,7 @@ PokefanfGeorgiaBeatenText: line "to do?" done -UnknownText_0x76596: +PokefanfGeorgiaAfterBattleText: text "Oh, yes! I have to" line "get my #MON out" cont "of DAY-CARE!" @@ -450,7 +450,7 @@ SupernerdShawnBeatenText: line "Please!" done -UnknownText_0x7660f: +SupernerdShawnAfterBattleText: text "You should use the" line "right BALLS to fit" cont "the situation." @@ -475,23 +475,23 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: warp_def $21, $2, 10, FAST_SHIP_1F warp_def $21, $3, 10, FAST_SHIP_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 25, 4, SIGNPOST_READ, FastShipCaptainsCabinTrashcan + bg_event 25, 4, BGEVENT_READ, FastShipCaptainsCabinTrashcan -.PersonEvents: +.ObjectEvents: db 11 - person_event SPRITE_CAPTAIN, 25, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CaptainScript_0x75ea7, -1 - person_event SPRITE_GENTLEMAN, 17, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x75f1f, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN - person_event SPRITE_TWIN, 17, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TwinScript_0x75f6d, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 - person_event SPRITE_TWIN, 25, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TwinScript_0x75ebb, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 - person_event SPRITE_POKEFAN_M, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_TWIN, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_SUPER_NERD, 5, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_POKEFAN_F, 5, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_SUPER_NERD, 15, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_CAPTAIN, 25, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CaptainScript_0x75ea7, -1 + object_event SPRITE_GENTLEMAN, 17, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x75f1f, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN + object_event SPRITE_TWIN, 17, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x75f6d, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 + object_event SPRITE_TWIN, 25, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x75ebb, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 + object_event SPRITE_POKEFAN_M, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event SPRITE_TWIN, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event SPRITE_SUPER_NERD, 5, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_POKEFAN_F, 5, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_SUPER_NERD, 15, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 76933c600..f2a7717f6 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -5,49 +5,49 @@ const_value set 2 const FASTSHIPCABINS_SW_SSW_NW_ROCKER FastShipCabins_SW_SSW_NW_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerFirebreatherLyle: - trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, FirebreatherLyleScript + trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script -FirebreatherLyleScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x75b52 + writetext FirebreatherLyleAfterBattleText waitbutton closetext end TrainerBug_catcherKen: - trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, 0, Bug_catcherKenScript + trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, 0, .Script -Bug_catcherKenScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x75bd5 + writetext Bug_catcherKenAfterBattleText waitbutton closetext end TrainerBeautyCassie: - trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, BeautyCassieScript + trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, .Script -BeautyCassieScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x75c43 + writetext BeautyCassieAfterBattleText waitbutton closetext end TrainerGuitaristClyde: - trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, GuitaristClydeScript + trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, .Script -GuitaristClydeScript: +.Script: end_if_just_battled special Mobile_DummyReturnFalse iftrue .mobile @@ -124,7 +124,7 @@ FirebreatherLyleBeatenText: line "flame's tiny…" done -UnknownText_0x75b52: +FirebreatherLyleAfterBattleText: text "I guess fire is" line "weak on the sea." @@ -143,7 +143,7 @@ Bug_catcherKenBeatenText: line "You're tough!" done -UnknownText_0x75bd5: +Bug_catcherKenAfterBattleText: text "You can find lots" line "of #MON in the" cont "trees of JOHTO!" @@ -159,7 +159,7 @@ BeautyCassieBeatenText: text "My heart weeps…" done -UnknownText_0x75c43: +BeautyCassieAfterBattleText: text "A voyage is best" line "for getting over" cont "a broken heart." @@ -234,18 +234,18 @@ FastShipCabins_SW_SSW_NW_MapEventHeader: warp_def $1f, $2, 7, FAST_SHIP_1F warp_def $1f, $3, 7, FAST_SHIP_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 7, SIGNPOST_READ, FastShipBed - signpost 2, 7, SIGNPOST_READ, FastShipBed - signpost 7, 7, SIGNPOST_READ, FastShipCabinsNorthwestCabinTrashcan + bg_event 1, 7, BGEVENT_READ, FastShipBed + bg_event 2, 7, BGEVENT_READ, FastShipBed + bg_event 7, 7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_FISHER, 15, 1, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_BUG_CATCHER, 15, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerBug_catcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_BUENA, 26, 1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_ROCKER, 28, 3, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_FISHER, 15, 1, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event SPRITE_BUG_CATCHER, 15, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBug_catcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_BUENA, 26, 1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event SPRITE_ROCKER, 28, 3, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index dc6a99a99..9507e9a26 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -3,7 +3,7 @@ const_value set 2 const FIGHTINGDOJO_POKE_BALL FightingDojo_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -51,15 +51,15 @@ FightingDojo_MapEventHeader: warp_def $b, $4, 1, SAFFRON_CITY warp_def $b, $5, 1, SAFFRON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 4, SIGNPOST_READ, MapFightingDojoSignpost0Script - signpost 0, 5, SIGNPOST_READ, MapFightingDojoSignpost1Script + bg_event 0, 4, BGEVENT_READ, MapFightingDojoSignpost0Script + bg_event 0, 5, BGEVENT_READ, MapFightingDojoSignpost1Script -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_BLACK_BELT, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1 - person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND + object_event SPRITE_BLACK_BELT, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1 + object_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index 7abec5a1e..3a0758a39 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -3,25 +3,25 @@ const_value set 2 const FUCHSIABILLSPEECHHOUSE_YOUNGSTER FuchsiaBillSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -PokefanFScript_0x1963bd: - jumptextfaceplayer UnknownText_0x1963c3 +FuchsiaBillSpeechHousePokefanFScript: + jumptextfaceplayer FuchsiaBillSpeechHousePokefanFText -YoungsterScript_0x1963c0: - jumptextfaceplayer UnknownText_0x1963f9 +FuchsiaBillSpeechHouseYoungsterScript: + jumptextfaceplayer FuchsiaBillSpeechHouseYoungsterText -UnknownText_0x1963c3: +FuchsiaBillSpeechHousePokefanFText: text "My grandpa is at " line "my brother BILL's" cont "on CERULEAN CAPE." done -UnknownText_0x1963f9: +FuchsiaBillSpeechHouseYoungsterText: text "I saw these weird," line "slow #MON on" cont "CYCLING ROAD." @@ -36,13 +36,13 @@ FuchsiaBillSpeechHouse_MapEventHeader: warp_def $7, $2, 4, FUCHSIA_CITY warp_def $7, $3, 4, FUCHSIA_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x1963bd, -1 - person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1963c0, -1 + object_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHousePokefanFScript, -1 + object_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHouseYoungsterScript, -1 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 13af9ee23..97a6f2363 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -5,13 +5,11 @@ const_value set 2 const FUCHSIACITY_FRUIT_TREE FuchsiaCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -45,7 +43,7 @@ SafariZoneClosedSign: NoLitteringSign: jumptext NoLitteringSignText -FuchsiaCityPokeCenterSign: +FuchsiaCityPokecenterSign: jumpstd pokecentersign FuchsiaCityMartSign: @@ -144,23 +142,23 @@ FuchsiaCity_MapEventHeader: warp_def $23, $7, 1, ROUTE_19___FUCHSIA_GATE warp_def $23, $8, 2, ROUTE_19___FUCHSIA_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 8 - signpost 15, 21, SIGNPOST_READ, FuchsiaCitySign - signpost 29, 5, SIGNPOST_READ, FuchsiaGymSign - signpost 15, 25, SIGNPOST_READ, SafariZoneOfficeSign - signpost 29, 27, SIGNPOST_READ, WardensHomeSign - signpost 5, 17, SIGNPOST_READ, SafariZoneClosedSign - signpost 15, 13, SIGNPOST_READ, NoLitteringSign - signpost 27, 20, SIGNPOST_READ, FuchsiaCityPokeCenterSign - signpost 13, 6, SIGNPOST_READ, FuchsiaCityMartSign - -.PersonEvents: + bg_event 15, 21, BGEVENT_READ, FuchsiaCitySign + bg_event 29, 5, BGEVENT_READ, FuchsiaGymSign + bg_event 15, 25, BGEVENT_READ, SafariZoneOfficeSign + bg_event 29, 27, BGEVENT_READ, WardensHomeSign + bg_event 5, 17, BGEVENT_READ, SafariZoneClosedSign + bg_event 15, 13, BGEVENT_READ, NoLitteringSign + bg_event 27, 20, BGEVENT_READ, FuchsiaCityPokecenterSign + bg_event 13, 6, BGEVENT_READ, FuchsiaCityMartSign + +.ObjectEvents: db 4 - person_event SPRITE_YOUNGSTER, 18, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1 - person_event SPRITE_POKEFAN_M, 8, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1 - person_event SPRITE_TEACHER, 14, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1 - person_event SPRITE_FRUIT_TREE, 1, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1 + object_event SPRITE_YOUNGSTER, 18, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1 + object_event SPRITE_POKEFAN_M, 8, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1 + object_event SPRITE_TEACHER, 14, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1 + object_event SPRITE_FRUIT_TREE, 1, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index b7660e9f1..7d3caac18 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -7,7 +7,7 @@ const_value set 2 const FUCHSIAGYM_GYM_GUY FuchsiaGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -389,19 +389,19 @@ FuchsiaGym_MapEventHeader: warp_def $11, $4, 3, FUCHSIA_CITY warp_def $11, $5, 3, FUCHSIA_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 15, 3, SIGNPOST_READ, FuchsiaGymStatue - signpost 15, 6, SIGNPOST_READ, FuchsiaGymStatue + bg_event 15, 3, BGEVENT_READ, FuchsiaGymStatue + bg_event 15, 6, BGEVENT_READ, FuchsiaGymStatue -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_JANINE, 10, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1 - person_event SPRITE_FUCHSIA_GYM_1, 7, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassAliceScript, -1 - person_event SPRITE_FUCHSIA_GYM_2, 11, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassLindaScript, -1 - person_event SPRITE_FUCHSIA_GYM_3, 4, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PicnickerCindyScript, -1 - person_event SPRITE_FUCHSIA_GYM_4, 2, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CamperBarryScript, -1 - person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1 + object_event SPRITE_JANINE, 10, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1 + object_event SPRITE_FUCHSIA_GYM_1, 7, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassAliceScript, -1 + object_event SPRITE_FUCHSIA_GYM_2, 11, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassLindaScript, -1 + object_event SPRITE_FUCHSIA_GYM_3, 4, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PicnickerCindyScript, -1 + object_event SPRITE_FUCHSIA_GYM_4, 2, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CamperBarryScript, -1 + object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index fdf0bc045..05266ecee 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -4,7 +4,7 @@ const_value set 2 const FUCHSIAMART_COOLTRAINER_F FuchsiaMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,13 +16,13 @@ ClerkScript_0x195ce8: closetext end -FisherScript_0x195cef: - jumptextfaceplayer UnknownText_0x195cf5 +FuchsiaMartFisherScript: + jumptextfaceplayer FuchsiaMartFisherText -CooltrainerFScript_0x195cf2: - jumptextfaceplayer UnknownText_0x195d36 +FuchsiaMartCooltrainerFScript: + jumptextfaceplayer FuchsiaMartCooltrainerFText -UnknownText_0x195cf5: +FuchsiaMartFisherText: text "I was hoping to" line "buy some SAFARI" @@ -30,7 +30,7 @@ UnknownText_0x195cf5: line "but it's closed…" done -UnknownText_0x195d36: +FuchsiaMartCooltrainerFText: text "The SAFARI ZONE" line "WARDEN's grand-" cont "daughter lives in" @@ -46,14 +46,14 @@ FuchsiaMart_MapEventHeader: warp_def $7, $2, 1, FUCHSIA_CITY warp_def $7, $3, 1, FUCHSIA_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1 - person_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x195cef, -1 - person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x195cf2, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1 + object_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1 + object_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1 diff --git a/maps/FuchsiaPokeCenter2FBeta.asm b/maps/FuchsiaPokeCenter2FBeta.asm deleted file mode 100644 index 7ba5508a9..000000000 --- a/maps/FuchsiaPokeCenter2FBeta.asm +++ /dev/null @@ -1,23 +0,0 @@ -FuchsiaPokeCenter2FBeta_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -FuchsiaPokeCenter2FBeta_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def $7, $0, 3, FUCHSIA_POKECENTER_1F - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 0 diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokecenter1F.asm index 820d854c5..7afc161e2 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -4,27 +4,25 @@ const_value set 2 const FUCHSIAPOKECENTER1F_COOLTRAINER_F const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR -FuchsiaPokeCenter1F_MapScriptHeader: -.MapTriggers: +FuchsiaPokecenter1F_MapScriptHeader: +.SceneScripts: db 1 - - ; triggers - dw UnknownScript_0x196458, 0 + scene_script .DummyScene .MapCallbacks: db 0 -UnknownScript_0x196458: +.DummyScene: end NurseScript_0x196459: jumpstd pokecenternurse -CooltrainerMScript_0x19645c: - jumptextfaceplayer UnknownText_0x196494 +FuchsiaPokecenter1FCooltrainerMScript: + jumptextfaceplayer FuchsiaPokecenter1FCooltrainerMText -CooltrainerFScript_0x19645f: - jumptextfaceplayer UnknownText_0x1964dc +FuchsiaPokecenter1FCooltrainerFScript: + jumptextfaceplayer FuchsiaPokecenter1FCooltrainerFText JanineImpersonatorScript_0x196462: faceplayer @@ -62,7 +60,7 @@ MovementData_0x196486: turn_head DOWN step_end -UnknownText_0x196494: +FuchsiaPokecenter1FCooltrainerMText: text "Hey! You have a" line "brand new kind of" cont "#DEX." @@ -71,7 +69,7 @@ UnknownText_0x196494: line "that to you?" done -UnknownText_0x1964dc: +FuchsiaPokecenter1FCooltrainerFText: text "I got quite a" line "shock at the GYM." @@ -90,7 +88,7 @@ UnknownText_0x19654e: line "like her now!" done -FuchsiaPokeCenter1F_MapEventHeader: +FuchsiaPokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -100,15 +98,15 @@ FuchsiaPokeCenter1F_MapEventHeader: warp_def $7, $4, 5, FUCHSIA_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, NurseScript_0x196459, -1 - person_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19645c, -1 - person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x19645f, -1 - person_event SPRITE_JANINE_IMPERSONATOR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1 + object_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1 + object_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1 + object_event SPRITE_JANINE_IMPERSONATOR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1 diff --git a/maps/FuchsiaPokecenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm new file mode 100644 index 000000000..90cb6de5d --- /dev/null +++ b/maps/FuchsiaPokecenter2FBeta.asm @@ -0,0 +1,23 @@ +FuchsiaPokecenter2FBeta_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +FuchsiaPokecenter2FBeta_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 1 + warp_def $7, $0, 3, FUCHSIA_POKECENTER_1F + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 0 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 456f5aaa0..1d83e2dfe 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -2,7 +2,7 @@ const_value set 2 const GOLDENRODBIKESHOP_CLERK GoldenrodBikeShop_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -111,21 +111,21 @@ GoldenrodBikeShop_MapEventHeader: warp_def $7, $2, 2, GOLDENROD_CITY warp_def $7, $3, 2, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 9 - signpost 2, 1, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - signpost 3, 0, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - signpost 3, 1, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - signpost 5, 0, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - signpost 5, 1, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - signpost 6, 0, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - signpost 6, 1, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - signpost 6, 6, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - signpost 6, 7, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - -.PersonEvents: + bg_event 2, 1, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 3, 0, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 3, 1, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 5, 0, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 5, 1, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 6, 0, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 6, 1, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 6, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 6, 7, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + +.ObjectEvents: db 1 - person_event SPRITE_CLERK, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ClerkScript_0x54750, -1 + object_event SPRITE_CLERK, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x54750, -1 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 6d33b5ce0..71e44841a 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -4,7 +4,7 @@ const_value set 2 const GOLDENRODBILLSHOUSE_TWIN GoldenrodBillsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -251,17 +251,17 @@ GoldenrodBillsHouse_MapEventHeader: warp_def $7, $2, 4, GOLDENROD_CITY warp_def $7, $3, 4, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 0, SIGNPOST_READ, BillsHouseBookshelf2 - signpost 1, 1, SIGNPOST_READ, BillsHouseBookshelf1 - signpost 1, 7, SIGNPOST_READ, BillsHouseRadio + bg_event 1, 0, BGEVENT_READ, BillsHouseBookshelf2 + bg_event 1, 1, BGEVENT_READ, BillsHouseBookshelf1 + bg_event 1, 7, BGEVENT_READ, BillsHouseRadio -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_BILL, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BillsHouseBill, EVENT_MET_BILL - person_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BillsMom, -1 - person_event SPRITE_TWIN, 4, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BillsSister, -1 + object_event SPRITE_BILL, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsHouseBill, EVENT_MET_BILL + object_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMom, -1 + object_event SPRITE_TWIN, 4, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSister, -1 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 7642bf6b7..d629d86c9 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -6,23 +6,21 @@ const_value set 2 const GOLDENRODCITY_YOUNGSTER2 const GOLDENRODCITY_LASS const GOLDENRODCITY_GRAMPS + const GOLDENRODCITY_ROCKETSCOUT const GOLDENRODCITY_ROCKET1 const GOLDENRODCITY_ROCKET2 const GOLDENRODCITY_ROCKET3 const GOLDENRODCITY_ROCKET4 const GOLDENRODCITY_ROCKET5 const GOLDENRODCITY_ROCKET6 - const GOLDENRODCITY_ROCKET7 const GOLDENRODCITY_POKEFAN_M2 GoldenrodCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 2 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPointAndFloria dbw MAPCALLBACK_OBJECTS, .MoveTutor @@ -162,11 +160,11 @@ MoveTutor: closetext end -PokefanMScript_0x1989e3: - jumptextfaceplayer UnknownText_0x198a69 +GoldenrodCityPokefanMScript: + jumptextfaceplayer GoldenrodCityPokefanMText -YoungsterScript_0x1989e6: - jumptextfaceplayer UnknownText_0x198aa9 +GoldenrodCityYoungster1Script: + jumptextfaceplayer GoldenrodCityYoungster1Text CooltrainerFScript_0x1989e9: faceplayer @@ -200,43 +198,43 @@ CooltrainerFScript_0x1989fd: closetext end -YoungsterScript_0x198a11: - jumptextfaceplayer UnknownText_0x198c36 +GoldenrodCityYoungster2Script: + jumptextfaceplayer GoldenrodCityYoungster2Text -LassScript_0x198a14: - jumptextfaceplayer UnknownText_0x198c83 +GoldenrodCityLassScript: + jumptextfaceplayer GoldenrodCityLassText -GrampsScript_0x198a17: - jumptextfaceplayer UnknownText_0x198ccf +GoldenrodCityGrampsScript: + jumptextfaceplayer GoldenrodCityGrampsText -RocketScript_0x198a1a: +GoldenrodCityRocketScoutScript: opentext - writetext UnknownText_0x198d0d + writetext GoldenrodCityRocketScoutText1 buttonsound faceplayer - writetext UnknownText_0x198d2a + writetext GoldenrodCityRocketScoutText2 waitbutton closetext - spriteface GOLDENRODCITY_ROCKET1, UP + spriteface GOLDENRODCITY_ROCKETSCOUT, UP end -RocketScript_0x198a29: - jumptextfaceplayer UnknownText_0x198d4e +GoldenrodCityRocket1Script: + jumptextfaceplayer GoldenrodCityRocket1Text -RocketScript_0x198a2c: - jumptextfaceplayer UnknownText_0x198d6d +GoldenrodCityRocket2Script: + jumptextfaceplayer GoldenrodCityRocket2Text -RocketScript_0x198a2f: - jumptextfaceplayer UnknownText_0x198daa +GoldenrodCityRocket3Script: + jumptextfaceplayer GoldenrodCityRocket3Text -RocketScript_0x198a32: - jumptextfaceplayer UnknownText_0x198de2 +GoldenrodCityRocket4Script: + jumptextfaceplayer GoldenrodCityRocket4Text -RocketScript_0x198a35: - jumptextfaceplayer UnknownText_0x198e1f +GoldenrodCityRocket5Script: + jumptextfaceplayer GoldenrodCityRocket5Text -RocketScript_0x198a38: - jumptextfaceplayer UnknownText_0x198e4b +GoldenrodCityRocket6Script: + jumptextfaceplayer GoldenrodCityRocket6Text GoldenrodCityStationSign: jumptext GoldenrodCityStationSignText @@ -268,7 +266,7 @@ GoldenrodCityUndergroundSignNorth: GoldenrodCityUndergroundSignSouth: jumptext GoldenrodCityUndergroundSignSouthText -GoldenrodCityPokeCenterSign: +GoldenrodCityPokecenterSign: jumpstd pokecentersign GoldenrodCityFlowerShopSign: @@ -288,7 +286,7 @@ MovementData_0x198a63: step UP step_end -UnknownText_0x198a69: +GoldenrodCityPokefanMText: text "They built the new" line "RADIO TOWER to" @@ -296,7 +294,7 @@ UnknownText_0x198a69: line "creaky one." done -UnknownText_0x198aa9: +GoldenrodCityYoungster1Text: text "I know there's a" line "new BIKE SHOP, but" @@ -341,7 +339,7 @@ UnknownText_0x198c14: line "works as a radio!" done -UnknownText_0x198c36: +GoldenrodCityYoungster2Text: text "E-he-he-he…" para "I got in trouble" @@ -351,7 +349,7 @@ UnknownText_0x198c36: line "DEPT.STORE." done -UnknownText_0x198c83: +GoldenrodCityLassText: text "The man at that" line "house rates your" cont "#MON names." @@ -360,7 +358,7 @@ UnknownText_0x198c83: line "your #MON." done -UnknownText_0x198ccf: +GoldenrodCityGrampsText: text "Whew! This is one" line "big town. I don't" @@ -368,22 +366,22 @@ UnknownText_0x198ccf: line "thing is." done -UnknownText_0x198d0d: +GoldenrodCityRocketScoutText1: text "So this is the" line "RADIO TOWER…" done -UnknownText_0x198d2a: +GoldenrodCityRocketScoutText2: text "What do you want," line "you pest? Scram!" done -UnknownText_0x198d4e: +GoldenrodCityRocket1Text: text "Stay out of the" line "way! Beat it!" done -UnknownText_0x198d6d: +GoldenrodCityRocket2Text: text "Take over the" line "RADIO TOWER…" @@ -391,7 +389,7 @@ UnknownText_0x198d6d: line "your business!" done -UnknownText_0x198daa: +GoldenrodCityRocket3Text: text "#MON? They're" line "nothing more than" @@ -399,7 +397,7 @@ UnknownText_0x198daa: line "money!" done -UnknownText_0x198de2: +GoldenrodCityRocket4Text: text "Our dream will" line "soon come true…" @@ -407,13 +405,13 @@ UnknownText_0x198de2: line "struggle…" done -UnknownText_0x198e1f: +GoldenrodCityRocket5Text: text "Hey, brat! You" line "don't belong here!" cont "Get lost!" done -UnknownText_0x198e4b: +GoldenrodCityRocket6Text: text "Come taste the" line "true terror of" cont "TEAM ROCKET!" @@ -574,42 +572,42 @@ GoldenrodCity_MapEventHeader: warp_def $15, $e, 1, GOLDENROD_GAME_CORNER warp_def $f, $5, 1, RADIO_TOWER_1F warp_def $1, $13, 3, ROUTE_35_GOLDENROD_GATE - warp_def $5, $9, 8, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES - warp_def $1d, $b, 5, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES + warp_def $5, $9, 8, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_def $1d, $b, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES warp_def $1b, $f, 1, GOLDENROD_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 12 - signpost 14, 10, SIGNPOST_READ, GoldenrodCityStationSign - signpost 17, 4, SIGNPOST_READ, GoldenrodCityRadioTowerSign - signpost 27, 26, SIGNPOST_READ, GoldenrodDeptStoreSign - signpost 9, 26, SIGNPOST_READ, GoldenrodGymSign - signpost 18, 22, SIGNPOST_READ, GoldenrodCitySign - signpost 30, 28, SIGNPOST_READ, GoldenrodCityBikeShopSign - signpost 22, 16, SIGNPOST_READ, GoldenrodCityGameCornerSign - signpost 7, 12, SIGNPOST_READ, GoldenrodCityNameRaterSign - signpost 6, 8, SIGNPOST_READ, GoldenrodCityUndergroundSignNorth - signpost 30, 12, SIGNPOST_READ, GoldenrodCityUndergroundSignSouth - signpost 27, 16, SIGNPOST_UP, GoldenrodCityPokeCenterSign - signpost 6, 30, SIGNPOST_READ, GoldenrodCityFlowerShopSign - -.PersonEvents: + bg_event 14, 10, BGEVENT_READ, GoldenrodCityStationSign + bg_event 17, 4, BGEVENT_READ, GoldenrodCityRadioTowerSign + bg_event 27, 26, BGEVENT_READ, GoldenrodDeptStoreSign + bg_event 9, 26, BGEVENT_READ, GoldenrodGymSign + bg_event 18, 22, BGEVENT_READ, GoldenrodCitySign + bg_event 30, 28, BGEVENT_READ, GoldenrodCityBikeShopSign + bg_event 22, 16, BGEVENT_READ, GoldenrodCityGameCornerSign + bg_event 7, 12, BGEVENT_READ, GoldenrodCityNameRaterSign + bg_event 6, 8, BGEVENT_READ, GoldenrodCityUndergroundSignNorth + bg_event 30, 12, BGEVENT_READ, GoldenrodCityUndergroundSignSouth + bg_event 27, 16, BGEVENT_UP, GoldenrodCityPokecenterSign + bg_event 6, 30, BGEVENT_READ, GoldenrodCityFlowerShopSign + +.ObjectEvents: db 15 - person_event SPRITE_POKEFAN_M, 18, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1989e3, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_YOUNGSTER, 17, 30, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1989e6, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_COOLTRAINER_F, 16, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_COOLTRAINER_F, 26, 20, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_YOUNGSTER, 17, 19, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x198a11, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_LASS, 10, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x198a14, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_GRAMPS, 27, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x198a17, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_ROCKET, 16, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a1a, EVENT_GOLDENROD_CITY_ROCKET_SCOUT - person_event SPRITE_ROCKET, 20, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a29, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a2c, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 23, 16, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a2f, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 20, 29, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a32, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 7, 29, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a35, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 10, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a38, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_POKEFAN_M, 22, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR + object_event SPRITE_POKEFAN_M, 18, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_YOUNGSTER, 17, 30, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_COOLTRAINER_F, 16, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_COOLTRAINER_F, 26, 20, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_YOUNGSTER, 17, 19, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster2Script, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_LASS, 10, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodCityLassScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_GRAMPS, 27, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityGrampsScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_ROCKET, 16, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocketScoutScript, EVENT_GOLDENROD_CITY_ROCKET_SCOUT + object_event SPRITE_ROCKET, 20, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket1Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket2Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 23, 16, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket3Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 20, 29, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket4Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 7, 29, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 10, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket6Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_POKEFAN_M, 22, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 455d66b79..9fd609dee 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -5,23 +5,23 @@ const_value set 2 const GOLDENRODDEPTSTORE1F_GENTLEMAN GoldenrodDeptStore1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -ReceptionistScript_0x55981: - jumptextfaceplayer UnknownText_0x55993 +GoldenrodDeptStore1FReceptionistScript: + jumptextfaceplayer GoldenrodDeptStore1FReceptionistText -GentlemanScript_0x55984: - jumptextfaceplayer UnknownText_0x559b7 +GoldenrodDeptStore1FGentlemanScript: + jumptextfaceplayer GoldenrodDeptStore1FGentlemanText -PokefanFScript_0x55987: - jumptextfaceplayer UnknownText_0x55a1a +GoldenrodDeptStore1FPokefanFScript: + jumptextfaceplayer GoldenrodDeptStore1FPokefanFText -BugCatcherScript_0x5598a: - jumptextfaceplayer UnknownText_0x55a3a +GoldenrodDeptStore1FBugCatcherScript: + jumptextfaceplayer GoldenrodDeptStore1FBugCatcherText GoldenrodDeptStore1FDirectory: jumptext GoldenrodDeptStore1FDirectoryText @@ -29,12 +29,12 @@ GoldenrodDeptStore1FDirectory: GoldenrodDeptStore1FElevatorButton: jumpstd elevatorbutton -UnknownText_0x55993: +GoldenrodDeptStore1FReceptionistText: text "Welcome to GOLDEN-" line "ROD DEPT.STORE." done -UnknownText_0x559b7: +GoldenrodDeptStore1FGentlemanText: text "The DEPT.STORE" line "has a decent se-" cont "lection." @@ -46,12 +46,12 @@ UnknownText_0x559b7: line "prizes." done -UnknownText_0x55a1a: +GoldenrodDeptStore1FPokefanFText: text "I'm raring to shop" line "again today!" done -UnknownText_0x55a3a: +GoldenrodDeptStore1FBugCatcherText: text "Mom's good at" line "bargain hunting." @@ -89,17 +89,17 @@ GoldenrodDeptStore1F_MapEventHeader: warp_def $0, $f, 2, GOLDENROD_DEPT_STORE_2F warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore1FDirectory - signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore1FElevatorButton + bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore1FDirectory + bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x55981, -1 - person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x55987, -1 - person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x5598a, -1 - person_event SPRITE_GENTLEMAN, 5, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x55984, -1 + object_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1 + object_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1 + object_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1 + object_event SPRITE_GENTLEMAN, 5, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FGentlemanScript, -1 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index ba7c74a18..d1d827c52 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -6,7 +6,7 @@ const_value set 2 const GOLDENRODDEPTSTORE2F_GENTLEMAN GoldenrodDeptStore2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -26,14 +26,14 @@ ClerkScript_0x55b65: closetext end -YoungsterScript_0x55b6d: - jumptextfaceplayer UnknownText_0x55c25 +GoldenrodDeptStore2FYoungsterScript: + jumptextfaceplayer GoldenrodDeptStore2FYoungsterText -CooltrainerFScript_0x55b70: - jumptextfaceplayer UnknownText_0x55c7b +GoldenrodDeptStore2FCooltrainerFScript: + jumptextfaceplayer GoldenrodDeptStore2FCooltrainerFText -GentlemanScript_0x55b73: - jumptextfaceplayer UnknownText_0x55cb7 +GoldenrodDeptStore2FGentlemanScript: + jumptextfaceplayer GoldenrodDeptStore2FGentlemanText GoldenrodDeptStore2FDirectory: jumptext GoldenrodDeptStore2FDirectoryText @@ -62,7 +62,7 @@ UnknownText_0x55bd3: cont "techniques." done -UnknownText_0x55c25: +GoldenrodDeptStore2FYoungsterText: text "#GEAR can store" line "up to ten phone" cont "numbers." @@ -72,7 +72,7 @@ UnknownText_0x55c25: cont "to keep." done -UnknownText_0x55c7b: +GoldenrodDeptStore2FCooltrainerFText: text "I got my ABRA at" line "the GAME CORNER." @@ -80,7 +80,7 @@ UnknownText_0x55c7b: line "partner." done -UnknownText_0x55cb7: +GoldenrodDeptStore2FGentlemanText: text "This DEPT.STORE" line "makes me realize" @@ -110,18 +110,18 @@ GoldenrodDeptStore2F_MapEventHeader: warp_def $0, $f, 3, GOLDENROD_DEPT_STORE_1F warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore2FDirectory - signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore2FElevatorButton + bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore2FDirectory + bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1 - person_event SPRITE_CLERK, 6, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1 - person_event SPRITE_YOUNGSTER, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x55b6d, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x55b70, -1 - person_event SPRITE_GENTLEMAN, 6, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x55b73, -1 + object_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1 + object_event SPRITE_CLERK, 6, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1 + object_event SPRITE_YOUNGSTER, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1 + object_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1 + object_event SPRITE_GENTLEMAN, 6, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index e9db446a0..94765e409 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -4,7 +4,7 @@ const_value set 2 const GOLDENRODDEPTSTORE3F_ROCKER GoldenrodDeptStore3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -17,11 +17,11 @@ ClerkScript_0x55db8: closetext end -SuperNerdScript_0x55dc0: - jumptextfaceplayer UnknownText_0x55dcc +GoldenrodDeptStore3FSuperNerdScript: + jumptextfaceplayer GoldenrodDeptStore3FSuperNerdText -RockerScript_0x55dc3: - jumptextfaceplayer UnknownText_0x55e15 +GoldenrodDeptStore3FRockerScript: + jumptextfaceplayer GoldenrodDeptStore3FRockerText GoldenrodDeptStore3FDirectory: jumptext GoldenrodDeptStore3FDirectoryText @@ -29,7 +29,7 @@ GoldenrodDeptStore3FDirectory: GoldenrodDeptStore3FElevatorButton: jumpstd elevatorbutton -UnknownText_0x55dcc: +GoldenrodDeptStore3FSuperNerdText: text "I, I, I'm really" line "impatient!" @@ -38,7 +38,7 @@ UnknownText_0x55dcc: cont "my #MON." done -UnknownText_0x55e15: +GoldenrodDeptStore3FRockerText: text "Hey! When you bat-" line "tle, do you use X" cont "SPECIAL?" @@ -66,16 +66,16 @@ GoldenrodDeptStore3F_MapEventHeader: warp_def $0, $f, 2, GOLDENROD_DEPT_STORE_4F warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore3FDirectory - signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore3FElevatorButton + bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore3FDirectory + bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1 - person_event SPRITE_SUPER_NERD, 5, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x55dc0, -1 - person_event SPRITE_ROCKER, 5, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RockerScript_0x55dc3, -1 + object_event SPRITE_CLERK, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1 + object_event SPRITE_SUPER_NERD, 5, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1 + object_event SPRITE_ROCKER, 5, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 61c5ff120..c12de0391 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -5,7 +5,7 @@ const_value set 2 const GOLDENRODDEPTSTORE4F_GAMEBOY_KID GoldenrodDeptStore4F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -18,11 +18,11 @@ ClerkScript_0x55ee9: closetext end -CooltrainerMScript_0x55ef1: - jumptextfaceplayer UnknownText_0x55f08 +GoldenrodDeptStore4FCooltrainerMScript: + jumptextfaceplayer GoldenrodDeptStore4FCooltrainerMText -BugCatcherScript_0x55ef4: - jumptextfaceplayer UnknownText_0x55f52 +GoldenrodDeptStore4FBugCatcherScript: + jumptextfaceplayer GoldenrodDeptStore4FBugCatcherText GameboyKidScript_0x55ef7: faceplayer @@ -39,7 +39,7 @@ GoldenrodDeptStore4FDirectory: GoldenrodDeptStore4FElevatorButton: jumpstd elevatorbutton -UnknownText_0x55f08: +GoldenrodDeptStore4FCooltrainerMText: text "Hey. I love strong" line "#MON." @@ -48,7 +48,7 @@ UnknownText_0x55f08: cont "their ATTACK." done -UnknownText_0x55f52: +GoldenrodDeptStore4FBugCatcherText: text "IRON adds to your" line "#MON's DEFENSE." done @@ -87,17 +87,17 @@ GoldenrodDeptStore4F_MapEventHeader: warp_def $0, $f, 2, GOLDENROD_DEPT_STORE_3F warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore4FDirectory - signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore4FElevatorButton + bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore4FDirectory + bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1 - person_event SPRITE_COOLTRAINER_M, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x55ef1, -1 - person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x55ef4, -1 - person_event SPRITE_GAMEBOY_KID, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1 + object_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1 + object_event SPRITE_COOLTRAINER_M, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1 + object_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1 + object_event SPRITE_GAMEBOY_KID, 1, 5, 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 b10f019ac..7c358cd18 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -7,14 +7,11 @@ const_value set 2 const GOLDENRODDEPTSTORE5F_RECEPTIONIST GoldenrodDeptStore5F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .CheckIfSunday .CheckIfSunday: @@ -123,19 +120,19 @@ Carrie: closetext end -LassScript_0x56130: - jumptextfaceplayer UnknownText_0x562ad +GoldenrodDeptStore5FLassScript: + jumptextfaceplayer GoldenrodDeptStore5FLassText Mike: faceplayer opentext - trade $0 + trade NPCTRADE_MIKE waitbutton closetext end -PokefanMScript_0x5613a: - jumptextfaceplayer UnknownText_0x562f3 +GoldenrodDeptStore5FPokefanMScript: + jumptextfaceplayer GoldenrodDeptStore5FPokefanMText GoldenrodDeptStore5FDirectory: jumptext GoldenrodDeptStore5FDirectoryText @@ -192,7 +189,7 @@ UnknownText_0x56279: cont "Game Boy Color." done -UnknownText_0x562ad: +GoldenrodDeptStore5FLassText: text "On Sundays, a lady" line "comes to check out" cont "#MON." @@ -201,7 +198,7 @@ UnknownText_0x562ad: line "away TMs!" done -UnknownText_0x562f3: +GoldenrodDeptStore5FPokefanMText: text "You can't rename a" line "#MON you get in" cont "a trade." @@ -230,19 +227,19 @@ GoldenrodDeptStore5F_MapEventHeader: warp_def $0, $f, 1, GOLDENROD_DEPT_STORE_6F warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore5FDirectory - signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore5FElevatorButton + bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore5FDirectory + bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1 - person_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x56130, -1 - person_event SPRITE_COOLTRAINER_M, 3, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Mike, -1 - person_event SPRITE_POKEFAN_M, 5, 13, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x5613a, -1 - person_event SPRITE_TWIN, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, Carrie, -1 - person_event SPRITE_RECEPTIONIST, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY + object_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1 + object_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1 + object_event SPRITE_COOLTRAINER_M, 3, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1 + object_event SPRITE_POKEFAN_M, 5, 13, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FPokefanMScript, -1 + object_event SPRITE_TWIN, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Carrie, -1 + object_event SPRITE_RECEPTIONIST, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 10e233381..f3fd44501 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -3,7 +3,7 @@ const_value set 2 const GOLDENRODDEPTSTORE6F_SUPER_NERD GoldenrodDeptStore6F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -84,11 +84,11 @@ GoldenrodVendingMachine: db "CANCEL@" -LassScript_0x564bf: - jumptextfaceplayer UnknownText_0x5654b +GoldenrodDeptStore6FLassScript: + jumptextfaceplayer GoldenrodDeptStore6FLassText -SuperNerdScript_0x564c2: - jumptextfaceplayer UnknownText_0x565ca +GoldenrodDeptStore6FSuperNerdScript: + jumptextfaceplayer GoldenrodDeptStore6FSuperNerdText GoldenrodDeptStore6FDirectory: jumptext GoldenrodDeptStore6FDirectoryText @@ -119,7 +119,7 @@ GoldenrodVendingNoSpaceText: line "room for stuff." done -UnknownText_0x5654b: +GoldenrodDeptStore6FLassText: text "Do you listen to" line "LUCKY CHANNEL?" @@ -133,7 +133,7 @@ UnknownText_0x5654b: line "numbers." done -UnknownText_0x565ca: +GoldenrodDeptStore6FSuperNerdText: text "If you're tired," line "try the vending" cont "machine's drinks." @@ -159,19 +159,19 @@ GoldenrodDeptStore6F_MapEventHeader: warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR warp_def $0, $d, 1, GOLDENROD_DEPT_STORE_ROOF -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore6FDirectory - signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore6FElevatorButton - signpost 1, 8, SIGNPOST_UP, GoldenrodVendingMachine - signpost 1, 9, SIGNPOST_UP, GoldenrodVendingMachine - signpost 1, 10, SIGNPOST_UP, GoldenrodVendingMachine - signpost 1, 11, SIGNPOST_UP, GoldenrodVendingMachine - -.PersonEvents: + bg_event 0, 14, BGEVENT_READ, GoldenrodDeptStore6FDirectory + bg_event 0, 3, BGEVENT_READ, GoldenrodDeptStore6FElevatorButton + bg_event 1, 8, BGEVENT_UP, GoldenrodVendingMachine + bg_event 1, 9, BGEVENT_UP, GoldenrodVendingMachine + bg_event 1, 10, BGEVENT_UP, GoldenrodVendingMachine + bg_event 1, 11, BGEVENT_UP, GoldenrodVendingMachine + +.ObjectEvents: db 2 - person_event SPRITE_LASS, 2, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x564bf, -1 - person_event SPRITE_SUPER_NERD, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x564c2, -1 + object_event SPRITE_LASS, 2, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1 + object_event SPRITE_SUPER_NERD, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 769c01fb8..a52f68ab5 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -9,16 +9,12 @@ const_value set 2 const GOLDENRODDEPTSTOREB1F_MACHOP GoldenrodDeptStoreB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_TILES, UnknownScript_0x7d781 - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac UnknownScript_0x7d781: @@ -31,9 +27,9 @@ UnknownScript_0x7d78a: jump UnknownScript_0x7d791 UnknownScript_0x7d791: - checkevent EVENT_WAREHOUSE_LAYOUT_2 + checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2 iftrue .Layout2 - checkevent EVENT_WAREHOUSE_LAYOUT_3 + checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 iftrue .Layout3 changeblock $a, $8, $d return @@ -47,17 +43,17 @@ UnknownScript_0x7d791: return UnknownScript_0x7d7ac: - clearevent EVENT_WAREHOUSE_BLOCKED_OFF + clearevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF return -BlackBeltScript_0x7d7b0: - jumptextfaceplayer UnknownText_0x7d7cb +GoldenrodDeptStoreB1FBlackBelt1Script: + jumptextfaceplayer GoldenrodDeptStoreB1FBlackBelt1Text -BlackBeltScript_0x7d7b3: - jumptextfaceplayer UnknownText_0x7d82c +GoldenrodDeptStoreB1FBlackBelt2Script: + jumptextfaceplayer GoldenrodDeptStoreB1FBlackBelt2Text -BlackBeltScript_0x7d7b6: - jumptextfaceplayer UnknownText_0x7d875 +GoldenrodDeptStoreB1FBlackBelt3Script: + jumptextfaceplayer GoldenrodDeptStoreB1FBlackBelt3Text MachopScript_0x7d7b9: opentext @@ -79,7 +75,7 @@ GoldenrodDeptStoreB1FBurnHeal: GoldenrodDeptStoreB1FUltraBall: itemball ULTRA_BALL -UnknownText_0x7d7cb: +GoldenrodDeptStoreB1FBlackBelt1Text: text "Hey, kid! You're" line "holding us up!" @@ -90,7 +86,7 @@ UnknownText_0x7d7cb: line "one can see us!" done -UnknownText_0x7d82c: +GoldenrodDeptStoreB1FBlackBelt2Text: text "I lose my passion" line "for work if some-" cont "one's watching." @@ -99,7 +95,7 @@ UnknownText_0x7d82c: line "scoot!" done -UnknownText_0x7d875: +GoldenrodDeptStoreB1FBlackBelt3Text: text "Oohah! Oohah!" para "The stuff on the" @@ -119,23 +115,23 @@ GoldenrodDeptStoreB1F_MapEventHeader: .Warps: db 3 - warp_def $2, $11, 3, UNDERGROUND_WAREHOUSE + warp_def $2, $11, 3, GOLDENROD_UNDERGROUND_WAREHOUSE warp_def $4, $9, 1, GOLDENROD_DEPT_STORE_ELEVATOR warp_def $4, $a, 2, GOLDENROD_DEPT_STORE_ELEVATOR -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER - person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN - person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL - person_event SPRITE_POKE_BALL, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL - person_event SPRITE_BLACK_BELT, 10, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b0, -1 - person_event SPRITE_BLACK_BELT, 8, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b3, -1 - person_event SPRITE_BLACK_BELT, 13, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b6, -1 - person_event SPRITE_MACHOP, 7, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1 + object_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER + object_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN + object_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL + object_event SPRITE_POKE_BALL, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL + object_event SPRITE_BLACK_BELT, 10, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1 + object_event SPRITE_BLACK_BELT, 8, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1 + object_event SPRITE_BLACK_BELT, 13, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1 + object_event SPRITE_MACHOP, 7, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1 diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 2a3e2434e..f951e7028 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -1,5 +1,5 @@ GoldenrodDeptStoreElevator_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -14,30 +14,30 @@ MapGoldenrodDeptStoreElevatorSignpost0Script: playsound SFX_ELEVATOR earthquake 60 waitsfx - checkevent EVENT_WAREHOUSE_BLOCKED_OFF + checkevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF iftrue .Done - checkevent EVENT_WAREHOUSE_LAYOUT_1 + checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1 iftrue .BoxLayout1 - checkevent EVENT_WAREHOUSE_LAYOUT_2 + checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2 iftrue .BoxLayout2 - checkevent EVENT_WAREHOUSE_LAYOUT_3 + checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 iftrue .BoxLayout3 .BoxLayout3: - setevent EVENT_WAREHOUSE_LAYOUT_1 - clearevent EVENT_WAREHOUSE_LAYOUT_2 - clearevent EVENT_WAREHOUSE_LAYOUT_3 + setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1 + clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2 + clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 end .BoxLayout1: - clearevent EVENT_WAREHOUSE_LAYOUT_1 - setevent EVENT_WAREHOUSE_LAYOUT_2 - clearevent EVENT_WAREHOUSE_LAYOUT_3 + clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1 + setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2 + clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 end .BoxLayout2: - clearevent EVENT_WAREHOUSE_LAYOUT_1 - clearevent EVENT_WAREHOUSE_LAYOUT_2 - setevent EVENT_WAREHOUSE_LAYOUT_3 + clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1 + clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2 + setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 end .Done: @@ -46,13 +46,13 @@ MapGoldenrodDeptStoreElevatorSignpost0Script: Elevator_0x566e0: db 7 ; floors - elevfloor _B1F, 2, GOLDENROD_DEPT_STORE_B1F - elevfloor _1F, 4, GOLDENROD_DEPT_STORE_1F - elevfloor _2F, 3, GOLDENROD_DEPT_STORE_2F - elevfloor _3F, 3, GOLDENROD_DEPT_STORE_3F - elevfloor _4F, 3, GOLDENROD_DEPT_STORE_4F - elevfloor _5F, 3, GOLDENROD_DEPT_STORE_5F - elevfloor _6F, 2, GOLDENROD_DEPT_STORE_6F + elevfloor FLOOR_B1F, 2, GOLDENROD_DEPT_STORE_B1F + elevfloor FLOOR_1F, 4, GOLDENROD_DEPT_STORE_1F + elevfloor FLOOR_2F, 3, GOLDENROD_DEPT_STORE_2F + elevfloor FLOOR_3F, 3, GOLDENROD_DEPT_STORE_3F + elevfloor FLOOR_4F, 3, GOLDENROD_DEPT_STORE_4F + elevfloor FLOOR_5F, 3, GOLDENROD_DEPT_STORE_5F + elevfloor FLOOR_6F, 2, GOLDENROD_DEPT_STORE_6F db -1 ; end @@ -62,15 +62,15 @@ GoldenrodDeptStoreElevator_MapEventHeader: .Warps: db 2 - warp_def $3, $1, 255, GOLDENROD_DEPT_STORE_1F - warp_def $3, $2, 255, GOLDENROD_DEPT_STORE_1F + warp_def $3, $1, -1, GOLDENROD_DEPT_STORE_1F + warp_def $3, $2, -1, GOLDENROD_DEPT_STORE_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 0, 3, SIGNPOST_READ, MapGoldenrodDeptStoreElevatorSignpost0Script + bg_event 0, 3, BGEVENT_READ, MapGoldenrodDeptStoreElevatorSignpost0Script -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index d3cb7af76..f60970e64 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -9,16 +9,12 @@ const_value set 2 const GOLDENRODDEPTSTOREROOF_BUG_CATCHER GoldenrodDeptStoreRoof_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_TILES, .CheckSaleChangeBlock - dbw MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk .CheckSaleChangeBlock: @@ -49,8 +45,8 @@ ClerkScript_0x5673f: closetext end -PokefanFScript_0x56746: - jumptextfaceplayer UnknownText_0x5677f +GoldenrodDeptStoreRoofPokefanFScript: + jumptextfaceplayer GoldenrodDeptStoreRoofPokefanFText FisherScript_0x56749: faceplayer @@ -61,8 +57,8 @@ FisherScript_0x56749: spriteface GOLDENRODDEPTSTOREROOF_FISHER, UP end -TwinScript_0x56754: - jumptextfaceplayer UnknownText_0x56839 +GoldenrodDeptStoreRoofTwinScript: + jumptextfaceplayer GoldenrodDeptStoreRoofTwinText SuperNerdScript_0x56757: opentext @@ -77,14 +73,14 @@ SuperNerdScript_0x56757: spriteface GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT end -PokefanMScript_0x5676a: - jumptextfaceplayer UnknownText_0x5688e +GoldenrodDeptStoreRoofPokefanMScript: + jumptextfaceplayer GoldenrodDeptStoreRoofPokefanMText -TeacherScript_0x5676d: - jumptextfaceplayer UnknownText_0x56901 +GoldenrodDeptStoreRoofTeacherScript: + jumptextfaceplayer GoldenrodDeptStoreRoofTeacherText -BugCatcherScript_0x56770: - jumptextfaceplayer UnknownText_0x56942 +GoldenrodDeptStoreRoofBugCatcherScript: + jumptextfaceplayer GoldenrodDeptStoreRoofBugCatcherText Binoculars1: jumptext Binoculars1Text @@ -98,7 +94,7 @@ Binoculars3: PokeDollVendingMachine: jumptext PokeDollVendingMachineText -UnknownText_0x5677f: +GoldenrodDeptStoreRoofPokefanFText: text "Whew, I'm tired." para "I sometimes come" @@ -120,7 +116,7 @@ UnknownText_0x567d2: line "dolls!" done -UnknownText_0x56839: +GoldenrodDeptStoreRoofTwinText: text "They have bargain" line "sales here every" cont "so often." @@ -135,7 +131,7 @@ UnknownText_0x56871: line "bothering me?" done -UnknownText_0x5688e: +GoldenrodDeptStoreRoofPokefanMText: text "There's something" line "I really want, but" @@ -147,7 +143,7 @@ UnknownText_0x5688e: cont "I've collected…" done -UnknownText_0x56901: +GoldenrodDeptStoreRoofTeacherText: text "Oh, everything is" line "so cheap!" @@ -155,7 +151,7 @@ UnknownText_0x56901: line "my PACK's crammed!" done -UnknownText_0x56942: +GoldenrodDeptStoreRoofBugCatcherText: text "My #MON always" line "get paralyzed or" @@ -223,23 +219,23 @@ GoldenrodDeptStoreRoof_MapEventHeader: db 1 warp_def $1, $d, 3, GOLDENROD_DEPT_STORE_6F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 3, 15, SIGNPOST_RIGHT, Binoculars1 - signpost 5, 15, SIGNPOST_RIGHT, Binoculars2 - signpost 6, 15, SIGNPOST_RIGHT, Binoculars3 - signpost 0, 3, SIGNPOST_UP, PokeDollVendingMachine + bg_event 3, 15, BGEVENT_RIGHT, Binoculars1 + bg_event 5, 15, BGEVENT_RIGHT, Binoculars2 + bg_event 6, 15, BGEVENT_RIGHT, Binoculars3 + bg_event 0, 3, BGEVENT_UP, PokeDollVendingMachine -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_CLERK, 4, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_POKEFAN_F, 3, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x56746, -1 - person_event SPRITE_FISHER, 1, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x56749, -1 - person_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x56754, EVENT_GOLDENROD_SALE_ON - person_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON - person_event SPRITE_POKEFAN_M, 0, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x5676a, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5676d, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x56770, EVENT_GOLDENROD_SALE_OFF + object_event SPRITE_CLERK, 4, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF + object_event SPRITE_POKEFAN_F, 3, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1 + object_event SPRITE_FISHER, 1, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x56749, -1 + object_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON + object_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON + object_event SPRITE_POKEFAN_M, 0, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF + object_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF + object_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index ae813c34d..974484112 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -3,7 +3,7 @@ const_value set 2 const GOLDENRODFLOWERSHOP_FLORIA GoldenrodFlowerShop_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -168,13 +168,13 @@ GoldenrodFlowerShop_MapEventHeader: warp_def $7, $2, 6, GOLDENROD_CITY warp_def $7, $3, 6, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1 - person_event SPRITE_LASS, 6, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP + object_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1 + object_event SPRITE_LASS, 6, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index ee0ccecb0..8a57e3ef0 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -13,14 +13,11 @@ const_value set 2 const GOLDENRODGAMECORNER_POKEFAN_M3 GoldenrodGameCorner_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Callback .Callback: @@ -454,54 +451,54 @@ GoldenrodGameCorner_MapEventHeader: warp_def $d, $2, 10, GOLDENROD_CITY warp_def $d, $3, 10, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 31 - signpost 6, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 7, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 8, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 9, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 10, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 11, 6, SIGNPOST_RIGHT, GoldenrodGameCornerSlotsMachineScript - signpost 6, 7, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 7, 7, SIGNPOST_READ, GoldenrodGameCornerLuckySlotsMachineScript - signpost 8, 7, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 9, 7, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 10, 7, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 11, 7, SIGNPOST_LEFT, GoldenrodGameCornerSlotsMachineScript - signpost 6, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 7, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 8, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 9, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 10, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript - signpost 11, 12, SIGNPOST_RIGHT, GoldenrodGameCornerSlotsMachineScript - signpost 6, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 7, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 8, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 9, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 10, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 11, 13, SIGNPOST_LEFT, GoldenrodGameCornerCardFlipMachineScript - signpost 6, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 7, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 8, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 9, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 10, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript - signpost 11, 18, SIGNPOST_RIGHT, GoldenrodGameCornerCardFlipMachineScript - signpost 1, 12, SIGNPOST_LEFT, GoldenrodGameCornerLeftTheirDrinkScript - -.PersonEvents: + bg_event 6, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 7, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 8, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 9, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 10, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 11, 6, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript + bg_event 6, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 7, 7, BGEVENT_READ, GoldenrodGameCornerLuckySlotsMachineScript + bg_event 8, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 9, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 10, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 11, 7, BGEVENT_LEFT, GoldenrodGameCornerSlotsMachineScript + bg_event 6, 12, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 7, 12, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 8, 12, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 9, 12, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 10, 12, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 11, 12, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript + bg_event 6, 13, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 7, 13, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 8, 13, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 9, 13, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 10, 13, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 11, 13, BGEVENT_LEFT, GoldenrodGameCornerCardFlipMachineScript + bg_event 6, 18, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 7, 18, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 8, 18, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 9, 18, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 10, 18, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 11, 18, BGEVENT_RIGHT, GoldenrodGameCornerCardFlipMachineScript + bg_event 1, 12, BGEVENT_LEFT, GoldenrodGameCornerLeftTheirDrinkScript + +.ObjectEvents: db 12 - person_event SPRITE_CLERK, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1 - person_event SPRITE_RECEPTIONIST, 2, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1 - person_event SPRITE_RECEPTIONIST, 2, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1 - person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << DAY), (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 - person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << NITE), (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 - person_event SPRITE_POKEFAN_M, 10, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM1Script, -1 - person_event SPRITE_COOLTRAINER_M, 8, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1 - person_event SPRITE_POKEFAN_F, 6, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1 - person_event SPRITE_COOLTRAINER_F, 3, 10, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1 - person_event SPRITE_GENTLEMAN, 10, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1 - person_event SPRITE_POKEFAN_M, 9, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1 - person_event SPRITE_POKEFAN_M, 10, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM3Script, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR + object_event SPRITE_CLERK, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1 + object_event SPRITE_RECEPTIONIST, 2, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1 + object_event SPRITE_RECEPTIONIST, 2, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1 + object_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 + object_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 + object_event SPRITE_POKEFAN_M, 10, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM1Script, -1 + object_event SPRITE_COOLTRAINER_M, 8, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1 + object_event SPRITE_POKEFAN_F, 6, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1 + object_event SPRITE_COOLTRAINER_F, 3, 10, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1 + object_event SPRITE_GENTLEMAN, 10, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1 + object_event SPRITE_POKEFAN_M, 9, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1 + object_event SPRITE_POKEFAN_M, 10, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM3Script, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 3fb6057dc..19bb2400b 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -7,20 +7,18 @@ const_value set 2 const GOLDENRODGYM_GYM_GUY GoldenrodGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x5400a, 0 - dw UnknownScript_0x5400b, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -UnknownScript_0x5400a: +.DummyScene0: end -UnknownScript_0x5400b: +.DummyScene1: end WhitneyScript_0x5400c: @@ -37,7 +35,7 @@ WhitneyScript_0x5400c: reloadmapafterbattle setevent EVENT_BEAT_WHITNEY setevent EVENT_MADE_WHITNEY_CRY - dotrigger $1 + setscene $1 setevent EVENT_BEAT_BEAUTY_VICTORIA setevent EVENT_BEAT_BEAUTY_SAMANTHA setevent EVENT_BEAT_LASS_CARRIE @@ -64,7 +62,7 @@ WhitneyScript_0x5400c: waitsfx setflag ENGINE_PLAINBADGE checkcode VAR_BADGES - scall GoldenrodGymTriggerRockets + scall GoldenrodGymActivateRockets UnknownScript_0x54064: writetext UnknownText_0x5428b buttonsound @@ -83,7 +81,7 @@ UnknownScript_0x5407b: closetext end -GoldenrodGymTriggerRockets: +GoldenrodGymActivateRockets: if_equal 7, .RadioTowerRockets if_equal 6, .GoldenrodRockets end @@ -95,12 +93,12 @@ GoldenrodGymTriggerRockets: jumpstd radiotowerrockets TrainerLassCarrie: - trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, LassCarrieScript + trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script -LassCarrieScript: +.Script: end_if_just_battled opentext - writetext LassCarrieOWText + writetext LassCarrieAfterBattleText waitbutton closetext end @@ -114,39 +112,39 @@ WhitneyCriesScript: waitbutton closetext applymovement GOLDENRODGYM_LASS2, BridgetWalksAwayMovement - dotrigger $0 + setscene $0 clearevent EVENT_MADE_WHITNEY_CRY end TrainerLassBridget: - trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, LassBridgetScript + trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, .Script -LassBridgetScript: +.Script: end_if_just_battled opentext - writetext LassBridgetOWText + writetext LassBridgetAfterBattleText waitbutton closetext end TrainerBeautyVictoria: - trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, BeautyVictoriaScript + trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, .Script -BeautyVictoriaScript: +.Script: end_if_just_battled opentext - writetext BeautyVictoriaOWText + writetext BeautyVictoriaAfterBattleText waitbutton closetext end TrainerBeautySamantha: - trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, BeautySamanthaScript + trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, .Script -BeautySamanthaScript: +.Script: end_if_just_battled opentext - writetext BeautySamanthaOWText + writetext BeautySamanthaAfterBattleText waitbutton closetext end @@ -285,7 +283,7 @@ LassCarrieBeatenText: line "you were weak…" done -LassCarrieOWText: +LassCarrieAfterBattleText: text "Do my #MON" line "think I'm cute?" done @@ -303,7 +301,7 @@ LassBridgetBeatenText: text "Oh, no, no, no!" done -LassBridgetOWText: +LassBridgetAfterBattleText: text "I'm trying to beat" line "WHITNEY, but…" cont "It's depressing." @@ -339,7 +337,7 @@ BeautyVictoriaBeatenText: line "it's over?" done -BeautyVictoriaOWText: +BeautyVictoriaAfterBattleText: text "Wow, you must be" line "good to beat me!" cont "Keep it up!" @@ -356,7 +354,7 @@ BeautySamanthaBeatenText: line "I'm so sorry!" done -BeautySamanthaOWText: +BeautySamanthaAfterBattleText: text "I taught MEOWTH" line "moves for taking" cont "on any type…" @@ -390,20 +388,20 @@ GoldenrodGym_MapEventHeader: warp_def $11, $2, 1, GOLDENROD_CITY warp_def $11, $3, 1, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 1, $5, $8, $0, WhitneyCriesScript, $0, $0 + coord_event 1, $5, $8, WhitneyCriesScript -.Signposts: +.BGEvents: db 2 - signpost 15, 1, SIGNPOST_READ, GoldenrodGymStatue - signpost 15, 4, SIGNPOST_READ, GoldenrodGymStatue + bg_event 15, 1, BGEVENT_READ, GoldenrodGymStatue + bg_event 15, 4, BGEVENT_READ, GoldenrodGymStatue -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_WHITNEY, 3, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1 - person_event SPRITE_LASS, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerLassCarrie, -1 - person_event SPRITE_LASS, 6, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerLassBridget, -1 - person_event SPRITE_BUENA, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBeautyVictoria, -1 - person_event SPRITE_BUENA, 5, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBeautySamantha, -1 - person_event SPRITE_GYM_GUY, 15, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1 + object_event SPRITE_WHITNEY, 3, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1 + object_event SPRITE_LASS, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1 + object_event SPRITE_LASS, 6, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1 + object_event SPRITE_BUENA, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1 + object_event SPRITE_BUENA, 5, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1 + object_event SPRITE_GYM_GUY, 15, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index cebfef9f2..bc7229ca2 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -4,7 +4,7 @@ const_value set 2 const GOLDENRODHAPPINESSRATER_TWIN GoldenrodHappinessRater_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -59,11 +59,11 @@ UnknownScript_0x54991: closetext end -PokefanMScript_0x54997: - jumptextfaceplayer UnknownText_0x54b04 +GoldenrodHappinessRaterPokefanMScript: + jumptextfaceplayer GoldenrodHappinessRaterPokefanMText -TwinScript_0x5499a: - jumptextfaceplayer UnknownText_0x54b67 +GoldenrodHappinessRaterTwinScript: + jumptextfaceplayer GoldenrodHappinessRaterTwinText HappinessRatersHouseBookshelf: jumpstd difficultbookshelf @@ -118,7 +118,7 @@ UnknownText_0x54ad1: cont "It looks mean." done -UnknownText_0x54b04: +GoldenrodHappinessRaterPokefanMText: text "I keep losing in" line "battles, and my" @@ -130,7 +130,7 @@ UnknownText_0x54b04: cont "like me much…" done -UnknownText_0x54b67: +GoldenrodHappinessRaterTwinText: text "When I use an item" line "on my #MON, it" cont "acts really glad!" @@ -145,17 +145,17 @@ GoldenrodHappinessRater_MapEventHeader: warp_def $7, $2, 3, GOLDENROD_CITY warp_def $7, $3, 3, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 0, SIGNPOST_READ, HappinessRatersHouseBookshelf - signpost 1, 1, SIGNPOST_READ, HappinessRatersHouseBookshelf - signpost 1, 7, SIGNPOST_READ, HappinessRatersHouseRadio + bg_event 1, 0, BGEVENT_READ, HappinessRatersHouseBookshelf + bg_event 1, 1, BGEVENT_READ, HappinessRatersHouseBookshelf + bg_event 1, 7, BGEVENT_READ, HappinessRatersHouseRadio -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x54953, -1 - person_event SPRITE_POKEFAN_M, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x54997, -1 - person_event SPRITE_TWIN, 6, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x5499a, -1 + object_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x54953, -1 + object_event SPRITE_POKEFAN_M, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1 + object_event SPRITE_TWIN, 6, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index eea47ac8f..83984a694 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -3,16 +3,14 @@ const_value set 2 const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN GoldenrodMagnetTrainStation_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - - ; triggers - maptrigger .Trigger0 + scene_script .DummyScene .MapCallbacks: db 0 -.Trigger0: +.DummyScene: end OfficerScript_0x550ec: @@ -70,8 +68,8 @@ Script_ArriveFromSaffron: closetext end -GentlemanScript_0x55143: - jumptextfaceplayer UnknownText_0x552a3 +GoldenrodMagnetTrainStationGentlemanScript: + jumptextfaceplayer GoldenrodMagnetTrainStationGentlemanText MovementData_0x55146: step UP @@ -152,7 +150,7 @@ UnknownText_0x5526a: line "again." done -UnknownText_0x552a3: +GoldenrodMagnetTrainStationGentlemanText: text "I'm the PRESIDENT." para "My dream was to" @@ -177,14 +175,14 @@ GoldenrodMagnetTrainStation_MapEventHeader: warp_def $5, $6, 4, SAFFRON_TRAIN_STATION warp_def $5, $b, 3, SAFFRON_TRAIN_STATION -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $6, $b, $0, Script_ArriveFromSaffron, $0, $0 + coord_event 0, $6, $b, Script_ArriveFromSaffron -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_OFFICER, 9, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1 - person_event SPRITE_GENTLEMAN, 14, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x55143, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN + object_event SPRITE_OFFICER, 9, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1 + object_event SPRITE_GENTLEMAN, 14, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationGentlemanScript, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index 216fba7c1..3b0ef46a2 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -2,7 +2,7 @@ const_value set 2 const GOLDENRODNAMERATER_NAME_RATER GoldenrodNameRater_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -22,7 +22,7 @@ GoldenrodNameRaterBookshelf: GoldenrodNameRaterRadio: jumpstd radio2 -INCLUDE "text/sweethoney.asm" +INCLUDE "text/unused_sweet_honey.asm" GoldenrodNameRater_MapEventHeader: ; filler @@ -33,15 +33,15 @@ GoldenrodNameRater_MapEventHeader: warp_def $7, $2, 8, GOLDENROD_CITY warp_def $7, $3, 8, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 0, SIGNPOST_READ, GoldenrodNameRaterBookshelf - signpost 1, 1, SIGNPOST_READ, GoldenrodNameRaterBookshelf - signpost 1, 7, SIGNPOST_READ, GoldenrodNameRaterRadio + bg_event 1, 0, BGEVENT_READ, GoldenrodNameRaterBookshelf + bg_event 1, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf + bg_event 1, 7, BGEVENT_READ, GoldenrodNameRaterRadio -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodNameRater, -1 + object_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1 diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 710959645..2d303adbe 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -3,17 +3,17 @@ const_value set 2 const GOLDENRODPPSPEECHHOUSE_LASS GoldenrodPPSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -FisherScript_0x5564a: - jumptextfaceplayer UnknownText_0x55659 +GoldenrodPPSpeechHouseFisherScript: + jumptextfaceplayer GoldenrodPPSpeechHouseFisherText -LassScript_0x5564d: - jumptextfaceplayer UnknownText_0x556ca +GoldenrodPPSpeechHouseLassScript: + jumptextfaceplayer GoldenrodPPSpeechHouseLassText GoldenrodPPSpeechHouseBookshelf2: jumpstd difficultbookshelf @@ -24,7 +24,7 @@ GoldenrodPPSpeechHouseBookshelf1: GoldenrodPPSpeechHouseRadio: jumpstd radio2 -UnknownText_0x55659: +GoldenrodPPSpeechHouseFisherText: text "Once while I was" line "battling, my" @@ -38,7 +38,7 @@ UnknownText_0x55659: line "gone." done -UnknownText_0x556ca: +GoldenrodPPSpeechHouseLassText: text "Sometimes, a" line "healthy #MON" @@ -60,16 +60,16 @@ GoldenrodPPSpeechHouse_MapEventHeader: warp_def $7, $2, 7, GOLDENROD_CITY warp_def $7, $3, 7, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 0, SIGNPOST_READ, GoldenrodPPSpeechHouseBookshelf1 - signpost 1, 1, SIGNPOST_READ, GoldenrodPPSpeechHouseBookshelf2 - signpost 1, 7, SIGNPOST_READ, GoldenrodPPSpeechHouseRadio + bg_event 1, 0, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1 + bg_event 1, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf2 + bg_event 1, 7, BGEVENT_READ, GoldenrodPPSpeechHouseRadio -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x5564a, -1 - person_event SPRITE_LASS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x5564d, -1 + object_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1 + object_event SPRITE_LASS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1 diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 56ae85b30..535ee02f8 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -4,20 +4,20 @@ const_value set 2 const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST3 GoldenrodPokeComCenter2FMobile_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -ScientistScript_0x625d1: - jumptextfaceplayer UnknownText_0x62674 +GoldenrodPokeComCenter2FMobileScientist1Script: + jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist1Text -ScientistScript_0x625d4: - jumptextfaceplayer UnknownText_0x626f9 +GoldenrodPokeComCenter2FMobileScientist2Script: + jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist2Text -ScientistScript_0x625d7: - jumptextfaceplayer UnknownText_0x62795 +GoldenrodPokeComCenter2FMobileScientist3Script: + jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist3Text MapGoldenrodPokeComCenter2FMobileSignpost0Script: opentext @@ -53,10 +53,10 @@ MenuDataHeader_0x62602: db $40 ; flags db 00, 00 ; start coords db 08, 15 ; end coords - dw MenuData2_0x6260a + dw .MenuData2 db 1 ; default option -MenuData2_0x6260a: +.MenuData2: db $80 ; flags db 3 ; items db "# つうしん クラブ@" ; # COM CLUB @@ -98,10 +98,10 @@ MenuDataHeader_0x6264c: db $40 ; flags db 00, 00 ; start coords db 08, 15 ; end coords - dw MenuData2_0x62654 + dw .MenuData2 db 1 ; default option -MenuData2_0x62654: +.MenuData2: db $80 ; flags db 3 ; items db "でんわ", $1f,"つかうとき@" ; Use phone @@ -112,7 +112,7 @@ MenuData2_0x62654: MapGoldenrodPokeComCenter2FMobileSignpost2Script: jumptext UnknownText_0x62b26 -UnknownText_0x62674: +GoldenrodPokeComCenter2FMobileScientist1Text: text "#COM CENTER and" line "MOBILE CENTER were" @@ -126,7 +126,7 @@ UnknownText_0x62674: line "strangers." done -UnknownText_0x626f9: +GoldenrodPokeComCenter2FMobileScientist2Text: text "When you linked" line "with someone by" @@ -143,7 +143,7 @@ UnknownText_0x626f9: line "got the shakes!" done -UnknownText_0x62795: +GoldenrodPokeComCenter2FMobileScientist3Text: text "They were able to" line "build this huge" @@ -277,17 +277,17 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader: warp_def $1f, $0, 3, GOLDENROD_POKECENTER_1F warp_def $1f, $1, 3, GOLDENROD_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 26, 6, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost0Script - signpost 28, 6, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost1Script - signpost 26, 3, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost2Script + bg_event 26, 6, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost0Script + bg_event 28, 6, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost1Script + bg_event 26, 3, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost2Script -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_SCIENTIST, 28, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d1, -1 - person_event SPRITE_SCIENTIST, 27, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d4, -1 - person_event SPRITE_SCIENTIST, 29, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d7, -1 + object_event SPRITE_SCIENTIST, 28, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist1Script, -1 + object_event SPRITE_SCIENTIST, 27, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist2Script, -1 + object_event SPRITE_SCIENTIST, 29, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist3Script, -1 diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokecenter1F.asm index ed027321d..d44c1b01e 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -5,8 +5,8 @@ const_value set 2 const GOLDENRODPOKECENTER1F_LASS const GOLDENRODPOKECENTER1F_POKEFAN_F -GoldenrodPokeCenter1F_MapScriptHeader: -.MapTriggers: +GoldenrodPokecenter1F_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: @@ -15,7 +15,7 @@ GoldenrodPokeCenter1F_MapScriptHeader: NurseScript_0x60f91: jumpstd pokecenternurse -GoldenrodPokeCenter1F_GSBallTriggerLeft: +GoldenrodPokecenter1F_GSBallSceneLeft: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball @@ -25,7 +25,7 @@ GoldenrodPokeCenter1F_GSBallTriggerLeft: checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue .cancel playsound SFX_EXIT_BUILDING - moveperson GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, $0, $7 + moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, $0, $7 disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND @@ -47,7 +47,7 @@ GoldenrodPokeCenter1F_GSBallTriggerLeft: .cancel end -GoldenrodPokeCenter1F_GSBallTriggerRight: +GoldenrodPokecenter1F_GSBallSceneRight: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball @@ -57,7 +57,7 @@ GoldenrodPokeCenter1F_GSBallTriggerRight: checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue .cancel playsound SFX_EXIT_BUILDING - moveperson GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, $0, $7 + moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, $0, $7 disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND @@ -79,11 +79,11 @@ GoldenrodPokeCenter1F_GSBallTriggerRight: .cancel end -GameboyKidScript_0x6101e: - jumptextfaceplayer UnknownText_0x62105 +GoldenrodPokecenter1FGameboyKidScript: + jumptextfaceplayer GoldenrodPokecenter1FGameboyKidText -LassScript_0x61021: - jumptextfaceplayer UnknownText_0x62260 +GoldenrodPokecenter1FLassScript: + jumptextfaceplayer GoldenrodPokecenter1FLassText PokefanFScript_0x61024: faceplayer @@ -663,7 +663,7 @@ UnknownText_0x620a1: cont "NEWS?" done -UnknownText_0x62105: +GoldenrodPokecenter1FGameboyKidText: text "The COLOSSEUM" line "upstairs is for" cont "link battles." @@ -701,7 +701,7 @@ UnknownText_0x62222: line "younger!" done -UnknownText_0x62260: +GoldenrodPokecenter1FLassText: text "A higher level" line "#MON doesn't" cont "always win." @@ -804,7 +804,7 @@ UnknownText_0x62549: line "the EON MAIL." done -GoldenrodPokeCenter1F_MapEventHeader: +GoldenrodPokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -815,18 +815,18 @@ GoldenrodPokeCenter1F_MapEventHeader: warp_def $6, $0, 1, GOLDENROD_POKECOM_CENTER_2F_MOBILE warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $7, $3, $0, GoldenrodPokeCenter1F_GSBallTriggerLeft, $0, $0 - xy_trigger 0, $7, $4, $0, GoldenrodPokeCenter1F_GSBallTriggerRight, $0, $0 + coord_event 0, $7, $3, GoldenrodPokecenter1F_GSBallSceneLeft + coord_event 0, $7, $4, GoldenrodPokecenter1F_GSBallSceneRight -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x60f91, -1 - person_event SPRITE_LINK_RECEPTIONIST, 8, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 - person_event SPRITE_GAMEBOY_KID, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x6101e, -1 - person_event SPRITE_LASS, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x61021, -1 - person_event SPRITE_POKEFAN_F, 5, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x60f91, -1 + object_event SPRITE_LINK_RECEPTIONIST, 8, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event SPRITE_GAMEBOY_KID, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1 + object_event SPRITE_LASS, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1 + object_event SPRITE_POKEFAN_F, 5, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1 diff --git a/maps/WarehouseEntrance.asm b/maps/GoldenrodUnderground.asm index 402e41294..49bcdd88c 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/GoldenrodUnderground.asm @@ -1,27 +1,22 @@ const_value set 2 - const WAREHOUSEENTRANCE_SUPER_NERD1 - const WAREHOUSEENTRANCE_SUPER_NERD2 - const WAREHOUSEENTRANCE_SUPER_NERD3 - const WAREHOUSEENTRANCE_SUPER_NERD4 - const WAREHOUSEENTRANCE_POKE_BALL - const WAREHOUSEENTRANCE_GRAMPS - const WAREHOUSEENTRANCE_SUPER_NERD5 - const WAREHOUSEENTRANCE_SUPER_NERD6 - const WAREHOUSEENTRANCE_GRANNY - -WarehouseEntrance_MapScriptHeader: -.MapTriggers: + const GOLDENRODUNDERGROUND_SUPER_NERD1 + const GOLDENRODUNDERGROUND_SUPER_NERD2 + const GOLDENRODUNDERGROUND_SUPER_NERD3 + const GOLDENRODUNDERGROUND_SUPER_NERD4 + const GOLDENRODUNDERGROUND_POKE_BALL + const GOLDENRODUNDERGROUND_GRAMPS + const GOLDENRODUNDERGROUND_SUPER_NERD5 + const GOLDENRODUNDERGROUND_SUPER_NERD6 + const GOLDENRODUNDERGROUND_GRANNY + +GoldenrodUnderground_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: db 3 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .ResetSwitches - dbw MAPCALLBACK_TILES, .CheckBasementKey - dbw MAPCALLBACK_OBJECTS, .CheckDayOfWeek .ResetSwitches: @@ -63,98 +58,98 @@ WarehouseEntrance_MapScriptHeader: if_equal SATURDAY, .Saturday .Sunday: - disappear WAREHOUSEENTRANCE_GRAMPS - disappear WAREHOUSEENTRANCE_SUPER_NERD5 - appear WAREHOUSEENTRANCE_SUPER_NERD6 - appear WAREHOUSEENTRANCE_GRANNY + disappear GOLDENRODUNDERGROUND_GRAMPS + disappear GOLDENRODUNDERGROUND_SUPER_NERD5 + appear GOLDENRODUNDERGROUND_SUPER_NERD6 + appear GOLDENRODUNDERGROUND_GRANNY return .Monday: - disappear WAREHOUSEENTRANCE_GRAMPS + disappear GOLDENRODUNDERGROUND_GRAMPS checkmorn iffalse .NotMondayMorning - appear WAREHOUSEENTRANCE_GRAMPS + appear GOLDENRODUNDERGROUND_GRAMPS .NotMondayMorning: - disappear WAREHOUSEENTRANCE_SUPER_NERD5 - disappear WAREHOUSEENTRANCE_SUPER_NERD6 - disappear WAREHOUSEENTRANCE_GRANNY + disappear GOLDENRODUNDERGROUND_SUPER_NERD5 + disappear GOLDENRODUNDERGROUND_SUPER_NERD6 + disappear GOLDENRODUNDERGROUND_GRANNY return .Tuesday: - disappear WAREHOUSEENTRANCE_GRAMPS - appear WAREHOUSEENTRANCE_SUPER_NERD5 - disappear WAREHOUSEENTRANCE_SUPER_NERD6 - disappear WAREHOUSEENTRANCE_GRANNY + disappear GOLDENRODUNDERGROUND_GRAMPS + appear GOLDENRODUNDERGROUND_SUPER_NERD5 + disappear GOLDENRODUNDERGROUND_SUPER_NERD6 + disappear GOLDENRODUNDERGROUND_GRANNY return .Wednesday: - disappear WAREHOUSEENTRANCE_GRAMPS - disappear WAREHOUSEENTRANCE_SUPER_NERD5 - appear WAREHOUSEENTRANCE_SUPER_NERD6 - disappear WAREHOUSEENTRANCE_GRANNY + disappear GOLDENRODUNDERGROUND_GRAMPS + disappear GOLDENRODUNDERGROUND_SUPER_NERD5 + appear GOLDENRODUNDERGROUND_SUPER_NERD6 + disappear GOLDENRODUNDERGROUND_GRANNY return .Thursday: - disappear WAREHOUSEENTRANCE_GRAMPS - appear WAREHOUSEENTRANCE_SUPER_NERD5 - disappear WAREHOUSEENTRANCE_SUPER_NERD6 - disappear WAREHOUSEENTRANCE_GRANNY + disappear GOLDENRODUNDERGROUND_GRAMPS + appear GOLDENRODUNDERGROUND_SUPER_NERD5 + disappear GOLDENRODUNDERGROUND_SUPER_NERD6 + disappear GOLDENRODUNDERGROUND_GRANNY return .Friday: - disappear WAREHOUSEENTRANCE_GRAMPS - disappear WAREHOUSEENTRANCE_SUPER_NERD5 - appear WAREHOUSEENTRANCE_SUPER_NERD6 - disappear WAREHOUSEENTRANCE_GRANNY + disappear GOLDENRODUNDERGROUND_GRAMPS + disappear GOLDENRODUNDERGROUND_SUPER_NERD5 + appear GOLDENRODUNDERGROUND_SUPER_NERD6 + disappear GOLDENRODUNDERGROUND_GRANNY return .Saturday: - disappear WAREHOUSEENTRANCE_GRAMPS - appear WAREHOUSEENTRANCE_SUPER_NERD5 - disappear WAREHOUSEENTRANCE_SUPER_NERD6 - appear WAREHOUSEENTRANCE_GRANNY + disappear GOLDENRODUNDERGROUND_GRAMPS + appear GOLDENRODUNDERGROUND_SUPER_NERD5 + disappear GOLDENRODUNDERGROUND_SUPER_NERD6 + appear GOLDENRODUNDERGROUND_GRANNY return TrainerSupernerdEric: - trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, SupernerdEricScript + trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script -SupernerdEricScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x7c36c + writetext SupernerdEricAfterBattleText waitbutton closetext end TrainerSupernerdTeru: - trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, SupernerdTeruScript + trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, .Script -SupernerdTeruScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x7c410 + writetext SupernerdTeruAfterBattleText waitbutton closetext end TrainerPokemaniacIssac: - trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, PokemaniacIssacScript + trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, .Script -PokemaniacIssacScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x7c498 + writetext PokemaniacIssacAfterBattleText waitbutton closetext end TrainerPokemaniacDonald: - trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, PokemaniacDonaldScript + trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, .Script -PokemaniacDonaldScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x7c52f + writetext PokemaniacDonaldAfterBattleText waitbutton closetext end @@ -164,7 +159,7 @@ GrannyScript_0x7c132: checkcode VAR_WEEKDAY if_equal SUNDAY, .Open if_equal SATURDAY, .Open - jump WarehouseEntranceScript_ShopClosed + jump GoldenrodUndergroundScript_ShopClosed .Open: pokemart MARTTYPE_BITTER, MART_UNDERGROUND @@ -174,14 +169,14 @@ GrannyScript_0x7c132: GrampsScript_0x7c146: opentext checkflag ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED - iftrue WarehouseEntranceScript_ShopClosed + iftrue GoldenrodUndergroundScript_ShopClosed checkcode VAR_WEEKDAY if_equal MONDAY, .CheckMorn - jump WarehouseEntranceScript_ShopClosed + jump GoldenrodUndergroundScript_ShopClosed .CheckMorn: checkmorn - iffalse WarehouseEntranceScript_ShopClosed + iffalse GoldenrodUndergroundScript_ShopClosed pokemart MARTTYPE_BARGAIN, 0 closetext end @@ -192,7 +187,7 @@ OlderHaircutBrotherScript: if_equal TUESDAY, .DoHaircut if_equal THURSDAY, .DoHaircut if_equal SATURDAY, .DoHaircut - jump WarehouseEntranceScript_ShopClosed + jump GoldenrodUndergroundScript_ShopClosed .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT @@ -275,7 +270,7 @@ YoungerHaircutBrotherScript: if_equal SUNDAY, .DoHaircut if_equal WEDNESDAY, .DoHaircut if_equal FRIDAY, .DoHaircut - jump WarehouseEntranceScript_ShopClosed + jump GoldenrodUndergroundScript_ShopClosed .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT @@ -401,29 +396,26 @@ BasementDoorScript:: closetext end -WarehouseEntranceScript_ShopClosed: +GoldenrodUndergroundScript_ShopClosed: writetext UnknownText_0x7c904 waitbutton closetext end -WarehouseEntranceCoinCase: +GoldenrodUndergroundCoinCase: itemball COIN_CASE -MapWarehouseEntranceSignpost1Script: +MapGoldenrodUndergroundSignpost1Script: jumptext UnknownText_0x7c91a -WarehouseEntranceHiddenParlyzHeal: - dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL - - -WarehouseEntranceHiddenSuperPotion: - dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_SUPER_POTION, SUPER_POTION - +GoldenrodUndergroundHiddenParlyzHeal: + dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL -WarehouseEntranceHiddenAntidote: - dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_ANTIDOTE, ANTIDOTE +GoldenrodUndergroundHiddenSuperPotion: + dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION, SUPER_POTION +GoldenrodUndergroundHiddenAntidote: + dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE, ANTIDOTE SupernerdEricSeenText: text "I got booted out" @@ -439,7 +431,7 @@ SupernerdEricBeatenText: text "…Grumble…" done -UnknownText_0x7c36c: +SupernerdEricAfterBattleText: text "I guess I have to" line "do things fair and" cont "square…" @@ -461,7 +453,7 @@ SupernerdTeruBeatenText: text "Ow, ow, ow!" done -UnknownText_0x7c410: +SupernerdTeruAfterBattleText: text "I know my #MON" line "type alignments." @@ -481,7 +473,7 @@ PokemaniacIssacBeatenText: text "Aiyeeee!" done -UnknownText_0x7c498: +PokemaniacIssacAfterBattleText: text "Your #MON will" line "like you more if" @@ -502,7 +494,7 @@ PokemaniacDonaldBeatenText: line "That makes me mad!" done -UnknownText_0x7c52f: +PokemaniacDonaldAfterBattleText: text "Are you making a" line "#DEX? Here's a" cont "hot tip." @@ -654,38 +646,38 @@ UnknownText_0x7c91a: line "THIS POINT" done -WarehouseEntrance_MapEventHeader: +GoldenrodUnderground_MapEventHeader: ; filler db 0, 0 .Warps: db 6 - warp_def $2, $3, 7, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES - warp_def $22, $3, 4, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES - warp_def $6, $12, 4, WAREHOUSE_ENTRANCE - warp_def $1f, $15, 3, WAREHOUSE_ENTRANCE - warp_def $1f, $16, 3, WAREHOUSE_ENTRANCE - warp_def $1b, $16, 1, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES - -.XYTriggers: + warp_def $2, $3, 7, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_def $22, $3, 4, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_def $6, $12, 4, GOLDENROD_UNDERGROUND + warp_def $1f, $15, 3, GOLDENROD_UNDERGROUND + warp_def $1f, $16, 3, GOLDENROD_UNDERGROUND + warp_def $1b, $16, 1, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 5 - signpost 6, 18, SIGNPOST_READ, BasementDoorScript - signpost 6, 19, SIGNPOST_READ, MapWarehouseEntranceSignpost1Script - signpost 13, 6, SIGNPOST_ITEM, WarehouseEntranceHiddenParlyzHeal - signpost 18, 4, SIGNPOST_ITEM, WarehouseEntranceHiddenSuperPotion - signpost 8, 17, SIGNPOST_ITEM, WarehouseEntranceHiddenAntidote + bg_event 6, 18, BGEVENT_READ, BasementDoorScript + bg_event 6, 19, BGEVENT_READ, MapGoldenrodUndergroundSignpost1Script + bg_event 13, 6, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal + bg_event 18, 4, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion + bg_event 8, 17, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_SUPER_NERD, 31, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerSupernerdEric, -1 - person_event SPRITE_SUPER_NERD, 9, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdTeru, -1 - person_event SPRITE_SUPER_NERD, 27, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1 - person_event SPRITE_SUPER_NERD, 6, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1 - person_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WarehouseEntranceCoinCase, EVENT_WAREHOUSE_ENTRANCE_COIN_CASE - person_event SPRITE_GRAMPS, 11, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_WAREHOUSE_ENTRANCE_GRAMPS - person_event SPRITE_SUPER_NERD, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER - person_event SPRITE_SUPER_NERD, 15, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER - person_event SPRITE_GRANNY, 21, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_WAREHOUSE_ENTRANCE_GRANNY + object_event SPRITE_SUPER_NERD, 31, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdEric, -1 + object_event SPRITE_SUPER_NERD, 9, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1 + object_event SPRITE_SUPER_NERD, 27, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1 + object_event SPRITE_SUPER_NERD, 6, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1 + object_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundCoinCase, EVENT_GOLDENROD_UNDERGROUND_COIN_CASE + object_event SPRITE_GRAMPS, 11, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_GOLDENROD_UNDERGROUND_GRAMPS + object_event SPRITE_SUPER_NERD, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER + object_event SPRITE_SUPER_NERD, 15, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER + object_event SPRITE_GRANNY, 21, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_GOLDENROD_UNDERGROUND_GRANNY diff --git a/maps/WarehouseEntrance.blk b/maps/GoldenrodUnderground.blk index e3d0b95be..e3d0b95be 100644 --- a/maps/WarehouseEntrance.blk +++ b/maps/GoldenrodUnderground.blk diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index bf4f1f1c9..d27b6ff85 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -31,37 +31,32 @@ doorstate: macro endm const_value set 2 - const UNDERGROUNDPATHSWITCHROOMENTRANCES_PHARMACIST1 - const UNDERGROUNDPATHSWITCHROOMENTRANCES_PHARMACIST2 - const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET1 - const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET2 - const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET3 - const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET_GIRL - const UNDERGROUNDPATHSWITCHROOMENTRANCES_TEACHER - const UNDERGROUNDPATHSWITCHROOMENTRANCES_SUPER_NERD - const UNDERGROUNDPATHSWITCHROOMENTRANCES_POKE_BALL1 - const UNDERGROUNDPATHSWITCHROOMENTRANCES_POKE_BALL2 - const UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER - -UndergroundPathSwitchRoomEntrances_MapScriptHeader: -.MapTriggers: + const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1 + const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST2 + const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET1 + const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET2 + const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET3 + const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET_GIRL + const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_TEACHER + const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SUPER_NERD + const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_POKE_BALL1 + const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_POKE_BALL2 + const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER + +GoldenrodUndergroundSwitchRoomEntrances_MapScriptHeader: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .UpdateDoorPositions -.Trigger0: +.DummyScene0: end -.Trigger1: +.DummyScene1: end .UpdateDoorPositions: @@ -117,45 +112,45 @@ UndergroundPathSwitchRoomEntrances_MapScriptHeader: return SuperNerdScript_0x7ca7a: - jumptextfaceplayer UndergroundPathSwitchRoomEntrances_SuperNerdText + jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_SuperNerdText TeacherScript_0x7ca7d: - jumptextfaceplayer UndergroundPathSwitchRoomEntrances_TeacherText + jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_TeacherText -UndergroundSilverTrigger1: +UndergroundSilverScene1: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic pause 15 playsound SFX_EXIT_BUILDING - appear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER + appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER waitsfx - applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement1 + applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement1 spriteface PLAYER, RIGHT scall UndergroundSilverBattleScript - applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1 + applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1 playsound SFX_EXIT_BUILDING - disappear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER - dotrigger 1 + disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER + setscene 1 waitsfx playmapmusic end -UndergroundSilverTrigger2: +UndergroundSilverScene2: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic pause 15 playsound SFX_EXIT_BUILDING - appear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER + appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER waitsfx - applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement2 + applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement2 spriteface PLAYER, RIGHT scall UndergroundSilverBattleScript - applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2 + applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2 playsound SFX_EXIT_BUILDING - disappear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER - dotrigger 1 + disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER + setscene 1 waitsfx playmapmusic end @@ -164,21 +159,21 @@ UndergroundSilverBattleScript: checkevent EVENT_RIVAL_BURNED_TOWER iftrue .Continue setevent EVENT_RIVAL_BURNED_TOWER - domaptrigger BURNED_TOWER_1F, 1 + setmapscene BURNED_TOWER_1F, 1 .Continue: playmusic MUSIC_RIVAL_ENCOUNTER opentext writetext UndergroundSilverBeforeText waitbutton closetext - setevent EVENT_RIVAL_UNDERGROUND_PATH + setevent EVENT_RIVAL_GOLDENROD_UNDERGROUND checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue .Totodile checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue .Chikorita winlosstext UndergroundSilverWinText, UndergroundSilverLossText - setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER - loadtrainer RIVAL1, RIVAL1_12 + setlasttalked GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER + loadtrainer RIVAL1, RIVAL1_4_TOTODILE startbattle dontrestartmapmusic reloadmapafterbattle @@ -186,8 +181,8 @@ UndergroundSilverBattleScript: .Totodile: winlosstext UndergroundSilverWinText, UndergroundSilverLossText - setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER - loadtrainer RIVAL1, RIVAL1_10 + setlasttalked GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER + loadtrainer RIVAL1, RIVAL1_4_CHIKORITA startbattle dontrestartmapmusic reloadmapafterbattle @@ -195,8 +190,8 @@ UndergroundSilverBattleScript: .Chikorita: winlosstext UndergroundSilverWinText, UndergroundSilverLossText - setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER - loadtrainer RIVAL1, RIVAL1_11 + setlasttalked GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER + loadtrainer RIVAL1, RIVAL1_4_CYNDAQUIL startbattle dontrestartmapmusic reloadmapafterbattle @@ -211,67 +206,67 @@ UndergroundSilverBattleScript: end TrainerGruntM11: - trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, GruntM11Script + trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, .Script -GruntM11Script: +.Script: end_if_just_battled opentext - writetext GruntM11AfterText + writetext GruntM11AfterBattleText waitbutton closetext end TrainerGruntM25: - trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, GruntM25Script + trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, .Script -GruntM25Script: +.Script: end_if_just_battled opentext - writetext GruntM25AfterText + writetext GruntM25AfterBattleText waitbutton closetext end TrainerBurglarDuncan: - trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, BurglarDuncanScript + trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, .Script -BurglarDuncanScript: +.Script: end_if_just_battled opentext - writetext BurglarDuncanAfterText + writetext BurglarDuncanAfterBattleText waitbutton closetext end TrainerBurglarEddie: - trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, BurglarEddieScript + trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, .Script -BurglarEddieScript: +.Script: end_if_just_battled opentext - writetext BurglarEddieAfterText + writetext BurglarEddieAfterBattleText waitbutton closetext end TrainerGruntM13: - trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, GruntM13Script + trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, .Script -GruntM13Script: +.Script: end_if_just_battled opentext - writetext GruntM13AfterText + writetext GruntM13AfterBattleText waitbutton closetext end TrainerGruntF3: - trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, GruntF3Script + trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, .Script -GruntF3Script: +.Script: end_if_just_battled opentext - writetext GruntF3AfterText + writetext GruntF3AfterBattleText waitbutton closetext end @@ -284,22 +279,22 @@ Switch1Script: iftrue .On writetext SwitchRoomText_OffTurnOn yesorno - iffalse UndergroundPathSwitchRoomEntrances_DontToggle + iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions addvar 1 copyvartobyte UndergroundSwitchPositions setevent EVENT_SWITCH_1 - jump UndergroundPathSwitchRoomEntrances_UpdateDoors + jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors .On: writetext SwitchRoomText_OnTurnOff yesorno - iffalse UndergroundPathSwitchRoomEntrances_DontToggle + iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions addvar -1 copyvartobyte UndergroundSwitchPositions clearevent EVENT_SWITCH_1 - jump UndergroundPathSwitchRoomEntrances_UpdateDoors + jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors Switch2Script: opentext @@ -309,22 +304,22 @@ Switch2Script: iftrue .On writetext SwitchRoomText_OffTurnOn yesorno - iffalse UndergroundPathSwitchRoomEntrances_DontToggle + iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions addvar 2 copyvartobyte UndergroundSwitchPositions setevent EVENT_SWITCH_2 - jump UndergroundPathSwitchRoomEntrances_UpdateDoors + jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors .On: writetext SwitchRoomText_OnTurnOff yesorno - iffalse UndergroundPathSwitchRoomEntrances_DontToggle + iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions addvar -2 copyvartobyte UndergroundSwitchPositions clearevent EVENT_SWITCH_2 - jump UndergroundPathSwitchRoomEntrances_UpdateDoors + jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors Switch3Script: opentext @@ -334,22 +329,22 @@ Switch3Script: iftrue .On writetext SwitchRoomText_OffTurnOn yesorno - iffalse UndergroundPathSwitchRoomEntrances_DontToggle + iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions addvar 3 copyvartobyte UndergroundSwitchPositions setevent EVENT_SWITCH_3 - jump UndergroundPathSwitchRoomEntrances_UpdateDoors + jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors .On: writetext SwitchRoomText_OnTurnOff yesorno - iffalse UndergroundPathSwitchRoomEntrances_DontToggle + iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions addvar -3 copyvartobyte UndergroundSwitchPositions clearevent EVENT_SWITCH_3 - jump UndergroundPathSwitchRoomEntrances_UpdateDoors + jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors EmergencySwitchScript: opentext @@ -359,32 +354,32 @@ EmergencySwitchScript: iftrue .On writetext SwitchRoomText_OffTurnOn yesorno - iffalse UndergroundPathSwitchRoomEntrances_DontToggle + iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle writebyte 7 copyvartobyte UndergroundSwitchPositions setevent EVENT_EMERGENCY_SWITCH setevent EVENT_SWITCH_1 setevent EVENT_SWITCH_2 setevent EVENT_SWITCH_3 - jump UndergroundPathSwitchRoomEntrances_UpdateDoors + jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors .On: writetext SwitchRoomText_OnTurnOff yesorno - iffalse UndergroundPathSwitchRoomEntrances_DontToggle + iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle writebyte 0 copyvartobyte UndergroundSwitchPositions clearevent EVENT_EMERGENCY_SWITCH clearevent EVENT_SWITCH_1 clearevent EVENT_SWITCH_2 clearevent EVENT_SWITCH_3 - jump UndergroundPathSwitchRoomEntrances_UpdateDoors + jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors -UndergroundPathSwitchRoomEntrances_DontToggle: +GoldenrodUndergroundSwitchRoomEntrances_DontToggle: closetext end -UndergroundPathSwitchRoomEntrances_UpdateDoors: +GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors: copybytetovar UndergroundSwitchPositions if_equal 0, .Position0 if_equal 1, .Position1 @@ -628,19 +623,17 @@ UndergroundPathSwitchRoomEntrances_UpdateDoors: clearevent EVENT_SWITCH_14 end -UndergroundPathSwitchRoomEntrancesSmokeBall: +GoldenrodUndergroundSwitchRoomEntrancesSmokeBall: itemball SMOKE_BALL -UndergroundPathSwitchRoomEntrancesFullHeal: +GoldenrodUndergroundSwitchRoomEntrancesFullHeal: itemball FULL_HEAL -UndergroundPathSwitchRoomEntrancesHiddenMaxPotion: - dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION - - -UndergroundPathSwitchRoomEntrancesHiddenRevive: - dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE +GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion: + dwb EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION +GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive: + dwb EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE UndergroundSilverApproachMovement1: step DOWN @@ -756,7 +749,7 @@ UndergroundSilverLossText: cont "under my heels." done -UndergroundPathSwitchRoomEntrances_SuperNerdText: +GoldenrodUndergroundSwitchRoomEntrances_SuperNerdText: text "I was challenged" line "to a battle down-" cont "stairs." @@ -766,7 +759,7 @@ UndergroundPathSwitchRoomEntrances_SuperNerdText: cont "better be careful." done -UndergroundPathSwitchRoomEntrances_TeacherText: +GoldenrodUndergroundSwitchRoomEntrances_TeacherText: text "There are some" line "shops downstairs…" @@ -790,7 +783,7 @@ GruntM11BeatenText: line "by indecision!" done -GruntM11AfterText: +GruntM11AfterBattleText: text "I'm confused too…" line "The switch on the" @@ -814,7 +807,7 @@ GruntM25BeatenText: line "I blew it." done -GruntM25AfterText: +GruntM25AfterBattleText: text "All right. A hint!" para "Change the order" @@ -834,7 +827,7 @@ BurglarDuncanBeatenText: text "Mercy!" done -BurglarDuncanAfterText: +BurglarDuncanAfterBattleText: text "Steal and sell!" line "That's basic in" cont "crime, kid!" @@ -853,7 +846,7 @@ BurglarEddieBeatenText: text "Over the top!" done -BurglarEddieAfterText: +BurglarEddieAfterBattleText: text "UNDERGROUND WARE-" line "HOUSE?" @@ -878,7 +871,7 @@ GruntM13BeatenText: line "you're cool, huh?" done -GruntM13AfterText: +GruntM13AfterBattleText: text "You must have ice" line "in your veins to" cont "dis TEAM ROCKET." @@ -905,7 +898,7 @@ GruntF3BeatenText: text "How could you?" done -GruntF3AfterText: +GruntF3AfterBattleText: text "Go wherever you'd" line "like! Get lost!" cont "See if I care!" @@ -936,46 +929,46 @@ SwitchRoomText_Emergency: line "EMERGENCY." done -UndergroundPathSwitchRoomEntrances_MapEventHeader: +GoldenrodUndergroundSwitchRoomEntrances_MapEventHeader: ; filler db 0, 0 .Warps: db 9 - warp_def $3, $17, 6, WAREHOUSE_ENTRANCE - warp_def $a, $16, 1, UNDERGROUND_WAREHOUSE - warp_def $a, $17, 2, UNDERGROUND_WAREHOUSE - warp_def $19, $5, 2, WAREHOUSE_ENTRANCE + warp_def $3, $17, 6, GOLDENROD_UNDERGROUND + warp_def $a, $16, 1, GOLDENROD_UNDERGROUND_WAREHOUSE + warp_def $a, $17, 2, GOLDENROD_UNDERGROUND_WAREHOUSE + warp_def $19, $5, 2, GOLDENROD_UNDERGROUND warp_def $1d, $4, 14, GOLDENROD_CITY warp_def $1d, $5, 14, GOLDENROD_CITY - warp_def $19, $15, 1, WAREHOUSE_ENTRANCE + warp_def $19, $15, 1, GOLDENROD_UNDERGROUND warp_def $1d, $14, 13, GOLDENROD_CITY warp_def $1d, $15, 13, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $4, $13, $0, UndergroundSilverTrigger1, $0, 0 - xy_trigger 0, $5, $13, $0, UndergroundSilverTrigger2, $0, 0 + coord_event 0, $4, $13, UndergroundSilverScene1 + coord_event 0, $5, $13, UndergroundSilverScene2 -.Signposts: +.BGEvents: db 6 - signpost 1, 16, SIGNPOST_READ, Switch1Script - signpost 1, 10, SIGNPOST_READ, Switch2Script - signpost 1, 2, SIGNPOST_READ, Switch3Script - signpost 11, 20, SIGNPOST_READ, EmergencySwitchScript - signpost 9, 8, SIGNPOST_ITEM, UndergroundPathSwitchRoomEntrancesHiddenMaxPotion - signpost 8, 1, SIGNPOST_ITEM, UndergroundPathSwitchRoomEntrancesHiddenRevive - -.PersonEvents: + bg_event 1, 16, BGEVENT_READ, Switch1Script + bg_event 1, 10, BGEVENT_READ, Switch2Script + bg_event 1, 2, BGEVENT_READ, Switch3Script + bg_event 11, 20, BGEVENT_READ, EmergencySwitchScript + bg_event 9, 8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion + bg_event 8, 1, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive + +.ObjectEvents: db 11 - person_event SPRITE_PHARMACIST, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_PHARMACIST, 8, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 2, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET_GIRL, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_TEACHER, 27, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1 - person_event SPRITE_SUPER_NERD, 27, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1 - person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundPathSwitchRoomEntrancesSmokeBall, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL - person_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundPathSwitchRoomEntrancesFullHeal, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL - person_event SPRITE_SILVER, 3, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_UNDERGROUND_PATH + object_event SPRITE_PHARMACIST, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_PHARMACIST, 8, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 2, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET_GIRL, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_TEACHER, 27, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1 + object_event SPRITE_SUPER_NERD, 27, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1 + object_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL + object_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL + object_event SPRITE_SILVER, 3, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND diff --git a/maps/UndergroundPathSwitchRoomEntrances.blk b/maps/GoldenrodUndergroundSwitchRoomEntrances.blk index d8a49b5ce..d8a49b5ce 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.blk +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.blk diff --git a/maps/UndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 943a042c1..f6f27cd1a 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -1,21 +1,18 @@ const_value set 2 - const UNDERGROUNDWAREHOUSE_ROCKET1 - const UNDERGROUNDWAREHOUSE_ROCKET2 - const UNDERGROUNDWAREHOUSE_ROCKET3 - const UNDERGROUNDWAREHOUSE_GENTLEMAN - const UNDERGROUNDWAREHOUSE_POKE_BALL1 - const UNDERGROUNDWAREHOUSE_POKE_BALL2 - const UNDERGROUNDWAREHOUSE_POKE_BALL3 - -UndergroundWarehouse_MapScriptHeader: -.MapTriggers: + const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET1 + const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET2 + const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET3 + const GOLDENRODUNDERGROUNDWAREHOUSE_GENTLEMAN + const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL1 + const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL2 + const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL3 + +GoldenrodUndergroundWarehouse_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .ResetSwitches .ResetSwitches: @@ -39,34 +36,34 @@ UndergroundWarehouse_MapScriptHeader: return TrainerGruntM24: - trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, GruntM24Script + trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script -GruntM24Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x7da48 + writetext GruntM24AfterBattleText waitbutton closetext end TrainerGruntM14: - trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, GruntM14Script + trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, .Script -GruntM14Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x7db01 + writetext GruntM14AfterBattleText waitbutton closetext end TrainerGruntM15: - trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, GruntM15Script + trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, .Script -GruntM15Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x7db8e + writetext GruntM15AfterBattleText waitbutton closetext end @@ -80,9 +77,9 @@ GentlemanScript_0x7d9bf: buttonsound verbosegiveitem CARD_KEY setevent EVENT_RECEIVED_CARD_KEY - setevent EVENT_WAREHOUSE_LAYOUT_1 - clearevent EVENT_WAREHOUSE_LAYOUT_2 - clearevent EVENT_WAREHOUSE_LAYOUT_3 + setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1 + clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2 + clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 writetext UnknownText_0x7dc5b buttonsound UnknownScript_0x7d9de: @@ -91,13 +88,13 @@ UnknownScript_0x7d9de: closetext end -UndergroundWarehouseMaxEther: +GoldenrodUndergroundWarehouseMaxEther: itemball MAX_ETHER -UndergroundWarehouseTMSleepTalk: +GoldenrodUndergroundWarehouseTMSleepTalk: itemball TM_SLEEP_TALK -UndergroundWarehouseUltraBall: +GoldenrodUndergroundWarehouseUltraBall: itemball ULTRA_BALL GruntM24SeenText: @@ -113,7 +110,7 @@ GruntM24BeatenText: text "I got disposed of…" done -UnknownText_0x7da48: +GruntM24AfterBattleText: text "TEAM ROCKET will" line "keep going, wait-" cont "ing for the return" @@ -136,7 +133,7 @@ GruntM14BeatenText: text "Blast it!" done -UnknownText_0x7db01: +GruntM14AfterBattleText: text "I lost…" para "Please forgive me," @@ -156,7 +153,7 @@ GruntM15BeatenText: line "So, that's how?" done -UnknownText_0x7db8e: +GruntM15AfterBattleText: text "Hyuck-hyuck-hyuck!" line "That was a blast!" cont "I'll remember you!" @@ -213,28 +210,28 @@ UnknownText_0x7dc8d: line "MON nationwide!" done -UndergroundWarehouse_MapEventHeader: +GoldenrodUndergroundWarehouse_MapEventHeader: ; filler db 0, 0 .Warps: db 3 - warp_def $c, $2, 2, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES - warp_def $c, $3, 3, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES + warp_def $c, $2, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_def $c, $3, 3, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES warp_def $2, $11, 1, GOLDENROD_DEPT_STORE_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_ROCKET, 8, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 3, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_GENTLEMAN, 8, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_POKE_BALL, 15, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundWarehouseMaxEther, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER - person_event SPRITE_POKE_BALL, 9, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundWarehouseTMSleepTalk, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK - person_event SPRITE_POKE_BALL, 1, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundWarehouseUltraBall, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL + object_event SPRITE_ROCKET, 8, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 3, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_GENTLEMAN, 8, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_POKE_BALL, 15, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseMaxEther, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER + object_event SPRITE_POKE_BALL, 9, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK + object_event SPRITE_POKE_BALL, 1, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL diff --git a/maps/UndergroundWarehouse.blk b/maps/GoldenrodUndergroundWarehouse.blk index 4b0f803df..4b0f803df 100644 --- a/maps/UndergroundWarehouse.blk +++ b/maps/GoldenrodUndergroundWarehouse.blk diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 1b6befa08..c8d6ed1c4 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const GUIDEGENTSHOUSE_GRAMPS GuideGentsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -36,14 +36,14 @@ GuideGentsHouse_MapEventHeader: warp_def $7, $2, 4, CHERRYGROVE_CITY warp_def $7, $3, 4, CHERRYGROVE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, GuideGentsHouseBookshelf - signpost 1, 1, SIGNPOST_READ, GuideGentsHouseBookshelf + bg_event 1, 0, BGEVENT_READ, GuideGentsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, GuideGentsHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE + object_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index bf5804c42..e795feea8 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -2,24 +2,22 @@ const_value set 2 const HALLOFFAME_LANCE HallOfFame_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .EnterHallOfFame + scene_script .DummyScene .MapCallbacks: db 0 -.Trigger0: - priorityjump HallOfFameScript +.EnterHallOfFame: + priorityjump .EnterHallOfFameScript end -.Trigger1: +.DummyScene: end -HallOfFameScript: +.EnterHallOfFameScript: follow HALLOFFAME_LANCE, PLAYER applymovement HALLOFFAME_LANCE, HallOfFame_WalkUpWithLance stopfollow @@ -30,7 +28,7 @@ HallOfFameScript: closetext spriteface HALLOFFAME_LANCE, UP applymovement PLAYER, HallOfFame_SlowlyApproachMachine - dotrigger $1 + setscene $1 pause 15 writebyte 2 ; Machine is in the Hall of Fame special HealMachineAnim @@ -40,7 +38,7 @@ HallOfFameScript: clearevent EVENT_RED_IN_MT_SILVER setevent EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME clearevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - domaptrigger SPROUT_TOWER_3F, $1 + setmapscene SPROUT_TOWER_3F, $1 special HealParty checkevent EVENT_GOT_SS_TICKET_FROM_ELM iftrue .SkipPhoneCall @@ -121,12 +119,12 @@ HallOfFame_MapEventHeader: warp_def $d, $4, 3, LANCES_ROOM warp_def $d, $5, 4, LANCES_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_LANCE, 12, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event SPRITE_LANCE, 12, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index ab2ba2702..d0341d0e1 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -4,7 +4,7 @@ const_value set 2 const ICEPATH1F_POKE_BALL3 IcePath1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -30,14 +30,14 @@ IcePath1F_MapEventHeader: warp_def $5, $25, 1, ICE_PATH_B1F warp_def $d, $25, 7, ICE_PATH_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKE_BALL, 7, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL - person_event SPRITE_POKE_BALL, 23, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP - person_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN + object_event SPRITE_POKE_BALL, 7, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL + object_event SPRITE_POKE_BALL, 23, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP + object_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index afac65352..3c818c766 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -6,14 +6,11 @@ const_value set 2 const ICEPATHB1F_POKE_BALL IcePathB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_CMDQUEUE, .SetUpStoneTable .SetUpStoneTable: @@ -97,17 +94,17 @@ IcePathB1F_MapEventHeader: warp_def $19, $5, 4, ICE_PATH_1F warp_def $1b, $b, 1, ICE_PATH_B2F_BLACKTHORN_SIDE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 30, 17, SIGNPOST_ITEM, IcePathB1FHiddenMaxPotion + bg_event 30, 17, BGEVENT_ITEM, IcePathB1FHiddenMaxPotion -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_BOULDER, 7, 11, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1 - person_event SPRITE_BOULDER, 8, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 - person_event SPRITE_BOULDER, 9, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 - person_event SPRITE_BOULDER, 7, 17, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4 - person_event SPRITE_POKE_BALL, 35, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON + object_event SPRITE_BOULDER, 7, 11, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1 + object_event SPRITE_BOULDER, 8, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 + object_event SPRITE_BOULDER, 9, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 + object_event SPRITE_BOULDER, 7, 17, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4 + object_event SPRITE_POKE_BALL, 35, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 135c70164..68b32a7e6 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -2,7 +2,7 @@ const_value set 2 const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL IcePathB2FBlackthornSide_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -24,13 +24,13 @@ IcePathB2FBlackthornSide_MapEventHeader: warp_def $f, $3, 8, ICE_PATH_B1F warp_def $3, $3, 2, ICE_PATH_B3F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 10, 2, SIGNPOST_ITEM, IcePathB2FBlackthornSideHiddenIceHeal + bg_event 10, 2, BGEVENT_ITEM, IcePathB2FBlackthornSideHiddenIceHeal -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST + object_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index a588441bd..60a36ac40 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -7,7 +7,7 @@ const_value set 2 const ICEPATHB2FMAHOGANYSIDE_POKE_BALL2 IcePathB2FMahoganySide_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -44,18 +44,18 @@ IcePathB2FMahoganySide_MapEventHeader: warp_def $c, $4, 5, ICE_PATH_B1F warp_def $c, $c, 6, ICE_PATH_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 17, 0, SIGNPOST_ITEM, IcePathB2FMahoganySideHiddenCarbos + bg_event 17, 0, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_BOULDER, 3, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A - person_event SPRITE_BOULDER, 7, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A - person_event SPRITE_BOULDER, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A - person_event SPRITE_BOULDER, 13, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A - person_event SPRITE_POKE_BALL, 9, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL - person_event SPRITE_POKE_BALL, 2, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION + object_event SPRITE_BOULDER, 3, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A + object_event SPRITE_BOULDER, 7, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A + object_event SPRITE_BOULDER, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A + object_event SPRITE_BOULDER, 13, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A + object_event SPRITE_POKE_BALL, 9, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL + object_event SPRITE_POKE_BALL, 2, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index 1eb0c4548..64d448956 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -3,7 +3,7 @@ const_value set 2 const ICEPATHB3F_ROCK IcePathB3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -24,13 +24,13 @@ IcePathB3F_MapEventHeader: warp_def $5, $3, 2, ICE_PATH_B2F_MAHOGANY_SIDE warp_def $5, $f, 2, ICE_PATH_B2F_BLACKTHORN_SIDE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKE_BALL, 7, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE - person_event SPRITE_ROCK, 6, 6, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB3FRock, -1 + object_event SPRITE_POKE_BALL, 7, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE + object_event SPRITE_ROCK, 6, 6, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index d09ec7ab7..6ce300e27 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -12,14 +12,11 @@ const_value set 2 const ILEXFOREST_POKE_BALL4 IlexForest_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .FarfetchdCallback .FarfetchdCallback: @@ -40,52 +37,52 @@ IlexForest_MapScriptHeader: return .PositionOne: - moveperson ILEXFOREST_FARFETCHD, $e, $1f + moveobject ILEXFOREST_FARFETCHD, $e, $1f appear ILEXFOREST_FARFETCHD return .PositionTwo: - moveperson ILEXFOREST_FARFETCHD, $f, $19 + moveobject ILEXFOREST_FARFETCHD, $f, $19 appear ILEXFOREST_FARFETCHD return .PositionThree: - moveperson ILEXFOREST_FARFETCHD, $14, $18 + moveobject ILEXFOREST_FARFETCHD, $14, $18 appear ILEXFOREST_FARFETCHD return .PositionFour: - moveperson ILEXFOREST_FARFETCHD, $1d, $16 + moveobject ILEXFOREST_FARFETCHD, $1d, $16 appear ILEXFOREST_FARFETCHD return .PositionFive: - moveperson ILEXFOREST_FARFETCHD, $1c, $1f + moveobject ILEXFOREST_FARFETCHD, $1c, $1f appear ILEXFOREST_FARFETCHD return .PositionSix: - moveperson ILEXFOREST_FARFETCHD, $18, $23 + moveobject ILEXFOREST_FARFETCHD, $18, $23 appear ILEXFOREST_FARFETCHD return .PositionSeven: - moveperson ILEXFOREST_FARFETCHD, $16, $1f + moveobject ILEXFOREST_FARFETCHD, $16, $1f appear ILEXFOREST_FARFETCHD return .PositionEight: - moveperson ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, $f, $1d appear ILEXFOREST_FARFETCHD return .PositionNine: - moveperson ILEXFOREST_FARFETCHD, $a, $23 + moveobject ILEXFOREST_FARFETCHD, $a, $23 appear ILEXFOREST_FARFETCHD return .PositionTen: - moveperson ILEXFOREST_FARFETCHD, $6, $1c + moveobject ILEXFOREST_FARFETCHD, $6, $1c appear ILEXFOREST_FARFETCHD return @@ -128,7 +125,7 @@ IlexForestFarfetchdScript: waitbutton closetext applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos1_Pos2 - moveperson ILEXFOREST_FARFETCHD, $f, $19 + moveobject ILEXFOREST_FARFETCHD, $f, $19 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 2 @@ -138,7 +135,7 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal DOWN, .Position2_Down applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos2_Pos3 - moveperson ILEXFOREST_FARFETCHD, $14, $18 + moveobject ILEXFOREST_FARFETCHD, $14, $18 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 3 @@ -146,7 +143,7 @@ IlexForestFarfetchdScript: .Position2_Down: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos2_Pos8 - moveperson ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, $f, $1d disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 @@ -156,7 +153,7 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal LEFT, .Position3_Left applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos3_Pos4 - moveperson ILEXFOREST_FARFETCHD, $1d, $16 + moveobject ILEXFOREST_FARFETCHD, $1d, $16 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 4 @@ -164,7 +161,7 @@ IlexForestFarfetchdScript: .Position3_Left: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos3_Pos2 - moveperson ILEXFOREST_FARFETCHD, $f, $19 + moveobject ILEXFOREST_FARFETCHD, $f, $19 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 2 @@ -174,7 +171,7 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal UP, .Position4_Up applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos4_Pos5 - moveperson ILEXFOREST_FARFETCHD, $1c, $1f + moveobject ILEXFOREST_FARFETCHD, $1c, $1f disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 5 @@ -182,7 +179,7 @@ IlexForestFarfetchdScript: .Position4_Up: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos4_Pos3 - moveperson ILEXFOREST_FARFETCHD, $14, $18 + moveobject ILEXFOREST_FARFETCHD, $14, $18 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 3 @@ -194,7 +191,7 @@ IlexForestFarfetchdScript: if_equal LEFT, .Position5_Left if_equal RIGHT, .Position5_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos5_Pos6 - moveperson ILEXFOREST_FARFETCHD, $18, $23 + moveobject ILEXFOREST_FARFETCHD, $18, $23 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 6 @@ -202,7 +199,7 @@ IlexForestFarfetchdScript: .Position5_Left: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos5_Pos7 - moveperson ILEXFOREST_FARFETCHD, $16, $1f + moveobject ILEXFOREST_FARFETCHD, $16, $1f disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 7 @@ -210,7 +207,7 @@ IlexForestFarfetchdScript: .Position5_Up: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos5_Pos4_Up - moveperson ILEXFOREST_FARFETCHD, $1d, $16 + moveobject ILEXFOREST_FARFETCHD, $1d, $16 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 4 @@ -218,7 +215,7 @@ IlexForestFarfetchdScript: .Position5_Right: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos5_Pos4_Right - moveperson ILEXFOREST_FARFETCHD, $1d, $16 + moveobject ILEXFOREST_FARFETCHD, $1d, $16 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 4 @@ -228,7 +225,7 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal RIGHT, .Position6_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos6_Pos7 - moveperson ILEXFOREST_FARFETCHD, $16, $1f + moveobject ILEXFOREST_FARFETCHD, $16, $1f disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 7 @@ -236,7 +233,7 @@ IlexForestFarfetchdScript: .Position6_Right: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos6_Pos5 - moveperson ILEXFOREST_FARFETCHD, $1c, $1f + moveobject ILEXFOREST_FARFETCHD, $1c, $1f disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 5 @@ -247,7 +244,7 @@ IlexForestFarfetchdScript: if_equal DOWN, .Position7_Down if_equal LEFT, .Position7_Left applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos8 - moveperson ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, $f, $1d disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 @@ -255,7 +252,7 @@ IlexForestFarfetchdScript: .Position7_Left: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos6 - moveperson ILEXFOREST_FARFETCHD, $18, $23 + moveobject ILEXFOREST_FARFETCHD, $18, $23 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 6 @@ -263,7 +260,7 @@ IlexForestFarfetchdScript: .Position7_Down: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos5 - moveperson ILEXFOREST_FARFETCHD, $1c, $1f + moveobject ILEXFOREST_FARFETCHD, $1c, $1f disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 5 @@ -275,7 +272,7 @@ IlexForestFarfetchdScript: if_equal LEFT, .Position8_Left if_equal RIGHT, .Position8_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos9 - moveperson ILEXFOREST_FARFETCHD, $a, $23 + moveobject ILEXFOREST_FARFETCHD, $a, $23 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 9 @@ -283,7 +280,7 @@ IlexForestFarfetchdScript: .Position8_Right: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos7 - moveperson ILEXFOREST_FARFETCHD, $16, $1f + moveobject ILEXFOREST_FARFETCHD, $16, $1f disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 7 @@ -292,7 +289,7 @@ IlexForestFarfetchdScript: .Position8_Up: .Position8_Left: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos2 - moveperson ILEXFOREST_FARFETCHD, $f, $19 + moveobject ILEXFOREST_FARFETCHD, $f, $19 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 2 @@ -303,7 +300,7 @@ IlexForestFarfetchdScript: if_equal DOWN, .Position9_Down if_equal RIGHT, .Position9_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos10 - moveperson ILEXFOREST_FARFETCHD, $6, $1c + moveobject ILEXFOREST_FARFETCHD, $6, $1c disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 10 @@ -314,7 +311,7 @@ IlexForestFarfetchdScript: .Position9_Right: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos8_Right - moveperson ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, $f, $1d disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 @@ -322,7 +319,7 @@ IlexForestFarfetchdScript: .Position9_Down: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos8_Down - moveperson ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, $f, $1d disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 @@ -391,12 +388,12 @@ IlexForestHeadbuttGuyScript: end TrainerBug_catcherWayne: - trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, 0, Bug_catcherWayneScript + trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, 0, .Script -Bug_catcherWayneScript: +.Script: end_if_just_battled opentext - writetext Bug_catcherWayneAfterText + writetext Bug_catcherWayneAfterBattleText waitbutton closetext end @@ -929,7 +926,7 @@ Bug_catcherWayneBeatenText: line "#MON before…" done -Bug_catcherWayneAfterText: +Bug_catcherWayneAfterBattleText: text "A #MON I've" line "never seen before" @@ -952,27 +949,27 @@ IlexForest_MapEventHeader: warp_def $2a, $3, 1, ILEX_FOREST_AZALEA_GATE warp_def $2b, $3, 2, ILEX_FOREST_AZALEA_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 5 - signpost 17, 3, SIGNPOST_READ, MapIlexForestSignpost0Script - signpost 7, 11, SIGNPOST_ITEM, IlexForestHiddenEther - signpost 14, 22, SIGNPOST_ITEM, IlexForestHiddenSuperPotion - signpost 17, 1, SIGNPOST_ITEM, IlexForestHiddenFullHeal - signpost 22, 8, SIGNPOST_UP, MapIlexForestSignpost4Script + bg_event 17, 3, BGEVENT_READ, MapIlexForestSignpost0Script + bg_event 7, 11, BGEVENT_ITEM, IlexForestHiddenEther + bg_event 14, 22, BGEVENT_ITEM, IlexForestHiddenSuperPotion + bg_event 17, 1, BGEVENT_ITEM, IlexForestHiddenFullHeal + bg_event 22, 8, BGEVENT_UP, MapIlexForestSignpost4Script -.PersonEvents: +.ObjectEvents: db 11 - person_event SPRITE_BIRD, 31, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD - person_event SPRITE_YOUNGSTER, 28, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE - person_event SPRITE_BLACK_BELT, 28, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER - person_event SPRITE_ROCKER, 14, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IlexForestHeadbuttGuyScript, -1 - person_event SPRITE_POKE_BALL, 32, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE - person_event SPRITE_KURT, 29, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT - person_event SPRITE_LASS, 24, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS - person_event SPRITE_YOUNGSTER, 1, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 0, TrainerBug_catcherWayne, -1 - person_event SPRITE_POKE_BALL, 17, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK - person_event SPRITE_POKE_BALL, 7, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE - person_event SPRITE_POKE_BALL, 1, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER + object_event SPRITE_BIRD, 31, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD + object_event SPRITE_YOUNGSTER, 28, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE + object_event SPRITE_BLACK_BELT, 28, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER + object_event SPRITE_ROCKER, 14, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestHeadbuttGuyScript, -1 + object_event SPRITE_POKE_BALL, 32, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE + object_event SPRITE_KURT, 29, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT + object_event SPRITE_LASS, 24, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS + object_event SPRITE_YOUNGSTER, 1, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerBug_catcherWayne, -1 + object_event SPRITE_POKE_BALL, 17, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK + object_event SPRITE_POKE_BALL, 7, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE + object_event SPRITE_POKE_BALL, 1, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 25ffdfcd0..76a2925de 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -3,25 +3,25 @@ const_value set 2 const ILEXFORESTAZALEAGATE_GRANNY IlexForestAzaleaGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -OfficerScript_0x62c7a: - jumptextfaceplayer UnknownText_0x62c80 +IlexForestAzaleaGateOfficerScript: + jumptextfaceplayer IlexForestAzaleaGateOfficerText -GrannyScript_0x62c7d: - jumptextfaceplayer UnknownText_0x62cb0 +IlexForestAzaleaGateGrannyScript: + jumptextfaceplayer IlexForestAzaleaGateGrannyText -UnknownText_0x62c80: +IlexForestAzaleaGateOfficerText: text "ILEX FOREST is" line "big. Be careful!" cont "Don't get lost." done -UnknownText_0x62cb0: +IlexForestAzaleaGateGrannyText: text "The FOREST is" line "watched over by" cont "its protector." @@ -41,13 +41,13 @@ IlexForestAzaleaGate_MapEventHeader: warp_def $4, $9, 7, AZALEA_TOWN warp_def $5, $9, 8, AZALEA_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x62c7a, -1 - person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrannyScript_0x62c7d, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1 + object_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1 diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 4ebc80cd1..dc657df20 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -6,30 +6,25 @@ const_value set 2 const INDIGOPLATEAUPOKECENTER1F_GRAMPS const INDIGOPLATEAUPOKECENTER1F_ABRA -IndigoPlateauPokeCenter1F_MapScriptHeader: -.MapTriggers: +IndigoPlateauPokecenter1F_MapScriptHeader: +.SceneScripts: db 1 - - ; triggers - dw UnknownScript_0x180009, 0 + scene_script .DummyScene .MapCallbacks: db 1 + dbw MAPCALLBACK_NEWMAP, .PrepareElite4 - ; callbacks - - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x18000a - -UnknownScript_0x180009: +.DummyScene: end -UnknownScript_0x18000a: - domaptrigger WILLS_ROOM, $0 - domaptrigger KOGAS_ROOM, $0 - domaptrigger BRUNOS_ROOM, $0 - domaptrigger KARENS_ROOM, $0 - domaptrigger LANCES_ROOM, $0 - domaptrigger HALL_OF_FAME, $0 +.PrepareElite4: + setmapscene WILLS_ROOM, $0 + setmapscene KOGAS_ROOM, $0 + setmapscene BRUNOS_ROOM, $0 + setmapscene KARENS_ROOM, $0 + setmapscene LANCES_ROOM, $0 + setmapscene HALL_OF_FAME, $0 clearevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED clearevent EVENT_WILLS_ROOM_EXIT_OPEN clearevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED @@ -59,7 +54,7 @@ PlateauRivalBattle1: if_equal THURSDAY, PlateauRivalScriptDone if_equal FRIDAY, PlateauRivalScriptDone if_equal SATURDAY, PlateauRivalScriptDone - moveperson INDIGOPLATEAUPOKECENTER1F_SILVER, $11, $9 + moveobject INDIGOPLATEAUPOKECENTER1F_SILVER, $11, $9 appear INDIGOPLATEAUPOKECENTER1F_SILVER spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 @@ -102,7 +97,7 @@ PlateauRivalBattleCommon: ; Cyndaquil winlosstext PlateauRivalWinText, PlateauRivalLoseText setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER - loadtrainer RIVAL2, 6 + loadtrainer RIVAL2, RIVAL2_2_TOTODILE startbattle dontrestartmapmusic reloadmapafterbattle @@ -111,7 +106,7 @@ PlateauRivalBattleCommon: .Totodile: winlosstext PlateauRivalWinText, PlateauRivalLoseText setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER - loadtrainer RIVAL2, 4 + loadtrainer RIVAL2, RIVAL2_2_CHIKORITA startbattle dontrestartmapmusic reloadmapafterbattle @@ -120,7 +115,7 @@ PlateauRivalBattleCommon: .Chikorita: winlosstext PlateauRivalWinText, PlateauRivalLoseText setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER - loadtrainer RIVAL2, 5 + loadtrainer RIVAL2, RIVAL2_2_CYNDAQUIL startbattle dontrestartmapmusic reloadmapafterbattle @@ -135,7 +130,7 @@ PlateauRivalPostBattle: spriteface PLAYER, DOWN applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement disappear INDIGOPLATEAUPOKECENTER1F_SILVER - dotrigger $0 + setscene $0 playmapmusic setflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT PlateauRivalScriptDone: @@ -150,8 +145,8 @@ ClerkScript_0x18012f: closetext end -CooltrainerMScript_0x180136: - jumptextfaceplayer UnknownText_0x180178 +IndigoPlateauPokecenter1FCooltrainerMScript: + jumptextfaceplayer IndigoPlateauPokecenter1FCooltrainerMText TeleportGuyScript: faceplayer @@ -208,7 +203,7 @@ PlateauRivalLeavesMovement: step DOWN step_end -UnknownText_0x180178: +IndigoPlateauPokecenter1FCooltrainerMText: text "At the #MON" line "LEAGUE, you'll get" @@ -307,7 +302,7 @@ AbraText: text "ABRA: Aabra…" done -IndigoPlateauPokeCenter1F_MapEventHeader: +IndigoPlateauPokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -318,19 +313,19 @@ IndigoPlateauPokeCenter1F_MapEventHeader: warp_def $d, $0, 1, POKECENTER_2F warp_def $3, $e, 1, WILLS_ROOM -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $4, $10, $0, PlateauRivalBattle1, $0, $0 - xy_trigger 0, $4, $11, $0, PlateauRivalBattle2, $0, $0 + coord_event 0, $4, $10, PlateauRivalBattle1 + coord_event 0, $4, $11, PlateauRivalBattle2 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_NURSE, 7, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18012c, -1 - person_event SPRITE_CLERK, 7, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1 - person_event SPRITE_COOLTRAINER_M, 11, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x180136, -1 - person_event SPRITE_SILVER, 9, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL - person_event SPRITE_GRAMPS, 9, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY - person_event SPRITE_JYNX, 9, 0, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY + object_event SPRITE_NURSE, 7, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18012c, -1 + object_event SPRITE_CLERK, 7, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1 + object_event SPRITE_COOLTRAINER_M, 11, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1 + object_event SPRITE_SILVER, 9, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL + object_event SPRITE_GRAMPS, 9, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY + object_event SPRITE_JYNX, 9, 0, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY diff --git a/maps/IndigoPlateauPokeCenter1F.blk b/maps/IndigoPlateauPokecenter1F.blk index 96c6a225b..96c6a225b 100644 --- a/maps/IndigoPlateauPokeCenter1F.blk +++ b/maps/IndigoPlateauPokecenter1F.blk diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 6ab50b3fc..a24500d24 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -2,25 +2,20 @@ const_value set 2 const KARENSROOM_KAREN KarensRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + scene_script .LockDoor + scene_script .DummyScene .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .KarensRoomDoors -.Trigger0: +.LockDoor: priorityjump .KarensDoorLocksBehindYou end -.Trigger1: +.DummyScene: end .KarensRoomDoors: @@ -42,7 +37,7 @@ KarensRoom_MapScriptHeader: changeblock $4, $e, $2a reloadmappart closetext - dotrigger $1 + setscene $1 setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -148,12 +143,12 @@ KarensRoom_MapEventHeader: warp_def $2, $4, 1, LANCES_ROOM warp_def $2, $5, 2, LANCES_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_KAREN, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, KarenScript_Battle, -1 + object_event SPRITE_KAREN, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KarenScript_Battle, -1 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 35fcb68b7..15d7185ab 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -2,25 +2,20 @@ const_value set 2 const KOGASROOM_KOGA KogasRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + scene_script .LockDoor + scene_script .DummyScene .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .KogasRoomDoors -.Trigger0: +.LockDoor: priorityjump .KogasDoorLocksBehindYou end -.Trigger1: +.DummyScene: end .KogasRoomDoors: @@ -42,7 +37,7 @@ KogasRoom_MapScriptHeader: changeblock $4, $e, $2a reloadmappart closetext - dotrigger $1 + setscene $1 setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -145,12 +140,12 @@ KogasRoom_MapEventHeader: warp_def $2, $4, 1, BRUNOS_ROOM warp_def $2, $5, 2, BRUNOS_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_KOGA, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, KogaScript_Battle, -1 + object_event SPRITE_KOGA, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, KogaScript_Battle, -1 diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 70aad1590..20d5d0b7e 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -6,20 +6,18 @@ const_value set 2 const KRISSHOUSE1F_POKEFAN_F KrissHouse1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x7a4d6, 0 - dw UnknownScript_0x7a4d7, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -UnknownScript_0x7a4d6: +.DummyScene0: end -UnknownScript_0x7a4d7: +.DummyScene1: end UnknownScript_0x7a4d8: @@ -45,7 +43,7 @@ UnknownScript_0x7a4f6: setflag ENGINE_POKEGEAR setflag ENGINE_PHONE_CARD addcellnum PHONE_MOM - dotrigger $1 + setscene $1 setevent EVENT_KRISS_HOUSE_MOM_1 clearevent EVENT_KRISS_HOUSE_MOM_2 writetext UnknownText_0x7a6bd @@ -117,7 +115,7 @@ UnknownScript_0x7a57e: MomScript_0x7a582: faceplayer setevent EVENT_RECEIVED_BALLS_FROM_KURT - checktriggers + checkscene iffalse UnknownScript_0x7a572 opentext checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM @@ -397,22 +395,22 @@ KrissHouse1F_MapEventHeader: warp_def $7, $7, 2, NEW_BARK_TOWN warp_def $0, $9, 1, KRISS_HOUSE_2F -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $4, $8, $0, UnknownScript_0x7a4d8, $0, $0 - xy_trigger 0, $4, $9, $0, UnknownScript_0x7a4db, $0, $0 + coord_event 0, $4, $8, UnknownScript_0x7a4d8 + coord_event 0, $4, $9, UnknownScript_0x7a4db -.Signposts: +.BGEvents: db 4 - signpost 1, 0, SIGNPOST_READ, StoveScript - signpost 1, 1, SIGNPOST_READ, SinkScript - signpost 1, 2, SIGNPOST_READ, FridgeScript - signpost 1, 4, SIGNPOST_READ, TVScript + bg_event 1, 0, BGEVENT_READ, StoveScript + bg_event 1, 1, BGEVENT_READ, SinkScript + bg_event 1, 2, BGEVENT_READ, FridgeScript + bg_event 1, 4, BGEVENT_READ, TVScript -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1 - person_event SPRITE_MOM, 2, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, 1, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - person_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, 2, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - person_event SPRITE_MOM, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, 4, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - person_event SPRITE_POKEFAN_F, 4, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR + object_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1 + object_event SPRITE_MOM, 2, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + object_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + object_event SPRITE_MOM, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + object_event SPRITE_POKEFAN_F, 4, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index f847f6fa0..528dc505f 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -5,16 +5,12 @@ const_value set 2 const KRISSHOUSE2F_BIG_DOLL KrissHouse2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .InitializeRoom - dbw MAPCALLBACK_TILES, .SetSpawn .Null: @@ -53,6 +49,7 @@ GameConsole: KrissHousePoster: dw EVENT_KRISS_ROOM_POSTER, .Script + .Script: describedecoration 0 @@ -127,19 +124,19 @@ KrissHouse2F_MapEventHeader: db 1 warp_def $0, $7, 3, KRISS_HOUSE_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 1, 2, SIGNPOST_UP, KrissHousePC - signpost 1, 3, SIGNPOST_READ, KrissHouseRadio - signpost 1, 5, SIGNPOST_READ, KrissHouseBookshelf - signpost 0, 6, SIGNPOST_IFSET, KrissHousePoster + bg_event 1, 2, BGEVENT_UP, KrissHousePC + bg_event 1, 3, BGEVENT_READ, KrissHouseRadio + bg_event 1, 5, BGEVENT_READ, KrissHouseBookshelf + bg_event 0, 6, BGEVENT_IFSET, KrissHousePoster -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_CONSOLE, 2, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE - person_event SPRITE_DOLL_1, 4, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1 - person_event SPRITE_DOLL_2, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2 - person_event SPRITE_BIG_DOLL, 1, 0, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL + object_event SPRITE_CONSOLE, 2, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE + object_event SPRITE_DOLL_1, 4, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1 + object_event SPRITE_DOLL_2, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2 + object_event SPRITE_BIG_DOLL, 1, 0, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 70fc3794e..44dbd8449 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const KRISSNEIGHBORSHOUSE_POKEFAN_F KrissNeighborsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -107,16 +107,16 @@ KrissNeighborsHouse_MapEventHeader: warp_def $7, $2, 3, NEW_BARK_TOWN warp_def $7, $3, 3, NEW_BARK_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 0, SIGNPOST_READ, KrissNeighborsHouseBookshelf - signpost 1, 1, SIGNPOST_READ, KrissNeighborsHouseBookshelf - signpost 1, 7, SIGNPOST_READ, KrissNeighborsHouseRadio + bg_event 1, 0, BGEVENT_READ, KrissNeighborsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf + bg_event 1, 7, BGEVENT_READ, KrissNeighborsHouseRadio -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, KrissNeighborsDaughter, -1 - person_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR + object_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighborsDaughter, -1 + object_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 17a278d65..ffbc78ea1 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -6,35 +6,32 @@ const_value set 2 const KURTSHOUSE_TWIN2 KurtsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .KurtCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x18e154 - -UnknownScript_0x18e154: +.KurtCallback: checkevent EVENT_CLEARED_SLOWPOKE_WELL - iffalse UnknownScript_0x18e177 + iffalse .Done checkevent EVENT_FOREST_IS_RESTLESS - iftrue UnknownScript_0x18e177 + iftrue .Done checkflag ENGINE_KURT_MAKING_BALLS - iftrue UnknownScript_0x18e16f + iftrue .MakingBalls disappear KURTSHOUSE_KURT2 appear KURTSHOUSE_KURT1 disappear KURTSHOUSE_TWIN2 appear KURTSHOUSE_TWIN1 return -UnknownScript_0x18e16f: +.MakingBalls: disappear KURTSHOUSE_KURT1 appear KURTSHOUSE_KURT2 disappear KURTSHOUSE_TWIN1 appear KURTSHOUSE_TWIN2 -UnknownScript_0x18e177: +.Done: return KurtScript_0x18e178: @@ -314,7 +311,7 @@ KurtScript_0x18e178: clearevent EVENT_AZALEA_TOWN_KURT waitsfx special RestartMapMusic - domaptrigger AZALEA_TOWN, $2 + setmapscene AZALEA_TOWN, $2 end KurtScript_0x18e3bd: @@ -688,23 +685,23 @@ KurtsHouse_MapEventHeader: warp_def $7, $3, 4, AZALEA_TOWN warp_def $7, $4, 4, AZALEA_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 7 - signpost 1, 6, SIGNPOST_READ, KurtsHouseRadio - signpost 0, 8, SIGNPOST_READ, KurtsHouseOakPhoto - signpost 0, 9, SIGNPOST_READ, KurtsHouseOakPhoto - signpost 1, 5, SIGNPOST_READ, KurtsHouseBookshelf - signpost 1, 2, SIGNPOST_READ, KurtsHouseBookshelf - signpost 1, 3, SIGNPOST_READ, KurtsHouseBookshelf - signpost 1, 4, SIGNPOST_READ, KurtsHouseCelebiStatue - -.PersonEvents: + bg_event 1, 6, BGEVENT_READ, KurtsHouseRadio + bg_event 0, 8, BGEVENT_READ, KurtsHouseOakPhoto + bg_event 0, 9, BGEVENT_READ, KurtsHouseOakPhoto + bg_event 1, 5, BGEVENT_READ, KurtsHouseBookshelf + bg_event 1, 2, BGEVENT_READ, KurtsHouseBookshelf + bg_event 1, 3, BGEVENT_READ, KurtsHouseBookshelf + bg_event 1, 4, BGEVENT_READ, KurtsHouseCelebiStatue + +.ObjectEvents: db 5 - person_event SPRITE_KURT, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1 - person_event SPRITE_TWIN, 3, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1 - person_event SPRITE_SLOWPOKE, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE - person_event SPRITE_KURT, 3, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2 - person_event SPRITE_TWIN, 4, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2 + object_event SPRITE_KURT, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1 + object_event SPRITE_TWIN, 3, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1 + object_event SPRITE_SLOWPOKE, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE + object_event SPRITE_KURT, 3, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2 + object_event SPRITE_TWIN, 4, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2 diff --git a/maps/LakeofRage.asm b/maps/LakeOfRage.asm index 6f2a356b6..80200cebc 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeOfRage.asm @@ -12,26 +12,21 @@ const_value set 2 const LAKEOFRAGE_POKE_BALL1 const LAKEOFRAGE_POKE_BALL2 -LakeofRage_MapScriptHeader: -.MapTriggers: +LakeOfRage_MapScriptHeader: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_OBJECTS, .Wesley -.Trigger0: +.DummyScene0: end -.Trigger1: +.DummyScene1: end .FlyPoint: @@ -67,7 +62,7 @@ UnknownScript_0x70035: disappear LAKEOFRAGE_LANCE clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_DECIDED_TO_HELP_LANCE - domaptrigger MAHOGANY_MART_1F, $1 + setmapscene MAHOGANY_MART_1F, $1 end UnknownScript_0x7004e: @@ -106,7 +101,7 @@ UnknownScript_0x7007a: waitsfx itemnotify closetext - dotrigger $0 + setscene $0 appear LAKEOFRAGE_LANCE end @@ -126,16 +121,16 @@ UnknownScript_0x7009c: closetext end -SuperNerdScript_0x700a2: - jumptextfaceplayer UnknownText_0x70444 +LakeOfRageSuperNerdScript: + jumptextfaceplayer LakeOfRageSuperNerdText -CooltrainerFScript_0x700a5: - jumptextfaceplayer UnknownText_0x704bb +LakeOfRageCooltrainerFScript: + jumptextfaceplayer LakeOfRageCooltrainerFText -MapLakeofRageSignpost0Script: +MapLakeOfRageSignpost0Script: jumptext UnknownText_0x708d7 -MapLakeofRageSignpost1Script: +MapLakeOfRageSignpost1Script: opentext writetext UnknownText_0x70903 checkevent EVENT_CLEARED_ROCKET_HIDEOUT @@ -151,45 +146,45 @@ UnknownScript_0x700b8: end TrainerFisherAndre: - trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, FisherAndreScript + trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, .Script -FisherAndreScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x7058f + writetext FisherAndreAfterBattleText waitbutton closetext end TrainerFisherRaymond: - trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, FisherRaymondScript + trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, .Script -FisherRaymondScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x70611 + writetext FisherRaymondAfterBattleText waitbutton closetext end TrainerCooltrainermAaron: - trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, CooltrainermAaronScript + trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, .Script -CooltrainermAaronScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x7069c + writetext CooltrainermAaronAfterBattleText waitbutton closetext end TrainerCooltrainerfLois: - trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, CooltrainerfLoisScript + trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, .Script -CooltrainerfLoisScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x70752 + writetext CooltrainerfLoisAfterBattleText waitbutton closetext end @@ -230,21 +225,21 @@ WesleyNotWednesdayScript: closetext end -LakeofRageElixer: +LakeOfRageElixer: itemball ELIXER -LakeofRageTMDetect: +LakeOfRageTMDetect: itemball TM_DETECT -LakeofRageHiddenFullRestore: +LakeOfRageHiddenFullRestore: dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE -LakeofRageHiddenRareCandy: +LakeOfRageHiddenRareCandy: dwb EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY -LakeofRageHiddenMaxPotion: +LakeOfRageHiddenMaxPotion: dwb EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION @@ -341,7 +336,7 @@ UnknownText_0x70421: line "KARP are biting!" done -UnknownText_0x70444: +LakeOfRageSuperNerdText: text "I heard this lake" line "was made by ram-" cont "paging GYARADOS." @@ -353,7 +348,7 @@ UnknownText_0x70444: line "break now?" done -UnknownText_0x704bb: +LakeOfRageCooltrainerFText: text "Did my eyes de-" line "ceive me? I saw a" @@ -379,7 +374,7 @@ FisherAndreBeatenText: line "MON trainer…" done -UnknownText_0x7058f: +FisherAndreAfterBattleText: text "I won't lose as an" line "angler! I catch" cont "#MON all day." @@ -398,7 +393,7 @@ FisherRaymondBeatenText: line "tangled up…" done -UnknownText_0x70611: +FisherRaymondAfterBattleText: text "Why can't I catch" line "any good #MON?" done @@ -419,7 +414,7 @@ CooltrainermAaronBeatenText: line "Good battle." done -UnknownText_0x7069c: +CooltrainermAaronAfterBattleText: text "#MON and their" line "trainer become" @@ -444,7 +439,7 @@ CooltrainerfLoisBeatenText: text "Good going!" done -UnknownText_0x70752: +CooltrainerfLoisAfterBattleText: text "Come to think of" line "it, I've seen a" cont "pink BUTTERFREE." @@ -501,7 +496,7 @@ UnknownText_0x70903: line "HOUSE" done -LakeofRage_MapEventHeader: +LakeOfRage_MapEventHeader: ; filler db 0, 0 @@ -510,28 +505,28 @@ LakeofRage_MapEventHeader: warp_def $3, $7, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE warp_def $1f, $1b, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 5 - signpost 27, 21, SIGNPOST_READ, MapLakeofRageSignpost0Script - signpost 31, 25, SIGNPOST_READ, MapLakeofRageSignpost1Script - signpost 28, 11, SIGNPOST_ITEM, LakeofRageHiddenFullRestore - signpost 4, 4, SIGNPOST_ITEM, LakeofRageHiddenRareCandy - signpost 5, 35, SIGNPOST_ITEM, LakeofRageHiddenMaxPotion + bg_event 27, 21, BGEVENT_READ, MapLakeOfRageSignpost0Script + bg_event 31, 25, BGEVENT_READ, MapLakeOfRageSignpost1Script + bg_event 28, 11, BGEVENT_ITEM, LakeOfRageHiddenFullRestore + bg_event 4, 4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy + bg_event 5, 35, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion -.PersonEvents: +.ObjectEvents: db 12 - person_event SPRITE_LANCE, 28, 21, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE - person_event SPRITE_GRAMPS, 26, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x7008e, -1 - person_event SPRITE_SUPER_NERD, 13, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x700a2, -1 - person_event SPRITE_COOLTRAINER_F, 29, 25, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x700a5, -1 - person_event SPRITE_FISHER, 23, 30, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS - person_event SPRITE_FISHER, 26, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS - person_event SPRITE_COOLTRAINER_M, 15, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS - person_event SPRITE_COOLTRAINER_F, 7, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS - person_event SPRITE_GYARADOS, 22, 18, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS - person_event SPRITE_SUPER_NERD, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY - person_event SPRITE_POKE_BALL, 10, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeofRageElixer, EVENT_LAKE_OF_RAGE_ELIXER - person_event SPRITE_POKE_BALL, 2, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeofRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT + object_event SPRITE_LANCE, 28, 21, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE + object_event SPRITE_GRAMPS, 26, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7008e, -1 + object_event SPRITE_SUPER_NERD, 13, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1 + object_event SPRITE_COOLTRAINER_F, 29, 25, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageCooltrainerFScript, -1 + object_event SPRITE_FISHER, 23, 30, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS + object_event SPRITE_FISHER, 26, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS + object_event SPRITE_COOLTRAINER_M, 15, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS + object_event SPRITE_COOLTRAINER_F, 7, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS + object_event SPRITE_GYARADOS, 22, 18, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS + object_event SPRITE_SUPER_NERD, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY + object_event SPRITE_POKE_BALL, 10, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER + object_event SPRITE_POKE_BALL, 2, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT diff --git a/maps/LakeofRage.blk b/maps/LakeOfRage.blk index 3b26d4f28..3b26d4f28 100644 --- a/maps/LakeofRage.blk +++ b/maps/LakeOfRage.blk diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index 74e3b3062..e5a88623d 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -1,8 +1,8 @@ const_value set 2 const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER -LakeofRageHiddenPowerHouse_MapScriptHeader: -.MapTriggers: +LakeOfRageHiddenPowerHouse_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: @@ -67,7 +67,7 @@ HiddenPowerGuyText3: text "I am meditating…" done -LakeofRageHiddenPowerHouse_MapEventHeader: +LakeOfRageHiddenPowerHouse_MapEventHeader: ; filler db 0, 0 @@ -76,14 +76,14 @@ LakeofRageHiddenPowerHouse_MapEventHeader: warp_def $7, $2, 1, LAKE_OF_RAGE warp_def $7, $3, 1, LAKE_OF_RAGE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, HiddenPowerHouseBookshelf - signpost 1, 1, SIGNPOST_READ, HiddenPowerHouseBookshelf + bg_event 1, 0, BGEVENT_READ, HiddenPowerHouseBookshelf + bg_event 1, 1, BGEVENT_READ, HiddenPowerHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, HiddenPowerGuy, -1 + object_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HiddenPowerGuy, -1 diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index 417af28d4..0ac776aa1 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -1,8 +1,8 @@ const_value set 2 const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU -LakeofRageMagikarpHouse_MapScriptHeader: -.MapTriggers: +LakeOfRageMagikarpHouse_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: @@ -205,7 +205,7 @@ UnknownText_0x19aabc: text_from_ram StringBuffer4 db "@@" -LakeofRageMagikarpHouse_MapEventHeader: +LakeOfRageMagikarpHouse_MapEventHeader: ; filler db 0, 0 @@ -214,14 +214,14 @@ LakeofRageMagikarpHouse_MapEventHeader: warp_def $7, $2, 2, LAKE_OF_RAGE warp_def $7, $3, 2, LAKE_OF_RAGE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, MagikarpHouseBookshelf - signpost 1, 1, SIGNPOST_READ, MagikarpHouseBookshelf + bg_event 1, 0, BGEVENT_READ, MagikarpHouseBookshelf + bg_event 1, 1, BGEVENT_READ, MagikarpHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1 + object_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index e3572d50d..17c8628ad 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -4,39 +4,34 @@ const_value set 2 const LANCESROOM_OAK LancesRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + scene_script .LockDoor + scene_script .DummyScene .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .LancesRoomDoors - ; callbacks - - dbw MAPCALLBACK_TILES, .CheckDoor - -.Trigger0: - priorityjump LancesRoom_PlayerWalksIn_DoorsCloseBehind +.LockDoor: + priorityjump .LancesDoorLocksBehindYou end -.Trigger1: +.DummyScene: end -.CheckDoor: +.LancesRoomDoors: checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED - iffalse .LanceEntranceOpen + iffalse .KeepDoorsClosed changeblock $4, $16, $34 -.LanceEntranceOpen: +.KeepDoorsClosed: checkevent EVENT_LANCES_ROOM_EXIT_OPEN - iffalse .LanceExitClosed + iffalse .OpenDoors changeblock $4, $0, $b -.LanceExitClosed: +.OpenDoors: return -LancesRoom_PlayerWalksIn_DoorsCloseBehind: +.LancesDoorLocksBehindYou: applymovement PLAYER, LancesRoom_PlayerWalksInMovementData refreshscreen $86 playsound SFX_STRENGTH @@ -44,7 +39,7 @@ LancesRoom_PlayerWalksIn_DoorsCloseBehind: changeblock $4, $16, $34 reloadmappart closetext - dotrigger $1 + setscene $1 setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED end @@ -353,16 +348,16 @@ LancesRoom_MapEventHeader: warp_def $1, $4, 1, HALL_OF_FAME warp_def $1, $5, 2, HALL_OF_FAME -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 1, $5, $4, $0, Script_ApproachLanceFromLeft, $0, $0 - xy_trigger 1, $5, $5, $0, Script_ApproachLanceFromRight, $0, $0 + coord_event 1, $5, $4, Script_ApproachLanceFromLeft + coord_event 1, $5, $5, Script_ApproachLanceFromRight -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_LANCE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1 - person_event SPRITE_TEACHER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY - person_event SPRITE_OAK, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY + object_event SPRITE_LANCE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1 + object_event SPRITE_TEACHER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY + object_event SPRITE_OAK, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 0669cf956..6a15dd7df 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -6,20 +6,20 @@ const_value set 2 const LAVRADIOTOWER1F_SUPER_NERD2 LavRadioTower1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -ReceptionistScript_0x7ee63: - jumptextfaceplayer UnknownText_0x7eebf +LavRadioTower1FReceptionistScript: + jumptextfaceplayer LavRadioTower1FReceptionistText -OfficerScript_0x7ee66: - jumptextfaceplayer UnknownText_0x7eefa +LavRadioTower1FOfficerScript: + jumptextfaceplayer LavRadioTower1FOfficerText -SuperNerdScript_0x7ee69: - jumptextfaceplayer UnknownText_0x7ef90 +LavRadioTower1FSuperNerdScript: + jumptextfaceplayer LavRadioTower1FSuperNerdText GentlemanScript_0x7ee6c: faceplayer @@ -77,7 +77,7 @@ MapLavRadioTower1FSignpost1Script: UnknownScript_0x7eebc: jumptext UnknownText_0x7f36b -UnknownText_0x7eebf: +LavRadioTower1FReceptionistText: text "Welcome!" line "Feel free to look" @@ -85,7 +85,7 @@ UnknownText_0x7eebf: line "this floor." done -UnknownText_0x7eefa: +LavRadioTower1FOfficerText: text "Sorry, but you can" line "only tour the" cont "ground floor." @@ -100,7 +100,7 @@ UnknownText_0x7eefa: line "up our security." done -UnknownText_0x7ef90: +LavRadioTower1FSuperNerdText: text "Many people are" line "hard at work here" @@ -230,18 +230,18 @@ LavRadioTower1F_MapEventHeader: warp_def $7, $2, 7, LAVENDER_TOWN warp_def $7, $3, 7, LAVENDER_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 11, SIGNPOST_READ, MapLavRadioTower1FSignpost0Script - signpost 0, 5, SIGNPOST_READ, MapLavRadioTower1FSignpost1Script + bg_event 0, 11, BGEVENT_READ, MapLavRadioTower1FSignpost0Script + bg_event 0, 5, BGEVENT_READ, MapLavRadioTower1FSignpost1Script -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_RECEPTIONIST, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x7ee63, -1 - person_event SPRITE_OFFICER, 1, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7ee66, -1 - person_event SPRITE_SUPER_NERD, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7ee69, -1 - person_event SPRITE_GENTLEMAN, 1, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1 - person_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1 + object_event SPRITE_RECEPTIONIST, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1 + object_event SPRITE_OFFICER, 1, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1 + object_event SPRITE_SUPER_NERD, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1 + object_event SPRITE_GENTLEMAN, 1, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1 + object_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index fa753ab1b..d8f88c659 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -4,7 +4,7 @@ const_value set 2 const LAVENDERMART_ROCKER LavenderMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,13 +16,13 @@ ClerkScript_0x7eb1c: closetext end -PokefanMScript_0x7eb23: - jumptextfaceplayer UnknownText_0x7eb29 +LavenderMartPokefanMScript: + jumptextfaceplayer LavenderMartPokefanMText -RockerScript_0x7eb26: - jumptextfaceplayer UnknownText_0x7ebac +LavenderMartRockerScript: + jumptextfaceplayer LavenderMartRockerText -UnknownText_0x7eb29: +LavenderMartPokefanMText: text "REPEL is a neces-" line "sity if you are" @@ -36,7 +36,7 @@ UnknownText_0x7eb29: line "all the caves." done -UnknownText_0x7ebac: +LavenderMartRockerText: text "I heard about a" line "craftsman who" @@ -56,14 +56,14 @@ LavenderMart_MapEventHeader: warp_def $7, $2, 5, LAVENDER_TOWN warp_def $7, $3, 5, LAVENDER_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1 - person_event SPRITE_POKEFAN_M, 6, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x7eb23, -1 - person_event SPRITE_ROCKER, 2, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RockerScript_0x7eb26, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1 + object_event SPRITE_POKEFAN_M, 6, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1 + object_event SPRITE_ROCKER, 2, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 6ac3cfb26..94eb4935b 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -2,16 +2,14 @@ const_value set 2 const LAVENDERNAMERATER_NAME_RATER LavenderNameRater_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - - ; triggers - dw UnknownScript_0x7eaf1, 0 + scene_script .DummyScene .MapCallbacks: db 0 -UnknownScript_0x7eaf1: +.DummyScene: end LavenderNameRater: @@ -22,8 +20,7 @@ LavenderNameRater: closetext end -LavenderNameRaterBookshelf: -; unused +LavenderNameRaterUnusedBookshelf: jumpstd difficultbookshelf LavenderNameRater_MapEventHeader: @@ -35,12 +32,12 @@ LavenderNameRater_MapEventHeader: warp_def $7, $2, 4, LAVENDER_TOWN warp_def $7, $3, 4, LAVENDER_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_GENTLEMAN, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, LavenderNameRater, -1 + object_event SPRITE_GENTLEMAN, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderNameRater, -1 diff --git a/maps/LavenderPokeCenter2FBeta.asm b/maps/LavenderPokeCenter2FBeta.asm deleted file mode 100644 index 9d31d8d4e..000000000 --- a/maps/LavenderPokeCenter2FBeta.asm +++ /dev/null @@ -1,23 +0,0 @@ -LavenderPokeCenter2FBeta_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -LavenderPokeCenter2FBeta_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def $7, $0, 3, LAVENDER_POKECENTER_1F - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 0 diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokecenter1F.asm index 6cf383773..3c0f40b20 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -4,8 +4,8 @@ const_value set 2 const LAVENDERPOKECENTER1F_TEACHER const LAVENDERPOKECENTER1F_YOUNGSTER -LavenderPokeCenter1F_MapScriptHeader: -.MapTriggers: +LavenderPokecenter1F_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: @@ -14,11 +14,11 @@ LavenderPokeCenter1F_MapScriptHeader: NurseScript_0x7e6a0: jumpstd pokecenternurse -GentlemanScript_0x7e6a3: - jumptextfaceplayer UnknownText_0x7e6bd +LavenderPokecenter1FGentlemanScript: + jumptextfaceplayer LavenderPokecenter1FGentlemanText -TeacherScript_0x7e6a6: - jumptextfaceplayer UnknownText_0x7e710 +LavenderPokecenter1FTeacherScript: + jumptextfaceplayer LavenderPokecenter1FTeacherText YoungsterScript_0x7e6a9: faceplayer @@ -36,7 +36,7 @@ UnknownScript_0x7e6b7: closetext end -UnknownText_0x7e6bd: +LavenderPokecenter1FGentlemanText: text "To the north of" line "LAVENDER is ROCK" @@ -45,7 +45,7 @@ UnknownText_0x7e6bd: cont "POWER PLANT." done -UnknownText_0x7e710: +LavenderPokecenter1FTeacherText: text "There's a radio" line "program that plays" cont "# FLUTE music." @@ -80,7 +80,7 @@ UnknownText_0x7e7ed: cont "smoothly again." done -LavenderPokeCenter1F_MapEventHeader: +LavenderPokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -90,15 +90,15 @@ LavenderPokeCenter1F_MapEventHeader: warp_def $7, $4, 1, LAVENDER_TOWN warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1 - person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x7e6a3, -1 - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7e6a6, -1 - person_event SPRITE_YOUNGSTER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1 + object_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1 + object_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1 + object_event SPRITE_YOUNGSTER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1 diff --git a/maps/LavenderPokecenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm new file mode 100644 index 000000000..459b1e5a4 --- /dev/null +++ b/maps/LavenderPokecenter2FBeta.asm @@ -0,0 +1,23 @@ +LavenderPokecenter2FBeta_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +LavenderPokecenter2FBeta_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 1 + warp_def $7, $0, 3, LAVENDER_POKECENTER_1F + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 0 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 45f235d76..2e0123061 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -5,30 +5,28 @@ const_value set 2 const LAVENDERTOWN_YOUNGSTER LavenderTown_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_LAVENDER return -PokefanMScript_0x1ad6e4: - jumptextfaceplayer UnknownText_0x1ad702 +LavenderTownPokefanMScript: + jumptextfaceplayer LavenderTownPokefanMText -TeacherScript_0x1ad6e7: - jumptextfaceplayer UnknownText_0x1ad73a +LavenderTownTeacherScript: + jumptextfaceplayer LavenderTownTeacherText -GrampsScript_0x1ad6ea: - jumptextfaceplayer UnknownText_0x1ad75c +LavenderTownGrampsScript: + jumptextfaceplayer LavenderTownGrampsText -YoungsterScript_0x1ad6ed: - jumptextfaceplayer UnknownText_0x1ad7ac +LavenderTownYoungsterScript: + jumptextfaceplayer LavenderTownYoungsterText LavenderTownSign: jumptext LavenderTownSignText @@ -42,13 +40,13 @@ VolunteerPokemonHouseSign: SoulHouseSign: jumptext SoulHouseSignText -LavenderPokeCenterSignText: +LavenderPokecenterSignText: jumpstd pokecentersign LavenderMartSignText: jumpstd martsign -UnknownText_0x1ad702: +LavenderTownPokefanMText: text "That's quite some" line "building, eh?" @@ -56,12 +54,12 @@ UnknownText_0x1ad702: line "TOWER." done -UnknownText_0x1ad73a: +LavenderTownTeacherText: text "KANTO has many" line "good radio shows." done -UnknownText_0x1ad75c: +LavenderTownGrampsText: text "People come from" line "all over to pay" @@ -70,7 +68,7 @@ UnknownText_0x1ad75c: cont "of #MON." done -UnknownText_0x1ad7ac: +LavenderTownYoungsterText: text "You need a #" line "FLUTE to wake" cont "sleeping #MON." @@ -121,21 +119,21 @@ LavenderTown_MapEventHeader: warp_def $b, $d, 1, SOUL_HOUSE warp_def $5, $e, 1, LAV_RADIO_TOWER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 3, 11, SIGNPOST_READ, LavenderTownSign - signpost 7, 15, SIGNPOST_READ, KantoRadioStationSign - signpost 9, 3, SIGNPOST_READ, VolunteerPokemonHouseSign - signpost 13, 15, SIGNPOST_READ, SoulHouseSign - signpost 5, 6, SIGNPOST_READ, LavenderPokeCenterSignText - signpost 5, 2, SIGNPOST_READ, LavenderMartSignText - -.PersonEvents: + bg_event 3, 11, BGEVENT_READ, LavenderTownSign + bg_event 7, 15, BGEVENT_READ, KantoRadioStationSign + bg_event 9, 3, BGEVENT_READ, VolunteerPokemonHouseSign + bg_event 13, 15, BGEVENT_READ, SoulHouseSign + bg_event 5, 6, BGEVENT_READ, LavenderPokecenterSignText + bg_event 5, 2, BGEVENT_READ, LavenderMartSignText + +.ObjectEvents: db 4 - person_event SPRITE_POKEFAN_M, 7, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1ad6e4, -1 - person_event SPRITE_TEACHER, 15, 2, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1ad6e7, -1 - person_event SPRITE_GRAMPS, 12, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1ad6ea, -1 - person_event SPRITE_YOUNGSTER, 11, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 1, YoungsterScript_0x1ad6ed, -1 + object_event SPRITE_POKEFAN_M, 7, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1 + object_event SPRITE_TEACHER, 15, 2, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1 + object_event SPRITE_GRAMPS, 12, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderTownGrampsScript, -1 + object_event SPRITE_YOUNGSTER, 11, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 1, LavenderTownYoungsterScript, -1 diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm index ad4d0e23c..d55546110 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderTownSpeechHouse.asm @@ -2,19 +2,19 @@ const_value set 2 const LAVENDERTOWNSPEECHHOUSE_POKEFAN_F LavenderTownSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -PokefanFScript_0x7ea47: - jumptextfaceplayer UnknownText_0x7ea4d +LavenderTownSpeechHousePokefanFScript: + jumptextfaceplayer LavenderTownSpeechHousePokefanFText LavenderTownSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x7ea4d: +LavenderTownSpeechHousePokefanFText: text "LAVENDER is a" line "tiny, quiet town" @@ -37,14 +37,14 @@ LavenderTownSpeechHouse_MapEventHeader: warp_def $7, $2, 3, LAVENDER_TOWN warp_def $7, $3, 3, LAVENDER_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, LavenderTownSpeechHouseBookshelf - signpost 1, 1, SIGNPOST_READ, LavenderTownSpeechHouseBookshelf + bg_event 1, 0, BGEVENT_READ, LavenderTownSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, LavenderTownSpeechHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x7ea47, -1 + object_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownSpeechHousePokefanFScript, -1 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 5ac4ef61b..9bef8263a 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -8,7 +8,7 @@ const_value set 2 const MAHOGANYGYM_GYM_GUY MahoganyGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -33,7 +33,7 @@ PryceScript_0x199a9e: waitsfx setflag ENGINE_GLACIERBADGE checkcode VAR_BADGES - scall MahoganyGymTriggerRockets + scall MahoganyGymActivateRockets .FightDone: checkevent EVENT_GOT_TM16_ICY_WIND iftrue PryceScript_Defeat @@ -59,7 +59,7 @@ MahoganyGym_NoRoomForIcyWind: closetext end -MahoganyGymTriggerRockets: +MahoganyGymActivateRockets: if_equal 7, .RadioTowerRockets if_equal 6, .GoldenrodRockets end @@ -71,56 +71,56 @@ MahoganyGymTriggerRockets: jumpstd radiotowerrockets TrainerSkierRoxanne: - trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, SkierRoxanneScript + trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script -SkierRoxanneScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19a116 + writetext SkierRoxanneAfterBattleText waitbutton closetext end TrainerSkierClarissa: - trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, SkierClarissaScript + trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, .Script -SkierClarissaScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19a18f + writetext SkierClarissaAfterBattleText waitbutton closetext end TrainerBoarderRonald: - trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, BoarderRonaldScript + trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, .Script -BoarderRonaldScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x199f2d + writetext BoarderRonaldAfterBattleText waitbutton closetext end TrainerBoarderBrad: - trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, BoarderBradScript + trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, .Script -BoarderBradScript: +.Script: end_if_just_battled opentext - writetext BorderBradTalkText + writetext BoarderBradAfterBattleText waitbutton closetext end TrainerBoarderDouglas: - trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, BoarderDouglasScript + trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, .Script -BoarderDouglasScript: +.Script: end_if_just_battled opentext - writetext BorderDouglasTalkText + writetext BoarderDouglasAfterBattleText waitbutton closetext end @@ -251,7 +251,7 @@ BoarderRonaldBeatenText: line "do a thing." done -UnknownText_0x199f2d: +BoarderRonaldAfterBattleText: text "I think there's a" line "move a #MON" @@ -276,7 +276,7 @@ BoarderBradBeatenText: line "serious we are?" done -BorderBradTalkText: +BoarderBradAfterBattleText: text "This GYM is great." line "I love boarding" cont "with my #MON!" @@ -292,7 +292,7 @@ BoarderDouglasBeatenText: line "PRYCE's secret." done -BorderDouglasTalkText: +BoarderDouglasAfterBattleText: text "The secret behind" line "PRYCE's power…" @@ -316,7 +316,7 @@ SkierRoxanneBeatenText: line "you in skiing!" done -UnknownText_0x19a116: +SkierRoxanneAfterBattleText: text "If you don't skate" line "with precision," @@ -334,7 +334,7 @@ SkierClarissaBeatenText: line "wipe out!" done -UnknownText_0x19a18f: +SkierClarissaAfterBattleText: text "I shouldn't have" line "been bragging" cont "about my skiing…" @@ -381,20 +381,20 @@ MahoganyGym_MapEventHeader: warp_def $11, $4, 3, MAHOGANY_TOWN warp_def $11, $5, 3, MAHOGANY_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 15, 3, SIGNPOST_READ, MahoganyGymStatue - signpost 15, 6, SIGNPOST_READ, MahoganyGymStatue + bg_event 15, 3, BGEVENT_READ, MahoganyGymStatue + bg_event 15, 6, BGEVENT_READ, MahoganyGymStatue -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_PRYCE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1 - person_event SPRITE_BUENA, 6, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerSkierRoxanne, -1 - person_event SPRITE_ROCKER, 17, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerBoarderRonald, -1 - person_event SPRITE_BUENA, 17, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerSkierClarissa, -1 - person_event SPRITE_ROCKER, 9, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerBoarderBrad, -1 - person_event SPRITE_ROCKER, 4, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerBoarderDouglas, -1 - person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1 + object_event SPRITE_PRYCE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1 + object_event SPRITE_BUENA, 6, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1 + object_event SPRITE_ROCKER, 17, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1 + object_event SPRITE_BUENA, 17, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1 + object_event SPRITE_ROCKER, 9, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderBrad, -1 + object_event SPRITE_ROCKER, 4, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderDouglas, -1 + object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 532574644..5ae14cbd8 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -6,33 +6,28 @@ const_value set 2 const MAHOGANYMART1F_GRANNY MahoganyMart1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x6c356, 0 - dw UnknownScript_0x6c357, 0 + scene_script .DummyScene0 + scene_script .LanceUncoversStaircase .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .MahoganyMart1FStaircase - ; callbacks - - dbw MAPCALLBACK_TILES, UnknownScript_0x6c35b - -UnknownScript_0x6c356: +.DummyScene0: end -UnknownScript_0x6c357: +.LanceUncoversStaircase: priorityjump UnknownScript_0x6c38f end -UnknownScript_0x6c35b: +.MahoganyMart1FStaircase: checkevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART - iftrue UnknownScript_0x6c362 + iftrue .ShowStairs return -UnknownScript_0x6c362: +.ShowStairs: changeblock $6, $2, $1e return @@ -106,7 +101,7 @@ UnknownScript_0x6c38f: applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412 playsound SFX_EXIT_BUILDING disappear MAHOGANYMART1F_LANCE - dotrigger $0 + setscene $0 waitsfx end @@ -235,16 +230,16 @@ MahoganyMart1F_MapEventHeader: warp_def $7, $4, 1, MAHOGANY_TOWN warp_def $3, $7, 1, TEAM_ROCKET_BASE_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_PHARMACIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_BLACK_BELT, 6, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_LANCE, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE - person_event SPRITE_DRAGON, 6, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE - person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS + object_event SPRITE_PHARMACIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_BLACK_BELT, 6, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_LANCE, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + object_event SPRITE_DRAGON, 6, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + object_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokeCenter1F.asm deleted file mode 100644 index eab6b6299..000000000 --- a/maps/MahoganyPokeCenter1F.asm +++ /dev/null @@ -1,77 +0,0 @@ -const_value set 2 - const MAHOGANYPOKECENTER1F_NURSE - const MAHOGANYPOKECENTER1F_POKEFAN_M - const MAHOGANYPOKECENTER1F_YOUNGSTER - const MAHOGANYPOKECENTER1F_COOLTRAINER_F - -MahoganyPokeCenter1F_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -NurseScript_0x19a356: - jumpstd pokecenternurse - -PokefanMScript_0x19a359: - jumptextfaceplayer UnknownText_0x19a362 - -YoungsterScript_0x19a35c: - jumptextfaceplayer UnknownText_0x19a3b3 - -CooltrainerFScript_0x19a35f: - jumptextfaceplayer UnknownText_0x19a418 - -UnknownText_0x19a362: - text "What's this? TEAM" - line "ROCKET has come" - cont "back?" - - para "I saw some men in" - line "black at LAKE OF" - cont "RAGE…" - done - -UnknownText_0x19a3b3: - text "I stop my #MON" - line "from evolving too" - cont "early." - - para "I make them learn" - line "certain moves be-" - cont "fore I let them" - cont "evolve." - done - -UnknownText_0x19a418: - text "#MON do become" - line "stronger when they" - - para "evolve, but they" - line "also learn moves" - cont "more slowly." - done - -MahoganyPokeCenter1F_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def $7, $3, 4, MAHOGANY_TOWN - warp_def $7, $4, 4, MAHOGANY_TOWN - warp_def $7, $0, 1, POKECENTER_2F - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x19a356, -1 - person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x19a359, -1 - person_event SPRITE_YOUNGSTER, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19a35c, -1 - person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x19a35f, -1 diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm new file mode 100644 index 000000000..9eead5301 --- /dev/null +++ b/maps/MahoganyPokecenter1F.asm @@ -0,0 +1,77 @@ +const_value set 2 + const MAHOGANYPOKECENTER1F_NURSE + const MAHOGANYPOKECENTER1F_POKEFAN_M + const MAHOGANYPOKECENTER1F_YOUNGSTER + const MAHOGANYPOKECENTER1F_COOLTRAINER_F + +MahoganyPokecenter1F_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +NurseScript_0x19a356: + jumpstd pokecenternurse + +MahoganyPokecenter1FPokefanMScript: + jumptextfaceplayer MahoganyPokecenter1FPokefanMText + +MahoganyPokecenter1FYoungsterScript: + jumptextfaceplayer MahoganyPokecenter1FYoungsterText + +MahoganyPokecenter1FCooltrainerFScript: + jumptextfaceplayer MahoganyPokecenter1FCooltrainerFText + +MahoganyPokecenter1FPokefanMText: + text "What's this? TEAM" + line "ROCKET has come" + cont "back?" + + para "I saw some men in" + line "black at LAKE OF" + cont "RAGE…" + done + +MahoganyPokecenter1FYoungsterText: + text "I stop my #MON" + line "from evolving too" + cont "early." + + para "I make them learn" + line "certain moves be-" + cont "fore I let them" + cont "evolve." + done + +MahoganyPokecenter1FCooltrainerFText: + text "#MON do become" + line "stronger when they" + + para "evolve, but they" + line "also learn moves" + cont "more slowly." + done + +MahoganyPokecenter1F_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 3 + warp_def $7, $3, 4, MAHOGANY_TOWN + warp_def $7, $4, 4, MAHOGANY_TOWN + warp_def $7, $0, 1, POKECENTER_2F + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 4 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19a356, -1 + object_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1 + object_event SPRITE_YOUNGSTER, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1 + object_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FCooltrainerFScript, -1 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index a2681e9bf..3ced3ac77 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -3,14 +3,14 @@ const_value set 2 const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER MahoganyRedGyaradosSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -BlackBeltScript_0x19997f: - jumptextfaceplayer UnknownText_0x19999c +MahoganyRedGyaradosSpeechHouseBlackBeltScript: + jumptextfaceplayer MahoganyRedGyaradosSpeechHouseBlackBeltText TeacherScript_0x199982: faceplayer @@ -34,7 +34,7 @@ UnknownScript_0x195996: UnknownScript_0x195999: jumpstd magazinebookshelf -UnknownText_0x19999c: +MahoganyRedGyaradosSpeechHouseBlackBeltText: text "I heard that a red" line "GYARADOS appeared" cont "at the LAKE." @@ -69,13 +69,13 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader: warp_def $7, $2, 2, MAHOGANY_TOWN warp_def $7, $3, 2, MAHOGANY_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x19997f, -1 - person_event SPRITE_TEACHER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x199982, -1 + object_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1 + object_event SPRITE_TEACHER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x199982, -1 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 0612b0811..93df069e8 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -5,23 +5,19 @@ const_value set 2 const MAHOGANYTOWN_LASS MahoganyTown_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0: +.DummyScene0: end -.Trigger1: +.DummyScene1: end .FlyPoint: @@ -107,11 +103,11 @@ UnknownScript_0x19008c: closetext end -FisherScript_0x190092: - jumptextfaceplayer UnknownText_0x190276 +MahoganyTownFisherScript: + jumptextfaceplayer MahoganyTownFisherText -LassScript_0x190095: - jumptextfaceplayer UnknownText_0x1902f2 +MahoganyTownLassScript: + jumptextfaceplayer MahoganyTownLassText MahoganyTownSign: jumptext MahoganyTownSignText @@ -122,7 +118,7 @@ MahoganyTownRagecandybarSign: MahoganyGymSign: jumptext MahoganyGymSignText -MahoganyTownPokeCenterSign: +MahoganyTownPokecenterSign: jumpstd pokecentersign MovementData_0x1900a4: @@ -204,7 +200,7 @@ UnknownText_0x19021d: cont "anglers there." done -UnknownText_0x190276: +MahoganyTownFisherText: text "Since you came" line "this far, take the" @@ -218,7 +214,7 @@ UnknownText_0x190276: line "right now." done -UnknownText_0x1902f2: +MahoganyTownLassText: text "Visit Grandma's" line "shop. She sells" @@ -260,21 +256,21 @@ MahoganyTown_MapEventHeader: warp_def $d, $f, 1, MAHOGANY_POKECENTER_1F warp_def $1, $9, 3, ROUTE_43_MAHOGANY_GATE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $8, $13, $0, UnknownScript_0x190013, $0, $0 - xy_trigger 0, $9, $13, $0, UnknownScript_0x190013, $0, $0 + coord_event 0, $8, $13, UnknownScript_0x190013 + coord_event 0, $9, $13, UnknownScript_0x190013 -.Signposts: +.BGEvents: db 4 - signpost 5, 1, SIGNPOST_READ, MahoganyTownSign - signpost 7, 9, SIGNPOST_READ, MahoganyTownRagecandybarSign - signpost 13, 3, SIGNPOST_READ, MahoganyGymSign - signpost 13, 16, SIGNPOST_READ, MahoganyTownPokeCenterSign + bg_event 5, 1, BGEVENT_READ, MahoganyTownSign + bg_event 7, 9, BGEVENT_READ, MahoganyTownRagecandybarSign + bg_event 13, 3, BGEVENT_READ, MahoganyGymSign + bg_event 13, 16, BGEVENT_READ, MahoganyTownPokecenterSign -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_POKEFAN_M, 8, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST - person_event SPRITE_GRAMPS, 9, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1 - person_event SPRITE_FISHER, 14, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x190092, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM - person_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x190095, EVENT_MAHOGANY_MART_OWNERS + object_event SPRITE_POKEFAN_M, 8, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST + object_event SPRITE_GRAMPS, 9, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1 + object_event SPRITE_FISHER, 14, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM + object_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownLassScript, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index f73aa3d8c..2c868e6d2 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const MANIASHOUSE_ROCKER ManiasHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -207,12 +207,12 @@ ManiasHouse_MapEventHeader: warp_def $7, $2, 1, CIANWOOD_CITY warp_def $7, $3, 1, CIANWOOD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_ROCKER, 4, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ManiaScript, -1 + object_event SPRITE_ROCKER, 4, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ManiaScript, -1 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 7c5628955..4983c3fa4 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -1,24 +1,22 @@ MobileBattleRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .InitializeMobileBattleRoom + scene_script .DummyScene .MapCallbacks: db 0 -.Trigger0: - priorityjump MobileBattleRoom_Initialize +.InitializeMobileBattleRoom: + priorityjump .InitializeAndPreparePokecenter2F end -.Trigger1: +.DummyScene: end -MobileBattleRoom_Initialize: - dotrigger $1 - domaptrigger POKECENTER_2F, $5 +.InitializeAndPreparePokecenter2F: + setscene $1 + setmapscene POKECENTER_2F, $5 end MapMobileBattleRoomSignpost0Script: @@ -77,12 +75,12 @@ MobileBattleRoom_MapEventHeader: warp_def $7, $4, 6, POKECENTER_2F warp_def $7, $5, 6, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 2, 4, SIGNPOST_UP, MapMobileBattleRoomSignpost0Script + bg_event 2, 4, BGEVENT_UP, MapMobileBattleRoomSignpost0Script -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 60a0f72fc..1ccd70ade 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -1,24 +1,22 @@ MobileTradeRoomMobile_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .InitializeMobileTradeRoomMobile + scene_script .DummyScene .MapCallbacks: db 0 -.Trigger0: - priorityjump MobileTradeRoomMobile_Initialize +.InitializeMobileTradeRoomMobile: + priorityjump .InitializeAndPreparePokecenter2F end -.Trigger1: +.DummyScene: end -MobileTradeRoomMobile_Initialize: - dotrigger $1 - domaptrigger POKECENTER_2F, $4 +.InitializeAndPreparePokecenter2F: + setscene $1 + setmapscene POKECENTER_2F, $4 end MapMobileTradeRoomMobileSignpost0Script: @@ -45,12 +43,12 @@ MobileTradeRoomMobile_MapEventHeader: warp_def $7, $4, 5, POKECENTER_2F warp_def $7, $5, 5, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 2, 4, SIGNPOST_UP, MapMobileTradeRoomMobileSignpost0Script + bg_event 2, 4, BGEVENT_UP, MapMobileTradeRoomMobileSignpost0Script -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 649b5686f..1f7301ebb 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -2,21 +2,19 @@ const_value set 2 const MOUNTMOON_SILVER MountMoon_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .RivalEncounter + scene_script .DummyScene .MapCallbacks: db 0 -.Trigger0: +.RivalEncounter: priorityjump .RivalBattle end -.Trigger1: +.DummyScene: end .RivalBattle: @@ -36,7 +34,7 @@ MountMoon_MapScriptHeader: iftrue .Chikorita winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss setlasttalked MOUNTMOON_SILVER - loadtrainer RIVAL2, 3 + loadtrainer RIVAL2, RIVAL2_1_TOTODILE startbattle dontrestartmapmusic reloadmapafterbattle @@ -45,7 +43,7 @@ MountMoon_MapScriptHeader: .Totodile: winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss setlasttalked MOUNTMOON_SILVER - loadtrainer RIVAL2, 1 + loadtrainer RIVAL2, RIVAL2_1_CHIKORITA startbattle dontrestartmapmusic reloadmapafterbattle @@ -54,7 +52,7 @@ MountMoon_MapScriptHeader: .Chikorita: winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss setlasttalked MOUNTMOON_SILVER - loadtrainer RIVAL2, 2 + loadtrainer RIVAL2, RIVAL2_1_CYNDAQUIL startbattle dontrestartmapmusic reloadmapafterbattle @@ -68,7 +66,7 @@ MountMoon_MapScriptHeader: closetext applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter disappear MOUNTMOON_SILVER - dotrigger $1 + setscene $1 setevent EVENT_BEAT_RIVAL_IN_MT_MOON playmapmusic end @@ -177,12 +175,12 @@ MountMoon_MapEventHeader: warp_def $3, $19, 3, MOUNT_MOON warp_def $d, $19, 4, MOUNT_MOON -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_SILVER, 3, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL + object_event SPRITE_SILVER, 3, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index 1df1c2279..954ab2d26 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -5,7 +5,7 @@ const_value set 2 const MOUNTMOONGIFTSHOP_LASS2 MountMoonGiftShop_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -18,10 +18,10 @@ GrampsScript_0x771a8: closetext end -LassScript_0x771b0: - jumptextfaceplayer UnknownText_0x771b3 +MountMoonGiftShopLassScript: + jumptextfaceplayer MountMoonGiftShopLassText -UnknownText_0x771b3: +MountMoonGiftShopLassText: text "When the sun goes" line "down, CLEFAIRY" cont "come out to play." @@ -36,15 +36,15 @@ MountMoonGiftShop_MapEventHeader: warp_def $7, $3, 3, MOUNT_MOON_SQUARE warp_def $7, $4, 3, MOUNT_MOON_SQUARE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, 1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 - person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, 2, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 - person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, 1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1 - person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, 2, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1 + object_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 + object_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 + object_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 + object_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 1c84c2e65..0bfff1457 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -4,21 +4,16 @@ const_value set 2 const MOUNTMOONSQUARE_ROCK MountMoonSquare_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - - ; triggers - dw .Trigger0, 0 + scene_script .DummyScene .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .DisappearMoonStone dbw MAPCALLBACK_OBJECTS, .DisappearRock -.Trigger0: +.DummyScene: end .DisappearMoonStone: @@ -148,17 +143,17 @@ MountMoonSquare_MapEventHeader: warp_def $b, $16, 6, MOUNT_MOON warp_def $7, $d, 1, MOUNT_MOON_GIFT_SHOP -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $b, $7, $0, ClefairyDance, $0, $0 + coord_event 0, $b, $7, ClefairyDance -.Signposts: +.BGEvents: db 2 - signpost 7, 7, SIGNPOST_ITEM, MountMoonSquareHiddenMoonStone - signpost 7, 17, SIGNPOST_READ, DontLitterSign + bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone + bg_event 7, 17, BGEVENT_READ, DontLitterSign -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_FAIRY, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY - person_event SPRITE_FAIRY, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY - person_event SPRITE_ROCK, 7, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK + object_event SPRITE_FAIRY, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY + object_event SPRITE_FAIRY, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY + object_event SPRITE_ROCK, 7, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 18abb2152..2c594870e 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -11,30 +11,30 @@ const_value set 2 const MOUNTMORTAR1FINSIDE_POKE_BALL7 MountMortar1FInside_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerPokemaniacMiller: - trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, PokemaniacMillerScript + trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, .Script -PokemaniacMillerScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x7debd + writetext PokemaniacMillerAfterBattleText waitbutton closetext end TrainerSupernerdMarkus: - trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, SupernerdMarkusScript + trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, .Script -SupernerdMarkusScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x7df97 + writetext SupernerdMarkusAfterBattleText waitbutton closetext end @@ -77,7 +77,7 @@ PokemaniacMillerBeatenText: line "kid…?" done -UnknownText_0x7debd: +PokemaniacMillerAfterBattleText: text "A while back, this" line "karate dude wanted" @@ -103,7 +103,7 @@ SupernerdMarkusBeatenText: line "someone else…" done -UnknownText_0x7df97: +SupernerdMarkusAfterBattleText: text "I came to explore" line "MT.MORTAR, but I" @@ -130,22 +130,22 @@ MountMortar1FInside_MapEventHeader: warp_def $13, $3, 1, MOUNT_MORTAR_B1F warp_def $9, $9, 2, MOUNT_MORTAR_2F_INSIDE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 11, 30, SIGNPOST_ITEM, MountMortar1FInsideHiddenMaxRepel + bg_event 11, 30, BGEVENT_ITEM, MountMortar1FInsideHiddenMaxRepel -.PersonEvents: +.ObjectEvents: db 10 - person_event SPRITE_BOULDER, 43, 21, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MountMortar1FBoulder, -1 - person_event SPRITE_POKE_BALL, 38, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE - person_event SPRITE_POKE_BALL, 10, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE - person_event SPRITE_POKE_BALL, 27, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideHyperPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION - person_event SPRITE_POKE_BALL, 20, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideMaxPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION - person_event SPRITE_POKE_BALL, 19, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideNugget, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET - person_event SPRITE_SUPER_NERD, 43, 33, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacMiller, -1 - person_event SPRITE_SUPER_NERD, 28, 24, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerSupernerdMarkus, -1 - person_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON - person_event SPRITE_POKE_BALL, 17, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL + object_event SPRITE_BOULDER, 43, 21, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortar1FBoulder, -1 + object_event SPRITE_POKE_BALL, 38, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE + object_event SPRITE_POKE_BALL, 10, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE + object_event SPRITE_POKE_BALL, 27, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideHyperPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION + object_event SPRITE_POKE_BALL, 20, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION + object_event SPRITE_POKE_BALL, 19, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideNugget, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET + object_event SPRITE_SUPER_NERD, 43, 33, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacMiller, -1 + object_event SPRITE_SUPER_NERD, 28, 24, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdMarkus, -1 + object_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON + object_event SPRITE_POKE_BALL, 17, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index 069874d8f..0cda940bb 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -3,7 +3,7 @@ const_value set 2 const MOUNTMORTAR1FOUTSIDE_POKE_BALL2 MountMortar1FOutside_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -35,14 +35,14 @@ MountMortar1FOutside_MapEventHeader: warp_def $d, $7, 3, MOUNT_MORTAR_1F_INSIDE warp_def $d, $21, 4, MOUNT_MORTAR_1F_INSIDE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 22, 25, SIGNPOST_ITEM, MountMortar1FOutsideHiddenHyperPotion + bg_event 22, 25, BGEVENT_ITEM, MountMortar1FOutsideHiddenHyperPotion -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKE_BALL, 15, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER - person_event SPRITE_POKE_BALL, 18, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE + object_event SPRITE_POKE_BALL, 15, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER + object_event SPRITE_POKE_BALL, 18, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index f76300a68..cc159273d 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -8,19 +8,19 @@ const_value set 2 const MOUNTMORTAR2FINSIDE_SUPER_NERD MountMortar2FInside_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerSupernerdHugh: - trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, SupernerdHughScript + trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, .Script -SupernerdHughScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x7e10e + writetext SupernerdHughAfterBattleText waitbutton closetext end @@ -55,7 +55,7 @@ SupernerdHughBeatenText: text "Sorry, my mistake." done -UnknownText_0x7e10e: +SupernerdHughAfterBattleText: text "I'm investigating" line "MT.MORTAR, but my" cont "pal's gone AWOL." @@ -76,19 +76,19 @@ MountMortar2FInside_MapEventHeader: warp_def $21, $11, 4, MOUNT_MORTAR_1F_OUTSIDE warp_def $5, $3, 6, MOUNT_MORTAR_1F_INSIDE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 8, 24, SIGNPOST_ITEM, MountMortar2FInsideHiddenFullRestore + bg_event 8, 24, BGEVENT_ITEM, MountMortar2FInsideHiddenFullRestore -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_POKE_BALL, 22, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION - person_event SPRITE_POKE_BALL, 33, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY - person_event SPRITE_POKE_BALL, 17, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL - person_event SPRITE_POKE_BALL, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE - person_event SPRITE_POKE_BALL, 11, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER - person_event SPRITE_POKE_BALL, 5, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE - person_event SPRITE_SUPER_NERD, 26, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdHugh, -1 + object_event SPRITE_POKE_BALL, 22, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION + object_event SPRITE_POKE_BALL, 33, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY + object_event SPRITE_POKE_BALL, 17, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL + object_event SPRITE_POKE_BALL, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE + object_event SPRITE_POKE_BALL, 11, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER + object_event SPRITE_POKE_BALL, 5, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE + object_event SPRITE_SUPER_NERD, 26, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdHugh, -1 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 06ebd10cc..3b7764961 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -8,7 +8,7 @@ const_value set 2 const MOUNTMORTARB1F_POKE_BALL5 MountMortarB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -144,19 +144,19 @@ MountMortarB1F_MapEventHeader: warp_def $3, $3, 5, MOUNT_MORTAR_1F_INSIDE warp_def $1d, $13, 7, MOUNT_MORTAR_1F_OUTSIDE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 6, 4, SIGNPOST_ITEM, MountMortarB1FHiddenMaxRevive + bg_event 6, 4, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_POKE_BALL, 12, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION - person_event SPRITE_POKE_BALL, 16, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS - person_event SPRITE_BOULDER, 10, 9, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1 - person_event SPRITE_BLACK_BELT, 4, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1 - person_event SPRITE_POKE_BALL, 24, 34, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE - person_event SPRITE_POKE_BALL, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER - person_event SPRITE_POKE_BALL, 26, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP + object_event SPRITE_POKE_BALL, 12, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION + object_event SPRITE_POKE_BALL, 16, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS + object_event SPRITE_BOULDER, 10, 9, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1 + object_event SPRITE_BLACK_BELT, 4, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1 + object_event SPRITE_POKE_BALL, 24, 34, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE + object_event SPRITE_POKE_BALL, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER + object_event SPRITE_POKE_BALL, 26, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 1d054f235..7845e98f5 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const MOVEDELETERSHOUSE_SUPER_NERD MoveDeletersHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -28,14 +28,14 @@ MoveDeletersHouse_MapEventHeader: warp_def $7, $2, 6, BLACKTHORN_CITY warp_def $7, $3, 6, BLACKTHORN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, MoveDeletersHouseBookshelf - signpost 1, 1, SIGNPOST_READ, MoveDeletersHouseBookshelf + bg_event 1, 0, BGEVENT_READ, MoveDeletersHouseBookshelf + bg_event 1, 1, BGEVENT_READ, MoveDeletersHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MoveDeleter, -1 + object_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoveDeleter, -1 diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 89ebc1568..df4b2fb8a 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -6,17 +6,17 @@ const_value set 2 const MRFUJISHOUSE_PIDGEY MrFujisHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -SuperNerdScript_0x7e8ca: - jumptextfaceplayer UnknownText_0x7e8f1 +MrFujisHouseSuperNerdScript: + jumptextfaceplayer MrFujisHouseSuperNerdText -LassScript_0x7e8cd: - jumptextfaceplayer UnknownText_0x7e940 +MrFujisHouseLassScript: + jumptextfaceplayer MrFujisHouseLassText MrFujisPsyduck: opentext @@ -45,7 +45,7 @@ MrFujisPidgey: MrFujisHouseBookshelf: jumpstd difficultbookshelf -UnknownText_0x7e8f1: +MrFujisHouseSuperNerdText: text "MR.FUJI does live" line "here, but he's not" @@ -55,7 +55,7 @@ UnknownText_0x7e8f1: line "the SOUL HOUSE." done -UnknownText_0x7e940: +MrFujisHouseLassText: text "Some cold-hearted" line "people stop caring" cont "for their #MON." @@ -88,18 +88,18 @@ MrFujisHouse_MapEventHeader: warp_def $7, $2, 2, LAVENDER_TOWN warp_def $7, $3, 2, LAVENDER_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, MrFujisHouseBookshelf - signpost 1, 1, SIGNPOST_READ, MrFujisHouseBookshelf + bg_event 1, 0, BGEVENT_READ, MrFujisHouseBookshelf + bg_event 1, 1, BGEVENT_READ, MrFujisHouseBookshelf -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_SUPER_NERD, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7e8ca, -1 - person_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x7e8cd, -1 - person_event SPRITE_RHYDON, 4, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MrFujisPsyduck, -1 - person_event SPRITE_GROWLITHE, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, MrFujisNidorino, -1 - person_event SPRITE_MOLTRES, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, MrFujisPidgey, -1 + object_event SPRITE_SUPER_NERD, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1 + object_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1 + object_event SPRITE_RHYDON, 4, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisPsyduck, -1 + object_event SPRITE_GROWLITHE, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFujisNidorino, -1 + object_event SPRITE_MOLTRES, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MrFujisPidgey, -1 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 6449ad404..bd0650481 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -3,21 +3,19 @@ const_value set 2 const MRPOKEMONSHOUSE_OAK MrPokemonsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .MeetMrPokemon + scene_script .DummyScene .MapCallbacks: db 0 -.Trigger0: +.MeetMrPokemon: priorityjump .MrPokemonEvent end -.Trigger1: +.DummyScene: end .MrPokemonEvent: @@ -127,9 +125,9 @@ MrPokemonsHouse_OakScript: setevent EVENT_RIVAL_NEW_BARK_TOWN setevent EVENT_KRISS_HOUSE_1F_NEIGHBOR clearevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR - dotrigger $1 - domaptrigger CHERRYGROVE_CITY, $1 - domaptrigger ELMS_LAB, $3 + setscene $1 + setmapscene CHERRYGROVE_CITY, $1 + setmapscene ELMS_LAB, $3 specialphonecall SPECIALCALL_ROBBED clearevent EVENT_COP_IN_ELMS_LAB checkevent EVENT_GOT_TOTODILE_FROM_ELM @@ -383,18 +381,18 @@ MrPokemonsHouse_MapEventHeader: warp_def $7, $2, 2, ROUTE_30 warp_def $7, $3, 2, ROUTE_30 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 5 - signpost 1, 0, SIGNPOST_READ, MapMrPokemonsHouseSignpost1Script - signpost 1, 1, SIGNPOST_READ, MapMrPokemonsHouseSignpost1Script - signpost 1, 6, SIGNPOST_READ, MapMrPokemonsHouseSignpost3Script - signpost 1, 7, SIGNPOST_READ, MapMrPokemonsHouseSignpost3Script - signpost 4, 6, SIGNPOST_READ, MapMrPokemonsHouseSignpost4Script + bg_event 1, 0, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script + bg_event 1, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script + bg_event 1, 6, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script + bg_event 1, 7, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script + bg_event 4, 6, BGEVENT_READ, MapMrPokemonsHouseSignpost4Script -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_GENTLEMAN, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1 - person_event SPRITE_OAK, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK + object_event SPRITE_GENTLEMAN, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1 + object_event SPRITE_OAK, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 04b570bdf..77f82b91e 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const MRPSYCHICSHOUSE_FISHING_GURU MrPsychicsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -15,7 +15,7 @@ MrPsychic: iftrue .AlreadyGotItem writetext MrPsychicText1 buttonsound - verbosegiveitem TM_PSYCHIC + verbosegiveitem TM_PSYCHIC_M iffalse .Done setevent EVENT_GOT_TM29_PSYCHIC .AlreadyGotItem: @@ -56,14 +56,14 @@ MrPsychicsHouse_MapEventHeader: warp_def $7, $2, 5, SAFFRON_CITY warp_def $7, $3, 5, SAFFRON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, MrPsychicsHouseBookshelf - signpost 1, 1, SIGNPOST_READ, MrPsychicsHouseBookshelf + bg_event 1, 0, BGEVENT_READ, MrPsychicsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, MrPsychicsHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, MrPsychic, -1 + object_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrPsychic, -1 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 1babc73a2..86538fe0d 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -15,17 +15,17 @@ const_value set 2 const NATIONALPARK_POKE_BALL2 NationalPark_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -LassScript_0x5c002: - jumptextfaceplayer UnknownText_0x5c1d3 +NationalParkLassScript: + jumptextfaceplayer NationalParkLassText -PokefanFScript_0x5c005: - jumptextfaceplayer UnknownText_0x5c22e +NationalParkPokefanFScript: + jumptextfaceplayer NationalParkPokefanFText TeacherScript_0x5c008: faceplayer @@ -44,14 +44,14 @@ UnknownScript_0x5c021: closetext end -YoungsterScript_0x5c023: - jumptextfaceplayer UnknownText_0x5c35d +NationalParkYoungster1Script: + jumptextfaceplayer NationalParkYoungster1Text -YoungsterScript_0x5c026: - jumptextfaceplayer UnknownText_0x5c38f +NationalParkYoungster2Script: + jumptextfaceplayer NationalParkYoungster2Text -TeacherScript_0x5c029: - jumptextfaceplayer UnknownText_0x5c3bc +NationalParkTeacherScript: + jumptextfaceplayer NationalParkTeacherText NationalParkPersian: faceplayer @@ -72,9 +72,9 @@ GameboyKidScript_0x5c037: end TrainerSchoolboyJack1: - trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, SchoolboyJack1Script + trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, .Script -SchoolboyJack1Script: +.Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK end_if_just_battled opentext @@ -189,20 +189,20 @@ UnknownScript_0x5c114: end TrainerPokefanmWilliam: - trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, PokefanmWilliamScript + trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, .Script -PokefanmWilliamScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5c645 + writetext PokefanmWilliamAfterBattleText waitbutton closetext end TrainerPokefanfBeverly1: - trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, PokefanfBeverly1Script + trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, .Script -PokefanfBeverly1Script: +.Script: writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY end_if_just_battled opentext @@ -279,12 +279,12 @@ UnknownScript_0x5c1ab: end TrainerLassKrise: - trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, 0, LassKriseScript + trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, 0, .Script -LassKriseScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5c71d + writetext LassKriseAfterBattleText waitbutton closetext end @@ -308,7 +308,7 @@ NationalParkHiddenFullHeal: dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL -UnknownText_0x5c1d3: +NationalParkLassText: text "Look! Check out my" line "bag!" @@ -319,7 +319,7 @@ UnknownText_0x5c1d3: line "them on my bag." done -UnknownText_0x5c22e: +NationalParkPokefanFText: text "This is MAIL I got" line "from my daughter." cont "It cheers me up." @@ -354,19 +354,19 @@ UnknownText_0x5c30d: cont "during battle." done -UnknownText_0x5c35d: +NationalParkYoungster1Text: text "I'm playing with" line "stickers I printed" cont "from my #DEX." done -UnknownText_0x5c38f: +NationalParkYoungster2Text: text "I get the other" line "guy's #DEX" cont "sticker if I win." done -UnknownText_0x5c3bc: +NationalParkTeacherText: text "I take walks in" line "the PARK, but I" @@ -454,7 +454,7 @@ PokefanmWilliamBeatenText: text "M-my #MON!" done -UnknownText_0x5c645: +PokefanmWilliamAfterBattleText: text "I lost the battle," line "but my #MON win" @@ -484,7 +484,7 @@ LassKriseBeatenText: text "…Hmmm…" done -UnknownText_0x5c71d: +LassKriseAfterBattleText: text "I thought you were" line "staring at me" cont "because I'm cute!" @@ -525,29 +525,29 @@ NationalPark_MapEventHeader: warp_def $2f, $a, 1, ROUTE_35_NATIONAL_PARK_GATE warp_def $2f, $b, 2, ROUTE_35_NATIONAL_PARK_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 44, 14, SIGNPOST_READ, MapNationalParkSignpost0Script - signpost 31, 27, SIGNPOST_READ, MapNationalParkSignpost1Script - signpost 47, 6, SIGNPOST_ITEM, NationalParkHiddenFullHeal - signpost 4, 12, SIGNPOST_READ, MapNationalParkSignpost3Script + bg_event 44, 14, BGEVENT_READ, MapNationalParkSignpost0Script + bg_event 31, 27, BGEVENT_READ, MapNationalParkSignpost1Script + bg_event 47, 6, BGEVENT_ITEM, NationalParkHiddenFullHeal + bg_event 4, 12, BGEVENT_READ, MapNationalParkSignpost3Script -.PersonEvents: +.ObjectEvents: db 14 - person_event SPRITE_LASS, 24, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x5c002, -1 - person_event SPRITE_POKEFAN_F, 4, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x5c005, -1 - person_event SPRITE_TEACHER, 40, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1 - person_event SPRITE_YOUNGSTER, 41, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c023, -1 - person_event SPRITE_YOUNGSTER, 41, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c026, -1 - person_event SPRITE_TEACHER, 41, 17, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5c029, -1 - person_event SPRITE_GROWLITHE, 40, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NationalParkPersian, -1 - person_event SPRITE_YOUNGSTER, 23, 27, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1 - person_event SPRITE_POKEFAN_F, 29, 18, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1 - person_event SPRITE_POKEFAN_M, 9, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1 - person_event SPRITE_LASS, 14, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerLassKrise, -1 - person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL - person_event SPRITE_GAMEBOY_KID, 6, 26, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1 - person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG + object_event SPRITE_LASS, 24, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkLassScript, -1 + object_event SPRITE_POKEFAN_F, 4, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1 + object_event SPRITE_TEACHER, 40, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1 + object_event SPRITE_YOUNGSTER, 41, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster1Script, -1 + object_event SPRITE_YOUNGSTER, 41, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster2Script, -1 + object_event SPRITE_TEACHER, 41, 17, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkTeacherScript, -1 + object_event SPRITE_GROWLITHE, 40, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPersian, -1 + object_event SPRITE_YOUNGSTER, 23, 27, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1 + object_event SPRITE_POKEFAN_F, 29, 18, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1 + object_event SPRITE_POKEFAN_M, 9, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1 + object_event SPRITE_LASS, 14, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassKrise, -1 + object_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL + object_event SPRITE_GAMEBOY_KID, 6, 26, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1 + object_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index eccc3295c..9cebf82fd 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -13,7 +13,7 @@ const_value set 2 const NATIONALPARKBUGCONTEST_POKE_BALL2 NationalParkBugContest_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -232,27 +232,27 @@ NationalParkBugContest_MapEventHeader: warp_def $2f, $a, 1, ROUTE_35_NATIONAL_PARK_GATE warp_def $2f, $b, 1, ROUTE_35_NATIONAL_PARK_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 44, 14, SIGNPOST_READ, MapNationalParkBugContestSignpost0Script - signpost 31, 27, SIGNPOST_READ, MapNationalParkBugContestSignpost1Script - signpost 47, 6, SIGNPOST_ITEM, NationalParkBugContestHiddenFullHeal - signpost 4, 12, SIGNPOST_READ, MapNationalParkBugContestSignpost3Script + bg_event 44, 14, BGEVENT_READ, MapNationalParkBugContestSignpost0Script + bg_event 31, 27, BGEVENT_READ, MapNationalParkBugContestSignpost1Script + bg_event 47, 6, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal + bg_event 4, 12, BGEVENT_READ, MapNationalParkBugContestSignpost3Script -.PersonEvents: +.ObjectEvents: db 12 - person_event SPRITE_YOUNGSTER, 29, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A - person_event SPRITE_YOUNGSTER, 22, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A - person_event SPRITE_ROCKER, 18, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A - person_event SPRITE_POKEFAN_M, 13, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A - person_event SPRITE_YOUNGSTER, 9, 23, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A - person_event SPRITE_YOUNGSTER, 13, 27, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A - person_event SPRITE_LASS, 23, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A - person_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A - person_event SPRITE_YOUNGSTER, 8, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A - person_event SPRITE_YOUNGSTER, 34, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A - person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL - person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG + object_event SPRITE_YOUNGSTER, 29, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A + object_event SPRITE_YOUNGSTER, 22, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A + object_event SPRITE_ROCKER, 18, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A + object_event SPRITE_POKEFAN_M, 13, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A + object_event SPRITE_YOUNGSTER, 9, 23, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A + object_event SPRITE_YOUNGSTER, 13, 27, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A + object_event SPRITE_LASS, 23, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A + object_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A + object_event SPRITE_YOUNGSTER, 8, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A + object_event SPRITE_YOUNGSTER, 34, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A + object_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL + object_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index d382a4cf1..3ad5cd2bf 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -4,23 +4,19 @@ const_value set 2 const NEWBARKTOWN_SILVER NewBarkTown_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0: +.DummyScene0: end -.Trigger1: +.DummyScene1: end .FlyPoint: @@ -28,7 +24,7 @@ NewBarkTown_MapScriptHeader: clearevent EVENT_FIRST_TIME_BANKING_WITH_MOM return -NewBarkTown_TeacherStopsYouTrigger1: +NewBarkTown_TeacherStopsYouScene1: playmusic MUSIC_MOM spriteface NEWBARKTOWN_TEACHER, LEFT opentext @@ -51,7 +47,7 @@ NewBarkTown_TeacherStopsYouTrigger1: special RestartMapMusic end -NewBarkTown_TeacherStopsYouTrigger2: +NewBarkTown_TeacherStopsYouScene2: playmusic MUSIC_MOM spriteface NEWBARKTOWN_TEACHER, LEFT opentext @@ -296,20 +292,20 @@ NewBarkTown_MapEventHeader: warp_def $b, $3, 1, KRISS_NEIGHBORS_HOUSE warp_def $d, $b, 1, ELMS_HOUSE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $8, $1, $0, NewBarkTown_TeacherStopsYouTrigger1, $0, $0 - xy_trigger 0, $9, $1, $0, NewBarkTown_TeacherStopsYouTrigger2, $0, $0 + coord_event 0, $8, $1, NewBarkTown_TeacherStopsYouScene1 + coord_event 0, $9, $1, NewBarkTown_TeacherStopsYouScene2 -.Signposts: +.BGEvents: db 4 - signpost 8, 8, SIGNPOST_READ, NewBarkTownSign - signpost 5, 11, SIGNPOST_READ, MapNewBarkTownSignpost1Script - signpost 3, 3, SIGNPOST_READ, MapNewBarkTownSignpost2Script - signpost 13, 9, SIGNPOST_READ, MapNewBarkTownSignpost3Script + bg_event 8, 8, BGEVENT_READ, NewBarkTownSign + bg_event 5, 11, BGEVENT_READ, MapNewBarkTownSignpost1Script + bg_event 3, 3, BGEVENT_READ, MapNewBarkTownSignpost2Script + bg_event 13, 9, BGEVENT_READ, MapNewBarkTownSignpost3Script -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_TEACHER, 8, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1 - person_event SPRITE_FISHER, 9, 12, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1 - person_event SPRITE_SILVER, 2, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN + object_event SPRITE_TEACHER, 8, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1 + object_event SPRITE_FISHER, 9, 12, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1 + object_event SPRITE_SILVER, 2, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 9162692a6..d2b67c0a0 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -5,13 +5,13 @@ const_value set 2 const OAKSLAB_SCIENTIST3 OaksLab_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -.DummyTrigger: +.DummyScene: end Oak: @@ -265,31 +265,31 @@ OaksLab_MapEventHeader: warp_def $b, $4, 3, PALLET_TOWN warp_def $b, $5, 3, PALLET_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 16 - signpost 1, 6, SIGNPOST_READ, OaksLabBookshelf - signpost 1, 7, SIGNPOST_READ, OaksLabBookshelf - signpost 1, 8, SIGNPOST_READ, OaksLabBookshelf - signpost 1, 9, SIGNPOST_READ, OaksLabBookshelf - signpost 7, 0, SIGNPOST_READ, OaksLabBookshelf - signpost 7, 1, SIGNPOST_READ, OaksLabBookshelf - signpost 7, 2, SIGNPOST_READ, OaksLabBookshelf - signpost 7, 3, SIGNPOST_READ, OaksLabBookshelf - signpost 7, 6, SIGNPOST_READ, OaksLabBookshelf - signpost 7, 7, SIGNPOST_READ, OaksLabBookshelf - signpost 7, 8, SIGNPOST_READ, OaksLabBookshelf - signpost 7, 9, SIGNPOST_READ, OaksLabBookshelf - signpost 0, 4, SIGNPOST_READ, OaksLabPoster1 - signpost 0, 5, SIGNPOST_READ, OaksLabPoster2 - signpost 3, 9, SIGNPOST_READ, OaksLabTrashcan - signpost 1, 0, SIGNPOST_READ, OaksLabPC - -.PersonEvents: + bg_event 1, 6, BGEVENT_READ, OaksLabBookshelf + bg_event 1, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 1, 8, BGEVENT_READ, OaksLabBookshelf + bg_event 1, 9, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 0, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 2, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 3, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 6, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 8, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 9, BGEVENT_READ, OaksLabBookshelf + bg_event 0, 4, BGEVENT_READ, OaksLabPoster1 + bg_event 0, 5, BGEVENT_READ, OaksLabPoster2 + bg_event 3, 9, BGEVENT_READ, OaksLabTrashcan + bg_event 1, 0, BGEVENT_READ, OaksLabPC + +.ObjectEvents: db 4 - person_event SPRITE_OAK, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Oak, -1 - person_event SPRITE_SCIENTIST, 8, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant1Script, -1 - person_event SPRITE_SCIENTIST, 9, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant2Script, -1 - person_event SPRITE_SCIENTIST, 4, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant3Script, -1 + object_event SPRITE_OAK, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1 + object_event SPRITE_SCIENTIST, 8, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1 + object_event SPRITE_SCIENTIST, 9, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1 + object_event SPRITE_SCIENTIST, 4, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant3Script, -1 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 9cf4e67f6..fef87b535 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -4,7 +4,7 @@ const_value set 2 const OLIVINECAFE_SAILOR2 OlivineCafe_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -25,11 +25,11 @@ UnknownScript_0x9c8d3: closetext end -FishingGuruScript_0x9c8d9: - jumptextfaceplayer UnknownText_0x9c9c5 +OlivineCafeFishingGuruScript: + jumptextfaceplayer OlivineCafeFishingGuruText -SailorScript_0x9c8dc: - jumptextfaceplayer UnknownText_0x9ca09 +OlivineCafeSailorScript: + jumptextfaceplayer OlivineCafeSailorText UnknownText_0x9c8df: text "Hah! Your #MON" @@ -56,7 +56,7 @@ UnknownText_0x9c965: line "buff bod!" done -UnknownText_0x9c9c5: +OlivineCafeFishingGuruText: text "OLIVINE CAFE's" line "menu is chock full" @@ -64,7 +64,7 @@ UnknownText_0x9c9c5: line "beefy SAILORS!" done -UnknownText_0x9ca09: +OlivineCafeSailorText: text "Whenever I roll" line "into this town, I" @@ -87,14 +87,14 @@ OlivineCafe_MapEventHeader: warp_def $7, $2, 7, OLIVINE_CITY warp_def $7, $3, 7, OLIVINE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_SAILOR, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1 - person_event SPRITE_FISHING_GURU, 3, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x9c8d9, -1 - person_event SPRITE_SAILOR, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x9c8dc, -1 + object_event SPRITE_SAILOR, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1 + object_event SPRITE_FISHING_GURU, 3, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1 + object_event SPRITE_SAILOR, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 87b842a39..fbed4e323 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -5,23 +5,19 @@ const_value set 2 const OLIVINECITY_OLIVINE_RIVAL OlivineCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0: +.DummyScene0: end -.Trigger1: +.DummyScene1: end .FlyPoint: @@ -45,7 +41,7 @@ UnknownScript_0x1a8833: applymovement PLAYER, MovementData_0x1a88f4 spriteface PLAYER, RIGHT applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db - dotrigger $1 + setscene $1 disappear OLIVINECITY_OLIVINE_RIVAL special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY @@ -70,14 +66,14 @@ UnknownScript_0x1a886b: spriteface PLAYER, RIGHT applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8 disappear OLIVINECITY_OLIVINE_RIVAL - dotrigger $1 + setscene $1 special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY special MapCallbackSprites_LoadUsedSpritesGFX end -SailorScript_0x1a88a3: - jumptextfaceplayer UnknownText_0x1a8a58 +OlivineCitySailor1Script: + jumptextfaceplayer OlivineCitySailor1Text StandingYoungsterScript_0x1a88a6: faceplayer @@ -95,8 +91,8 @@ UnknownScript_0x1a88b4: closetext end -SailorScript_0x1a88ba: - jumptextfaceplayer UnknownText_0x1a8b71 +OlivineCitySailor2Script: + jumptextfaceplayer OlivineCitySailor2Text OlivineCitySign: jumptext OlivineCitySignText @@ -113,7 +109,7 @@ OlivineLighthouseSign: OlivineCityBattleTowerSign: jumptext OlivineCityBattleTowerSignText -OlivineCityPokeCenterSign: +OlivineCityPokecenterSign: jumpstd pokecentersign OlivineCityMartSign: @@ -211,7 +207,7 @@ UnknownText_0x1a88fa: cont "less weak!" done -UnknownText_0x1a8a58: +OlivineCitySailor1Text: text "Dark roads are" line "dangerous at" cont "night." @@ -244,7 +240,7 @@ UnknownText_0x1a8b41: line "awesome." done -UnknownText_0x1a8b71: +OlivineCitySailor2Text: text "The sea is sweet!" para "Sunsets on the sea" @@ -309,24 +305,24 @@ OlivineCity_MapEventHeader: warp_def $1b, $13, 1, OLIVINE_PORT_PASSAGE warp_def $1b, $14, 2, OLIVINE_PORT_PASSAGE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $c, $d, $0, UnknownScript_0x1a8833, $0, $0 - xy_trigger 0, $d, $d, $0, UnknownScript_0x1a886b, $0, $0 + coord_event 0, $c, $d, UnknownScript_0x1a8833 + coord_event 0, $d, $d, UnknownScript_0x1a886b -.Signposts: +.BGEvents: db 7 - signpost 11, 17, SIGNPOST_READ, OlivineCitySign - signpost 24, 20, SIGNPOST_READ, OlivineCityPortSign - signpost 11, 7, SIGNPOST_READ, OlivineGymSign - signpost 28, 30, SIGNPOST_READ, OlivineLighthouseSign - signpost 23, 3, SIGNPOST_READ, OlivineCityBattleTowerSign - signpost 21, 14, SIGNPOST_READ, OlivineCityPokeCenterSign - signpost 17, 20, SIGNPOST_READ, OlivineCityMartSign - -.PersonEvents: + bg_event 11, 17, BGEVENT_READ, OlivineCitySign + bg_event 24, 20, BGEVENT_READ, OlivineCityPortSign + bg_event 11, 7, BGEVENT_READ, OlivineGymSign + bg_event 28, 30, BGEVENT_READ, OlivineLighthouseSign + bg_event 23, 3, BGEVENT_READ, OlivineCityBattleTowerSign + bg_event 21, 14, BGEVENT_READ, OlivineCityPokecenterSign + bg_event 17, 20, BGEVENT_READ, OlivineCityMartSign + +.ObjectEvents: db 4 - person_event SPRITE_SAILOR, 27, 26, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x1a88a3, -1 - person_event SPRITE_STANDING_YOUNGSTER, 13, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a88a6, -1 - person_event SPRITE_SAILOR, 21, 17, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x1a88ba, -1 - person_event SPRITE_OLIVINE_RIVAL, 11, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY + object_event SPRITE_SAILOR, 27, 26, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor1Script, -1 + object_event SPRITE_STANDING_YOUNGSTER, 13, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a88a6, -1 + object_event SPRITE_SAILOR, 21, 17, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor2Script, -1 + object_event SPRITE_OLIVINE_RIVAL, 11, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 59b20b95e..8fe953932 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const OLIVINEGOODRODHOUSE_FISHING_GURU OlivineGoodRodHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -91,12 +91,12 @@ OlivineGoodRodHouse_MapEventHeader: warp_def $7, $2, 6, OLIVINE_CITY warp_def $7, $3, 6, OLIVINE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GoodRodGuru, -1 + object_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index a429b0fdc..128cbca70 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -3,7 +3,7 @@ const_value set 2 const OLIVINEGYM_GYM_GUY OlivineGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -28,7 +28,7 @@ JasmineScript_0x9c12f: waitsfx setflag ENGINE_MINERALBADGE checkcode VAR_BADGES - scall OlivineGymTriggerRockets + scall OlivineGymActivateRockets .FightDone: checkevent EVENT_GOT_TM23_IRON_TAIL iftrue .GotIronTail @@ -49,7 +49,7 @@ JasmineScript_0x9c12f: closetext end -OlivineGymTriggerRockets: +OlivineGymActivateRockets: if_equal 7, .RadioTowerRockets if_equal 6, .GoldenrodRockets end @@ -206,15 +206,15 @@ OlivineGym_MapEventHeader: warp_def $f, $4, 2, OLIVINE_CITY warp_def $f, $5, 2, OLIVINE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 13, 3, SIGNPOST_READ, OlivineGymStatue - signpost 13, 6, SIGNPOST_READ, OlivineGymStatue + bg_event 13, 3, BGEVENT_READ, OlivineGymStatue + bg_event 13, 6, BGEVENT_READ, OlivineGymStatue -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_JASMINE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE - person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OlivineGymGuyScript, -1 + object_event SPRITE_JASMINE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE + object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1 diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 06cffbe27..23b568cf0 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -3,14 +3,14 @@ const_value set 2 const OLIVINEHOUSEBETA_RHYDON OlivineHouseBeta_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -TeacherScript_0x9c58f: - jumptextfaceplayer UnknownText_0x9c5a2 +OlivineHouseBetaTeacherScript: + jumptextfaceplayer OlivineHouseBetaTeacherText RhydonScript_0x9c592: opentext @@ -26,7 +26,7 @@ OlivineHouseBetaBookshelf1: OlivineHouseBetaBookshelf2: jumpstd magazinebookshelf -UnknownText_0x9c5a2: +OlivineHouseBetaTeacherText: text "When my #MON" line "got sick, the" @@ -48,15 +48,15 @@ OlivineHouseBeta_MapEventHeader: warp_def $7, $2, 4, OLIVINE_CITY warp_def $7, $3, 4, OLIVINE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, OlivineHouseBetaBookshelf1 - signpost 1, 1, SIGNPOST_READ, OlivineHouseBetaBookshelf2 + bg_event 1, 0, BGEVENT_READ, OlivineHouseBetaBookshelf1 + bg_event 1, 1, BGEVENT_READ, OlivineHouseBetaBookshelf2 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x9c58f, -1 - person_event SPRITE_RHYDON, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1 + object_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1 + object_event SPRITE_RHYDON, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 422e86ad2..4c5ead8cc 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -3,19 +3,19 @@ const_value set 2 const OLIVINELIGHTHOUSE1F_POKEFAN_F OlivineLighthouse1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -SailorScript_0x5ae67: - jumptextfaceplayer UnknownText_0x5ae6d +OlivineLighthouse1FSailorScript: + jumptextfaceplayer OlivineLighthouse1FSailorText -PokefanFScript_0x5ae6a: - jumptextfaceplayer UnknownText_0x5aec2 +OlivineLighthouse1FPokefanFScript: + jumptextfaceplayer OlivineLighthouse1FPokefanFText -UnknownText_0x5ae6d: +OlivineLighthouse1FSailorText: text "People train at" line "this LIGHTHOUSE." @@ -24,7 +24,7 @@ UnknownText_0x5ae6d: cont "all the trainers." done -UnknownText_0x5aec2: +OlivineLighthouse1FPokefanFText: text "In the past, #-" line "MON used to light" @@ -48,13 +48,13 @@ OlivineLighthouse1F_MapEventHeader: warp_def $d, $10, 3, OLIVINE_LIGHTHOUSE_2F warp_def $d, $11, 4, OLIVINE_LIGHTHOUSE_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_SAILOR, 2, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x5ae67, -1 - person_event SPRITE_POKEFAN_F, 9, 16, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x5ae6a, -1 + object_event SPRITE_SAILOR, 2, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1 + object_event SPRITE_POKEFAN_F, 9, 16, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 9afec908a..be2632285 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -3,27 +3,27 @@ const_value set 2 const OLIVINELIGHTHOUSE2F_GENTLEMAN OlivineLighthouse2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerGentlemanAlfred: - trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, GentlemanAlfredScript + trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, .Script -GentlemanAlfredScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5b13e + writetext GentlemanAlfredAfterBattleText waitbutton closetext end TrainerSailorHuey1: - trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, 0, SailorHuey1Script + trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, 0, .Script -SailorHuey1Script: +.Script: writecode VAR_CALLERID, PHONE_SAILOR_HUEY end_if_just_battled opentext @@ -183,7 +183,7 @@ GentlemanAlfredBeatenText: line "you're serious." done -UnknownText_0x5b13e: +GentlemanAlfredAfterBattleText: text "Up top is a #-" line "MON that keeps the" cont "LIGHTHOUSE lit." @@ -217,13 +217,13 @@ OlivineLighthouse2F_MapEventHeader: warp_def $b, $10, 4, OLIVINE_LIGHTHOUSE_3F warp_def $b, $11, 5, OLIVINE_LIGHTHOUSE_3F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_SAILOR, 3, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorHuey1, -1 - person_event SPRITE_GENTLEMAN, 8, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1 + object_event SPRITE_SAILOR, 3, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey1, -1 + object_event SPRITE_GENTLEMAN, 8, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index ea1c26ac3..847de0e44 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -5,41 +5,41 @@ const_value set 2 const OLIVINELIGHTHOUSE3F_POKE_BALL OlivineLighthouse3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerBird_keeperTheo: - trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, Bird_keeperTheoScript + trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, .Script -Bird_keeperTheoScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5b2df + writetext Bird_keeperTheoAfterBattleText waitbutton closetext end TrainerGentlemanPreston: - trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, GentlemanPrestonScript + trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, .Script -GentlemanPrestonScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5b457 + writetext GentlemanPrestonAfterBattleText waitbutton closetext end TrainerSailorTerrell: - trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, SailorTerrellScript + trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, .Script -SailorTerrellScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5b384 + writetext SailorTerrellAfterBattleText waitbutton closetext end @@ -60,7 +60,7 @@ Bird_keeperTheoBeatenText: line "concerned…" done -UnknownText_0x5b2df: +Bird_keeperTheoAfterBattleText: text "How the heck do" line "you go up?" @@ -82,7 +82,7 @@ SailorTerrellBeatenText: line "and strong…" done -UnknownText_0x5b384: +SailorTerrellAfterBattleText: text "Every time I come" line "back to OLIVINE, I" cont "visit the GYM." @@ -106,7 +106,7 @@ GentlemanPrestonBeatenText: line "train some more…" done -UnknownText_0x5b457: +GentlemanPrestonAfterBattleText: text "JASMINE used to" line "use rock #MON" cont "like ONIX." @@ -128,15 +128,15 @@ OlivineLighthouse3F_MapEventHeader: warp_def $3, $8, 7, OLIVINE_LIGHTHOUSE_4F warp_def $3, $9, 8, OLIVINE_LIGHTHOUSE_4F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_SAILOR, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerSailorTerrell, -1 - person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 - person_event SPRITE_YOUNGSTER, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperTheo, -1 - person_event SPRITE_POKE_BALL, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER + object_event SPRITE_SAILOR, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1 + object_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 + object_event SPRITE_YOUNGSTER, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperTheo, -1 + object_event SPRITE_POKE_BALL, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index ae5571dec..321c7a96f 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -3,30 +3,30 @@ const_value set 2 const OLIVINELIGHTHOUSE4F_LASS OlivineLighthouse4F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerLassConnie: - trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, 0, LassConnie1Script + trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, 0, .Script -LassConnie1Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5b63c + writetext LassConnie1AfterBattleText waitbutton closetext end TrainerSailorKent: - trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, 0, SailorKentScript + trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, 0, .Script -SailorKentScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5b584 + writetext SailorKentAfterBattleText waitbutton closetext end @@ -45,7 +45,7 @@ SailorKentBeatenText: line "smile either…" done -UnknownText_0x5b584: +SailorKentAfterBattleText: text "Speaking of sick," line "I've heard there's" @@ -68,7 +68,7 @@ LassConnie1BeatenText: text "Aaack! My #MON!" done -UnknownText_0x5b63c: +LassConnie1AfterBattleText: text "Right. Anybody" line "would be worried" cont "if his or her own" @@ -98,13 +98,13 @@ OlivineLighthouse4F_MapEventHeader: warp_def $7, $10, 4, OLIVINE_LIGHTHOUSE_5F warp_def $7, $11, 5, OLIVINE_LIGHTHOUSE_5F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_SAILOR, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorKent, -1 - person_event SPRITE_LASS, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerLassConnie, -1 + object_event SPRITE_SAILOR, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorKent, -1 + object_event SPRITE_LASS, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassConnie, -1 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 7b8b334c9..2c166bc69 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -6,30 +6,30 @@ const_value set 2 const OLIVINELIGHTHOUSE5F_POKE_BALL3 OlivineLighthouse5F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerBird_keeperDenis: - trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, 0, Bird_keeperDenisScript + trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, 0, .Script -Bird_keeperDenisScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x60ac3 + writetext Bird_keeperDenisAfterBattleText waitbutton closetext end TrainerSailorErnest: - trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, SailorErnestScript + trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, .Script -SailorErnestScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x60a1f + writetext SailorErnestAfterBattleText waitbutton closetext end @@ -60,7 +60,7 @@ SailorErnestBeatenText: line "overwhelming!" done -UnknownText_0x60a1f: +SailorErnestAfterBattleText: text "A GYM LEADER isn't" line "just about being" @@ -81,7 +81,7 @@ Bird_keeperDenisBeatenText: text "Oops…They crashed…" done -UnknownText_0x60ac3: +Bird_keeperDenisAfterBattleText: text "My #MON learned" line "how to use FLY in" cont "CIANWOOD." @@ -105,17 +105,17 @@ OlivineLighthouse5F_MapEventHeader: warp_def $5, $10, 2, OLIVINE_LIGHTHOUSE_6F warp_def $5, $11, 3, OLIVINE_LIGHTHOUSE_6F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 13, 3, SIGNPOST_ITEM, OlivineLighthouse5FHiddenHyperPotion + bg_event 13, 3, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_SAILOR, 11, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorErnest, -1 - person_event SPRITE_YOUNGSTER, 3, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerBird_keeperDenis, -1 - person_event SPRITE_POKE_BALL, 12, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY - person_event SPRITE_POKE_BALL, 15, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL - person_event SPRITE_POKE_BALL, 13, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER + object_event SPRITE_SAILOR, 11, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1 + object_event SPRITE_YOUNGSTER, 3, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBird_keeperDenis, -1 + object_event SPRITE_POKE_BALL, 12, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY + object_event SPRITE_POKE_BALL, 15, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL + object_event SPRITE_POKE_BALL, 13, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index f99085ea2..713d08d43 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -4,7 +4,7 @@ const_value set 2 const OLIVINELIGHTHOUSE6F_POKE_BALL OlivineLighthouse6F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -267,14 +267,14 @@ OlivineLighthouse6F_MapEventHeader: warp_def $5, $10, 6, OLIVINE_LIGHTHOUSE_5F warp_def $5, $11, 7, OLIVINE_LIGHTHOUSE_5F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_JASMINE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE - person_event SPRITE_MONSTER, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1 - person_event SPRITE_POKE_BALL, 4, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION + object_event SPRITE_JASMINE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE + object_event SPRITE_MONSTER, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1 + object_event SPRITE_POKE_BALL, 4, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index 06c999876..db193c7e4 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -4,7 +4,7 @@ const_value set 2 const OLIVINEMART_LASS OlivineMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,13 +16,13 @@ ClerkScript_0x9cac7: closetext end -CooltrainerFScript_0x9cace: - jumptextfaceplayer UnknownText_0x9cad4 +OlivineMartCooltrainerFScript: + jumptextfaceplayer OlivineMartCooltrainerFText -LassScript_0x9cad1: - jumptextfaceplayer UnknownText_0x9cb16 +OlivineMartLassScript: + jumptextfaceplayer OlivineMartLassText -UnknownText_0x9cad4: +OlivineMartCooltrainerFText: text "Do your #MON" line "already know the" @@ -30,7 +30,7 @@ UnknownText_0x9cad4: line "people on water?" done -UnknownText_0x9cb16: +OlivineMartLassText: text "My BUTTERFREE came" line "from my boyfriend" cont "overseas." @@ -54,14 +54,14 @@ OlivineMart_MapEventHeader: warp_def $7, $2, 8, OLIVINE_CITY warp_def $7, $3, 8, OLIVINE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9cace, -1 - person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x9cad1, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1 + object_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1 + object_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1 diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokeCenter1F.asm deleted file mode 100644 index e0f0dbb69..000000000 --- a/maps/OlivinePokeCenter1F.asm +++ /dev/null @@ -1,71 +0,0 @@ -const_value set 2 - const OLIVINEPOKECENTER1F_NURSE - const OLIVINEPOKECENTER1F_FISHING_GURU - const OLIVINEPOKECENTER1F_FISHER - const OLIVINEPOKECENTER1F_TEACHER - -OlivinePokeCenter1F_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -NurseScript_0x9c002: - jumpstd pokecenternurse - -FishingGuruScript_0x9c005: - jumpstd happinesschecknpc - -FisherScript_0x9c008: - jumptextfaceplayer UnknownText_0x9c00e - -TeacherScript_0x9c00b: - jumptextfaceplayer UnknownText_0x9c086 - -UnknownText_0x9c00e: - text "The SAILOR in the" - line "OLIVINE CAFE next" - - para "door is really" - line "generous." - - para "He taught my" - line "#MON STRENGTH." - - para "Now it can move" - line "big boulders." - done - -UnknownText_0x9c086: - text "There's a person" - line "in CIANWOOD CITY" - cont "across the sea." - - para "I heard him brag-" - line "ging about his" - cont "rare #MON." - done - -OlivinePokeCenter1F_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def $7, $3, 1, OLIVINE_CITY - warp_def $7, $4, 1, OLIVINE_CITY - warp_def $7, $0, 1, POKECENTER_2F - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x9c002, -1 - person_event SPRITE_FISHING_GURU, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1 - person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x9c008, -1 - person_event SPRITE_TEACHER, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x9c00b, -1 diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm new file mode 100644 index 000000000..fd4bf2556 --- /dev/null +++ b/maps/OlivinePokecenter1F.asm @@ -0,0 +1,71 @@ +const_value set 2 + const OLIVINEPOKECENTER1F_NURSE + const OLIVINEPOKECENTER1F_FISHING_GURU + const OLIVINEPOKECENTER1F_FISHER + const OLIVINEPOKECENTER1F_TEACHER + +OlivinePokecenter1F_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +NurseScript_0x9c002: + jumpstd pokecenternurse + +FishingGuruScript_0x9c005: + jumpstd happinesschecknpc + +OlivinePokecenter1FFisherScript: + jumptextfaceplayer OlivinePokecenter1FFisherText + +OlivinePokecenter1FTeacherScript: + jumptextfaceplayer OlivinePokecenter1FTeacherText + +OlivinePokecenter1FFisherText: + text "The SAILOR in the" + line "OLIVINE CAFE next" + + para "door is really" + line "generous." + + para "He taught my" + line "#MON STRENGTH." + + para "Now it can move" + line "big boulders." + done + +OlivinePokecenter1FTeacherText: + text "There's a person" + line "in CIANWOOD CITY" + cont "across the sea." + + para "I heard him brag-" + line "ging about his" + cont "rare #MON." + done + +OlivinePokecenter1F_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 3 + warp_def $7, $3, 1, OLIVINE_CITY + warp_def $7, $4, 1, OLIVINE_CITY + warp_def $7, $0, 1, POKECENTER_2F + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 4 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9c002, -1 + object_event SPRITE_FISHING_GURU, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1 + object_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1 + object_event SPRITE_TEACHER, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FTeacherScript, -1 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index b7830eaed..d0972ced3 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -8,27 +8,25 @@ const_value set 2 const OLIVINEPORT_COOLTRAINER_F OlivinePort_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x748ac, 0 - dw UnknownScript_0x748ad, 0 + scene_script .DummyScene0 + scene_script .LeaveFastShip .MapCallbacks: db 0 -UnknownScript_0x748ac: +.DummyScene0: end -UnknownScript_0x748ad: - priorityjump UnknownScript_0x748b1 +.LeaveFastShip: + priorityjump .LeaveFastShipScript end -UnknownScript_0x748b1: +.LeaveFastShipScript: applymovement PLAYER, MovementData_0x74a32 appear OLIVINEPORT_SAILOR1 - dotrigger $0 + setscene $0 setevent EVENT_GAVE_KURT_APRICORNS blackoutmod OLIVINE_CITY end @@ -66,7 +64,7 @@ SailorScript_0x748c0: UnknownScript_0x7490a: clearevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear OLIVINEPORT_SAILOR1 - domaptrigger FAST_SHIP_1F, $1 + setmapscene FAST_SHIP_1F, $1 warp FAST_SHIP_1F, $19, $1 end @@ -196,8 +194,8 @@ UnknownScript_0x749f8: closetext end -SailorScript_0x749fe: - jumptextfaceplayer UnknownText_0x74cd7 +OlivinePortSailorScript: + jumptextfaceplayer OlivinePortSailorText FishingGuruScript_0x74a01: faceplayer @@ -379,7 +377,7 @@ UnknownText_0x74ca2: para "I wish I could go…" done -UnknownText_0x74cd7: +OlivinePortSailorText: text "We don't want you" line "to fall into the" @@ -396,20 +394,20 @@ OlivinePort_MapEventHeader: warp_def $7, $b, 5, OLIVINE_PORT_PASSAGE warp_def $17, $7, 1, FAST_SHIP_1F -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $f, $7, $0, UnknownScript_0x7491f, $0, $0 + coord_event 0, $f, $7, UnknownScript_0x7491f -.Signposts: +.BGEvents: db 1 - signpost 22, 1, SIGNPOST_ITEM, OlivinePortHiddenProtein + bg_event 22, 1, BGEVENT_ITEM, OlivinePortHiddenProtein -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_SAILOR, 23, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY - person_event SPRITE_SAILOR, 15, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x749fe, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME - person_event SPRITE_SAILOR, 15, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - person_event SPRITE_FISHING_GURU, 14, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME - person_event SPRITE_FISHING_GURU, 14, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME - person_event SPRITE_YOUNGSTER, 15, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - person_event SPRITE_COOLTRAINER_F, 15, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + object_event SPRITE_SAILOR, 23, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY + object_event SPRITE_SAILOR, 15, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + object_event SPRITE_SAILOR, 15, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + object_event SPRITE_FISHING_GURU, 14, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + object_event SPRITE_FISHING_GURU, 14, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + object_event SPRITE_YOUNGSTER, 15, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + object_event SPRITE_COOLTRAINER_F, 15, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 116a05dfd..08f4532c0 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -2,16 +2,16 @@ const_value set 2 const OLIVINEPORTPASSAGE_POKEFAN_M OlivinePortPassage_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -PokefanMScript_0x76fac: - jumptextfaceplayer UnknownText_0x76faf +OlivinePortPassagePokefanMScript: + jumptextfaceplayer OlivinePortPassagePokefanMText -UnknownText_0x76faf: +OlivinePortPassagePokefanMText: text "FAST SHIP S.S.AQUA" line "sails to KANTO on" @@ -31,12 +31,12 @@ OlivinePortPassage_MapEventHeader: warp_def $2, $3, 3, OLIVINE_PORT_PASSAGE warp_def $e, $3, 1, OLIVINE_PORT -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKEFAN_M, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x76fac, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M + object_event SPRITE_POKEFAN_M, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index b819ab567..f3537224b 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const OLIVINEPUNISHMENTSPEECHHOUSE_LASS OlivinePunishmentSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -48,15 +48,15 @@ OlivinePunishmentSpeechHouse_MapEventHeader: warp_def $7, $2, 5, OLIVINE_CITY warp_def $7, $3, 5, OLIVINE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, OlivinePunishmentSpeechHouseBookshelf1 - signpost 1, 1, SIGNPOST_READ, OlivinePunishmentSpeechHouseBookshelf2 + bg_event 1, 0, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf1 + bg_event 1, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf2 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKEFAN_M, 2, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1 - person_event SPRITE_LASS, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1 + object_event SPRITE_POKEFAN_M, 2, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1 + object_event SPRITE_LASS, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1 diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 311f0543a..96ea2636b 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const OLIVINETIMSHOUSE_TIM OlivineTimsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -11,7 +11,7 @@ OlivineTimsHouse_MapScriptHeader: Tim: faceplayer opentext - trade $2 + trade NPCTRADE_TIM waitbutton closetext end @@ -28,14 +28,14 @@ OlivineTimsHouse_MapEventHeader: warp_def $7, $2, 3, OLIVINE_CITY warp_def $7, $3, 3, OLIVINE_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, TimsHouseBookshelf - signpost 1, 1, SIGNPOST_READ, TimsHouseBookshelf + bg_event 1, 0, BGEVENT_READ, TimsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, TimsHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Tim, -1 + object_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 45ab0c5ca..b7f48f47d 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -3,24 +3,22 @@ const_value set 2 const PALLETTOWN_FISHER PalletTown_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_PALLET return -TeacherScript_0x1ac6d5: - jumptextfaceplayer UnknownText_0x1ac6e7 +PalletTownTeacherScript: + jumptextfaceplayer PalletTownTeacherText -FisherScript_0x1ac6d8: - jumptextfaceplayer UnknownText_0x1ac720 +PalletTownFisherScript: + jumptextfaceplayer PalletTownFisherText PalletTownSign: jumptext PalletTownSignText @@ -34,7 +32,7 @@ OaksLabSign: BluesHouseSign: jumptext BluesHouseSignText -UnknownText_0x1ac6e7: +PalletTownTeacherText: text "I'm raising #-" line "MON too." @@ -42,7 +40,7 @@ UnknownText_0x1ac6e7: line "private guards." done -UnknownText_0x1ac720: +PalletTownFisherText: text "Technology is" line "incredible!" @@ -81,17 +79,17 @@ PalletTown_MapEventHeader: warp_def $5, $d, 1, BLUES_HOUSE warp_def $b, $c, 1, OAKS_LAB -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 9, 7, SIGNPOST_READ, PalletTownSign - signpost 5, 3, SIGNPOST_READ, RedsHouseSign - signpost 13, 13, SIGNPOST_READ, OaksLabSign - signpost 5, 11, SIGNPOST_READ, BluesHouseSign + bg_event 9, 7, BGEVENT_READ, PalletTownSign + bg_event 5, 3, BGEVENT_READ, RedsHouseSign + bg_event 13, 13, BGEVENT_READ, OaksLabSign + bg_event 5, 11, BGEVENT_READ, BluesHouseSign -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_TEACHER, 8, 3, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1ac6d5, -1 - person_event SPRITE_FISHER, 14, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1ac6d8, -1 + object_event SPRITE_TEACHER, 8, 3, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1 + object_event SPRITE_FISHER, 14, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PalletTownFisherScript, -1 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index e70012447..04d5c0d8f 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -6,24 +6,22 @@ const_value set 2 const PEWTERCITY_FRUIT_TREE2 PewterCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_PEWTER return -CooltrainerFScript_0x18c009: - jumptextfaceplayer UnknownText_0x18c042 +PewterCityCooltrainerFScript: + jumptextfaceplayer PewterCityCooltrainerFText -BugCatcherScript_0x18c00c: - jumptextfaceplayer UnknownText_0x18c080 +PewterCityBugCatcherScript: + jumptextfaceplayer PewterCityBugCatcherText GrampsScript_0x18c00f: faceplayer @@ -58,7 +56,7 @@ PewterCityMtMoonGiftShopSign: PewterCityWelcomeSign: jumptext PewterCityWelcomeSignText -PewterCityPokeCenterSign: +PewterCityPokecenterSign: jumpstd pokecentersign PewterCityMartSign: @@ -70,7 +68,7 @@ FruitTreeScript_0x18c03e: FruitTreeScript_0x18c040: fruittree FRUITTREE_PEWTER_CITY_2 -UnknownText_0x18c042: +PewterCityCooltrainerFText: text "Have you visited" line "PEWTER GYM?" @@ -78,7 +76,7 @@ UnknownText_0x18c042: line "rock-type #MON." done -UnknownText_0x18c080: +PewterCityBugCatcherText: text "At night, CLEFAIRY" line "come out to play" cont "at MT.MOON." @@ -166,23 +164,23 @@ PewterCity_MapEventHeader: warp_def $19, $d, 1, PEWTER_POKECENTER_1F warp_def $1d, $7, 1, PEWTER_SNOOZE_SPEECH_HOUSE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 7 - signpost 23, 25, SIGNPOST_READ, PewterCitySign - signpost 17, 11, SIGNPOST_READ, PewterGymSign - signpost 9, 15, SIGNPOST_READ, PewterMuseumSign - signpost 19, 33, SIGNPOST_READ, PewterCityMtMoonGiftShopSign - signpost 29, 19, SIGNPOST_READ, PewterCityWelcomeSign - signpost 25, 14, SIGNPOST_READ, PewterCityPokeCenterSign - signpost 17, 24, SIGNPOST_READ, PewterCityMartSign - -.PersonEvents: + bg_event 23, 25, BGEVENT_READ, PewterCitySign + bg_event 17, 11, BGEVENT_READ, PewterGymSign + bg_event 9, 15, BGEVENT_READ, PewterMuseumSign + bg_event 19, 33, BGEVENT_READ, PewterCityMtMoonGiftShopSign + bg_event 29, 19, BGEVENT_READ, PewterCityWelcomeSign + bg_event 25, 14, BGEVENT_READ, PewterCityPokecenterSign + bg_event 17, 24, BGEVENT_READ, PewterCityMartSign + +.ObjectEvents: db 5 - person_event SPRITE_COOLTRAINER_F, 11, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x18c009, -1 - person_event SPRITE_BUG_CATCHER, 29, 14, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x18c00c, -1 - person_event SPRITE_GRAMPS, 17, 29, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1 - person_event SPRITE_FRUIT_TREE, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1 - person_event SPRITE_FRUIT_TREE, 3, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1 + object_event SPRITE_COOLTRAINER_F, 11, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1 + object_event SPRITE_BUG_CATCHER, 29, 14, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1 + object_event SPRITE_GRAMPS, 17, 29, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1 + object_event SPRITE_FRUIT_TREE, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1 + object_event SPRITE_FRUIT_TREE, 3, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 3adc06019..524113ba3 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -4,7 +4,7 @@ const_value set 2 const PEWTERGYM_GYM_GUY PewterGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -41,12 +41,12 @@ BrockScript_0x1a2864: end TrainerCamperJerry: - trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, CamperJerryScript + trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, .Script -CamperJerryScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a2c0f + writetext CamperJerryAfterBattleText waitbutton closetext end @@ -166,7 +166,7 @@ CamperJerryBeatenText: line "these battles…" done -UnknownText_0x1a2c0f: +CamperJerryAfterBattleText: text "Hey, you! Trainer" line "from JOHTO! BROCK" @@ -217,16 +217,16 @@ PewterGym_MapEventHeader: warp_def $d, $4, 2, PEWTER_CITY warp_def $d, $5, 2, PEWTER_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 11, 2, SIGNPOST_READ, PewterGymStatue - signpost 11, 7, SIGNPOST_READ, PewterGymStatue + bg_event 11, 2, BGEVENT_READ, PewterGymStatue + bg_event 11, 7, BGEVENT_READ, PewterGymStatue -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_BROCK, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1 - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperJerry, -1 - person_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 1, PewterGymGuyScript, -1 + object_event SPRITE_BROCK, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1 + object_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1 + object_event SPRITE_GYM_GUY, 11, 6, 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 6ee67b720..be92c8cac 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -4,7 +4,7 @@ const_value set 2 const PEWTERMART_SUPER_NERD PewterMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,13 +16,13 @@ ClerkScript_0x1a2dcb: closetext end -YoungsterScript_0x1a2dd2: - jumptextfaceplayer UnknownText_0x1a2dd8 +PewterMartYoungsterScript: + jumptextfaceplayer PewterMartYoungsterText -SuperNerdScript_0x1a2dd5: - jumptextfaceplayer UnknownText_0x1a2e3a +PewterMartSuperNerdScript: + jumptextfaceplayer PewterMartSuperNerdText -UnknownText_0x1a2dd8: +PewterMartYoungsterText: text "Hi! Check out my" line "GYARADOS!" @@ -33,7 +33,7 @@ UnknownText_0x1a2dd8: line "it has become." done -UnknownText_0x1a2e3a: +PewterMartSuperNerdText: text "There once was a" line "weird old man who" cont "sold MAGIKARP." @@ -54,14 +54,14 @@ PewterMart_MapEventHeader: warp_def $7, $2, 3, PEWTER_CITY warp_def $7, $3, 3, PEWTER_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1 - person_event SPRITE_YOUNGSTER, 2, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a2dd2, -1 - person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1a2dd5, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1 + object_event SPRITE_YOUNGSTER, 2, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1 + object_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 4bc958979..410e3c365 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -3,14 +3,14 @@ const_value set 2 const PEWTERNIDORANSPEECHHOUSE_GROWLITHE PewterNidoranSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -SuperNerdScript_0x1a2807: - jumptextfaceplayer UnknownText_0x1a2814 +PewterNidoranSpeechHouseSuperNerdScript: + jumptextfaceplayer PewterNidoranSpeechHouseSuperNerdText PewterNidoran: opentext @@ -20,7 +20,7 @@ PewterNidoran: closetext end -UnknownText_0x1a2814: +PewterNidoranSpeechHouseSuperNerdText: text "NIDORAN, shake!" done @@ -37,13 +37,13 @@ PewterNidoranSpeechHouse_MapEventHeader: warp_def $7, $2, 1, PEWTER_CITY warp_def $7, $3, 1, PEWTER_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_SUPER_NERD, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1a2807, -1 - person_event SPRITE_GROWLITHE, 5, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PewterNidoran, -1 + object_event SPRITE_SUPER_NERD, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1 + object_event SPRITE_GROWLITHE, 5, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterNidoran, -1 diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm deleted file mode 100644 index 90aac7428..000000000 --- a/maps/PewterPokeCenter1F.asm +++ /dev/null @@ -1,92 +0,0 @@ -const_value set 2 - const PEWTERPOKECENTER1F_NURSE - const PEWTERPOKECENTER1F_TEACHER - const PEWTERPOKECENTER1F_JIGGLYPUFF - const PEWTERPOKECENTER1F_BUG_CATCHER - const PEWTERPOKECENTER1F_CHRIS - -PewterPokeCenter1F_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -NurseScript_0x1a2ee7: - jumpstd pokecenternurse - -TeacherScript_0x1a2eea: - jumptextfaceplayer UnknownText_0x1a2f01 - -PewterJigglypuff: - opentext - writetext PewterJigglypuffText - cry JIGGLYPUFF - waitbutton - closetext - end - -BugCatcherScript_0x1a2ef7: - jumptextfaceplayer UnknownText_0x1a2f75 - -Chris: - faceplayer - opentext - trade $4 - waitbutton - closetext - end - -UnknownText_0x1a2f01: - text "…Yeah, and the" - line "GYM in CINNABAR's" - - para "gone. I was really" - line "amazed." - - para "…Yes? I'm on the" - line "phone. Go away!" - done - -PewterJigglypuffText: - text "JIGGLYPUFF: Puu" - line "pupuu." - done - -UnknownText_0x1a2f75: - text "Most #MON get" - line "drowsy if they" - - para "hear a JIGGLYPUFF" - line "singing." - - para "There are several" - line "moves that can be" - - para "used only while a" - line "#MON is asleep." - done - -PewterPokeCenter1F_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def $7, $3, 4, PEWTER_CITY - warp_def $7, $4, 4, PEWTER_CITY - warp_def $7, $0, 1, POKECENTER_2F - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 5 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1 - person_event SPRITE_TEACHER, 6, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a2eea, -1 - person_event SPRITE_JIGGLYPUFF, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PewterJigglypuff, -1 - person_event SPRITE_BUG_CATCHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x1a2ef7, -1 - person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Chris, -1 diff --git a/maps/PewterPokeCenter2FBeta.asm b/maps/PewterPokeCenter2FBeta.asm deleted file mode 100644 index b2530ed8b..000000000 --- a/maps/PewterPokeCenter2FBeta.asm +++ /dev/null @@ -1,23 +0,0 @@ -PewterPokeCenter2FBeta_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -PewterPokeCenter2FBeta_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def $7, $0, 3, PEWTER_POKECENTER_1F - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 0 diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm new file mode 100644 index 000000000..1ab45da18 --- /dev/null +++ b/maps/PewterPokecenter1F.asm @@ -0,0 +1,92 @@ +const_value set 2 + const PEWTERPOKECENTER1F_NURSE + const PEWTERPOKECENTER1F_TEACHER + const PEWTERPOKECENTER1F_JIGGLYPUFF + const PEWTERPOKECENTER1F_BUG_CATCHER + const PEWTERPOKECENTER1F_CHRIS + +PewterPokecenter1F_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +NurseScript_0x1a2ee7: + jumpstd pokecenternurse + +PewterPokecenter1FTeacherScript: + jumptextfaceplayer PewterPokecenter1FTeacherText + +PewterJigglypuff: + opentext + writetext PewterJigglypuffText + cry JIGGLYPUFF + waitbutton + closetext + end + +PewterPokecenter1FBugCatcherScript: + jumptextfaceplayer PewterPokecenter1FBugCatcherText + +Chris: + faceplayer + opentext + trade NPCTRADE_CHRIS + waitbutton + closetext + end + +PewterPokecenter1FTeacherText: + text "…Yeah, and the" + line "GYM in CINNABAR's" + + para "gone. I was really" + line "amazed." + + para "…Yes? I'm on the" + line "phone. Go away!" + done + +PewterJigglypuffText: + text "JIGGLYPUFF: Puu" + line "pupuu." + done + +PewterPokecenter1FBugCatcherText: + text "Most #MON get" + line "drowsy if they" + + para "hear a JIGGLYPUFF" + line "singing." + + para "There are several" + line "moves that can be" + + para "used only while a" + line "#MON is asleep." + done + +PewterPokecenter1F_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 3 + warp_def $7, $3, 4, PEWTER_CITY + warp_def $7, $4, 4, PEWTER_CITY + warp_def $7, $0, 1, POKECENTER_2F + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 5 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1 + object_event SPRITE_TEACHER, 6, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1 + object_event SPRITE_JIGGLYPUFF, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1 + object_event SPRITE_BUG_CATCHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FBugCatcherScript, -1 + object_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Chris, -1 diff --git a/maps/PewterPokecenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm new file mode 100644 index 000000000..33c22b063 --- /dev/null +++ b/maps/PewterPokecenter2FBeta.asm @@ -0,0 +1,23 @@ +PewterPokecenter2FBeta_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +PewterPokecenter2FBeta_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 1 + warp_def $7, $0, 3, PEWTER_POKECENTER_1F + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 0 diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 41d0c10ba..3b7c60f93 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -2,19 +2,19 @@ const_value set 2 const PEWTERSNOOZESPEECHHOUSE_GRAMPS PewterSnoozeSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -GrampsScript_0x1a3059: - jumptextfaceplayer UnknownText_0x1a305f +PewterSnoozeSpeechHouseGrampsScript: + jumptextfaceplayer PewterSnoozeSpeechHouseGrampsText PewterSnoozeSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x1a305f: +PewterSnoozeSpeechHouseGrampsText: text "I like snoozing" line "with the radio on…" cont "…Zzzz…" @@ -29,14 +29,14 @@ PewterSnoozeSpeechHouse_MapEventHeader: warp_def $7, $2, 5, PEWTER_CITY warp_def $7, $3, 5, PEWTER_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, PewterSnoozeSpeechHouseBookshelf - signpost 1, 1, SIGNPOST_READ, PewterSnoozeSpeechHouseBookshelf + bg_event 1, 0, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_GRAMPS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a3059, -1 + object_event SPRITE_GRAMPS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1 diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 40c039f83..0c79865aa 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const POKESEERSHOUSE_GRANNY PokeSeersHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -25,12 +25,12 @@ PokeSeersHouse_MapEventHeader: warp_def $7, $2, 7, CIANWOOD_CITY warp_def $7, $3, 7, CIANWOOD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SeerScript, -1 + object_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SeerScript, -1 diff --git a/maps/PokeCenter1F.blk b/maps/Pokecenter1F.blk index 6d4f1eca9..6d4f1eca9 100644 --- a/maps/PokeCenter1F.blk +++ b/maps/Pokecenter1F.blk diff --git a/maps/PokeCenter2F.asm b/maps/Pokecenter2F.asm index 3730b6708..ad4682cc5 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -4,53 +4,51 @@ const_value set 2 const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST const POKECENTER2F_OFFICER -PokeCenter2F_MapScriptHeader: -.MapTriggers: +Pokecenter2F_MapScriptHeader: +.SceneScripts: db 6 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 - maptrigger .Trigger3 - maptrigger .Trigger4 - maptrigger .Trigger5 + scene_script .Scene0 + scene_script .Scene1 + scene_script .Scene2 + scene_script .Scene3 + scene_script .Scene4 + scene_script .Scene5 .MapCallbacks: db 0 -.Trigger0: +.Scene0: special Special_CheckMysteryGift - if_equal $0, .Trigger0Done + if_equal $0, .Scene0Done clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY checkevent EVENT_RECEIVED_BALLS_FROM_KURT - iftrue .Trigger0Done - priorityjump PokeCenter2F_AppearMysteryGiftDeliveryGuy + iftrue .Scene0Done + priorityjump Pokecenter2F_AppearMysteryGiftDeliveryGuy -.Trigger0Done: +.Scene0Done: end -.Trigger1: +.Scene1: priorityjump Script_LeftCableTradeCenter end -.Trigger2: +.Scene2: priorityjump Script_LeftCableColosseum end -.Trigger3: +.Scene3: priorityjump Script_LeftTimeCapsule end -.Trigger4: +.Scene4: priorityjump Script_LeftMobileTradeRoom end -.Trigger5: +.Scene5: priorityjump Script_LeftMobileBattleRoom end -PokeCenter2F_AppearMysteryGiftDeliveryGuy: +Pokecenter2F_AppearMysteryGiftDeliveryGuy: appear POKECENTER2F_OFFICER setevent EVENT_RECEIVED_BALLS_FROM_KURT end @@ -104,7 +102,7 @@ LinkReceptionistScript_Trade: writetext Text_PleaseComeIn2 waitbutton closetext - scall PokeCenter2F_CheckGender + scall Pokecenter2F_CheckGender warpcheck end @@ -169,8 +167,8 @@ LinkReceptionistScript_Trade: end BattleTradeMobile_WalkIn: - applymovement2 PokeCenter2FMobileMobileMovementData_ReceptionistWalksUpAndLeft_LookDown - applymovement PLAYER, PokeCenter2FMobileMovementData_PlayerWalksIntoMobileBattleRoom + applymovement2 Pokecenter2FMobileMobileMovementData_ReceptionistWalksUpAndLeft_LookDown + applymovement PLAYER, Pokecenter2FMobileMovementData_PlayerWalksIntoMobileBattleRoom end LinkReceptionistScript_Battle: @@ -206,7 +204,7 @@ LinkReceptionistScript_Battle: writetext Text_PleaseComeIn2 waitbutton closetext - scall PokeCenter2F_CheckGender + scall Pokecenter2F_CheckGender warpcheck end @@ -378,68 +376,68 @@ LinkReceptionistScript_TimeCapsule: Script_LeftCableTradeCenter: special WaitForOtherPlayerToExit scall Script_WalkOutOfLinkTradeRoom - dotrigger $0 - domaptrigger TRADE_CENTER, $0 + setscene $0 + setmapscene TRADE_CENTER, $0 end Script_LeftMobileTradeRoom: special Function101220 scall Script_WalkOutOfMobileTradeRoom - dotrigger $0 - domaptrigger MOBILE_TRADE_ROOM_MOBILE, $0 + setscene $0 + setmapscene MOBILE_TRADE_ROOM_MOBILE, $0 end Script_WalkOutOfMobileTradeRoom: - applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMobileMovementData_ReceptionistWalksUpAndLeft - applymovement PLAYER, PokeCenter2FMovementData_PlayerWalksOutOfMobileRoom - applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMobileMovementData_ReceptionistWalksRightAndDown + applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMobileMovementData_ReceptionistWalksUpAndLeft + applymovement PLAYER, Pokecenter2FMovementData_PlayerWalksOutOfMobileRoom + applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMobileMovementData_ReceptionistWalksRightAndDown end Script_LeftCableColosseum: special WaitForOtherPlayerToExit scall Script_WalkOutOfLinkBattleRoom - dotrigger $0 - domaptrigger COLOSSEUM, $0 + setscene $0 + setmapscene COLOSSEUM, $0 end Script_LeftMobileBattleRoom: special Function101220 scall Script_WalkOutOfMobileBattleRoom - dotrigger $0 - domaptrigger MOBILE_BATTLE_ROOM, $0 + setscene $0 + setmapscene MOBILE_BATTLE_ROOM, $0 end Script_WalkOutOfMobileBattleRoom: - applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMobileMovementData_ReceptionistWalksUpAndLeft - applymovement PLAYER, PokeCenter2FMovementData_PlayerWalksOutOfMobileRoom - applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMobileMovementData_ReceptionistWalksRightAndDown + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMobileMovementData_ReceptionistWalksUpAndLeft + applymovement PLAYER, Pokecenter2FMovementData_PlayerWalksOutOfMobileRoom + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMobileMovementData_ReceptionistWalksRightAndDown end -PokeCenter2F_CheckGender: +Pokecenter2F_CheckGender: checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Female - applymovement2 PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesThreeStepsUp + applymovement2 Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesThreeStepsUp end .Female: - applymovement2 PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight_2 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsUp + applymovement2 Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight_2 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsUp opentext writetext Text_OhPleaseWait waitbutton closetext - applymovement2 PokeCenter2FMovementData_ReceptionistLooksRight + applymovement2 Pokecenter2FMovementData_ReceptionistLooksRight spriteface PLAYER, LEFT opentext writetext Text_ChangeTheLook waitbutton closetext playsound SFX_TINGLE - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight - writebyte (1 << 7) | (PAL_OW_RED << 4) + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight + writebyte (PAL_NPC_RED << 4) special Special_SetPlayerPalette - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft setflag ENGINE_KRIS_IN_CABLE_CLUB special ReplaceKrisSprite opentext @@ -447,51 +445,51 @@ PokeCenter2F_CheckGender: waitbutton closetext showemote EMOTE_SHOCK, PLAYER, 15 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepUp + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepUp end Script_WalkOutOfLinkTradeRoom: checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female - applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesThreeStepsDown - applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightAndDown + applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_3 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesThreeStepsDown + applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown end .Female: - applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepDown_2 + applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_3 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown_2 clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight - writebyte (1 << 7) | (PAL_OW_BLUE << 4) + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight + writebyte (PAL_NPC_BLUE << 4) special Special_SetPlayerPalette - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsDown_2 - applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightAndDown + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2 + applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown end Script_WalkOutOfLinkBattleRoom: checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female - applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesThreeStepsDown - applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightAndDown + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_3 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesThreeStepsDown + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown end .Female: - applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepDown_2 + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_3 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown_2 clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight - writebyte (1 << 7) | (PAL_OW_BLUE << 4) + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight + writebyte (PAL_NPC_BLUE << 4) special Special_SetPlayerPalette - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsDown_2 - applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightAndDown + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2 + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown end TimeCapsuleScript_CheckPlayerGender: @@ -500,36 +498,36 @@ TimeCapsuleScript_CheckPlayerGender: checkcode VAR_FACING if_equal LEFT, .MaleFacingLeft if_equal RIGHT, .MaleFacingRight - applymovement2 PokeCenter2FMovementData_ReceptionistStepsLeftLooksDown - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsUp_2 + applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksDown + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsUp_2 end .MaleFacingLeft: - applymovement2 PokeCenter2FMovementData_ReceptionistStepsLeftLooksDown - applymovement PLAYER, PokeCenter2FMovementData_PlayerWalksLeftAndUp + applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksDown + applymovement PLAYER, Pokecenter2FMovementData_PlayerWalksLeftAndUp end .MaleFacingRight: - applymovement2 PokeCenter2FMovementData_ReceptionistStepsRightLooksDown - applymovement PLAYER, PokeCenter2FMovementData_PlayerWalksRightAndUp + applymovement2 Pokecenter2FMovementData_ReceptionistStepsRightLooksDown + applymovement PLAYER, Pokecenter2FMovementData_PlayerWalksRightAndUp end .Female: checkcode VAR_FACING if_equal RIGHT, .FemaleFacingRight if_equal LEFT, .FemaleFacingLeft - applymovement2 PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight_2 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepUp_2 + applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight_2 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepUp_2 jump .FemaleContinue .FemaleFacingRight: - applymovement2 PokeCenter2FMovementData_ReceptionistStepsRightLooksLeft_2 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepRight + applymovement2 Pokecenter2FMovementData_ReceptionistStepsRightLooksLeft_2 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepRight jump .FemaleContinue .FemaleFacingLeft: - applymovement2 PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight_2 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepLeft + applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight_2 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepLeft .FemaleContinue: opentext writetext Text_OhPleaseWait @@ -544,11 +542,11 @@ TimeCapsuleScript_CheckPlayerGender: waitbutton closetext playsound SFX_TINGLE - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight - writebyte (1 << 7) | (PAL_OW_RED << 4) + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight + writebyte (PAL_NPC_RED << 4) special Special_SetPlayerPalette - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown - faceperson PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown + faceobject PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST setflag ENGINE_KRIS_IN_CABLE_CLUB special ReplaceKrisSprite opentext @@ -556,36 +554,36 @@ TimeCapsuleScript_CheckPlayerGender: waitbutton closetext showemote EMOTE_SHOCK, PLAYER, 15 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepUp_2 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepUp_2 end Script_LeftTimeCapsule: special WaitForOtherPlayerToExit checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female - applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsDown - applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_2 + applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown + applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2 jump .Done .Female: - applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepDown + applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight - writebyte (1 << 7) | (PAL_OW_BLUE << 4) + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight + writebyte (PAL_NPC_BLUE << 4) special Special_SetPlayerPalette - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepDown - applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_2 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown + applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2 .Done: - dotrigger $0 - domaptrigger TIME_CAPSULE, $0 + setscene $0 + setmapscene TIME_CAPSULE, $0 end -MapPokeCenter2FSignpost0Script: +MapPokecenter2FSignpost0Script: refreshscreen $0 special Special_DisplayLinkRecord closetext @@ -624,137 +622,137 @@ OfficerScript_0x192c9a: closetext end -PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight: +Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight: slow_step UP slow_step LEFT turn_head RIGHT step_end -PokeCenter2FMobileMobileMovementData_ReceptionistWalksUpAndLeft_LookDown: +Pokecenter2FMobileMobileMovementData_ReceptionistWalksUpAndLeft_LookDown: slow_step UP slow_step LEFT turn_head DOWN step_end -PokeCenter2FMovementData_ReceptionistStepsLeftLooksDown: +Pokecenter2FMovementData_ReceptionistStepsLeftLooksDown: slow_step LEFT turn_head DOWN step_end -PokeCenter2FMovementData_ReceptionistStepsRightLooksDown: +Pokecenter2FMovementData_ReceptionistStepsRightLooksDown: slow_step RIGHT turn_head DOWN step_end -PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight_2: +Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight_2: slow_step UP slow_step LEFT turn_head RIGHT step_end -PokeCenter2FMovementData_ReceptionistLooksRight: +Pokecenter2FMovementData_ReceptionistLooksRight: turn_head RIGHT step_end -PokeCenter2FMovementData_PlayerTakesThreeStepsUp: +Pokecenter2FMovementData_PlayerTakesThreeStepsUp: step UP step UP step UP step_end -PokeCenter2FMovementData_PlayerTakesTwoStepsUp: +Pokecenter2FMovementData_PlayerTakesTwoStepsUp: step UP step UP step_end -PokeCenter2FMovementData_PlayerTakesOneStepUp: +Pokecenter2FMovementData_PlayerTakesOneStepUp: step UP step_end -PokeCenter2FMobileMovementData_PlayerWalksIntoMobileBattleRoom: +Pokecenter2FMobileMovementData_PlayerWalksIntoMobileBattleRoom: step UP step UP step RIGHT step UP step_end -PokeCenter2FMovementData_PlayerTakesTwoStepsUp_2: +Pokecenter2FMovementData_PlayerTakesTwoStepsUp_2: step UP step UP step_end -PokeCenter2FMovementData_PlayerWalksLeftAndUp: +Pokecenter2FMovementData_PlayerWalksLeftAndUp: step LEFT step UP step_end -PokeCenter2FMovementData_PlayerWalksRightAndUp: +Pokecenter2FMovementData_PlayerWalksRightAndUp: step RIGHT step UP step_end -PokeCenter2FMovementData_PlayerTakesThreeStepsDown: +Pokecenter2FMovementData_PlayerTakesThreeStepsDown: step DOWN step DOWN step DOWN step_end -PokeCenter2FMovementData_PlayerTakesTwoStepsDown: +Pokecenter2FMovementData_PlayerTakesTwoStepsDown: step DOWN step DOWN step_end -PokeCenter2FMovementData_PlayerTakesOneStepDown: +Pokecenter2FMovementData_PlayerTakesOneStepDown: step DOWN step_end -PokeCenter2FMovementData_ReceptionistStepsRightAndDown: +Pokecenter2FMovementData_ReceptionistStepsRightAndDown: slow_step RIGHT slow_step DOWN step_end -PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_2: +Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2: slow_step RIGHT turn_head DOWN step_end -PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3: +Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_3: slow_step UP slow_step LEFT turn_head RIGHT step_end -PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight: +Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight: slow_step LEFT turn_head RIGHT step_end -PokeCenter2FMobileMovementData_ReceptionistWalksUpAndLeft: +Pokecenter2FMobileMovementData_ReceptionistWalksUpAndLeft: slow_step UP slow_step LEFT turn_head RIGHT step_end -PokeCenter2FMovementData_PlayerWalksOutOfMobileRoom: +Pokecenter2FMovementData_PlayerWalksOutOfMobileRoom: step DOWN step LEFT step DOWN step DOWN step_end -PokeCenter2FMobileMovementData_ReceptionistWalksRightAndDown: +Pokecenter2FMobileMovementData_ReceptionistWalksRightAndDown: slow_step RIGHT slow_step DOWN step_end -PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight: +Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight: turn_head DOWN turn_head LEFT turn_head UP turn_head RIGHT step_end -PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft: +Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft: turn_head DOWN turn_head LEFT turn_head UP @@ -762,7 +760,7 @@ PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft: turn_head LEFT step_end -PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown: +Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown: turn_head DOWN turn_head LEFT turn_head UP @@ -770,33 +768,33 @@ PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown: turn_head DOWN step_end -PokeCenter2FMovementData_PlayerTakesOneStepDown_2: +Pokecenter2FMovementData_PlayerTakesOneStepDown_2: step DOWN step_end -PokeCenter2FMovementData_PlayerTakesTwoStepsDown_2: +Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2: step DOWN step DOWN step_end -PokeCenter2FMovementData_PlayerTakesOneStepUp_2: +Pokecenter2FMovementData_PlayerTakesOneStepUp_2: step UP step_end -PokeCenter2FMovementData_PlayerTakesOneStepRight: +Pokecenter2FMovementData_PlayerTakesOneStepRight: step RIGHT step_end -PokeCenter2FMovementData_PlayerTakesOneStepLeft: +Pokecenter2FMovementData_PlayerTakesOneStepLeft: step LEFT step_end -PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight_2: +Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight_2: slow_step LEFT turn_head RIGHT step_end -PokeCenter2FMovementData_ReceptionistStepsRightLooksLeft_2: +Pokecenter2FMovementData_ReceptionistStepsRightLooksLeft_2: slow_step RIGHT turn_head LEFT step_end @@ -1024,7 +1022,7 @@ Text_BrokeStadiumRules: line "when you're ready." done -PokeCenter2F_MapEventHeader: +Pokecenter2F_MapEventHeader: ; filler db 0, 0 @@ -1037,16 +1035,16 @@ PokeCenter2F_MapEventHeader: warp_def $0, $6, 1, MOBILE_TRADE_ROOM_MOBILE warp_def $0, $a, 1, MOBILE_BATTLE_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 3, 7, SIGNPOST_READ, MapPokeCenter2FSignpost0Script + bg_event 3, 7, BGEVENT_READ, MapPokecenter2FSignpost0Script -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_LINK_RECEPTIONIST, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1 - person_event SPRITE_LINK_RECEPTIONIST, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1 - person_event SPRITE_LINK_RECEPTIONIST, 3, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1 - person_event SPRITE_OFFICER, 1, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY + object_event SPRITE_LINK_RECEPTIONIST, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1 + object_event SPRITE_LINK_RECEPTIONIST, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1 + object_event SPRITE_LINK_RECEPTIONIST, 3, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1 + object_event SPRITE_OFFICER, 1, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY diff --git a/maps/PokeCenter2F.blk b/maps/Pokecenter2F.blk index 968f746e6..968f746e6 100644 --- a/maps/PokeCenter2F.blk +++ b/maps/Pokecenter2F.blk diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 7424f9b73..db04c88fd 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -7,7 +7,7 @@ const_value set 2 const POKEMONFANCLUB_ODDISH PokemonFanClub_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -49,8 +49,8 @@ UnknownScript_0x19181f: closetext end -ReceptionistScript_0x191821: - jumptextfaceplayer UnknownText_0x191b6d +PokemonFanClubReceptionistScript: + jumptextfaceplayer PokemonFanClubReceptionistText FisherScript_0x191824: faceplayer @@ -100,8 +100,8 @@ UnknownScript_0x191865: closetext end -TeacherScript_0x19186b: - jumptextfaceplayer UnknownText_0x191d73 +PokemonFanClubTeacherScript: + jumptextfaceplayer PokemonFanClubTeacherText ClefairyDoll: jumptext ClefairyDollText @@ -199,7 +199,7 @@ UnknownText_0x191b38: line "want to listen." done -UnknownText_0x191b6d: +PokemonFanClubReceptionistText: text "Our CHAIRMAN is" line "very vocal when it" cont "comes to #MON…" @@ -264,7 +264,7 @@ UnknownText_0x191d58: line "jammed full." done -UnknownText_0x191d73: +PokemonFanClubTeacherText: text "Look at my darling" line "BAYLEEF!" @@ -305,19 +305,19 @@ PokemonFanClub_MapEventHeader: warp_def $7, $2, 3, VERMILION_CITY warp_def $7, $3, 3, VERMILION_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 7, SIGNPOST_READ, MapPokemonFanClubSignpost0Script - signpost 0, 9, SIGNPOST_READ, MapPokemonFanClubSignpost1Script + bg_event 0, 7, BGEVENT_READ, MapPokemonFanClubSignpost0Script + bg_event 0, 9, BGEVENT_READ, MapPokemonFanClubSignpost1Script -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_GENTLEMAN, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1 - person_event SPRITE_RECEPTIONIST, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x191821, -1 - person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x191824, -1 - person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x19186b, -1 - person_event SPRITE_FAIRY, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL - person_event SPRITE_ODDISH, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FanClubBayleef, -1 + object_event SPRITE_GENTLEMAN, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1 + object_event SPRITE_RECEPTIONIST, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1 + object_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FisherScript_0x191824, -1 + object_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1 + object_event SPRITE_FAIRY, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL + object_event SPRITE_ODDISH, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FanClubBayleef, -1 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 62a539eb3..9445f4c97 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -8,20 +8,18 @@ const_value set 2 const POWERPLANT_FOREST PowerPlant_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x188dc3, 0 - dw UnknownScript_0x188dc4, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -UnknownScript_0x188dc3: +.DummyScene0: end -UnknownScript_0x188dc4: +.DummyScene1: end PowerPlantGuardPhoneScript: @@ -44,7 +42,7 @@ PowerPlantGuardPhoneScript: closetext spriteface PLAYER, DOWN applymovement POWERPLANT_OFFICER1, MovementData_0x188eda - dotrigger $0 + setscene $0 end OfficerScript_0x188df5: @@ -150,8 +148,8 @@ PowerPlantManager: setevent EVENT_MET_MANAGER_AT_POWER_PLANT clearevent EVENT_CERULEAN_GYM_ROCKET clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM - domaptrigger CERULEAN_GYM, $1 - dotrigger $1 + setmapscene CERULEAN_GYM, $1 + setscene $1 end UnknownScript_0x188e8d: @@ -193,7 +191,7 @@ UnknownScript_0x188ec5: Forest: faceplayer opentext - trade $6 + trade NPCTRADE_FOREST waitbutton closetext end @@ -399,21 +397,21 @@ PowerPlant_MapEventHeader: warp_def $11, $2, 2, ROUTE_10_NORTH warp_def $11, $3, 2, ROUTE_10_NORTH -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 1, $c, $5, $0, PowerPlantGuardPhoneScript, $0, $0 + coord_event 1, $c, $5, PowerPlantGuardPhoneScript -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, PowerPlantBookshelf - signpost 1, 1, SIGNPOST_READ, PowerPlantBookshelf + bg_event 1, 0, BGEVENT_READ, PowerPlantBookshelf + bg_event 1, 1, BGEVENT_READ, PowerPlantBookshelf -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_OFFICER, 14, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1 - person_event SPRITE_GYM_GUY, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1 - person_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1 - person_event SPRITE_OFFICER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1 - person_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1 - person_event SPRITE_FISHER, 10, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PowerPlantManager, -1 - person_event SPRITE_GYM_GUY, 5, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Forest, -1 + object_event SPRITE_OFFICER, 14, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1 + object_event SPRITE_GYM_GUY, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1 + object_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1 + object_event SPRITE_OFFICER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1 + object_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1 + object_event SPRITE_FISHER, 10, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PowerPlantManager, -1 + object_event SPRITE_GYM_GUY, 5, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 4e670be07..56e1b0510 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -7,7 +7,7 @@ const_value set 2 const RADIOTOWER1F_COOLTRAINER_F RadioTower1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -179,19 +179,19 @@ UnknownScript_0x5ce4b: closetext end -LassScript_0x5ce51: - jumptextfaceplayer UnknownText_0x5d476 +RadioTower1FLassScript: + jumptextfaceplayer RadioTower1FLassText -YoungsterScript_0x5ce54: - jumptextfaceplayer UnknownText_0x5d4ac +RadioTower1FYoungsterScript: + jumptextfaceplayer RadioTower1FYoungsterText TrainerGruntM3: - trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, GruntM3Script + trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, .Script -GruntM3Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5d5a2 + writetext GruntM3AfterBattleText waitbutton closetext end @@ -405,7 +405,7 @@ UnknownText_0x5d443: cont "change your mind." done -UnknownText_0x5d476: +RadioTower1FLassText: text "BEN is a fabulous" line "DJ." @@ -413,7 +413,7 @@ UnknownText_0x5d476: line "makes me melt!" done -UnknownText_0x5d4ac: +RadioTower1FYoungsterText: text "I love MARY, from" line "#MON TALK." @@ -442,7 +442,7 @@ GruntM3BeatenText: line "must watch you…" done -UnknownText_0x5d5a2: +GruntM3AfterBattleText: text "You're too strong." para "Our plan could be" @@ -482,19 +482,19 @@ RadioTower1F_MapEventHeader: warp_def $7, $3, 11, GOLDENROD_CITY warp_def $0, $f, 2, RADIO_TOWER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 3, SIGNPOST_READ, MapRadioTower1FSignpost0Script - signpost 0, 13, SIGNPOST_READ, MapRadioTower1FSignpost1Script + bg_event 0, 3, BGEVENT_READ, MapRadioTower1FSignpost0Script + bg_event 0, 13, BGEVENT_READ, MapRadioTower1FSignpost1Script -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_RECEPTIONIST, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1 - person_event SPRITE_LASS, 4, 16, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, LassScript_0x5ce51, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_YOUNGSTER, 4, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5ce54, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_ROCKET, 1, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_COOLTRAINER_F, 6, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_RECEPTIONIST, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1 + object_event SPRITE_LASS, 4, 16, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_YOUNGSTER, 4, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_ROCKET, 1, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_COOLTRAINER_F, 6, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 5925532e9..bf267dc67 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -12,7 +12,7 @@ const_value set 2 const RADIOTOWER2F_RECEPTIONIST RadioTower2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -21,8 +21,8 @@ RadioTower2F_MapScriptHeader: UnknownScript_0x5d6fd: end -SuperNerdScript_0x5d6fe: - jumptextfaceplayer UnknownText_0x5d924 +RadioTower2FSuperNerdScript: + jumptextfaceplayer RadioTower2FSuperNerdText TeacherScript_0x5d701: faceplayer @@ -48,52 +48,52 @@ RadioTowerJigglypuff: closetext end -BlackBeltScript_0x5d71f: - jumptextfaceplayer UnknownText_0x5d9cb +RadioTower2FBlackBelt1Script: + jumptextfaceplayer RadioTower2FBlackBelt1Text -BlackBeltScript_0x5d722: - jumptextfaceplayer UnknownText_0x5da44 +RadioTower2FBlackBelt2Script: + jumptextfaceplayer RadioTower2FBlackBelt2Text TrainerGruntM4: - trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, GruntM4Script + trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, .Script -GruntM4Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5db07 + writetext GruntM4AfterBattleText waitbutton closetext end TrainerGruntM5: - trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, GruntM5Script + trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, .Script -GruntM5Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5db99 + writetext GruntM5AfterBattleText waitbutton closetext end TrainerGruntM6: - trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, GruntM6Script + trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, .Script -GruntM6Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5dc00 + writetext GruntM6AfterBattleText waitbutton closetext end TrainerGruntF2: - trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, GruntF2Script + trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, .Script -GruntF2Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5dcd0 + writetext GruntF2AfterBattleText waitbutton closetext end @@ -343,7 +343,7 @@ MovementData_0x5d921: slow_step RIGHT step_end -UnknownText_0x5d924: +RadioTower2FSuperNerdText: text "You can listen to" line "the radio any-" cont "where. Tune in!" @@ -366,7 +366,7 @@ RadioTowerJigglypuffText: line "Jiggly…" done -UnknownText_0x5d9cb: +RadioTower2FBlackBelt1Text: text "Sorry. Authorized" line "personnel only" cont "beyond this point." @@ -379,7 +379,7 @@ UnknownText_0x5d9cb: cont "DIRECTOR…" done -UnknownText_0x5da44: +RadioTower2FBlackBelt2Text: text "Feel free to look" line "around anywhere." @@ -402,7 +402,7 @@ GruntM4BeatenText: line "cute!" done -UnknownText_0x5db07: +GruntM4AfterBattleText: text "We won't let you" line "ruin our plans" cont "for our comeback!" @@ -422,7 +422,7 @@ GruntM5BeatenText: line "hero?" done -UnknownText_0x5db99: +GruntM5AfterBattleText: text "We're not always" line "evil. We just do" cont "whatever we like." @@ -437,7 +437,7 @@ GruntM6BeatenText: text "Arggh. I give up." done -UnknownText_0x5dc00: +GruntM6AfterBattleText: text "Our EXECUTIVES are" line "trying to take" cont "this place over." @@ -464,7 +464,7 @@ GruntF2BeatenText: text "Wh-who are you?" done -UnknownText_0x5dcd0: +GruntF2AfterBattleText: text "You beat me, and" line "I won't forget it!" done @@ -719,28 +719,28 @@ RadioTower2F_MapEventHeader: warp_def $0, $0, 1, RADIO_TOWER_3F warp_def $0, $f, 3, RADIO_TOWER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 0, 3, SIGNPOST_READ, MapRadioTower2FSignpost0Script - signpost 0, 5, SIGNPOST_READ, MapRadioTower2FSignpost1Script - signpost 1, 9, SIGNPOST_READ, RadioTower2FBookshelf - signpost 1, 10, SIGNPOST_READ, RadioTower2FBookshelf - signpost 1, 11, SIGNPOST_READ, RadioTower2FBookshelf - signpost 0, 13, SIGNPOST_READ, MapRadioTower2FSignpost5Script - -.PersonEvents: + bg_event 0, 3, BGEVENT_READ, MapRadioTower2FSignpost0Script + bg_event 0, 5, BGEVENT_READ, MapRadioTower2FSignpost1Script + bg_event 1, 9, BGEVENT_READ, RadioTower2FBookshelf + bg_event 1, 10, BGEVENT_READ, RadioTower2FBookshelf + bg_event 1, 11, BGEVENT_READ, RadioTower2FBookshelf + bg_event 0, 13, BGEVENT_READ, MapRadioTower2FSignpost5Script + +.ObjectEvents: db 11 - person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x5d6fe, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_TEACHER, 2, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1 - person_event SPRITE_ROCKET, 4, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 4, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET_GIRL, 5, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_BLACK_BELT, 1, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x5d71f, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS - person_event SPRITE_BLACK_BELT, 1, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x5d722, EVENT_RADIO_TOWER_CIVILIANS_AFTER - person_event SPRITE_JIGGLYPUFF, 1, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1 - person_event SPRITE_BUENA, 5, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Buena, -1 - person_event SPRITE_RECEPTIONIST, 7, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event SPRITE_TEACHER, 2, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1 + object_event SPRITE_ROCKET, 4, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 4, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET_GIRL, 5, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_BLACK_BELT, 1, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS + object_event SPRITE_BLACK_BELT, 1, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER + object_event SPRITE_JIGGLYPUFF, 1, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1 + object_event SPRITE_BUENA, 5, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Buena, -1 + object_event SPRITE_RECEPTIONIST, 7, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 166950d44..dc14a2912 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -8,17 +8,14 @@ const_value set 2 const RADIOTOWER3F_SCIENTIST RadioTower3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .CardKeyShutterCallback - ; callbacks - - dbw MAPCALLBACK_TILES, CardKeyShutterCallback - -CardKeyShutterCallback: +.CardKeyShutterCallback: checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue .Change return @@ -28,8 +25,8 @@ CardKeyShutterCallback: changeblock $e, $4, $1 return -SuperNerdScript_0x5e553: - jumptextfaceplayer UnknownText_0x5e621 +RadioTower3FSuperNerdScript: + jumptextfaceplayer RadioTower3FSuperNerdText GymGuyScript_0x5e556: faceplayer @@ -86,45 +83,45 @@ UnknownScript_0x5e5a1: end TrainerGruntM7: - trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, GruntM7Script + trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, .Script -GruntM7Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5e8d0 + writetext GruntM7AfterBattleText waitbutton closetext end TrainerGruntM8: - trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, GruntM8Script + trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, .Script -GruntM8Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5e944 + writetext GruntM8AfterBattleText waitbutton closetext end TrainerGruntM9: - trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, GruntM9Script + trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, .Script -GruntM9Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5e9d0 + writetext GruntM9AfterBattleText waitbutton closetext end TrainerScientistMarc: - trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, ScientistMarcScript + trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, .Script -ScientistMarcScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5ea61 + writetext ScientistMarcAfterBattleText waitbutton closetext end @@ -159,7 +156,7 @@ MapRadioTower3FSignpost0Script: MapRadioTower3FSignpost1Script: jumptext UnknownText_0x5eae4 -UnknownText_0x5e621: +RadioTower3FSuperNerdText: text "We have recordings" line "of the cries of" @@ -246,7 +243,7 @@ GruntM7BeatenText: text "What?!" done -UnknownText_0x5e8d0: +GruntM7AfterBattleText: text "I failed in my" line "duties…" @@ -264,7 +261,7 @@ GruntM8BeatenText: text "You're kidding!" done -UnknownText_0x5e944: +GruntM8AfterBattleText: text "I feel lousy over" line "losing!" @@ -284,7 +281,7 @@ GruntM9BeatenText: text "I'm done for!" done -UnknownText_0x5e9d0: +GruntM9AfterBattleText: text "What?! You made it" line "past our men in" cont "the UNDERGROUND?" @@ -304,7 +301,7 @@ ScientistMarcBeatenText: line "too lightly!" done -UnknownText_0x5ea61: +ScientistMarcAfterBattleText: text "Bwahahaha…" para "I can transmit as" @@ -341,21 +338,21 @@ RadioTower3F_MapEventHeader: warp_def $0, $7, 2, RADIO_TOWER_4F warp_def $0, $11, 4, RADIO_TOWER_4F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 0, 3, SIGNPOST_READ, MapRadioTower3FSignpost0Script - signpost 0, 9, SIGNPOST_READ, MapRadioTower3FSignpost1Script - signpost 2, 14, SIGNPOST_UP, MapRadioTower3FSignpost2Script + bg_event 0, 3, BGEVENT_READ, MapRadioTower3FSignpost0Script + bg_event 0, 9, BGEVENT_READ, MapRadioTower3FSignpost1Script + bg_event 2, 14, BGEVENT_UP, MapRadioTower3FSignpost2Script -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_SUPER_NERD, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x5e553, EVENT_RADIO_TOWER_CIVILIANS_AFTER - person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1 - person_event SPRITE_COOLTRAINER_F, 3, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1 - person_event SPRITE_ROCKET, 1, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 6, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_SCIENTIST, 6, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_SUPER_NERD, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER + object_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1 + object_event SPRITE_COOLTRAINER_F, 3, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1 + object_event SPRITE_ROCKET, 1, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 6, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_SCIENTIST, 6, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 837858d69..4066bf75d 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -8,14 +8,14 @@ const_value set 2 const RADIOTOWER4F_SCIENTIST RadioTower4F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -FisherScript_0x5eb82: - jumptextfaceplayer UnknownText_0x5ec12 +RadioTower4FFisherScript: + jumptextfaceplayer RadioTower4FFisherText TeacherScript_0x5eb85: faceplayer @@ -56,45 +56,45 @@ RadioTowerMeowth: end TrainerGruntM10: - trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, GruntM10Script + trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, .Script -GruntM10Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5ede2 + writetext GruntM10AfterBattleText waitbutton closetext end TrainerExecutivem2: - trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, 2, Executivem2SeenText, Executivem2BeatenText, 0, Executivem2Script + trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, EXECUTIVEM_2, Executivem2SeenText, Executivem2BeatenText, 0, .Script -Executivem2Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5ee69 + writetext Executivem2AfterBattleText waitbutton closetext end TrainerGruntF4: - trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, GruntF4Script + trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, .Script -GruntF4Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5ef31 + writetext GruntF4AfterBattleText waitbutton closetext end TrainerScientistRich: - trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, ScientistRichScript + trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, .Script -ScientistRichScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5efcb + writetext ScientistRichAfterBattleText waitbutton closetext end @@ -105,7 +105,7 @@ MapRadioTower4FSignpost0Script: MapRadioTower4FSignpost1Script: jumptext UnknownText_0x5f00d -UnknownText_0x5ec12: +RadioTower4FFisherText: text "I listened to the" line "radio while I was" cont "at the RUINS." @@ -163,7 +163,7 @@ GruntM10BeatenText: text "No! Unbelievable!" done -UnknownText_0x5ede2: +GruntM10AfterBattleText: text "I don't believe" line "it! I was beaten!" done @@ -182,7 +182,7 @@ Executivem2BeatenText: line "down!" done -UnknownText_0x5ee69: +Executivem2AfterBattleText: text "You've earned my" line "respect, so here's" cont "some advice." @@ -208,7 +208,7 @@ GruntF4BeatenText: line "useless!" done -UnknownText_0x5ef31: +GruntF4AfterBattleText: text "I love my" line "beautiful self!" @@ -231,7 +231,7 @@ ScientistRichBeatenText: line "come with snags." done -UnknownText_0x5efcb: +ScientistRichAfterBattleText: text "Do you honestly" line "believe you can" cont "stop TEAM ROCKET?" @@ -256,20 +256,20 @@ RadioTower4F_MapEventHeader: warp_def $0, $c, 2, RADIO_TOWER_5F warp_def $0, $11, 3, RADIO_TOWER_3F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 0, 7, SIGNPOST_READ, MapRadioTower4FSignpost0Script - signpost 0, 15, SIGNPOST_READ, MapRadioTower4FSignpost1Script + bg_event 0, 7, BGEVENT_READ, MapRadioTower4FSignpost0Script + bg_event 0, 15, BGEVENT_READ, MapRadioTower4FSignpost1Script -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_FISHER, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x5eb82, EVENT_RADIO_TOWER_CIVILIANS_AFTER - person_event SPRITE_TEACHER, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1 - person_event SPRITE_GROWLITHE, 7, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, RadioTowerMeowth, -1 - person_event SPRITE_ROCKET, 6, 5, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 1, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET_GIRL, 4, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_SCIENTIST, 2, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_FISHER, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER + object_event SPRITE_TEACHER, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1 + object_event SPRITE_GROWLITHE, 7, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1 + object_event SPRITE_ROCKET, 6, 5, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET, 1, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET_GIRL, 4, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_SCIENTIST, 2, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 31d54e742..e09b280e1 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -6,24 +6,22 @@ const_value set 2 const RADIOTOWER5F_POKE_BALL RadioTower5F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + scene_script .DummyScene0 + scene_script .DummyScene1 + scene_script .DummyScene2 .MapCallbacks: db 0 -.Trigger0: +.DummyScene0: end -.Trigger1: +.DummyScene1: end -.Trigger2: +.DummyScene2: end FakeDirectorScript: @@ -41,7 +39,7 @@ FakeDirectorScript: closetext winlosstext FakeDirectorWinText, 0 setlasttalked RADIOTOWER5F_DIRECTOR - loadtrainer EXECUTIVEM, 3 + loadtrainer EXECUTIVEM, EXECUTIVEM_3 startbattle reloadmapafterbattle opentext @@ -49,7 +47,7 @@ FakeDirectorScript: buttonsound verbosegiveitem BASEMENT_KEY closetext - dotrigger $1 + setscene $1 setevent EVENT_BEAT_ROCKET_EXECUTIVEM_3 end @@ -70,17 +68,17 @@ Director: end TrainerExecutivef1: - trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, 1, Executivef1SeenText, Executivef1BeatenText, 0, Executivef1Script + trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, .Script -Executivef1Script: +.Script: end_if_just_battled opentext - writetext Executivef1AfterText + writetext Executivef1AfterBattleText waitbutton closetext end -RadioTower5FRocketBossTrigger: +RadioTower5FRocketBossScene: applymovement PLAYER, MovementData_0x60125 playmusic MUSIC_ROCKET_ENCOUNTER spriteface RADIOTOWER5F_ROCKET, RIGHT @@ -90,7 +88,7 @@ RadioTower5FRocketBossTrigger: closetext winlosstext RadioTower5FRocketBossWinText, 0 setlasttalked RADIOTOWER5F_ROCKET - loadtrainer EXECUTIVEM, 1 + loadtrainer EXECUTIVEM, EXECUTIVEM_1 startbattle reloadmapafterbattle opentext @@ -117,7 +115,7 @@ RadioTower5FRocketBossTrigger: clearevent EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM special PlayMapMusic disappear RADIOTOWER5F_DIRECTOR - moveperson RADIOTOWER5F_DIRECTOR, $c, $0 + moveobject RADIOTOWER5F_DIRECTOR, $c, $0 appear RADIOTOWER5F_DIRECTOR applymovement RADIOTOWER5F_DIRECTOR, RadioTower5FDirectorWalksIn spriteface PLAYER, RIGHT @@ -128,8 +126,8 @@ RadioTower5FRocketBossTrigger: writetext RadioTower5FDirectorDescribeClearBellText waitbutton closetext - dotrigger $2 - domaptrigger ECRUTEAK_HOUSE, $0 + setscene $2 + setmapscene ECRUTEAK_HOUSE, $0 setevent EVENT_GOT_CLEAR_BELL setevent EVENT_TEAM_ROCKET_DISBANDED jump .UselessJump @@ -258,7 +256,7 @@ Executivef1BeatenText: line "I still lost…" done -Executivef1AfterText: +Executivef1AfterBattleText: text "<PLAYER>, isn't it?" para "A brat like you" @@ -431,23 +429,23 @@ RadioTower5F_MapEventHeader: warp_def $0, $0, 1, RADIO_TOWER_4F warp_def $0, $c, 3, RADIO_TOWER_4F -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $3, $0, $0, FakeDirectorScript, $0, $0 - xy_trigger 1, $5, $10, $0, RadioTower5FRocketBossTrigger, $0, $0 + coord_event 0, $3, $0, FakeDirectorScript + coord_event 1, $5, $10, RadioTower5FRocketBossScene -.Signposts: +.BGEvents: db 5 - signpost 0, 3, SIGNPOST_READ, MapRadioTower5FSignpost0Script - signpost 0, 11, SIGNPOST_READ, MapRadioTower5FSignpost2Script - signpost 0, 15, SIGNPOST_READ, MapRadioTower5FSignpost2Script - signpost 1, 16, SIGNPOST_READ, RadioTower5FBookshelf - signpost 1, 17, SIGNPOST_READ, RadioTower5FBookshelf + bg_event 0, 3, BGEVENT_READ, MapRadioTower5FSignpost0Script + bg_event 0, 11, BGEVENT_READ, MapRadioTower5FSignpost2Script + bg_event 0, 15, BGEVENT_READ, MapRadioTower5FSignpost2Script + bg_event 1, 16, BGEVENT_READ, RadioTower5FBookshelf + bg_event 1, 17, BGEVENT_READ, RadioTower5FBookshelf -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_GENTLEMAN, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Director, -1 - person_event SPRITE_ROCKET, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET_GIRL, 2, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKER, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER - person_event SPRITE_POKE_BALL, 5, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL + object_event SPRITE_GENTLEMAN, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Director, -1 + object_event SPRITE_ROCKET, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKET_GIRL, 2, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event SPRITE_ROCKER, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER + object_event SPRITE_POKE_BALL, 5, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index ae909f6da..9d7408386 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -2,16 +2,14 @@ const_value set 2 const REDSHOUSE1F_REDS_MOM RedsHouse1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - - ; triggers - dw .Trigger, 0 + scene_script .DummyScene .MapCallbacks: db 0 -.Trigger: +.DummyScene: end RedsMom: @@ -86,15 +84,15 @@ RedsHouse1F_MapEventHeader: warp_def $7, $3, 1, PALLET_TOWN warp_def $0, $7, 1, REDS_HOUSE_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 1, 0, SIGNPOST_READ, RedsHouse1FBookshelf - signpost 1, 1, SIGNPOST_READ, RedsHouse1FBookshelf - signpost 1, 2, SIGNPOST_READ, RedsHouse1FTV + bg_event 1, 0, BGEVENT_READ, RedsHouse1FBookshelf + bg_event 1, 1, BGEVENT_READ, RedsHouse1FBookshelf + bg_event 1, 2, BGEVENT_READ, RedsHouse1FTV -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_REDS_MOM, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RedsMom, -1 + object_event SPRITE_REDS_MOM, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RedsMom, -1 diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index 5704cdcaf..6919b7fe0 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -1,17 +1,17 @@ RedsHouse2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -MapRedsHouse2FSignpost0Script: - jumptext UnknownText_0x19b050 +RedsHouse2FN64Script: + jumptext RedsHouse2FN64Text -MapRedsHouse2FSignpost1Script: - jumptext UnknownText_0x19b087 +RedsHouse2FPCScript: + jumptext RedsHouse2FPCText -UnknownText_0x19b050: +RedsHouse2FN64Text: text "<PLAYER> played the" line "N64." @@ -19,7 +19,7 @@ UnknownText_0x19b050: line "no time to lose!" done -UnknownText_0x19b087: +RedsHouse2FPCText: text "It looks like it" line "hasn't been used" cont "in a long time…" @@ -33,13 +33,13 @@ RedsHouse2F_MapEventHeader: db 1 warp_def $0, $7, 3, REDS_HOUSE_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 5, 3, SIGNPOST_READ, MapRedsHouse2FSignpost0Script - signpost 1, 0, SIGNPOST_READ, MapRedsHouse2FSignpost1Script + bg_event 5, 3, BGEVENT_READ, RedsHouse2FN64Script + bg_event 1, 0, BGEVENT_READ, RedsHouse2FPCScript -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 1fa6ef971..32b274ca5 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -3,7 +3,7 @@ const_value set 2 const ROCKTUNNEL1F_POKE_BALL2 RockTunnel1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -36,15 +36,15 @@ RockTunnel1F_MapEventHeader: warp_def $3, $1b, 4, ROCK_TUNNEL_B1F warp_def $d, $1b, 1, ROCK_TUNNEL_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 4, 24, SIGNPOST_ITEM, RockTunnel1FHiddenXAccuracy - signpost 15, 21, SIGNPOST_ITEM, RockTunnel1FHiddenXDefend + bg_event 4, 24, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy + bg_event 15, 21, BGEVENT_ITEM, RockTunnel1FHiddenXDefend -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKE_BALL, 18, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER - person_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING + object_event SPRITE_POKE_BALL, 18, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER + object_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 391083470..e4b820d5d 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -4,7 +4,7 @@ const_value set 2 const ROCKTUNNELB1F_POKE_BALL3 RockTunnelB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -34,15 +34,15 @@ RockTunnelB1F_MapEventHeader: warp_def $3, $17, 3, ROCK_TUNNEL_1F warp_def $17, $19, 5, ROCK_TUNNEL_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 14, 4, SIGNPOST_ITEM, RockTunnelB1FHiddenMaxPotion + bg_event 14, 4, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON - person_event SPRITE_POKE_BALL, 17, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP - person_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE + object_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON + object_event SPRITE_POKE_BALL, 17, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP + object_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE diff --git a/maps/Route1.asm b/maps/Route1.asm index a8070b4e5..0f898163c 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -4,30 +4,30 @@ const_value set 2 const ROUTE1_FRUIT_TREE Route1_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerSchoolboyDanny: - trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, SchoolboyDannyScript + trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script -SchoolboyDannyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ac5d7 + writetext SchoolboyDannyAfterBattleText waitbutton closetext end TrainerCooltrainerfQuinn: - trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, CooltrainerfQuinnScript + trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, .Script -CooltrainerfQuinnScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ac640 + writetext CooltrainerfQuinnAfterBattleText waitbutton closetext end @@ -49,7 +49,7 @@ SchoolboyDannyBeatenText: line "losing record…" done -UnknownText_0x1ac5d7: +SchoolboyDannyAfterBattleText: text "For trainers, it's" line "a given that we'll" @@ -66,7 +66,7 @@ CooltrainerfQuinnBeatenText: text "Down and out…" done -UnknownText_0x1ac640: +CooltrainerfQuinnAfterBattleText: text "You're strong." para "You obviously must" @@ -87,15 +87,15 @@ Route1_MapEventHeader: .Warps: db 0 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 27, 7, SIGNPOST_READ, Route1Sign + bg_event 27, 7, BGEVENT_READ, Route1Sign -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_YOUNGSTER, 12, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1 - person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1 - person_event SPRITE_FRUIT_TREE, 7, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1 + object_event SPRITE_YOUNGSTER, 12, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1 + object_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1 + object_event SPRITE_FRUIT_TREE, 7, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1 diff --git a/maps/Route10North.asm b/maps/Route10North.asm index 29b345fed..48aaa4bdc 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -1,5 +1,5 @@ Route10North_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -8,7 +8,7 @@ Route10North_MapScriptHeader: PowerPlantSign: jumptext PowerPlantSignText -Route10PokeCenterSign: +Route10PokecenterSign: jumpstd pokecentersign PowerPlantSignText: @@ -24,13 +24,13 @@ Route10North_MapEventHeader: warp_def $1, $b, 1, ROUTE_10_POKECENTER_1F warp_def $9, $3, 1, POWER_PLANT -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 11, 5, SIGNPOST_READ, PowerPlantSign - signpost 1, 12, SIGNPOST_READ, Route10PokeCenterSign + bg_event 11, 5, BGEVENT_READ, PowerPlantSign + bg_event 1, 12, BGEVENT_READ, Route10PokecenterSign -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/Route10PokeCenter2FBeta.asm b/maps/Route10PokeCenter2FBeta.asm deleted file mode 100644 index a4a4aed6f..000000000 --- a/maps/Route10PokeCenter2FBeta.asm +++ /dev/null @@ -1,23 +0,0 @@ -Route10PokeCenter2FBeta_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -Route10PokeCenter2FBeta_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def $7, $0, 3, ROUTE_10_POKECENTER_1F - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 0 diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10Pokecenter1F.asm index 720421fda..09474c902 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -4,8 +4,8 @@ const_value set 2 const ROUTE10POKECENTER1F_GYM_GUY const ROUTE10POKECENTER1F_COOLTRAINER_F -Route10PokeCenter1F_MapScriptHeader: -.MapTriggers: +Route10Pokecenter1F_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: @@ -14,8 +14,8 @@ Route10PokeCenter1F_MapScriptHeader: NurseScript_0x188bd4: jumpstd pokecenternurse -GentlemanScript_0x188bd7: - jumptextfaceplayer UnknownText_0x188bf1 +Route10Pokecenter1FGentlemanScript: + jumptextfaceplayer Route10Pokecenter1FGentlemanText GymGuyScript_0x188bda: faceplayer @@ -33,10 +33,10 @@ UnknownScript_0x188be8: closetext end -CooltrainerFScript_0x188bee: - jumptextfaceplayer UnknownText_0x188d0c +Route10Pokecenter1FCooltrainerFScript: + jumptextfaceplayer Route10Pokecenter1FCooltrainerFText -UnknownText_0x188bf1: +Route10Pokecenter1FGentlemanText: text "A #MON CENTER" line "near a cave?" @@ -69,7 +69,7 @@ UnknownText_0x188c9e: line "thing about that." done -UnknownText_0x188d0c: +Route10Pokecenter1FCooltrainerFText: text "When you go out-" line "side, you can see" @@ -80,7 +80,7 @@ UnknownText_0x188d0c: line "PLANT." done -Route10PokeCenter1F_MapEventHeader: +Route10Pokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -90,15 +90,15 @@ Route10PokeCenter1F_MapEventHeader: warp_def $7, $4, 1, ROUTE_10_NORTH warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1 - person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x188bd7, -1 - person_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1 - person_event SPRITE_COOLTRAINER_F, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x188bee, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1 + object_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1 + object_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1 + object_event SPRITE_COOLTRAINER_F, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1 diff --git a/maps/Route10Pokecenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm new file mode 100644 index 000000000..047e42c78 --- /dev/null +++ b/maps/Route10Pokecenter2FBeta.asm @@ -0,0 +1,23 @@ +Route10Pokecenter2FBeta_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +Route10Pokecenter2FBeta_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 1 + warp_def $7, $0, 3, ROUTE_10_POKECENTER_1F + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 0 diff --git a/maps/Route10South.asm b/maps/Route10South.asm index a644f1540..ac8c56357 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -3,30 +3,30 @@ const_value set 2 const ROUTE10SOUTH_POKEFAN_M2 Route10South_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerHikerJim: - trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, HikerJimScript + trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script -HikerJimScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ae43b + writetext HikerJimAfterBattleText waitbutton closetext end TrainerPokefanmRobert: - trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, PokefanmRobertScript + trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, .Script -PokefanmRobertScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ae4a9 + writetext PokefanmRobertAfterBattleText waitbutton closetext end @@ -42,7 +42,7 @@ HikerJimBeatenText: text "Hahaha-hachoo!" done -UnknownText_0x1ae43b: +HikerJimAfterBattleText: text "Hay fever is" line "making me sneeze!" cont "Ahahah-CHOO!" @@ -60,7 +60,7 @@ PokefanmRobertBeatenText: line "that's my loss." done -UnknownText_0x1ae4a9: +PokefanmRobertAfterBattleText: text "Look what you did" line "to my #MON…" @@ -83,14 +83,14 @@ Route10South_MapEventHeader: db 1 warp_def $1, $6, 2, ROCK_TUNNEL_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 3, 5, SIGNPOST_READ, Route10Sign + bg_event 3, 5, BGEVENT_READ, Route10Sign -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKEFAN_M, 3, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerJim, -1 - person_event SPRITE_POKEFAN_M, 10, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmRobert, -1 + object_event SPRITE_POKEFAN_M, 3, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1 + object_event SPRITE_POKEFAN_M, 10, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1 diff --git a/maps/Route11.asm b/maps/Route11.asm index 05b19d424..9aa324439 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -6,52 +6,52 @@ const_value set 2 const ROUTE11_FRUIT_TREE Route11_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerYoungsterOwen: - trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, YoungsterOwenScript + trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script -YoungsterOwenScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x680b2 + writetext YoungsterOwenAfterBattleText waitbutton closetext end TrainerYoungsterJason: - trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, YoungsterJasonScript + trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, .Script -YoungsterJasonScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x6814a + writetext YoungsterJasonAfterBattleText waitbutton closetext end TrainerPsychicHerman: - trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, PsychicHermanScript + trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, .Script -PsychicHermanScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x6817b + writetext PsychicHermanAfterBattleText waitbutton closetext end TrainerPsychicFidel: - trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, PsychicFidelScript + trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, .Script -PsychicFidelScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x681ec + writetext PsychicFidelAfterBattleText waitbutton closetext end @@ -79,7 +79,7 @@ YoungsterOwenBeatenText: line "happen?" done -UnknownText_0x680b2: +YoungsterOwenAfterBattleText: text "I fought fair and" line "square with honor." @@ -100,7 +100,7 @@ YoungsterJasonBeatenText: line "I got stomped!" done -UnknownText_0x6814a: +YoungsterJasonAfterBattleText: text "I'm going to catch" line "more #MON in" cont "the grass." @@ -114,7 +114,7 @@ PsychicHermanBeatenText: text "…" done -UnknownText_0x6817b: +PsychicHermanAfterBattleText: text "…" para "I lost while I had" @@ -133,7 +133,7 @@ PsychicFidelBeatenText: line "your power…" done -UnknownText_0x681ec: +PsychicFidelAfterBattleText: text "Strength in con-" line "viction…" @@ -153,18 +153,18 @@ Route11_MapEventHeader: .Warps: db 0 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 7, 3, SIGNPOST_READ, Route11Sign - signpost 5, 32, SIGNPOST_ITEM, Route11HiddenRevive + bg_event 7, 3, BGEVENT_READ, Route11Sign + bg_event 5, 32, BGEVENT_ITEM, Route11HiddenRevive -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_YOUNGSTER, 14, 22, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterOwen, -1 - person_event SPRITE_YOUNGSTER, 4, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterJason, -1 - person_event SPRITE_YOUNGSTER, 7, 28, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerPsychicHerman, -1 - person_event SPRITE_YOUNGSTER, 6, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicFidel, -1 - person_event SPRITE_FRUIT_TREE, 2, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1 + object_event SPRITE_YOUNGSTER, 14, 22, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterOwen, -1 + object_event SPRITE_YOUNGSTER, 4, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1 + object_event SPRITE_YOUNGSTER, 7, 28, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1 + object_event SPRITE_YOUNGSTER, 6, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1 + object_event SPRITE_FRUIT_TREE, 2, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1 diff --git a/maps/Route12.asm b/maps/Route12.asm index 2a1e078f5..3d55a2852 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -7,52 +7,52 @@ const_value set 2 const ROUTE12_POKE_BALL2 Route12_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerFisherKyle: - trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, FisherKyleScript + trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script -FisherKyleScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a7238 + writetext FisherKyleAfterBattleText waitbutton closetext end TrainerFisherMartin: - trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, FisherMartinScript + trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, .Script -FisherMartinScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a704c + writetext FisherMartinAfterBattleText waitbutton closetext end TrainerFisherStephen: - trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, FisherStephenScript + trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, .Script -FisherStephenScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a70d4 + writetext FisherStephenAfterBattleText waitbutton closetext end TrainerFisherBarney: - trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, FisherBarneyScript + trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, .Script -FisherBarneyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a716d + writetext FisherBarneyAfterBattleText waitbutton closetext end @@ -83,7 +83,7 @@ FisherMartinBeatenText: text "Gwaaah!" done -UnknownText_0x1a704c: +FisherMartinAfterBattleText: text "I'm too impatient" line "for fishing…" done @@ -100,7 +100,7 @@ FisherStephenBeatenText: line "distracted me!" done -UnknownText_0x1a70d4: +FisherStephenAfterBattleText: text "Have you checked" line "out KANTO's radio" @@ -119,7 +119,7 @@ FisherBarneyBeatenText: line "coming up next!" done -UnknownText_0x1a716d: +FisherBarneyAfterBattleText: text "I think electric-" line "ity is the most" @@ -144,7 +144,7 @@ FisherKyleBeatenText: text "You do remember?" done -UnknownText_0x1a7238: +FisherKyleAfterBattleText: text "The tug you feel" line "on the ROD when" @@ -175,20 +175,20 @@ Route12_MapEventHeader: db 1 warp_def $21, $b, 1, ROUTE_12_SUPER_ROD_HOUSE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 27, 11, SIGNPOST_READ, Route12Sign - signpost 9, 13, SIGNPOST_READ, FishingSpotSign - signpost 13, 14, SIGNPOST_ITEM, Route12HiddenElixer + bg_event 27, 11, BGEVENT_READ, Route12Sign + bg_event 9, 13, BGEVENT_READ, FishingSpotSign + bg_event 13, 14, BGEVENT_ITEM, Route12HiddenElixer -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_FISHER, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherMartin, -1 - person_event SPRITE_FISHER, 23, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherStephen, -1 - person_event SPRITE_FISHER, 38, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 5, TrainerFisherBarney, -1 - person_event SPRITE_FISHER, 7, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherKyle, -1 - person_event SPRITE_POKE_BALL, 43, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM - person_event SPRITE_POKE_BALL, 51, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET + object_event SPRITE_FISHER, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherMartin, -1 + object_event SPRITE_FISHER, 23, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherStephen, -1 + object_event SPRITE_FISHER, 38, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerFisherBarney, -1 + object_event SPRITE_FISHER, 7, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherKyle, -1 + object_event SPRITE_POKE_BALL, 43, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM + object_event SPRITE_POKE_BALL, 51, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index f19594e20..a349641e0 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE12SUPERRODHOUSE_FISHING_GURU Route12SuperRodHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -88,12 +88,12 @@ Route12SuperRodHouse_MapEventHeader: warp_def $7, $2, 1, ROUTE_12 warp_def $7, $3, 1, ROUTE_12 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1 + object_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1 diff --git a/maps/Route13.asm b/maps/Route13.asm index 79e035aa6..7ea3738fd 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -6,63 +6,63 @@ const_value set 2 const ROUTE13_POKEFAN_M3 Route13_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerPokefanmAlex: - trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, PokefanmAlexScript + trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script -PokefanmAlexScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a24e3 + writetext PokefanmAlexAfterBattleText waitbutton closetext end TrainerPokefanmJoshua: - trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, PokefanmJoshuaScript + trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, .Script -PokefanmJoshuaScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a254f + writetext PokefanmJoshuaAfterBattleText waitbutton closetext end TrainerBird_keeperPerry: - trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, 0, Bird_keeperPerryScript + trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, 0, .Script -Bird_keeperPerryScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a25db + writetext Bird_keeperPerryAfterBattleText waitbutton closetext end TrainerBird_keeperBret: - trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, 0, Bird_keeperBretScript + trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, 0, .Script -Bird_keeperBretScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a2662 + writetext Bird_keeperBretAfterBattleText waitbutton closetext end TrainerHikerKenny: - trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, HikerKennyScript + trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, .Script -HikerKennyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a26c2 + writetext HikerKennyAfterBattleText waitbutton closetext end @@ -90,7 +90,7 @@ PokefanmAlexBeatenText: line "mock royalty!" done -UnknownText_0x1a24e3: +PokefanmAlexAfterBattleText: text "Doesn't everyone" line "wish to someday be" cont "a king?" @@ -106,7 +106,7 @@ PokefanmJoshuaBeatenText: text "PI-PIKACHU!" done -UnknownText_0x1a254f: +PokefanmJoshuaAfterBattleText: text "You look like you" line "have many #MON," @@ -125,7 +125,7 @@ Bird_keeperPerryBeatenText: line "your speed…" done -UnknownText_0x1a25db: +Bird_keeperPerryAfterBattleText: text "Your #MON are" line "remarkably well-" cont "trained." @@ -144,7 +144,7 @@ Bird_keeperBretBeatenText: line "Not good enough!" done -UnknownText_0x1a2662: +Bird_keeperBretAfterBattleText: text "If you groom them," line "#MON get happy." done @@ -159,7 +159,7 @@ HikerKennyBeatenText: text "I lost…" done -UnknownText_0x1a26c2: +HikerKennyAfterBattleText: text "Geological fea-" line "tures don't appear" cont "to change." @@ -199,20 +199,20 @@ Route13_MapEventHeader: .Warps: db 0 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 13, 29, SIGNPOST_READ, Route13TrainerTips - signpost 11, 41, SIGNPOST_READ, Route13Sign - signpost 13, 17, SIGNPOST_READ, Route13DirectionsSign - signpost 13, 30, SIGNPOST_ITEM, Route13HiddenCalcium + bg_event 13, 29, BGEVENT_READ, Route13TrainerTips + bg_event 11, 41, BGEVENT_READ, Route13Sign + bg_event 13, 17, BGEVENT_READ, Route13DirectionsSign + bg_event 13, 30, BGEVENT_ITEM, Route13HiddenCalcium -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_YOUNGSTER, 6, 42, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerBird_keeperPerry, -1 - person_event SPRITE_YOUNGSTER, 6, 43, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerBird_keeperBret, -1 - person_event SPRITE_POKEFAN_M, 8, 32, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1 - person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerHikerKenny, -1 - person_event SPRITE_POKEFAN_M, 6, 25, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanmAlex, -1 + object_event SPRITE_YOUNGSTER, 6, 42, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBird_keeperPerry, -1 + object_event SPRITE_YOUNGSTER, 6, 43, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBird_keeperBret, -1 + object_event SPRITE_POKEFAN_M, 8, 32, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1 + object_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerHikerKenny, -1 + object_event SPRITE_POKEFAN_M, 6, 25, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmAlex, -1 diff --git a/maps/Route14.asm b/maps/Route14.asm index fabb3af5c..ba9a510af 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -5,7 +5,7 @@ const_value set 2 const ROUTE14_KIM Route14_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -14,40 +14,40 @@ Route14_MapScriptHeader: Kim: faceplayer opentext - trade $5 + trade NPCTRADE_KIM waitbutton closetext end TrainerPokefanmCarter: - trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, PokefanmCarterScript + trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, .Script -PokefanmCarterScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ad508 + writetext PokefanmCarterAfterBattleText waitbutton closetext end TrainerBird_keeperRoy: - trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, 0, Bird_keeperRoyScript + trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, 0, .Script -Bird_keeperRoyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ad5a4 + writetext Bird_keeperRoyAfterBattleText waitbutton closetext end TrainerPokefanmTrevor: - trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, PokefanmTrevorScript + trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, .Script -PokefanmTrevorScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ad660 + writetext PokefanmTrevorAfterBattleText waitbutton closetext end @@ -64,7 +64,7 @@ PokefanmCarterBeatenText: text "Awaaah!" done -UnknownText_0x1ad508: +PokefanmCarterAfterBattleText: text "SQUIRTLE, CHARMAN-" line "DER and BULBASAUR…" @@ -83,7 +83,7 @@ Bird_keeperRoyBeatenText: line "can't ever fly…" done -UnknownText_0x1ad5a4: +Bird_keeperRoyAfterBattleText: text "You have #MON" line "that know the HM" @@ -107,7 +107,7 @@ PokefanmTrevorBeatenText: line "this PSYDUCK?" done -UnknownText_0x1ad660: +PokefanmTrevorAfterBattleText: text "If only there were" line "an easy way to" @@ -122,15 +122,15 @@ Route14_MapEventHeader: .Warps: db 0 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_POKEFAN_M, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmCarter, -1 - person_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperRoy, -1 - person_event SPRITE_POKEFAN_M, 11, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1 - person_event SPRITE_TEACHER, 5, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 4, Kim, -1 + object_event SPRITE_POKEFAN_M, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmCarter, -1 + object_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperRoy, -1 + object_event SPRITE_POKEFAN_M, 11, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1 + object_event SPRITE_TEACHER, 5, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 4, Kim, -1 diff --git a/maps/Route15.asm b/maps/Route15.asm index 50406872e..8eb5bbb84 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -8,74 +8,74 @@ const_value set 2 const ROUTE15_POKE_BALL Route15_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerTeacherColette: - trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, TeacherColetteScript + trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script -TeacherColetteScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1aa60d + writetext TeacherColetteAfterBattleText waitbutton closetext end TrainerTeacherHillary: - trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, TeacherHillaryScript + trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, .Script -TeacherHillaryScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1aa6ca + writetext TeacherHillaryAfterBattleText waitbutton closetext end TrainerSchoolboyKipp: - trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, SchoolboyKippScript + trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, .Script -SchoolboyKippScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1aa740 + writetext SchoolboyKippAfterBattleText waitbutton closetext end TrainerSchoolboyTommy: - trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, SchoolboyTommyScript + trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, .Script -SchoolboyTommyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1aa7bc + writetext SchoolboyTommyAfterBattleText waitbutton closetext end TrainerSchoolboyJohnny: - trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, SchoolboyJohnnyScript + trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, .Script -SchoolboyJohnnyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1aa84a + writetext SchoolboyJohnnyAfterBattleText waitbutton closetext end TrainerSchoolboyBilly: - trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, SchoolboyBillyScript + trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, .Script -SchoolboyBillyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1aa8b0 + writetext SchoolboyBillyAfterBattleText waitbutton closetext end @@ -95,7 +95,7 @@ TeacherColetteBeatenText: text "Kyaaah!" done -UnknownText_0x1aa60d: +TeacherColetteAfterBattleText: text "Before I became a" line "teacher, I used to" @@ -119,7 +119,7 @@ TeacherHillaryBeatenText: line "lose…" done -UnknownText_0x1aa6ca: +TeacherHillaryAfterBattleText: text "Studying is impor-" line "tant, but exercise" cont "is just as vital." @@ -135,7 +135,7 @@ SchoolboyKippBeatenText: line "I was beaten!" done -UnknownText_0x1aa740: +SchoolboyKippAfterBattleText: text "My mom worries so" line "much about me, I" @@ -153,7 +153,7 @@ SchoolboyTommyBeatenText: line "homework!" done -UnknownText_0x1aa7bc: +SchoolboyTommyAfterBattleText: text "Sayonara! I just" line "learned that in my" cont "Japanese class." @@ -172,7 +172,7 @@ SchoolboyJohnnyBeatenText: line "tough!" done -UnknownText_0x1aa84a: +SchoolboyJohnnyAfterBattleText: text "I'm tired of walk-" line "ing. I need to" cont "take a break." @@ -188,7 +188,7 @@ SchoolboyBillyBeatenText: line "How could I lose?" done -UnknownText_0x1aa8b0: +SchoolboyBillyAfterBattleText: text "If #MON were a" line "subject at school," cont "I'd be the best!" @@ -210,19 +210,19 @@ Route15_MapEventHeader: warp_def $4, $2, 3, ROUTE_15_FUCHSIA_GATE warp_def $5, $2, 4, ROUTE_15_FUCHSIA_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 9, 19, SIGNPOST_READ, Route15Sign + bg_event 9, 19, BGEVENT_READ, Route15Sign -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_YOUNGSTER, 10, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSchoolboyKipp, -1 - person_event SPRITE_YOUNGSTER, 13, 15, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyTommy, -1 - person_event SPRITE_YOUNGSTER, 10, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyJohnny, -1 - person_event SPRITE_YOUNGSTER, 10, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1 - person_event SPRITE_TEACHER, 12, 30, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerTeacherColette, -1 - person_event SPRITE_TEACHER, 10, 20, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerTeacherHillary, -1 - person_event SPRITE_POKE_BALL, 5, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP + object_event SPRITE_YOUNGSTER, 10, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyKipp, -1 + object_event SPRITE_YOUNGSTER, 13, 15, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyTommy, -1 + object_event SPRITE_YOUNGSTER, 10, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJohnny, -1 + object_event SPRITE_YOUNGSTER, 10, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1 + object_event SPRITE_TEACHER, 12, 30, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerTeacherColette, -1 + object_event SPRITE_TEACHER, 10, 20, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherHillary, -1 + object_event SPRITE_POKE_BALL, 5, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 00ba666bb..f78fab3ae 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -2,16 +2,16 @@ const_value set 2 const ROUTE15FUCHSIAGATE_OFFICER Route15FuchsiaGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -OfficerScript_0x19679e: - jumptextfaceplayer UnknownText_0x1967a1 +Route15FuchsiaGateOfficerScript: + jumptextfaceplayer Route15FuchsiaGateOfficerText -UnknownText_0x1967a1: +Route15FuchsiaGateOfficerText: text "You're working on" line "a #DEX? That's" @@ -30,12 +30,12 @@ Route15FuchsiaGate_MapEventHeader: warp_def $4, $9, 1, ROUTE_15 warp_def $5, $9, 2, ROUTE_15 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19679e, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1 diff --git a/maps/Route16.asm b/maps/Route16.asm index 4d9c02ece..abbd7d7e2 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -1,23 +1,20 @@ Route16_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 + dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike - ; callbacks - - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x1ad318 - -UnknownScript_0x1ad318: +.AlwaysOnBike: checkcode VAR_YCOORD - if_less_than $5, UnknownScript_0x1ad328 + if_less_than $5, .CanWalk checkcode VAR_XCOORD - if_greater_than $d, UnknownScript_0x1ad328 + if_greater_than $d, .CanWalk setflag ENGINE_ALWAYS_ON_BIKE return -UnknownScript_0x1ad328: +.CanWalk: clearflag ENGINE_ALWAYS_ON_BIKE return @@ -43,12 +40,12 @@ Route16_MapEventHeader: warp_def $6, $9, 1, ROUTE_16_GATE warp_def $7, $9, 2, ROUTE_16_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 5, 5, SIGNPOST_READ, CyclingRoadSign + bg_event 5, 5, BGEVENT_READ, CyclingRoadSign -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 76cc7fa15..4b3164b23 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -2,19 +2,19 @@ const_value set 2 const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD Route16FuchsiaSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -SuperNerdScript_0x73373: - jumptextfaceplayer UnknownText_0x73379 +Route16FuchsiaSpeechHouseSuperNerdScript: + jumptextfaceplayer Route16FuchsiaSpeechHouseSuperNerdText Route16FuchsiaSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x73379: +Route16FuchsiaSpeechHouseSuperNerdText: text "If you cruise down" line "CYCLING ROAD, you" @@ -31,14 +31,14 @@ Route16FuchsiaSpeechHouse_MapEventHeader: warp_def $7, $2, 1, ROUTE_16 warp_def $7, $3, 1, ROUTE_16 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, Route16FuchsiaSpeechHouseBookshelf - signpost 1, 1, SIGNPOST_READ, Route16FuchsiaSpeechHouseBookshelf + bg_event 1, 0, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x73373, -1 + object_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index e1ed8c714..3ce10b391 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -2,20 +2,18 @@ const_value set 2 const ROUTE16GATE_OFFICER Route16Gate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - - ; triggers - dw UnknownScript_0x733e9, 0 + scene_script .DummyScene .MapCallbacks: db 0 -UnknownScript_0x733e9: +.DummyScene: end -OfficerScript_0x733ea: - jumptextfaceplayer UnknownText_0x73408 +Route16GateOfficerScript: + jumptextfaceplayer Route16GateOfficerText UnknownScript_0x733ed: checkitem BICYCLE @@ -37,7 +35,7 @@ MovementData_0x73405: turn_head LEFT step_end -UnknownText_0x73408: +Route16GateOfficerText: text "CYCLING ROAD" line "starts here." @@ -73,14 +71,14 @@ Route16Gate_MapEventHeader: warp_def $4, $9, 2, ROUTE_16 warp_def $5, $9, 3, ROUTE_16 -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $4, $5, $0, UnknownScript_0x733ed, $0, $0 - xy_trigger 0, $5, $5, $0, UnknownScript_0x733ed, $0, $0 + coord_event 0, $4, $5, UnknownScript_0x733ed + coord_event 0, $5, $5, UnknownScript_0x733ed -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x733ea, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1 diff --git a/maps/Route17.asm b/maps/Route17.asm index b01ce1ddc..147e5238c 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -5,61 +5,58 @@ const_value set 2 const ROUTE17_BIKER4 Route17_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 + dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike - ; callbacks - - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x1ad0ab - -UnknownScript_0x1ad0ab: +.AlwaysOnBike: setflag ENGINE_ALWAYS_ON_BIKE setflag ENGINE_DOWNHILL return TrainerBikerCharles: - trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, BikerCharlesScript + trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script -BikerCharlesScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ad293 + writetext BikerCharlesAfterBattleText waitbutton closetext end TrainerBikerRiley: - trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, BikerRileyScript + trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, .Script -BikerRileyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ad13b + writetext BikerRileyAfterBattleText waitbutton closetext end TrainerBikerJoel: - trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, BikerJoelScript + trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, .Script -BikerJoelScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ad196 + writetext BikerJoelAfterBattleText waitbutton closetext end TrainerBikerGlenn: - trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, BikerGlennScript + trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, .Script -BikerGlennScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ad225 + writetext BikerGlennAfterBattleText waitbutton closetext end @@ -81,7 +78,7 @@ BikerRileyBeatenText: text "Whoa, you kick!" done -UnknownText_0x1ad13b: +BikerRileyAfterBattleText: text "Don't get cocky," line "you JOHTO punk!" done @@ -96,7 +93,7 @@ BikerJoelBeatenText: line "look cool…" done -UnknownText_0x1ad196: +BikerJoelAfterBattleText: text "I look cool, but" line "I'm weak, so I'm" cont "not really cool." @@ -115,7 +112,7 @@ BikerGlennBeatenText: line "awesome torque!" done -UnknownText_0x1ad225: +BikerGlennAfterBattleText: text "Hands-free riding" line "is considered cool" cont "on CYCLING ROAD." @@ -131,7 +128,7 @@ BikerCharlesBeatenText: line "burn!" done -UnknownText_0x1ad293: +BikerCharlesAfterBattleText: text "Reckless driving" line "causes accidents!" cont "Take it easy!" @@ -146,17 +143,17 @@ Route17_MapEventHeader: warp_def $52, $11, 1, ROUTE_17_18_GATE warp_def $53, $11, 2, ROUTE_17_18_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 54, 9, SIGNPOST_ITEM, Route17HiddenMaxEther - signpost 77, 8, SIGNPOST_ITEM, Route17HiddenMaxElixer + bg_event 54, 9, BGEVENT_ITEM, Route17HiddenMaxEther + bg_event 77, 8, BGEVENT_ITEM, Route17HiddenMaxElixer -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_BIKER, 17, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 4, TrainerBikerRiley, -1 - person_event SPRITE_BIKER, 68, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerBikerJoel, -1 - person_event SPRITE_BIKER, 53, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBikerGlenn, -1 - person_event SPRITE_BIKER, 80, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 4, TrainerBikerCharles, -1 + object_event SPRITE_BIKER, 17, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerRiley, -1 + object_event SPRITE_BIKER, 68, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBikerJoel, -1 + object_event SPRITE_BIKER, 53, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBikerGlenn, -1 + object_event SPRITE_BIKER, 80, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerCharles, -1 diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index e1650702b..610362396 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -2,20 +2,18 @@ const_value set 2 const ROUTE1718GATE_OFFICER Route1718Gate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - - ; triggers - dw UnknownScript_0x7360d, 0 + scene_script .DummyScene .MapCallbacks: db 0 -UnknownScript_0x7360d: +.DummyScene: end -OfficerScript_0x7360e: - jumptextfaceplayer UnknownText_0x7362c +Route1718GateOfficerScript: + jumptextfaceplayer Route1718GateOfficerText UnknownScript_0x73611: checkitem BICYCLE @@ -37,7 +35,7 @@ MovementData_0x73629: turn_head LEFT step_end -UnknownText_0x7362c: +Route1718GateOfficerText: text "CYCLING ROAD" line "Uphill Starts Here" done @@ -64,14 +62,14 @@ Route1718Gate_MapEventHeader: warp_def $4, $9, 1, ROUTE_18 warp_def $5, $9, 2, ROUTE_18 -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $4, $5, $0, UnknownScript_0x73611, $0, $0 - xy_trigger 0, $5, $5, $0, UnknownScript_0x73611, $0, $0 + coord_event 0, $4, $5, UnknownScript_0x73611 + coord_event 0, $5, $5, UnknownScript_0x73611 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7360e, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route1718GateOfficerScript, -1 diff --git a/maps/Route18.asm b/maps/Route18.asm index 6c28da07e..aaa2ce6cf 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -3,30 +3,30 @@ const_value set 2 const ROUTE18_YOUNGSTER2 Route18_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerBird_keeperBoris: - trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, 0, Bird_keeperBorisScript + trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, 0, .Script -Bird_keeperBorisScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1acfa5 + writetext Bird_keeperBorisAfterBattleText waitbutton closetext end TrainerBird_keeperBob: - trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, 0, Bird_keeperBobScript + trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, 0, .Script -Bird_keeperBobScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ad00d + writetext Bird_keeperBobAfterBattleText waitbutton closetext end @@ -46,7 +46,7 @@ Bird_keeperBorisBeatenText: text "Ayieee!" done -UnknownText_0x1acfa5: +Bird_keeperBorisAfterBattleText: text "Since you're so" line "strong, it must be" cont "fun to battle." @@ -62,7 +62,7 @@ Bird_keeperBobBeatenText: text "…Whew!" done -UnknownText_0x1ad00d: +Bird_keeperBobAfterBattleText: text "If you don't have" line "a BICYCLE, you're" @@ -86,14 +86,14 @@ Route18_MapEventHeader: warp_def $6, $2, 3, ROUTE_17_18_GATE warp_def $7, $2, 4, ROUTE_17_18_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 5, 9, SIGNPOST_READ, Route18Sign + bg_event 5, 9, BGEVENT_READ, Route18Sign -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_YOUNGSTER, 12, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperBoris, -1 - person_event SPRITE_YOUNGSTER, 6, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperBob, -1 + object_event SPRITE_YOUNGSTER, 12, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperBoris, -1 + object_event SPRITE_YOUNGSTER, 6, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperBob, -1 diff --git a/maps/Route19.asm b/maps/Route19.asm index d414459a0..e0e62a5b8 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -7,14 +7,11 @@ const_value set 2 const ROUTE19_FISHER2 Route19_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .ClearRocks .ClearRocks: @@ -30,45 +27,45 @@ Route19_MapScriptHeader: return TrainerSwimmerfDawn: - trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, SwimmerfDawnScript + trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script -SwimmerfDawnScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19ebad + writetext SwimmerfDawnAfterBattleText waitbutton closetext end TrainerSwimmermHarold: - trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, SwimmermHaroldScript + trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, .Script -SwimmermHaroldScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19eab4 + writetext SwimmermHaroldAfterBattleText waitbutton closetext end TrainerSwimmermJerome: - trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, SwimmermJeromeScript + trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, .Script -SwimmermJeromeScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19ec7e + writetext SwimmermJeromeAfterBattleText waitbutton closetext end TrainerSwimmermTucker: - trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, SwimmermTuckerScript + trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, .Script -SwimmermTuckerScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19eb3b + writetext SwimmermTuckerAfterBattleText waitbutton closetext end @@ -121,7 +118,7 @@ SwimmermHaroldBeatenText: text "Glub…" done -UnknownText_0x19eab4: +SwimmermHaroldAfterBattleText: text "At night, the sea" line "turns black. It" @@ -141,7 +138,7 @@ SwimmermTuckerBeatenText: text "I'm drowning!" done -UnknownText_0x19eb3b: +SwimmermTuckerAfterBattleText: text "I… asked my girl-" line "friend to swim to" cont "FUCHSIA… Gasp…" @@ -157,7 +154,7 @@ SwimmerfDawnBeatenText: line "at swimming…" done -UnknownText_0x19ebad: +SwimmerfDawnAfterBattleText: text "It's a quick swim" line "between FUCHSIA" @@ -184,7 +181,7 @@ SwimmermJeromeBeatenText: line "win." done -UnknownText_0x19ec7e: +SwimmermJeromeAfterBattleText: text "I might be bad at" line "swimming, but I" cont "love the sea." @@ -245,19 +242,19 @@ Route19_MapEventHeader: db 1 warp_def $3, $7, 3, ROUTE_19___FUCHSIA_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 13, 11, SIGNPOST_READ, Route19Sign - signpost 1, 11, SIGNPOST_READ, CarefulSwimmingSign + bg_event 13, 11, BGEVENT_READ, Route19Sign + bg_event 1, 11, BGEVENT_READ, CarefulSwimmingSign -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_SWIMMER_GIRL, 23, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1 - person_event SPRITE_SWIMMER_GUY, 28, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermHarold, -1 - person_event SPRITE_SWIMMER_GUY, 17, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermJerome, -1 - person_event SPRITE_SWIMMER_GUY, 23, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, TrainerSwimmermTucker, -1 - person_event SPRITE_FISHER, 5, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 1, FisherScript_0x19ea4d, -1 - person_event SPRITE_FISHER, 5, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 1, FisherScript_0x19ea61, -1 + object_event SPRITE_SWIMMER_GIRL, 23, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1 + object_event SPRITE_SWIMMER_GUY, 28, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermHarold, -1 + object_event SPRITE_SWIMMER_GUY, 17, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermJerome, -1 + object_event SPRITE_SWIMMER_GUY, 23, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerSwimmermTucker, -1 + object_event SPRITE_FISHER, 5, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea4d, -1 + object_event SPRITE_FISHER, 5, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea61, -1 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index fcdbc9be1..5bbf83c8c 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE19FUCHSIAGATE_OFFICER Route19FuchsiaGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -56,12 +56,12 @@ Route19FuchsiaGate_MapEventHeader: warp_def $7, $4, 1, ROUTE_19 warp_def $7, $5, 1, ROUTE_19 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1 + object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1 diff --git a/maps/Route2.asm b/maps/Route2.asm index 6b7a0e8ec..80f703b16 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -9,41 +9,41 @@ const_value set 2 const ROUTE2_FRUIT_TREE Route2_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerBug_catcherRob: - trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, 0, Bug_catcherRobScript + trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, 0, .Script -Bug_catcherRobScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ac34d + writetext Bug_catcherRobAfterBattleText waitbutton closetext end TrainerBug_catcherEd: - trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, 0, Bug_catcherEdScript + trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, 0, .Script -Bug_catcherEdScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ac3cf + writetext Bug_catcherEdAfterBattleText waitbutton closetext end TrainerBug_catcherDoug: - trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, 0, Bug_catcherDougScript + trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, 0, .Script -Bug_catcherDougScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ac423 + writetext Bug_catcherDougAfterBattleText waitbutton closetext end @@ -91,7 +91,7 @@ Bug_catcherRobBeatenText: text "I was whipped…" done -UnknownText_0x1ac34d: +Bug_catcherRobAfterBattleText: text "I'm going to look" line "for stronger bug" cont "#MON." @@ -109,7 +109,7 @@ Bug_catcherEdBeatenText: text "Ouch, ouch, ouch!" done -UnknownText_0x1ac3cf: +Bug_catcherEdAfterBattleText: text "They'll really" line "sting when you" cont "take a bath." @@ -124,7 +124,7 @@ Bug_catcherDougBeatenText: text "No good!" done -UnknownText_0x1ac423: +Bug_catcherDougAfterBattleText: text "Bug #MON squish" line "like plush toys" @@ -158,25 +158,25 @@ Route2_MapEventHeader: warp_def $1b, $11, 2, ROUTE_2_GATE warp_def $7, $c, 3, DIGLETTS_CAVE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 51, 7, SIGNPOST_READ, Route2Sign - signpost 9, 11, SIGNPOST_READ, MapRoute2Signpost1Script - signpost 23, 7, SIGNPOST_ITEM, Route2HiddenMaxEther - signpost 14, 4, SIGNPOST_ITEM, Route2HiddenFullHeal - signpost 27, 4, SIGNPOST_ITEM, Route2HiddenFullRestore - signpost 30, 11, SIGNPOST_ITEM, Route2HiddenRevive - -.PersonEvents: + bg_event 51, 7, BGEVENT_READ, Route2Sign + bg_event 9, 11, BGEVENT_READ, MapRoute2Signpost1Script + bg_event 23, 7, BGEVENT_ITEM, Route2HiddenMaxEther + bg_event 14, 4, BGEVENT_ITEM, Route2HiddenFullHeal + bg_event 27, 4, BGEVENT_ITEM, Route2HiddenFullRestore + bg_event 30, 11, BGEVENT_ITEM, Route2HiddenRevive + +.ObjectEvents: db 8 - person_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 5, TrainerBug_catcherRob, -1 - person_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherEd, -1 - person_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherDoug, -1 - person_event SPRITE_POKE_BALL, 29, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT - person_event SPRITE_POKE_BALL, 23, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION - person_event SPRITE_POKE_BALL, 2, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS - person_event SPRITE_POKE_BALL, 50, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER - person_event SPRITE_FRUIT_TREE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1 + object_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBug_catcherRob, -1 + object_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherEd, -1 + object_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherDoug, -1 + object_event SPRITE_POKE_BALL, 29, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT + object_event SPRITE_POKE_BALL, 23, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION + object_event SPRITE_POKE_BALL, 2, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS + object_event SPRITE_POKE_BALL, 50, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER + object_event SPRITE_FRUIT_TREE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1 diff --git a/maps/Route20.asm b/maps/Route20.asm index 3355026dd..1bdac9b3c 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -4,14 +4,11 @@ const_value set 2 const ROUTE20_SWIMMER_GUY Route20_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .ClearRocks .ClearRocks: @@ -19,34 +16,34 @@ Route20_MapScriptHeader: return TrainerSwimmerfNicole: - trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, SwimmerfNicoleScript + trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script -SwimmerfNicoleScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1acd93 + writetext SwimmerfNicoleAfterBattleText waitbutton closetext end TrainerSwimmerfLori: - trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, SwimmerfLoriScript + trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, .Script -SwimmerfLoriScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ace15 + writetext SwimmerfLoriAfterBattleText waitbutton closetext end TrainerSwimmermCameron: - trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, SwimmermCameronScript + trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, .Script -SwimmermCameronScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ace8b + writetext SwimmermCameronAfterBattleText waitbutton closetext end @@ -63,7 +60,7 @@ SwimmerfNicoleBeatenText: text "Oh, no!" done -UnknownText_0x1acd93: +SwimmerfNicoleAfterBattleText: text "Swimming exercises" line "your full body." @@ -83,7 +80,7 @@ SwimmerfLoriBeatenText: text "No!" done -UnknownText_0x1ace15: +SwimmerfLoriAfterBattleText: text "SURF is no longer" line "the only HM move" cont "you use in water." @@ -101,7 +98,7 @@ SwimmermCameronBeatenText: text "Aiyah!" done -UnknownText_0x1ace8b: +SwimmermCameronAfterBattleText: text "Besides the sea, I" line "can also swim in" cont "ponds and rivers." @@ -123,15 +120,15 @@ Route20_MapEventHeader: db 1 warp_def $7, $26, 1, SEAFOAM_GYM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 11, 37, SIGNPOST_READ, CinnabarGymSign + bg_event 11, 37, BGEVENT_READ, CinnabarGymSign -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_SWIMMER_GIRL, 8, 52, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1 - person_event SPRITE_SWIMMER_GIRL, 13, 45, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfLori, -1 - person_event SPRITE_SWIMMER_GUY, 13, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermCameron, -1 + object_event SPRITE_SWIMMER_GIRL, 8, 52, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1 + object_event SPRITE_SWIMMER_GIRL, 13, 45, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfLori, -1 + object_event SPRITE_SWIMMER_GUY, 13, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCameron, -1 diff --git a/maps/Route21.asm b/maps/Route21.asm index bb3a2cb59..b68c3c27b 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -4,41 +4,41 @@ const_value set 2 const ROUTE21_FISHER Route21_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerSwimmermSeth: - trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, SwimmermSethScript + trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script -SwimmermSethScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ac873 + writetext SwimmermSethAfterBattleText waitbutton closetext end TrainerSwimmerfNikki: - trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, SwimmerfNikkiScript + trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, .Script -SwimmerfNikkiScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ac8f1 + writetext SwimmerfNikkiAfterBattleText waitbutton closetext end TrainerFisherArnold: - trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, FisherArnoldScript + trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, .Script -FisherArnoldScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ac95c + writetext FisherArnoldAfterBattleText waitbutton closetext end @@ -52,7 +52,7 @@ SwimmermSethBeatenText: text "Glug…" done -UnknownText_0x1ac873: +SwimmermSethAfterBattleText: text "This arrogant guy" line "was at CINNABAR's" cont "volcano." @@ -69,7 +69,7 @@ SwimmerfNikkiBeatenText: line "sunburn…" done -UnknownText_0x1ac8f1: +SwimmerfNikkiAfterBattleText: text "I have to watch" line "out for blemishes" cont "caused by the sun." @@ -84,7 +84,7 @@ FisherArnoldBeatenText: text "Utter failure…" done -UnknownText_0x1ac95c: +FisherArnoldAfterBattleText: text "I'll just go back" line "to fishing…" done @@ -96,14 +96,14 @@ Route21_MapEventHeader: .Warps: db 0 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_SWIMMER_GIRL, 16, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfNikki, -1 - person_event SPRITE_SWIMMER_GUY, 30, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerSwimmermSeth, -1 - person_event SPRITE_FISHER, 22, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherArnold, -1 + object_event SPRITE_SWIMMER_GIRL, 16, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNikki, -1 + object_event SPRITE_SWIMMER_GUY, 30, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSeth, -1 + object_event SPRITE_FISHER, 22, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherArnold, -1 diff --git a/maps/Route22.asm b/maps/Route22.asm index 9735a09e1..8e349ec34 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -1,5 +1,5 @@ Route22_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -23,12 +23,12 @@ Route22_MapEventHeader: db 1 warp_def $5, $d, 1, VICTORY_ROAD_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 7, 15, SIGNPOST_READ, VictoryRoadEntranceSign + bg_event 7, 15, BGEVENT_READ, VictoryRoadEntranceSign -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/Route23.asm b/maps/Route23.asm index a8bd39b5e..1c0e2aa8e 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -1,11 +1,9 @@ Route23_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -35,12 +33,12 @@ Route23_MapEventHeader: warp_def $d, $9, 10, VICTORY_ROAD warp_def $d, $a, 10, VICTORY_ROAD -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 7, 11, SIGNPOST_READ, IndigoPlateauSign + bg_event 7, 11, BGEVENT_READ, IndigoPlateauSign -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/Route24.asm b/maps/Route24.asm index 365d347e5..5a98bb650 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE24_ROCKET Route24_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -125,12 +125,12 @@ Route24_MapEventHeader: .Warps: db 0 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_ROCKET, 7, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET + object_event SPRITE_ROCKET, 7, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET diff --git a/maps/Route25.asm b/maps/Route25.asm index f49c4c3d4..ca6576771 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -12,20 +12,18 @@ const_value set 2 const ROUTE25_POKE_BALL Route25_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x19ee9e, 0 - dw UnknownScript_0x19ee9f, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -UnknownScript_0x19ee9e: +.DummyScene0: end -UnknownScript_0x19ee9f: +.DummyScene1: end UnknownScript_0x19eea0: @@ -50,7 +48,7 @@ UnknownScript_0x19eea0: applymovement ROUTE25_MISTY, MovementData_0x19f000 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM - dotrigger $0 + setscene $0 special RestartMapMusic end @@ -76,83 +74,83 @@ UnknownScript_0x19eee0: applymovement ROUTE25_MISTY, MovementData_0x19f000 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM - dotrigger $0 + setscene $0 special RestartMapMusic end TrainerSchoolboyDudley: - trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, SchoolboyDudleyScript + trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, .Script -SchoolboyDudleyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19f1b5 + writetext SchoolboyDudleyAfterBattleText waitbutton closetext end TrainerLassEllen: - trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, LassEllenScript + trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, .Script -LassEllenScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19f208 + writetext LassEllenAfterBattleText waitbutton closetext end TrainerSchoolboyJoe: - trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, SchoolboyJoeScript + trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, .Script -SchoolboyJoeScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19f25c + writetext SchoolboyJoeAfterBattleText waitbutton closetext end TrainerLassLaura: - trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, LassLauraScript + trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, .Script -LassLauraScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19f2a6 + writetext LassLauraAfterBattleText waitbutton closetext end TrainerCamperLloyd: - trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, CamperLloydScript + trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, .Script -CamperLloydScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19f2f8 + writetext CamperLloydAfterBattleText waitbutton closetext end TrainerLassShannon: - trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, LassShannonScript + trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, .Script -LassShannonScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19f35b + writetext LassShannonAfterBattleText waitbutton closetext end TrainerSupernerdPat: - trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, SupernerdPatScript + trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, .Script -SupernerdPatScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19f41a + writetext SupernerdPatAfterBattleText waitbutton closetext end @@ -287,7 +285,7 @@ SchoolboyDudleyBeatenText: text "Whoo! Good stuff." done -UnknownText_0x19f1b5: +SchoolboyDudleyAfterBattleText: text "I did my best." line "I have no regrets." done @@ -301,7 +299,7 @@ LassEllenBeatenText: text "How could I lose?" done -UnknownText_0x19f208: +LassEllenAfterBattleText: text "I did my best." line "I have no regrets." done @@ -315,7 +313,7 @@ SchoolboyJoeBeatenText: text "Ow! Stomped flat!" done -UnknownText_0x19f25c: +SchoolboyJoeAfterBattleText: text "I did my best." line "I have no regrets." done @@ -329,7 +327,7 @@ LassLauraBeatenText: text "I lost too…" done -UnknownText_0x19f2a6: +LassLauraAfterBattleText: text "I did my best." line "I have no regrets." done @@ -343,7 +341,7 @@ CamperLloydBeatenText: text "Whoa! Too much." done -UnknownText_0x19f2f8: +CamperLloydAfterBattleText: text "I did my best." line "I have no regrets." done @@ -358,7 +356,7 @@ LassShannonBeatenText: text "You're kidding." done -UnknownText_0x19f35b: +LassShannonAfterBattleText: text "I did my best." line "I have no regrets." done @@ -382,7 +380,7 @@ SupernerdPatBeatenText: line "at all?" done -UnknownText_0x19f41a: +SupernerdPatAfterBattleText: text "I'm sorry… I won't" line "cheat anymore…" done @@ -440,26 +438,26 @@ Route25_MapEventHeader: db 1 warp_def $5, $2f, 1, BILLS_HOUSE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 1, $6, $2a, $0, UnknownScript_0x19eea0, $0, $0 - xy_trigger 1, $7, $2a, $0, UnknownScript_0x19eee0, $0, $0 + coord_event 1, $6, $2a, UnknownScript_0x19eea0 + coord_event 1, $7, $2a, UnknownScript_0x19eee0 -.Signposts: +.BGEvents: db 2 - signpost 5, 45, SIGNPOST_READ, BillsHouseSign - signpost 5, 4, SIGNPOST_ITEM, Route25HiddenPotion + bg_event 5, 45, BGEVENT_READ, BillsHouseSign + bg_event 5, 4, BGEVENT_ITEM, Route25HiddenPotion -.PersonEvents: +.ObjectEvents: db 11 - person_event SPRITE_MISTY, 9, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND - person_event SPRITE_COOLTRAINER_M, 10, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND - person_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1 - person_event SPRITE_LASS, 11, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerLassEllen, -1 - person_event SPRITE_YOUNGSTER, 8, 21, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1 - person_event SPRITE_LASS, 6, 22, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerLassLaura, -1 - person_event SPRITE_YOUNGSTER, 4, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerCamperLloyd, -1 - person_event SPRITE_LASS, 11, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerLassShannon, -1 - person_event SPRITE_SUPER_NERD, 7, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerSupernerdPat, -1 - person_event SPRITE_COOLTRAINER_M, 8, 37, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19efac, -1 - person_event SPRITE_POKE_BALL, 4, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN + object_event SPRITE_MISTY, 9, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND + object_event SPRITE_COOLTRAINER_M, 10, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND + object_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1 + object_event SPRITE_LASS, 11, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassEllen, -1 + object_event SPRITE_YOUNGSTER, 8, 21, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1 + object_event SPRITE_LASS, 6, 22, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassLaura, -1 + object_event SPRITE_YOUNGSTER, 4, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperLloyd, -1 + object_event SPRITE_LASS, 11, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassShannon, -1 + object_event SPRITE_SUPER_NERD, 7, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1 + object_event SPRITE_COOLTRAINER_M, 8, 37, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19efac, -1 + object_event SPRITE_POKE_BALL, 4, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN diff --git a/maps/Route26.asm b/maps/Route26.asm index ccc32ed63..91fcc9fab 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -9,27 +9,27 @@ const_value set 2 const ROUTE26_POKE_BALL Route26_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerCooltrainermJake: - trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, CooltrainermJakeScript + trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script -CooltrainermJakeScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a4f08 + writetext CooltrainermJakeAfterBattleText waitbutton closetext end TrainerCooltrainermGaven3: - trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, CooltrainermGaven3Script + trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, .Script -CooltrainermGaven3Script: +.Script: writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN end_if_just_battled opentext @@ -120,20 +120,20 @@ UnknownScript_0x1a4dd7: end TrainerCooltrainerfJoyce: - trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, CooltrainerfJoyceScript + trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, .Script -CooltrainerfJoyceScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a50d7 + writetext CooltrainerfJoyceAfterBattleText waitbutton closetext end TrainerCooltrainerfBeth1: - trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, CooltrainerfBeth1Script + trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, .Script -CooltrainerfBeth1Script: +.Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH end_if_just_battled opentext @@ -224,23 +224,23 @@ UnknownScript_0x1a4e93: end TrainerPsychicRichard: - trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, PsychicRichardScript + trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, .Script -PsychicRichardScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a5278 + writetext PsychicRichardAfterBattleText waitbutton closetext end TrainerFisherScott: - trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, FisherScottScript + trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, .Script -FisherScottScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a5326 + writetext FisherScottAfterBattleText waitbutton closetext end @@ -266,7 +266,7 @@ CooltrainermJakeBeatenText: text "I blew it!" done -UnknownText_0x1a4f08: +CooltrainermJakeAfterBattleText: text "It's going to be" line "tough to win at" cont "the LEAGUE." @@ -321,7 +321,7 @@ CooltrainerfJoyceBeatenText: line "believe this!" done -UnknownText_0x1a50d7: +CooltrainerfJoyceAfterBattleText: text "I've defeated" line "eight GYM LEADERS," @@ -374,7 +374,7 @@ PsychicRichardBeatenText: text "Good battle!" done -UnknownText_0x1a5278: +PsychicRichardAfterBattleText: text "People and #MON" line "grow from their" cont "experiences." @@ -397,7 +397,7 @@ FisherScottBeatenText: line "battle!" done -UnknownText_0x1a5326: +FisherScottAfterBattleText: text "Just like in fish-" line "ing, it's all over" @@ -422,20 +422,20 @@ Route26_MapEventHeader: warp_def $39, $f, 1, ROUTE_26_HEAL_SPEECH_HOUSE warp_def $47, $5, 1, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 6, 8, SIGNPOST_READ, Route26Sign + bg_event 6, 8, BGEVENT_READ, Route26Sign -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_COOLTRAINER_M, 24, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainermJake, -1 - person_event SPRITE_COOLTRAINER_M, 38, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1 - person_event SPRITE_COOLTRAINER_F, 56, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1 - person_event SPRITE_COOLTRAINER_F, 8, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1 - person_event SPRITE_YOUNGSTER, 79, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerPsychicRichard, -1 - person_event SPRITE_FISHER, 92, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherScott, -1 - person_event SPRITE_FRUIT_TREE, 54, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1 - person_event SPRITE_POKE_BALL, 15, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER + object_event SPRITE_COOLTRAINER_M, 24, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermJake, -1 + object_event SPRITE_COOLTRAINER_M, 38, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1 + object_event SPRITE_COOLTRAINER_F, 56, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1 + object_event SPRITE_COOLTRAINER_F, 8, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1 + object_event SPRITE_YOUNGSTER, 79, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicRichard, -1 + object_event SPRITE_FISHER, 92, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherScott, -1 + object_event SPRITE_FRUIT_TREE, 54, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1 + object_event SPRITE_POKE_BALL, 15, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm index 6463ba89e..da946711d 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/Route26DayofWeekSiblingsHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE26DAYOFWEEKSIBLINGSHOUSE_POKEDEX Route26DayofWeekSiblingsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -79,12 +79,12 @@ Route26DayofWeekSiblingsHouse_MapEventHeader: warp_def $7, $2, 3, ROUTE_26 warp_def $7, $3, 3, ROUTE_26 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKEDEX, 3, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1 + object_event SPRITE_POKEDEX, 3, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1 diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index 050493637..11a8cc50d 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE26HEALSPEECHHOUSE_TEACHER Route26HealSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -57,14 +57,14 @@ Route26HealSpeechHouse_MapEventHeader: warp_def $7, $2, 2, ROUTE_26 warp_def $7, $3, 2, ROUTE_26 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, Route26HealHouseBookshelf - signpost 1, 1, SIGNPOST_READ, Route26HealHouseBookshelf + bg_event 1, 0, BGEVENT_READ, Route26HealHouseBookshelf + bg_event 1, 1, BGEVENT_READ, Route26HealHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1 + object_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1 diff --git a/maps/Route27.asm b/maps/Route27.asm index 1ff42703a..a058af254 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -10,20 +10,18 @@ const_value set 2 const ROUTE27_FISHER Route27_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x1a0871, 0 - dw UnknownScript_0x1a0872, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -UnknownScript_0x1a0871: +.DummyScene0: end -UnknownScript_0x1a0872: +.DummyScene1: end UnknownScript_0x1a0873: @@ -41,30 +39,30 @@ UnknownScript_0x1a088c: opentext writetext UnknownText_0x1a0a6b buttonsound - writetext UnknownText_0x1a0a71 + writetext Route27FisherText waitbutton closetext - dotrigger $1 + setscene $1 end -FisherScript_0x1a089c: - jumptextfaceplayer UnknownText_0x1a0a71 +Route27FisherScript: + jumptextfaceplayer Route27FisherText TrainerPsychicGilbert: - trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, PsychicGilbertScript + trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, .Script -PsychicGilbertScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a0dd2 + writetext PsychicGilbertAfterBattleText waitbutton closetext end TrainerBird_keeperJose2: - trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, Bird_keeperJose2SeenText, Bird_keeperJose2BeatenText, 0, Bird_keeperJose2Script + trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, Bird_keeperJose2SeenText, Bird_keeperJose2BeatenText, 0, .Script -Bird_keeperJose2Script: +.Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE end_if_just_battled opentext @@ -175,31 +173,31 @@ UnknownScript_0x1a0977: end TrainerCooltrainermBlake: - trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, CooltrainermBlakeScript + trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, .Script -CooltrainermBlakeScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a0b0b + writetext CooltrainermBlakeAfterBattleText waitbutton closetext end TrainerCooltrainermBrian: - trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, CooltrainermBrianScript + trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, .Script -CooltrainermBrianScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a0bac + writetext CooltrainermBrianAfterBattleText waitbutton closetext end TrainerCooltrainerfReena: - trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReena1SeenText, CooltrainerfReena1BeatenText, 0, CooltrainerfReena1Script + trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReena1SeenText, CooltrainerfReena1BeatenText, 0, .Script -CooltrainerfReena1Script: +.Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA end_if_just_battled opentext @@ -290,12 +288,12 @@ UnknownScript_0x1a0a47: end TrainerCooltrainerfMegan: - trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, CooltrainerfMeganScript + trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, .Script -CooltrainerfMeganScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a0cce + writetext CooltrainerfMeganAfterBattleText waitbutton closetext end @@ -322,7 +320,7 @@ UnknownText_0x1a0a6b: text "Hey!" done -UnknownText_0x1a0a71: +Route27FisherText: text "Do you know what" line "you just did?" @@ -344,7 +342,7 @@ CooltrainermBlakeBeatenText: text "Yow!" done -UnknownText_0x1a0b0b: +CooltrainermBlakeAfterBattleText: text "If you prevail on" line "this harsh trek," @@ -365,7 +363,7 @@ CooltrainermBrianBeatenText: text "Just as I thought!" done -UnknownText_0x1a0bac: +CooltrainermBrianAfterBattleText: text "A good trainer can" line "recognize other" cont "good trainers." @@ -405,7 +403,7 @@ CooltrainerfMeganBeatenText: line "strong!" done -UnknownText_0x1a0cce: +CooltrainerfMeganAfterBattleText: text "I'm checking out" line "pre- and post-" cont "evolution #MON." @@ -436,7 +434,7 @@ PsychicGilbertBeatenText: text "You're too much!" done -UnknownText_0x1a0dd2: +PsychicGilbertAfterBattleText: text "With your skills," line "you'll do well at" cont "the LEAGUE." @@ -479,23 +477,23 @@ Route27_MapEventHeader: warp_def $5, $1a, 1, TOHJO_FALLS warp_def $5, $24, 2, TOHJO_FALLS -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $a, $12, $0, UnknownScript_0x1a0873, $0, $0 - xy_trigger 0, $a, $13, $0, UnknownScript_0x1a0881, $0, $0 + coord_event 0, $a, $12, UnknownScript_0x1a0873 + coord_event 0, $a, $13, UnknownScript_0x1a0881 -.Signposts: +.BGEvents: db 1 - signpost 7, 25, SIGNPOST_READ, TohjoFallsSign + bg_event 7, 25, BGEVENT_READ, TohjoFallsSign -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_COOLTRAINER_M, 7, 48, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1 - person_event SPRITE_COOLTRAINER_M, 6, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1 - person_event SPRITE_COOLTRAINER_F, 10, 72, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1 - person_event SPRITE_COOLTRAINER_F, 6, 37, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1 - person_event SPRITE_YOUNGSTER, 7, 65, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicGilbert, -1 - person_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperJose2, -1 - person_event SPRITE_POKE_BALL, 12, 60, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM - person_event SPRITE_POKE_BALL, 12, 53, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY - person_event SPRITE_FISHER, 10, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 3, FisherScript_0x1a089c, -1 + object_event SPRITE_COOLTRAINER_M, 7, 48, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1 + object_event SPRITE_COOLTRAINER_M, 6, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1 + object_event SPRITE_COOLTRAINER_F, 10, 72, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1 + object_event SPRITE_COOLTRAINER_F, 6, 37, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1 + object_event SPRITE_YOUNGSTER, 7, 65, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicGilbert, -1 + object_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperJose2, -1 + object_event SPRITE_POKE_BALL, 12, 60, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM + object_event SPRITE_POKE_BALL, 12, 53, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY + object_event SPRITE_FISHER, 10, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 3, Route27FisherScript, -1 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 1a7d77dee..5e43f661c 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE27SANDSTORMHOUSE_GRANNY Route27SandstormHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -102,14 +102,14 @@ Route27SandstormHouse_MapEventHeader: warp_def $7, $2, 1, ROUTE_27 warp_def $7, $3, 1, ROUTE_27 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, SandstormHouseBookshelf - signpost 1, 1, SIGNPOST_READ, SandstormHouseBookshelf + bg_event 1, 0, BGEVENT_READ, SandstormHouseBookshelf + bg_event 1, 1, BGEVENT_READ, SandstormHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SandstormHouseWoman, -1 + object_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1 diff --git a/maps/Route28.asm b/maps/Route28.asm index 6923947fb..eb87b2701 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -1,5 +1,5 @@ Route28_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -25,13 +25,13 @@ Route28_MapEventHeader: warp_def $3, $7, 1, ROUTE_28_FAMOUS_SPEECH_HOUSE warp_def $5, $21, 7, VICTORY_ROAD_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 5, 31, SIGNPOST_READ, Route28Sign - signpost 2, 25, SIGNPOST_ITEM, Route28HiddenRareCandy + bg_event 5, 31, BGEVENT_READ, Route28Sign + bg_event 2, 25, BGEVENT_ITEM, Route28HiddenRareCandy -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index 0e0f95f01..e8da9da02 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -3,16 +3,14 @@ const_value set 2 const ROUTE28FAMOUSSPEECHHOUSE_FEAROW Route28FamousSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - - ; triggers - dw .Trigger, 0 + scene_script .DummyScene .MapCallbacks: db 0 -.Trigger: +.DummyScene: end Celebrity: @@ -81,15 +79,15 @@ Route28FamousSpeechHouse_MapEventHeader: warp_def $7, $2, 1, ROUTE_28 warp_def $7, $3, 1, ROUTE_28 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, CelebrityHouseBookshelf - signpost 1, 1, SIGNPOST_READ, CelebrityHouseBookshelf + bg_event 1, 0, BGEVENT_READ, CelebrityHouseBookshelf + bg_event 1, 1, BGEVENT_READ, CelebrityHouseBookshelf -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, Celebrity, -1 - person_event SPRITE_MOLTRES, 5, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, CelebritysFearow, -1 + object_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1 + object_event SPRITE_MOLTRES, 5, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1 diff --git a/maps/Route29.asm b/maps/Route29.asm index 629c4dd77..a7bb9ecc5 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -9,24 +9,19 @@ const_value set 2 const ROUTE29_POKE_BALL Route29_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Tuscany -.Trigger0: +.DummyScene0: end -.Trigger1: +.DummyScene1: end .Tuscany: @@ -64,7 +59,7 @@ Route29Tutorial1: writetext CatchingTutorialDebriefText waitbutton closetext - dotrigger $0 + setscene $0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end @@ -89,7 +84,7 @@ Route29Tutorial2: writetext CatchingTutorialDebriefText waitbutton closetext - dotrigger $0 + setscene $0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end @@ -98,7 +93,7 @@ Script_RefusedTutorial1: waitbutton closetext applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b - dotrigger $0 + setscene $0 end Script_RefusedTutorial2: @@ -106,7 +101,7 @@ Script_RefusedTutorial2: waitbutton closetext applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b - dotrigger $0 + setscene $0 end CatchingTutorialDudeScript: @@ -428,23 +423,23 @@ Route29_MapEventHeader: db 1 warp_def $1, $1b, 3, ROUTE_29_46_GATE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 1, $8, $35, $0, Route29Tutorial1, $0, $0 - xy_trigger 1, $9, $35, $0, Route29Tutorial2, $0, $0 + coord_event 1, $8, $35, Route29Tutorial1 + coord_event 1, $9, $35, Route29Tutorial2 -.Signposts: +.BGEvents: db 2 - signpost 7, 51, SIGNPOST_READ, Route29Sign1 - signpost 5, 3, SIGNPOST_READ, Route29Sign2 + bg_event 7, 51, BGEVENT_READ, Route29Sign1 + bg_event 5, 3, BGEVENT_READ, Route29Sign2 -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_COOLTRAINER_M, 12, 50, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1 - person_event SPRITE_YOUNGSTER, 16, 27, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, Route29YoungsterScript, -1 - person_event SPRITE_TEACHER, 11, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, Route29TeacherScript, -1 - person_event SPRITE_FRUIT_TREE, 2, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route29FruitTree, -1 - person_event SPRITE_FISHER, 3, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Route29FisherScript, -1 - person_event SPRITE_COOLTRAINER_M, 4, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1 - person_event SPRITE_TEACHER, 12, 29, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY - person_event SPRITE_POKE_BALL, 2, 48, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION + object_event SPRITE_COOLTRAINER_M, 12, 50, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1 + object_event SPRITE_YOUNGSTER, 16, 27, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29YoungsterScript, -1 + object_event SPRITE_TEACHER, 11, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29TeacherScript, -1 + object_event SPRITE_FRUIT_TREE, 2, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route29FruitTree, -1 + object_event SPRITE_FISHER, 3, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route29FisherScript, -1 + object_event SPRITE_COOLTRAINER_M, 4, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1 + object_event SPRITE_TEACHER, 12, 29, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY + object_event SPRITE_POKE_BALL, 2, 48, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm index 2101fbe64..a3d824eec 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route2946Gate.asm @@ -3,19 +3,19 @@ const_value set 2 const ROUTE2946GATE_YOUNGSTER Route2946Gate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -OfficerScript_0x7b5bb: - jumptextfaceplayer UnknownText_0x7b5c1 +Route2946GateOfficerScript: + jumptextfaceplayer Route2946GateOfficerText -YoungsterScript_0x7b5be: - jumptextfaceplayer UnknownText_0x7b60d +Route2946GateYoungsterScript: + jumptextfaceplayer Route2946GateYoungsterText -UnknownText_0x7b5c1: +Route2946GateOfficerText: text "You can't climb" line "ledges." @@ -24,7 +24,7 @@ UnknownText_0x7b5c1: cont "take a shortcut." done -UnknownText_0x7b60d: +Route2946GateYoungsterText: text "Different kinds of" line "#MON appear" cont "past here." @@ -47,13 +47,13 @@ Route2946Gate_MapEventHeader: warp_def $7, $4, 1, ROUTE_29 warp_def $7, $5, 1, ROUTE_29 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7b5bb, -1 - person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x7b5be, -1 + object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route2946GateOfficerScript, -1 + object_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route2946GateYoungsterScript, -1 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index f567dd3ae..954714590 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -2,16 +2,16 @@ const_value set 2 const ROUTE2GATE_SCIENTIST Route2Gate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -ScientistScript_0x9b952: - jumptextfaceplayer UnknownText_0x9b955 +Route2GateScientistScript: + jumptextfaceplayer Route2GateScientistText -UnknownText_0x9b955: +Route2GateScientistText: text "Are you <PLAY_G>?" para "I work as PROF." @@ -36,12 +36,12 @@ Route2Gate_MapEventHeader: warp_def $7, $4, 2, ROUTE_2 warp_def $7, $5, 2, ROUTE_2 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_SCIENTIST, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x9b952, -1 + object_event SPRITE_SCIENTIST, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1 diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index 2c37f8ff6..4ff8e2a18 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE2NUGGETSPEECHHOUSE_FISHER Route2NuggetSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -61,12 +61,12 @@ Route2NuggetSpeechHouse_MapEventHeader: warp_def $7, $2, 1, ROUTE_2 warp_def $7, $3, 1, ROUTE_2 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x9b847, -1 + object_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1 diff --git a/maps/Route3.asm b/maps/Route3.asm index b5e08faf9..0df90cd80 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -5,52 +5,52 @@ const_value set 2 const ROUTE3_FISHER2 Route3_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerFirebreatherOtis: - trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, FirebreatherOtisScript + trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script -FirebreatherOtisScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1adff7 + writetext FirebreatherOtisAfterBattleText waitbutton closetext end TrainerYoungsterWarren: - trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, YoungsterWarrenScript + trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, .Script -YoungsterWarrenScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ae051 + writetext YoungsterWarrenAfterBattleText waitbutton closetext end TrainerYoungsterJimmy: - trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, YoungsterJimmyScript + trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, .Script -YoungsterJimmyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ae0a9 + writetext YoungsterJimmyAfterBattleText waitbutton closetext end TrainerFirebreatherBurt: - trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, FirebreatherBurtScript + trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, .Script -FirebreatherBurtScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ae118 + writetext FirebreatherBurtAfterBattleText waitbutton closetext end @@ -68,7 +68,7 @@ FirebreatherOtisBeatenText: line "I'm all wet…" done -UnknownText_0x1adff7: +FirebreatherOtisAfterBattleText: text "When it rains," line "it's hard to get" cont "ignition…" @@ -83,7 +83,7 @@ YoungsterWarrenBeatenText: text "I knew I'd lose…" done -UnknownText_0x1ae051: +YoungsterWarrenAfterBattleText: text "You looked strong." para "I was afraid to" @@ -99,7 +99,7 @@ YoungsterJimmyBeatenText: text "Blown away!" done -UnknownText_0x1ae0a9: +YoungsterJimmyAfterBattleText: text "I wear shorts the" line "whole year round." @@ -116,7 +116,7 @@ FirebreatherBurtBeatenText: text "Yow! That's hot!" done -UnknownText_0x1ae118: +FirebreatherBurtAfterBattleText: text "The greatest fire-" line "breather in KANTO," cont "that's me." @@ -140,16 +140,16 @@ Route3_MapEventHeader: db 1 warp_def $1, $34, 1, MOUNT_MOON -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 13, 49, SIGNPOST_READ, MapRoute3Signpost0Script + bg_event 13, 49, BGEVENT_READ, MapRoute3Signpost0Script -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_FISHER, 12, 26, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1 - person_event SPRITE_YOUNGSTER, 7, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterWarren, -1 - person_event SPRITE_YOUNGSTER, 3, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1 - person_event SPRITE_FISHER, 5, 49, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1 + object_event SPRITE_FISHER, 12, 26, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1 + object_event SPRITE_YOUNGSTER, 7, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1 + object_event SPRITE_YOUNGSTER, 3, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1 + object_event SPRITE_FISHER, 5, 49, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1 diff --git a/maps/Route30.asm b/maps/Route30.asm index e4f1f03d3..7a98c6a7e 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -12,7 +12,7 @@ const_value set 2 const ROUTE30_POKE_BALL Route30_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -416,27 +416,27 @@ Route30_MapEventHeader: warp_def $27, $7, 1, ROUTE_30_BERRY_SPEECH_HOUSE warp_def $5, $11, 1, MR_POKEMONS_HOUSE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 5 - signpost 43, 9, SIGNPOST_READ, Route30Sign - signpost 29, 13, SIGNPOST_READ, MrPokemonsHouseDirectionsSign - signpost 5, 15, SIGNPOST_READ, MrPokemonsHouseSign - signpost 21, 3, SIGNPOST_READ, Route30TrainerTips - signpost 9, 14, SIGNPOST_ITEM, Route30HiddenPotion + bg_event 43, 9, BGEVENT_READ, Route30Sign + bg_event 29, 13, BGEVENT_READ, MrPokemonsHouseDirectionsSign + bg_event 5, 15, BGEVENT_READ, MrPokemonsHouseSign + bg_event 21, 3, BGEVENT_READ, Route30TrainerTips + bg_event 9, 14, BGEVENT_ITEM, Route30HiddenPotion -.PersonEvents: +.ObjectEvents: db 11 - person_event SPRITE_YOUNGSTER, 26, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE - person_event SPRITE_YOUNGSTER, 28, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY - person_event SPRITE_YOUNGSTER, 23, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerYoungsterMikey, -1 - person_event SPRITE_BUG_CATCHER, 7, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherDon, -1 - person_event SPRITE_YOUNGSTER, 30, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Route30YoungsterScript, -1 - person_event SPRITE_MONSTER, 24, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE - person_event SPRITE_MONSTER, 25, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE - person_event SPRITE_FRUIT_TREE, 39, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route30FruitTree1, -1 - person_event SPRITE_FRUIT_TREE, 5, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route30FruitTree2, -1 - person_event SPRITE_COOLTRAINER_F, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1 - person_event SPRITE_POKE_BALL, 35, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE + object_event SPRITE_YOUNGSTER, 26, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE + object_event SPRITE_YOUNGSTER, 28, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY + object_event SPRITE_YOUNGSTER, 23, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1 + object_event SPRITE_BUG_CATCHER, 7, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherDon, -1 + object_event SPRITE_YOUNGSTER, 30, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route30YoungsterScript, -1 + object_event SPRITE_MONSTER, 24, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE + object_event SPRITE_MONSTER, 25, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE + object_event SPRITE_FRUIT_TREE, 39, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree1, -1 + object_event SPRITE_FRUIT_TREE, 5, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree2, -1 + object_event SPRITE_COOLTRAINER_F, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1 + object_event SPRITE_POKE_BALL, 35, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index d05258f3f..55dbff282 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE30BERRYSPEECHHOUSE_POKEFAN_M Route30BerrySpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -55,14 +55,14 @@ Route30BerrySpeechHouse_MapEventHeader: warp_def $7, $2, 1, ROUTE_30 warp_def $7, $3, 1, ROUTE_30 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, Route30BerrySpeechHouseBookshelf - signpost 1, 1, SIGNPOST_READ, Route30BerrySpeechHouseBookshelf + bg_event 1, 0, BGEVENT_READ, Route30BerrySpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1 + object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1 diff --git a/maps/Route31.asm b/maps/Route31.asm index 61b67be11..d356f2c6f 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -8,14 +8,11 @@ const_value set 2 const ROUTE31_POKE_BALL2 Route31_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .CheckMomCall .CheckMomCall: @@ -429,20 +426,20 @@ Route31_MapEventHeader: warp_def $7, $4, 4, ROUTE_31_VIOLET_GATE warp_def $5, $22, 1, DARK_CAVE_VIOLET_ENTRANCE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 5, 7, SIGNPOST_READ, Route31Sign - signpost 5, 31, SIGNPOST_READ, DarkCaveSign + bg_event 5, 7, BGEVENT_READ, Route31Sign + bg_event 5, 31, BGEVENT_READ, DarkCaveSign -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_FISHER, 7, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route31MailRecipientScript, -1 - person_event SPRITE_YOUNGSTER, 5, 9, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route31YoungsterScript, -1 - person_event SPRITE_BUG_CATCHER, 13, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 5, TrainerBug_catcherWade1, -1 - person_event SPRITE_COOLTRAINER_M, 8, 33, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1 - person_event SPRITE_FRUIT_TREE, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route31FruitTree, -1 - person_event SPRITE_POKE_BALL, 5, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION - person_event SPRITE_POKE_BALL, 15, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route31PokeBall, EVENT_ROUTE_31_POKE_BALL + object_event SPRITE_FISHER, 7, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1 + object_event SPRITE_YOUNGSTER, 5, 9, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1 + object_event SPRITE_BUG_CATCHER, 13, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBug_catcherWade1, -1 + object_event SPRITE_COOLTRAINER_M, 8, 33, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1 + object_event SPRITE_FRUIT_TREE, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31FruitTree, -1 + object_event SPRITE_POKE_BALL, 5, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION + object_event SPRITE_POKE_BALL, 15, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31PokeBall, EVENT_ROUTE_31_POKE_BALL diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 68155a705..404a216e2 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -3,25 +3,25 @@ const_value set 2 const ROUTE31VIOLETGATE_COOLTRAINER_F Route31VioletGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -OfficerScript_0x197634: - jumptextfaceplayer UnknownText_0x19763a +Route31VioletGateOfficerScript: + jumptextfaceplayer Route31VioletGateOfficerText -CooltrainerFScript_0x197637: - jumptextfaceplayer UnknownText_0x197661 +Route31VioletGateCooltrainerFScript: + jumptextfaceplayer Route31VioletGateCooltrainerFText -UnknownText_0x19763a: +Route31VioletGateOfficerText: text "Hi there!" line "Did you visit" cont "SPROUT TOWER?" done -UnknownText_0x197661: +Route31VioletGateCooltrainerFText: text "I came too far" line "out. I'd better" cont "phone home!" @@ -38,13 +38,13 @@ Route31VioletGate_MapEventHeader: warp_def $4, $9, 1, ROUTE_31 warp_def $5, $9, 2, ROUTE_31 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x197634, -1 - person_event SPRITE_COOLTRAINER_F, 2, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x197637, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1 + object_event SPRITE_COOLTRAINER_F, 2, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1 diff --git a/maps/Route32.asm b/maps/Route32.asm index da9eb5c70..660f972f3 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -15,28 +15,23 @@ const_value set 2 const ROUTE32_POKE_BALL2 Route32_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + scene_script .DummyScene0 + scene_script .DummyScene1 + scene_script .DummyScene2 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Frieda -.Trigger0: +.DummyScene0: end -.Trigger1: +.DummyScene1: end -.Trigger2: +.DummyScene2: end .Frieda: @@ -51,7 +46,7 @@ Route32_MapScriptHeader: Route32CooltrainerMScript: faceplayer -Route32CooltrainerMTrigger: +Route32CooltrainerMContinueScene: opentext checkevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 iftrue .GotMiracleSeed @@ -91,7 +86,7 @@ Route32CooltrainerMTrigger: closetext end -Route32CooltrainerMStopsYou: +Route32CooltrainerMStopsYouScene: spriteface ROUTE32_COOLTRAINER_M, LEFT spriteface PLAYER, RIGHT opentext @@ -102,7 +97,7 @@ Route32CooltrainerMStopsYou: applymovement PLAYER, Movement_Route32CooltrainerMPushesYouBackToViolet stopfollow spriteface PLAYER, DOWN - scall Route32CooltrainerMTrigger + scall Route32CooltrainerMContinueScene applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset1 applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset2 end @@ -132,7 +127,7 @@ Route32WannaBuyASlowpokeTailScript: SlowpokeTailSalesmanScript: faceplayer _OfferToSellSlowpokeTail: - dotrigger $2 + setscene $2 opentext writetext Text_MillionDollarSlowpokeTail yesorno @@ -507,7 +502,7 @@ Route32RuinsSign: Route32UnionCaveSign: jumptext Route32UnionCaveSignText -Route32PokeCenterSign: +Route32PokecenterSign: jumpstd pokecentersign Route32HiddenGreatBall: @@ -946,33 +941,33 @@ Route32_MapEventHeader: warp_def $3, $4, 4, ROUTE_32_RUINS_OF_ALPH_GATE warp_def $4f, $6, 4, UNION_CAVE_1F -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $8, $12, $0, Route32CooltrainerMStopsYou, $0, $0 - xy_trigger 1, $47, $7, $0, Route32WannaBuyASlowpokeTailScript, $0, $0 + coord_event 0, $8, $12, Route32CooltrainerMStopsYouScene + coord_event 1, $47, $7, Route32WannaBuyASlowpokeTailScript -.Signposts: +.BGEvents: db 6 - signpost 5, 13, SIGNPOST_READ, Route32Sign - signpost 1, 9, SIGNPOST_READ, Route32RuinsSign - signpost 84, 10, SIGNPOST_READ, Route32UnionCaveSign - signpost 73, 12, SIGNPOST_READ, Route32PokeCenterSign - signpost 67, 12, SIGNPOST_ITEM, Route32HiddenGreatBall - signpost 40, 11, SIGNPOST_ITEM, Route32HiddenSuperPotion - -.PersonEvents: + bg_event 5, 13, BGEVENT_READ, Route32Sign + bg_event 1, 9, BGEVENT_READ, Route32RuinsSign + bg_event 84, 10, BGEVENT_READ, Route32UnionCaveSign + bg_event 73, 12, BGEVENT_READ, Route32PokecenterSign + bg_event 67, 12, BGEVENT_ITEM, Route32HiddenGreatBall + bg_event 40, 11, BGEVENT_ITEM, Route32HiddenSuperPotion + +.ObjectEvents: db 14 - person_event SPRITE_FISHER, 49, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherJustin, -1 - person_event SPRITE_FISHER, 56, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherRalph1, -1 - person_event SPRITE_FISHER, 48, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherHenry, -1 - person_event SPRITE_YOUNGSTER, 22, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterAlbert, -1 - person_event SPRITE_YOUNGSTER, 63, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterGordon, -1 - person_event SPRITE_YOUNGSTER, 45, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperRoland, -1 - person_event SPRITE_LASS, 30, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1 - person_event SPRITE_COOLTRAINER_M, 8, 19, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1 - person_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperPeter, -1 - person_event SPRITE_FISHER, 70, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS - person_event SPRITE_POKE_BALL, 53, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL - person_event SPRITE_FISHER, 13, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1 - person_event SPRITE_LASS, 67, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY - person_event SPRITE_POKE_BALL, 30, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL + object_event SPRITE_FISHER, 49, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1 + object_event SPRITE_FISHER, 56, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherRalph1, -1 + object_event SPRITE_FISHER, 48, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1 + object_event SPRITE_YOUNGSTER, 22, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterAlbert, -1 + object_event SPRITE_YOUNGSTER, 63, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterGordon, -1 + object_event SPRITE_YOUNGSTER, 45, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1 + object_event SPRITE_LASS, 30, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1 + object_event SPRITE_COOLTRAINER_M, 8, 19, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1 + object_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperPeter, -1 + object_event SPRITE_FISHER, 70, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS + object_event SPRITE_POKE_BALL, 53, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL + object_event SPRITE_FISHER, 13, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1 + object_event SPRITE_LASS, 67, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY + object_event SPRITE_POKE_BALL, 30, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32Pokecenter1F.asm index ae1b641ff..a65239d31 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -3,8 +3,8 @@ const_value set 2 const ROUTE32POKECENTER1F_FISHING_GURU const ROUTE32POKECENTER1F_COOLTRAINER_F -Route32PokeCenter1F_MapScriptHeader: -.MapTriggers: +Route32Pokecenter1F_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: @@ -42,8 +42,8 @@ UnknownScript_0x69b7a: closetext end -CooltrainerFScript_0x69b80: - jumptextfaceplayer UnknownText_0x69cac +Route32Pokecenter1FCooltrainerFScript: + jumptextfaceplayer Route32Pokecenter1FCooltrainerFText UnknownText_0x69b83: text "This is a great" @@ -85,7 +85,7 @@ UnknownText_0x69c8d: line "they biting?" done -UnknownText_0x69cac: +Route32Pokecenter1FCooltrainerFText: text "What should I make" line "my #MON hold?" @@ -94,7 +94,7 @@ UnknownText_0x69cac: cont "power…" done -Route32PokeCenter1F_MapEventHeader: +Route32Pokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -104,14 +104,14 @@ Route32PokeCenter1F_MapEventHeader: warp_def $7, $4, 1, ROUTE_32 warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x69b52, -1 - person_event SPRITE_FISHING_GURU, 4, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x69b80, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1 + object_event SPRITE_FISHING_GURU, 4, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1 + object_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1 diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm new file mode 100644 index 000000000..8b9dcede0 --- /dev/null +++ b/maps/Route32RuinsOfAlphGate.asm @@ -0,0 +1,70 @@ +const_value set 2 + const ROUTE32RUINSOFALPHGATE_OFFICER + const ROUTE32RUINSOFALPHGATE_POKEFAN_M + const ROUTE32RUINSOFALPHGATE_YOUNGSTER + +Route32RuinsOfAlphGate_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +Route32RuinsOfAlphGateOfficerScript: + jumptextfaceplayer Route32RuinsOfAlphGateOfficerText + +Route32RuinsOfAlphGatePokefanMScript: + jumptextfaceplayer Route32RuinsOfAlphGatePokefanMText + +Route32RuinsOfAlphGateYoungsterScript: + jumptextfaceplayer Route32RuinsOfAlphGateYoungsterText + +Route32RuinsOfAlphGateOfficerText: + text "RUINS OF ALPH" + + para "A Look-and-Touch" + line "Tourist Site" + + para "Try the sliding" + line "stone panels!" + done + +Route32RuinsOfAlphGatePokefanMText: + text "You're studying" + line "the RUINS?" + + para "I see a scientist" + line "in the making." + done + +Route32RuinsOfAlphGateYoungsterText: + text "There are drawings" + line "on stone panels." + + para "I tried moving" + line "them. I wonder" + cont "what they are." + done + +Route32RuinsOfAlphGate_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 4 + warp_def $4, $0, 10, RUINS_OF_ALPH_OUTSIDE + warp_def $5, $0, 11, RUINS_OF_ALPH_OUTSIDE + warp_def $4, $9, 2, ROUTE_32 + warp_def $5, $9, 3, ROUTE_32 + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 3 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1 + object_event SPRITE_POKEFAN_M, 2, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1 + object_event SPRITE_YOUNGSTER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1 diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm deleted file mode 100644 index 404bb1a5f..000000000 --- a/maps/Route32RuinsofAlphGate.asm +++ /dev/null @@ -1,70 +0,0 @@ -const_value set 2 - const ROUTE32RUINSOFALPHGATE_OFFICER - const ROUTE32RUINSOFALPHGATE_POKEFAN_M - const ROUTE32RUINSOFALPHGATE_YOUNGSTER - -Route32RuinsofAlphGate_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -OfficerScript_0x69a2d: - jumptextfaceplayer UnknownText_0x69a36 - -PokefanMScript_0x69a30: - jumptextfaceplayer UnknownText_0x69a81 - -YoungsterScript_0x69a33: - jumptextfaceplayer UnknownText_0x69abd - -UnknownText_0x69a36: - text "RUINS OF ALPH" - - para "A Look-and-Touch" - line "Tourist Site" - - para "Try the sliding" - line "stone panels!" - done - -UnknownText_0x69a81: - text "You're studying" - line "the RUINS?" - - para "I see a scientist" - line "in the making." - done - -UnknownText_0x69abd: - text "There are drawings" - line "on stone panels." - - para "I tried moving" - line "them. I wonder" - cont "what they are." - done - -Route32RuinsofAlphGate_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def $4, $0, 10, RUINS_OF_ALPH_OUTSIDE - warp_def $5, $0, 11, RUINS_OF_ALPH_OUTSIDE - warp_def $4, $9, 2, ROUTE_32 - warp_def $5, $9, 3, ROUTE_32 - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 3 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x69a2d, -1 - person_event SPRITE_POKEFAN_M, 2, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x69a30, -1 - person_event SPRITE_YOUNGSTER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x69a33, -1 diff --git a/maps/Route33.asm b/maps/Route33.asm index 383f32e67..e92e0cbb1 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE33_FRUIT_TREE Route33_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -202,15 +202,15 @@ Route33_MapEventHeader: db 1 warp_def $9, $b, 3, UNION_CAVE_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 11, 11, SIGNPOST_READ, Route33Sign + bg_event 11, 11, BGEVENT_READ, Route33Sign -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKEFAN_M, 13, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerAnthony, -1 - person_event SPRITE_LASS, 16, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Route33LassScript, -1 - person_event SPRITE_FRUIT_TREE, 16, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route33FruitTreeScript, -1 + object_event SPRITE_POKEFAN_M, 13, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1 + object_event SPRITE_LASS, 16, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1 + object_event SPRITE_FRUIT_TREE, 16, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1 diff --git a/maps/Route34.asm b/maps/Route34.asm index 607de8968..633e9984a 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -6,54 +6,51 @@ const_value set 2 const ROUTE34_OFFICER const ROUTE34_POKEFAN_M const ROUTE34_GRAMPS - const ROUTE34_DAYCARE_MON_1 - const ROUTE34_DAYCARE_MON_2 + const ROUTE34_DAY_CARE_MON_1 + const ROUTE34_DAY_CARE_MON_2 const ROUTE34_COOLTRAINER_F1 const ROUTE34_COOLTRAINER_F2 const ROUTE34_COOLTRAINER_F3 const ROUTE34_POKE_BALL Route34_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: - checkflag ENGINE_DAYCARE_MAN_HAS_EGG - iftrue .PutDaycareManOutside - clearevent EVENT_DAYCARE_MAN_IN_DAYCARE - setevent EVENT_DAYCARE_MAN_ON_ROUTE_34 + checkflag ENGINE_DAY_CARE_MAN_HAS_EGG + iftrue .PutDayCareManOutside + clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE + setevent EVENT_DAY_CARE_MAN_ON_ROUTE_34 jump .CheckMon1 -.PutDaycareManOutside: - setevent EVENT_DAYCARE_MAN_IN_DAYCARE - clearevent EVENT_DAYCARE_MAN_ON_ROUTE_34 +.PutDayCareManOutside: + setevent EVENT_DAY_CARE_MAN_IN_DAY_CARE + clearevent EVENT_DAY_CARE_MAN_ON_ROUTE_34 jump .CheckMon1 .CheckMon1: - checkflag ENGINE_DAYCARE_MAN_HAS_MON + checkflag ENGINE_DAY_CARE_MAN_HAS_MON iffalse .HideMon1 - clearevent EVENT_DAYCARE_MON_1 + clearevent EVENT_DAY_CARE_MON_1 jump .CheckMon2 .HideMon1: - setevent EVENT_DAYCARE_MON_1 + setevent EVENT_DAY_CARE_MON_1 jump .CheckMon2 .CheckMon2: - checkflag ENGINE_DAYCARE_LADY_HAS_MON + checkflag ENGINE_DAY_CARE_LADY_HAS_MON iffalse .HideMon2 - clearevent EVENT_DAYCARE_MON_2 + clearevent EVENT_DAY_CARE_MON_2 return .HideMon2: - setevent EVENT_DAYCARE_MON_2 + setevent EVENT_DAY_CARE_MON_2 return DayCareManScript_Outside: @@ -63,7 +60,7 @@ DayCareManScript_Outside: waitbutton closetext if_equal $1, .end_fail - clearflag ENGINE_DAYCARE_MAN_HAS_EGG + clearflag ENGINE_DAY_CARE_MAN_HAS_EGG checkcode VAR_FACING if_equal RIGHT, .walk_around_player applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside @@ -78,13 +75,13 @@ DayCareManScript_Outside: disappear ROUTE34_GRAMPS end -DaycareMon1Script: +DayCareMon1Script: opentext special Special_DayCareMon1 closetext end -DaycareMon2Script: +DayCareMon2Script: opentext special Special_DayCareMon2 closetext @@ -773,33 +770,33 @@ Route34_MapEventHeader: db 5 warp_def $25, $d, 1, ROUTE_34_ILEX_FOREST_GATE warp_def $25, $e, 2, ROUTE_34_ILEX_FOREST_GATE - warp_def $e, $b, 1, DAYCARE - warp_def $f, $b, 2, DAYCARE - warp_def $f, $d, 3, DAYCARE + warp_def $e, $b, 1, DAY_CARE + warp_def $f, $b, 2, DAY_CARE + warp_def $f, $d, 3, DAY_CARE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 5 - signpost 6, 12, SIGNPOST_READ, Route34Sign - signpost 33, 13, SIGNPOST_READ, Route34TrainerTips - signpost 13, 10, SIGNPOST_READ, DayCareSign - signpost 32, 8, SIGNPOST_ITEM, Route34HiddenRareCandy - signpost 19, 17, SIGNPOST_ITEM, Route34HiddenSuperPotion + bg_event 6, 12, BGEVENT_READ, Route34Sign + bg_event 33, 13, BGEVENT_READ, Route34TrainerTips + bg_event 13, 10, BGEVENT_READ, DayCareSign + bg_event 32, 8, BGEVENT_ITEM, Route34HiddenRareCandy + bg_event 19, 17, BGEVENT_ITEM, Route34HiddenSuperPotion -.PersonEvents: +.ObjectEvents: db 13 - person_event SPRITE_YOUNGSTER, 7, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 5, TrainerCamperTodd1, -1 - person_event SPRITE_YOUNGSTER, 32, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1 - person_event SPRITE_YOUNGSTER, 20, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterIan, -1 - person_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerGina1, -1 - person_event SPRITE_OFFICER, 11, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerKeithScript, -1 - person_event SPRITE_POKEFAN_M, 28, 18, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmBrandon, -1 - person_event SPRITE_GRAMPS, 16, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAYCARE_MAN_ON_ROUTE_34 - person_event SPRITE_DAYCARE_MON_1, 18, 14, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaycareMon1Script, EVENT_DAYCARE_MON_1 - person_event SPRITE_DAYCARE_MON_2, 19, 17, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaycareMon2Script, EVENT_DAYCARE_MON_2 - person_event SPRITE_COOLTRAINER_F, 48, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1 - person_event SPRITE_COOLTRAINER_F, 48, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1 - person_event SPRITE_COOLTRAINER_F, 51, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1 - person_event SPRITE_POKE_BALL, 30, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET + object_event SPRITE_YOUNGSTER, 7, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1 + object_event SPRITE_YOUNGSTER, 32, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1 + object_event SPRITE_YOUNGSTER, 20, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterIan, -1 + object_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerGina1, -1 + object_event SPRITE_OFFICER, 11, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerKeithScript, -1 + object_event SPRITE_POKEFAN_M, 28, 18, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmBrandon, -1 + object_event SPRITE_GRAMPS, 16, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAY_CARE_MAN_ON_ROUTE_34 + object_event SPRITE_DAY_CARE_MON_1, 18, 14, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon1Script, EVENT_DAY_CARE_MON_1 + object_event SPRITE_DAY_CARE_MON_2, 19, 17, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon2Script, EVENT_DAY_CARE_MON_2 + object_event SPRITE_COOLTRAINER_F, 48, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1 + object_event SPRITE_COOLTRAINER_F, 48, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1 + object_event SPRITE_COOLTRAINER_F, 51, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1 + object_event SPRITE_POKE_BALL, 30, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 674bca42d..799cb4d9e 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -5,24 +5,21 @@ const_value set 2 const ROUTE34ILEXFORESTGATE_TEACHER2 Route34IlexForestGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .IsForestRestless - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x62d2d - -UnknownScript_0x62d2d: +.IsForestRestless: checkevent EVENT_FOREST_IS_RESTLESS - iffalse UnknownScript_0x62d38 + iffalse .Normal disappear ROUTE34ILEXFORESTGATE_TEACHER1 appear ROUTE34ILEXFORESTGATE_TEACHER2 return -UnknownScript_0x62d38: +.Normal: disappear ROUTE34ILEXFORESTGATE_TEACHER2 appear ROUTE34ILEXFORESTGATE_TEACHER1 return @@ -78,8 +75,8 @@ IlexGateButterfree: closetext end -LassScript_0x62d94: - jumptextfaceplayer UnknownText_0x62e97 +Route34IlexForestGateLassScript: + jumptextfaceplayer Route34IlexForestGateLassText MovementData_0x62d97: step UP @@ -124,7 +121,7 @@ UnknownText_0x62e83: text "BUTTERFREE: Freeh!" done -UnknownText_0x62e97: +Route34IlexForestGateLassText: text "Did you see the" line "shrine honoring" cont "the protector?" @@ -149,16 +146,16 @@ Route34IlexForestGate_MapEventHeader: warp_def $7, $4, 1, ILEX_FOREST warp_def $7, $5, 1, ILEX_FOREST -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $7, $4, $0, UnknownScript_0x62d3d, $0, $0 + coord_event 0, $7, $4, UnknownScript_0x62d3d -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_TEACHER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER - person_event SPRITE_BUTTERFREE, 4, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, IlexGateButterfree, -1 - person_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x62d94, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS - person_event SPRITE_TEACHER, 7, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY + object_event SPRITE_TEACHER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER + object_event SPRITE_BUTTERFREE, 4, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexGateButterfree, -1 + object_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS + object_event SPRITE_TEACHER, 7, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY diff --git a/maps/Route35.asm b/maps/Route35.asm index afa3f8ce0..2e10bd22a 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -12,27 +12,27 @@ const_value set 2 const ROUTE35_POKE_BALL Route35_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerBird_keeperBryan: - trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, 0, Bird_keeperBryanScript + trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, 0, .Script -Bird_keeperBryanScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19cc87 + writetext Bird_keeperBryanAfterBattleText waitbutton closetext end TrainerJugglerIrwin: - trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, 0, JugglerIrwin1Script + trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, 0, .Script -JugglerIrwin1Script: +.Script: writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN end_if_just_battled opentext @@ -85,53 +85,53 @@ UnknownScript_0x19c91b: end TrainerCamperIvan: - trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, CamperIvanScript + trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, .Script -CamperIvanScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19cac4 + writetext CamperIvanAfterBattleText waitbutton closetext end TrainerCamperElliot: - trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, CamperElliotScript + trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, .Script -CamperElliotScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19cb47 + writetext CamperElliotAfterBattleText waitbutton closetext end TrainerPicnickerBrooke: - trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, PicnickerBrookeScript + trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, .Script -PicnickerBrookeScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19cbba + writetext PicnickerBrookeAfterBattleText waitbutton closetext end TrainerPicnickerKim: - trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, PicnickerKimScript + trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, .Script -PicnickerKimScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19cc21 + writetext PicnickerKimAfterBattleText waitbutton closetext end TrainerBug_catcherArnie1: - trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, 0, Bug_catcherArnie1Script + trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, 0, .Script -Bug_catcherArnie1Script: +.Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE end_if_just_battled opentext @@ -226,12 +226,12 @@ UnknownScript_0x19ca2f: end TrainerFirebreatherWalt: - trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, FirebreatherWaltScript + trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, .Script -FirebreatherWaltScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19cebc + writetext FirebreatherWaltAfterBattleText waitbutton closetext end @@ -288,7 +288,7 @@ CamperIvanBeatenText: text "I give!" done -UnknownText_0x19cac4: +CamperIvanAfterBattleText: text "Music on the radio" line "changes the moods" cont "of wild #MON." @@ -305,7 +305,7 @@ CamperElliotBeatenText: line "have lost for me…" done -UnknownText_0x19cb47: +CamperElliotAfterBattleText: text "I was humiliated" line "in front of my" cont "girlfriend…" @@ -322,7 +322,7 @@ PicnickerBrookeBeatenText: line "strong!" done -UnknownText_0x19cbba: +PicnickerBrookeAfterBattleText: text "I can count on my" line "#MON more than" cont "my boyfriend." @@ -338,7 +338,7 @@ PicnickerKimBeatenText: line "win…" done -UnknownText_0x19cc21: +PicnickerKimAfterBattleText: text "The GYM BADGES are" line "pretty. I collect" cont "them." @@ -354,7 +354,7 @@ Bird_keeperBryanBeatenText: line "enough!" done -UnknownText_0x19cc87: +Bird_keeperBryanAfterBattleText: text "Some #MON flee" line "right away." @@ -426,7 +426,7 @@ FirebreatherWaltBeatenText: line "tip of my nose!" done -UnknownText_0x19cebc: +FirebreatherWaltAfterBattleText: text "The #MON March" line "on the radio lures" cont "wild #MON." @@ -472,24 +472,24 @@ Route35_MapEventHeader: warp_def $21, $a, 2, ROUTE_35_GOLDENROD_GATE warp_def $5, $3, 3, ROUTE_35_NATIONAL_PARK_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 7, 1, SIGNPOST_READ, Route35Sign - signpost 31, 11, SIGNPOST_READ, Route35Sign + bg_event 7, 1, BGEVENT_READ, Route35Sign + bg_event 31, 11, BGEVENT_READ, Route35Sign -.PersonEvents: +.ObjectEvents: db 11 - person_event SPRITE_YOUNGSTER, 19, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerCamperIvan, -1 - person_event SPRITE_YOUNGSTER, 20, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperElliot, -1 - person_event SPRITE_LASS, 20, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1 - person_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerKim, -1 - person_event SPRITE_YOUNGSTER, 28, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 0, TrainerBird_keeperBryan, -1 - person_event SPRITE_FISHER, 10, 2, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1 - person_event SPRITE_BUG_CATCHER, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherArnie1, -1 - person_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerJugglerIrwin, -1 - person_event SPRITE_OFFICER, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19ca49, -1 - person_event SPRITE_FRUIT_TREE, 25, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1 - person_event SPRITE_POKE_BALL, 16, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT + object_event SPRITE_YOUNGSTER, 19, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperIvan, -1 + object_event SPRITE_YOUNGSTER, 20, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1 + object_event SPRITE_LASS, 20, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1 + object_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerKim, -1 + object_event SPRITE_YOUNGSTER, 28, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerBird_keeperBryan, -1 + object_event SPRITE_FISHER, 10, 2, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1 + object_event SPRITE_BUG_CATCHER, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherArnie1, -1 + object_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1 + object_event SPRITE_OFFICER, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ca49, -1 + object_event SPRITE_FRUIT_TREE, 25, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1 + object_event SPRITE_POKE_BALL, 16, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35GoldenrodGate.asm index 96d202f9d..bfc8e688d 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -3,8 +3,8 @@ const_value set 2 const ROUTE35GOLDENRODGATE_POKEFAN_F const ROUTE35GOLDENRODGATE_FISHER -Route35Goldenrodgate_MapScriptHeader: -.MapTriggers: +Route35GoldenrodGate_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: @@ -91,8 +91,8 @@ PokefanFScript_0x69dc6: closetext end -FisherScript_0x69dda: - jumptextfaceplayer UnknownText_0x6a0cb +Route35GoldenrodGateFisherScript: + jumptextfaceplayer Route35GoldenrodGateFisherText UnknownText_0x69ddd: text "Excuse me, kid!" @@ -181,7 +181,7 @@ UnknownText_0x6a09a: cont "on the radio." done -UnknownText_0x6a0cb: +Route35GoldenrodGateFisherText: text "I wonder how many" line "kinds of #MON" @@ -195,7 +195,7 @@ UnknownText_0x6a0cb: line "different kinds." done -Route35Goldenrodgate_MapEventHeader: +Route35GoldenrodGate_MapEventHeader: ; filler db 0, 0 @@ -206,14 +206,14 @@ Route35Goldenrodgate_MapEventHeader: warp_def $7, $4, 12, GOLDENROD_CITY warp_def $7, $5, 12, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1 - person_event SPRITE_POKEFAN_F, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1 - person_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x69dda, -1 + object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1 + object_event SPRITE_POKEFAN_F, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1 + object_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1 diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkGate.asm index d2df78c46..c3c38a34f 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkGate.asm @@ -3,63 +3,57 @@ const_value set 2 const ROUTE35NATIONALPARKGATE_YOUNGSTER const ROUTE35NATIONALPARKGATE_OFFICER2 -Route35NationalParkgate_MapScriptHeader: -.MapTriggers: +Route35NationalParkGate_MapScriptHeader: +.SceneScripts: db 3 - - ; triggers - dw Route35NationalParkgate_Trigger1, 0 - dw Route35NationalParkgate_Trigger2, 0 - dw Route35NationalParkgate_Trigger3, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 + scene_script .LeaveContestEarly .MapCallbacks: db 2 + dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning + dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable - ; callbacks - - dbw MAPCALLBACK_NEWMAP, Route35NationalParkgate_CheckIfStillInContest - - dbw MAPCALLBACK_OBJECTS, Route35NationalParkgate_CheckIfContestDay - -Route35NationalParkgate_Trigger1: +.DummyScene0: end -Route35NationalParkgate_Trigger2: +.DummyScene1: end -Route35NationalParkgate_Trigger3: - priorityjump Route35NationalParkGate_LeavingContestEarly +.LeaveContestEarly: + priorityjump .LeavingContestEarly end -Route35NationalParkgate_CheckIfStillInContest: +.CheckIfContestRunning: checkflag ENGINE_BUG_CONTEST_TIMER - iftrue Route35NationalParkgate_Yes - dotrigger $0 + iftrue .BugContestIsRunning + setscene $0 return -Route35NationalParkgate_Yes: - dotrigger $2 +.BugContestIsRunning: + setscene $2 return -Route35NationalParkgate_CheckIfContestDay: +.CheckIfContestAvailable: checkcode VAR_WEEKDAY - if_equal TUESDAY, Route35NationalParkgate_IsContestDay - if_equal THURSDAY, Route35NationalParkgate_IsContestDay - if_equal SATURDAY, Route35NationalParkgate_IsContestDay + if_equal TUESDAY, .SetContestOfficer + if_equal THURSDAY, .SetContestOfficer + if_equal SATURDAY, .SetContestOfficer checkflag ENGINE_BUG_CONTEST_TIMER - iftrue Route35NationalParkgate_Yes + iftrue .BugContestIsRunning disappear ROUTE35NATIONALPARKGATE_OFFICER1 appear ROUTE35NATIONALPARKGATE_YOUNGSTER appear ROUTE35NATIONALPARKGATE_OFFICER2 return -Route35NationalParkgate_IsContestDay: +.SetContestOfficer: appear ROUTE35NATIONALPARKGATE_OFFICER1 disappear ROUTE35NATIONALPARKGATE_YOUNGSTER disappear ROUTE35NATIONALPARKGATE_OFFICER2 return -Route35NationalParkGate_LeavingContestEarly: +.LeavingContestEarly: applymovement PLAYER, MovementData_0x6a2e2 spriteface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT opentext @@ -68,17 +62,17 @@ Route35NationalParkGate_LeavingContestEarly: RAM2MEM $0 writetext UnknownText_0x6a79a yesorno - iffalse Route35NationalParkgate_GoBackIn + iffalse .GoBackToContest writetext UnknownText_0x6a7db waitbutton closetext jumpstd bugcontestresultswarp -Route35NationalParkgate_GoBackIn: +.GoBackToContest: writetext UnknownText_0x6a823 waitbutton closetext - scall Route35NationalParkgate_EnterContest + scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR special FadeOutPalettes waitsfx @@ -87,23 +81,23 @@ Route35NationalParkgate_GoBackIn: OfficerScript_0x6a204: checkcode VAR_WEEKDAY - if_equal SUNDAY, Route35NationalParkgate_NoContestToday - if_equal MONDAY, Route35NationalParkgate_NoContestToday - if_equal WEDNESDAY, Route35NationalParkgate_NoContestToday - if_equal FRIDAY, Route35NationalParkgate_NoContestToday + if_equal SUNDAY, Route35NationalParkGate_NoContestToday + if_equal MONDAY, Route35NationalParkGate_NoContestToday + if_equal WEDNESDAY, Route35NationalParkGate_NoContestToday + if_equal FRIDAY, Route35NationalParkGate_NoContestToday faceplayer opentext checkflag ENGINE_DAILY_BUG_CONTEST - iftrue Route35NationalParkgate_ContestIsOver - scall Route35NationalParkgate_GetDayOfWeek + iftrue Route35NationalParkGate_ContestIsOver + scall Route35NationalParkGate_GetDayOfWeek writetext UnknownText_0x6a2eb yesorno - iffalse Route35NationalParkgate_DeclinedToParticipate + iffalse Route35NationalParkGate_DeclinedToParticipate checkcode VAR_PARTYCOUNT - if_greater_than $1, Route35NationalParkgate_LeaveTheRestBehind + if_greater_than $1, Route35NationalParkGate_LeaveTheRestBehind special ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER -Route35NationalParkgate_OkayToProceed: +Route35NationalParkGate_OkayToProceed: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic writetext UnknownText_0x6a39d @@ -115,7 +109,7 @@ Route35NationalParkgate_OkayToProceed: waitbutton closetext special Special_GiveParkBalls - scall Route35NationalParkgate_EnterContest + scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR special FadeOutPalettes waitsfx @@ -123,30 +117,30 @@ Route35NationalParkgate_OkayToProceed: warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f end -Route35NationalParkgate_EnterContest: +Route35NationalParkGate_EnterContest: checkcode VAR_FACING - if_equal LEFT, Route35NationalParkgate_FacingLeft + if_equal LEFT, Route35NationalParkGate_FacingLeft applymovement PLAYER, MovementData_0x6a2e5 end -Route35NationalParkgate_FacingLeft: +Route35NationalParkGate_FacingLeft: applymovement PLAYER, MovementData_0x6a2e9 end -Route35NationalParkgate_LeaveTheRestBehind: +Route35NationalParkGate_LeaveTheRestBehind: checkcode VAR_PARTYCOUNT - if_less_than 6, Route35NationalParkgate_LessThanFullParty + if_less_than 6, Route35NationalParkGate_LessThanFullParty checkcode VAR_BOXSPACE - if_equal 0, Route35NationalParkgate_NoRoomInBox + if_equal 0, Route35NationalParkGate_NoRoomInBox -Route35NationalParkgate_LessThanFullParty: ; 6a27d +Route35NationalParkGate_LessThanFullParty: ; 6a27d special CheckFirstMonIsEgg - if_equal $1, Route35NationalParkgate_FirstMonIsEgg + if_equal $1, Route35NationalParkGate_FirstMonIsEgg writetext UnknownText_0x6a4c6 yesorno - iffalse Route35NationalParkgate_DeclinedToLeaveMonsBehind + iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind special ContestDropOffMons - iftrue Route35NationalParkgate_FirstMonIsFainted + iftrue Route35NationalParkGate_FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6a537 buttonsound @@ -154,64 +148,64 @@ Route35NationalParkgate_LessThanFullParty: ; 6a27d playsound SFX_GOT_SAFARI_BALLS waitsfx buttonsound - jump Route35NationalParkgate_OkayToProceed + jump Route35NationalParkGate_OkayToProceed -Route35NationalParkgate_DeclinedToParticipate: +Route35NationalParkGate_DeclinedToParticipate: writetext UnknownText_0x6a5dc waitbutton closetext end -Route35NationalParkgate_DeclinedToLeaveMonsBehind: +Route35NationalParkGate_DeclinedToLeaveMonsBehind: writetext UnknownText_0x6a597 waitbutton closetext end -Route35NationalParkgate_FirstMonIsFainted: +Route35NationalParkGate_FirstMonIsFainted: writetext UnknownText_0x6a608 waitbutton closetext end -Route35NationalParkgate_NoRoomInBox: +Route35NationalParkGate_NoRoomInBox: writetext UnknownText_0x6a67c waitbutton closetext end -Route35NationalParkgate_FirstMonIsEgg: +Route35NationalParkGate_FirstMonIsEgg: writetext UnknownText_0x6a71f waitbutton closetext end -Route35NationalParkgate_ContestIsOver: +Route35NationalParkGate_ContestIsOver: writetext UnknownText_0x6a84f waitbutton closetext end -Route35NationalParkgate_NoContestToday: +Route35NationalParkGate_NoContestToday: jumptextfaceplayer UnknownText_0x6a894 OfficerScript_0x6a2ca: faceplayer opentext checkflag ENGINE_DAILY_BUG_CONTEST - iftrue Route35NationalParkgate_ContestIsOver + iftrue Route35NationalParkGate_ContestIsOver writetext UnknownText_0x6a894 waitbutton closetext end -YoungsterScript_0x6a2d8: - jumptextfaceplayer UnknownText_0x6a8d8 +Route35NationalParkGateYoungsterScript: + jumptextfaceplayer Route35NationalParkGateYoungsterText -MapRoute36NationalParkgateSignpost0Script: +MapRoute36NationalParkGateSignpost0Script: jumptext UnknownText_0x6a90e -Route35NationalParkgate_GetDayOfWeek: +Route35NationalParkGate_GetDayOfWeek: jumpstd daytotext end @@ -417,7 +411,7 @@ UnknownText_0x6a894: line "give it a shot." done -UnknownText_0x6a8d8: +Route35NationalParkGateYoungsterText: text "When is the next" line "Bug-Catching Con-" cont "test going to be?" @@ -443,7 +437,7 @@ UnknownText_0x6a90e: line "the contest." done -Route35NationalParkgate_MapEventHeader: +Route35NationalParkGate_MapEventHeader: ; filler db 0, 0 @@ -454,15 +448,15 @@ Route35NationalParkgate_MapEventHeader: warp_def $7, $3, 3, ROUTE_35 warp_def $7, $4, 3, ROUTE_35 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 0, 5, SIGNPOST_READ, MapRoute36NationalParkgateSignpost0Script + bg_event 0, 5, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_OFFICER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY - person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6a2d8, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER - person_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY + object_event SPRITE_OFFICER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + object_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER + object_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route35NationalParkgate.blk b/maps/Route35NationalParkGate.blk index 14662eb45..14662eb45 100644 --- a/maps/Route35NationalParkgate.blk +++ b/maps/Route35NationalParkGate.blk diff --git a/maps/Route36.asm b/maps/Route36.asm index 02ca0e9cd..86f7ca9fe 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -10,24 +10,19 @@ const_value set 2 const ROUTE36_SUICUNE Route36_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .ArthurCallback -.Trigger0: +.DummyScene0: end -.Trigger1: +.DummyScene1: end .ArthurCallback: @@ -49,9 +44,9 @@ Route36SuicuneScript: disappear ROUTE36_SUICUNE spriteface PLAYER, DOWN pause 10 - dotrigger $0 + setscene $0 clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY - domaptrigger CIANWOOD_CITY, $1 + setmapscene CIANWOOD_CITY, $1 end SudowoodoScript: @@ -315,7 +310,7 @@ TrainerPsychicMark: .Script: end_if_just_battled opentext - writetext UnknownText_0x19471e + writetext PsychicMarkAfterBattleText waitbutton closetext end @@ -558,7 +553,7 @@ PsychicMarkBeatenText: text "I misread you!" done -UnknownText_0x19471e: +PsychicMarkAfterBattleText: text "I'd be strong if" line "only I could tell" @@ -675,26 +670,26 @@ Route36_MapEventHeader: warp_def $d, $2f, 1, ROUTE_36_RUINS_OF_ALPH_GATE warp_def $d, $30, 2, ROUTE_36_RUINS_OF_ALPH_GATE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 1, $7, $14, $0, Route36SuicuneScript, $0, $0 - xy_trigger 1, $7, $16, $0, Route36SuicuneScript, $0, $0 + coord_event 1, $7, $14, Route36SuicuneScript + coord_event 1, $7, $16, Route36SuicuneScript -.Signposts: +.BGEvents: db 4 - signpost 1, 29, SIGNPOST_READ, Route36TrainerTips2 - signpost 11, 45, SIGNPOST_READ, RuinsOfAlphNorthSign - signpost 7, 55, SIGNPOST_READ, Route36Sign - signpost 7, 21, SIGNPOST_READ, Route36TrainerTips1 + bg_event 1, 29, BGEVENT_READ, Route36TrainerTips2 + bg_event 11, 45, BGEVENT_READ, RuinsOfAlphNorthSign + bg_event 7, 55, BGEVENT_READ, Route36Sign + bg_event 7, 21, BGEVENT_READ, Route36TrainerTips1 -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_YOUNGSTER, 13, 20, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicMark, -1 - person_event SPRITE_YOUNGSTER, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1 - person_event SPRITE_WEIRD_TREE, 9, 35, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO - person_event SPRITE_LASS, 8, 51, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1940e0, -1 - person_event SPRITE_FISHER, 9, 44, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1 - person_event SPRITE_FRUIT_TREE, 4, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route36FruitTree, -1 - person_event SPRITE_YOUNGSTER, 6, 46, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY - person_event SPRITE_LASS, 12, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO - person_event SPRITE_SUICUNE, 6, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 + object_event SPRITE_YOUNGSTER, 13, 20, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicMark, -1 + object_event SPRITE_YOUNGSTER, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1 + object_event SPRITE_WEIRD_TREE, 9, 35, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO + object_event SPRITE_LASS, 8, 51, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1940e0, -1 + object_event SPRITE_FISHER, 9, 44, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1 + object_event SPRITE_FRUIT_TREE, 4, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1 + object_event SPRITE_YOUNGSTER, 6, 46, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY + object_event SPRITE_LASS, 12, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO + object_event SPRITE_SUICUNE, 6, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkGate.asm index d55cc48cf..8640b49cf 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkGate.asm @@ -12,42 +12,36 @@ const_value set 2 const ROUTE36NATIONALPARKGATE_YOUNGSTER7 const ROUTE36NATIONALPARKGATE_OFFICER2 -Route36NationalParkgate_MapScriptHeader: -.MapTriggers: +Route36NationalParkGate_MapScriptHeader: +.SceneScripts: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + scene_script .DummyScene0 + scene_script .DummyScene1 + scene_script .LeaveContestEarly .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning - dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable -.Trigger0: +.DummyScene0: end -.Trigger1: +.DummyScene1: end -.Trigger2: - priorityjump .LeftTheContestEarly +.LeaveContestEarly: + priorityjump .LeavingContestEarly end .CheckIfContestRunning: checkflag ENGINE_BUG_CONTEST_TIMER iftrue .BugContestIsRunning - dotrigger $0 + setscene $0 return .BugContestIsRunning: - dotrigger $2 + setscene $2 return .CheckIfContestAvailable: @@ -69,7 +63,7 @@ Route36NationalParkgate_MapScriptHeader: .Return: return -.LeftTheContestEarly: +.LeavingContestEarly: spriteface PLAYER, UP opentext checkcode VAR_CONTESTMINUTES @@ -156,7 +150,7 @@ Route36OfficerScriptContest: opentext checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route36Officer_ContestHasConcluded - scall Route36Parkgate_DayToText + scall Route36ParkGate_DayToText writetext UnknownText_0x6add5 yesorno iffalse .DecidedNotToJoinContest @@ -307,7 +301,7 @@ OfficerScript_0x6acf4: closetext end -Route36Parkgate_DayToText: +Route36ParkGate_DayToText: jumpstd daytotext end @@ -856,7 +850,7 @@ UnknownText_0x6b97f: cont "for you." done -Route36NationalParkgate_MapEventHeader: +Route36NationalParkGate_MapEventHeader: ; filler db 0, 0 @@ -867,24 +861,24 @@ Route36NationalParkgate_MapEventHeader: warp_def $4, $9, 1, ROUTE_36 warp_def $5, $9, 2, ROUTE_36 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 0, 6, SIGNPOST_READ, MapRoute36NationalParkgateSignpost0Script + bg_event 0, 6, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script -.PersonEvents: +.ObjectEvents: db 12 - person_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B - person_event SPRITE_YOUNGSTER, 5, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B - person_event SPRITE_ROCKER, 6, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B - person_event SPRITE_POKEFAN_M, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B - person_event SPRITE_YOUNGSTER, 7, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B - person_event SPRITE_YOUNGSTER, 6, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B - person_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B - person_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B - person_event SPRITE_YOUNGSTER, 7, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B - person_event SPRITE_YOUNGSTER, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B - person_event SPRITE_OFFICER, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY + object_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + object_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B + object_event SPRITE_YOUNGSTER, 5, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B + object_event SPRITE_ROCKER, 6, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B + object_event SPRITE_POKEFAN_M, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B + object_event SPRITE_YOUNGSTER, 7, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B + object_event SPRITE_YOUNGSTER, 6, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B + object_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B + object_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B + object_event SPRITE_YOUNGSTER, 7, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B + object_event SPRITE_YOUNGSTER, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B + object_event SPRITE_OFFICER, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route36NationalParkgate.blk b/maps/Route36NationalParkGate.blk index 814583120..814583120 100644 --- a/maps/Route36NationalParkgate.blk +++ b/maps/Route36NationalParkGate.blk diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm new file mode 100644 index 000000000..a41d6b558 --- /dev/null +++ b/maps/Route36RuinsOfAlphGate.asm @@ -0,0 +1,57 @@ +const_value set 2 + const ROUTE36RUINSOFALPHGATE_OFFICER + const ROUTE36RUINSOFALPHGATE_GRAMPS + +Route36RuinsOfAlphGate_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +Route36RuinsOfAlphGateOfficerScript: + jumptextfaceplayer Route36RuinsOfAlphGateOfficerText + +Route36RuinsOfAlphGateGrampsScript: + jumptextfaceplayer Route36RuinsOfAlphGateGrampsText + +Route36RuinsOfAlphGateOfficerText: + text "Don't you wonder" + line "who'd make some-" + cont "thing like this?" + cont "And why?" + done + +Route36RuinsOfAlphGateGrampsText: + text "Did you see that" + line "strange tree in" + cont "the road?" + + para "That may explain" + line "why fewer people" + + para "are visiting the" + line "RUINS OF ALPH." + done + +Route36RuinsOfAlphGate_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 4 + warp_def $0, $4, 3, ROUTE_36 + warp_def $0, $5, 4, ROUTE_36 + warp_def $7, $4, 9, RUINS_OF_ALPH_OUTSIDE + warp_def $7, $5, 9, RUINS_OF_ALPH_OUTSIDE + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 2 + object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1 + object_event SPRITE_GRAMPS, 5, 7, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1 diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm deleted file mode 100644 index 88ba737f4..000000000 --- a/maps/Route36RuinsofAlphgate.asm +++ /dev/null @@ -1,57 +0,0 @@ -const_value set 2 - const ROUTE36RUINSOFALPHGATE_OFFICER - const ROUTE36RUINSOFALPHGATE_GRAMPS - -Route36RuinsofAlphgate_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -OfficerScript_0x6aa1a: - jumptextfaceplayer UnknownText_0x6aa20 - -GrampsScript_0x6aa1d: - jumptextfaceplayer UnknownText_0x6aa5b - -UnknownText_0x6aa20: - text "Don't you wonder" - line "who'd make some-" - cont "thing like this?" - cont "And why?" - done - -UnknownText_0x6aa5b: - text "Did you see that" - line "strange tree in" - cont "the road?" - - para "That may explain" - line "why fewer people" - - para "are visiting the" - line "RUINS OF ALPH." - done - -Route36RuinsofAlphgate_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def $0, $4, 3, ROUTE_36 - warp_def $0, $5, 4, ROUTE_36 - warp_def $7, $4, 9, RUINS_OF_ALPH_OUTSIDE - warp_def $7, $5, 9, RUINS_OF_ALPH_OUTSIDE - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 2 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6aa1a, -1 - person_event SPRITE_GRAMPS, 5, 7, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x6aa1d, -1 diff --git a/maps/Route37.asm b/maps/Route37.asm index 7c4b6e98f..5be5bb297 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -8,17 +8,14 @@ const_value set 2 const ROUTE37_FRUIT_TREE3 Route37_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .Sunny - ; callbacks - - dbw MAPCALLBACK_OBJECTS, SunnyCallback - -SunnyCallback: +.Sunny: checkcode VAR_WEEKDAY if_equal SUNDAY, .SunnyAppears disappear ROUTE37_SUNNY @@ -29,34 +26,34 @@ SunnyCallback: return TrainerTwinsAnnandanne1: - trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, TwinsAnnandanne1Script + trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script -TwinsAnnandanne1Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a8e62 + writetext TwinsAnnandanne1AfterBattleText waitbutton closetext end TrainerTwinsAnnandanne2: - trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, TwinsAnnandanne2Script + trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, .Script -TwinsAnnandanne2Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a8eec + writetext TwinsAnnandanne2AfterBattleText waitbutton closetext end TrainerPsychicGreg: - trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, PsychicGregScript + trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, .Script -PsychicGregScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a8f80 + writetext PsychicGregAfterBattleText waitbutton closetext end @@ -131,7 +128,7 @@ TwinsAnnandanne1BeatenText: line "little too strong." done -UnknownText_0x1a8e62: +TwinsAnnandanne1AfterBattleText: text "ANN: I can tell" line "what my sister and" @@ -150,7 +147,7 @@ TwinsAnnandanne2BeatenText: line "little too strong." done -UnknownText_0x1a8eec: +TwinsAnnandanne2AfterBattleText: text "ANNE: We share the" line "same feelings as" cont "our #MON." @@ -170,7 +167,7 @@ PsychicGregBeatenText: line "pretty sad…" done -UnknownText_0x1a8f80: +PsychicGregAfterBattleText: text "Putting #MON to" line "sleep or paralyz-" cont "ing them are good" @@ -248,20 +245,20 @@ Route37_MapEventHeader: .Warps: db 0 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 3, 5, SIGNPOST_READ, Route37Sign - signpost 2, 4, SIGNPOST_ITEM, Route37HiddenEther + bg_event 3, 5, BGEVENT_READ, Route37Sign + bg_event 2, 4, BGEVENT_ITEM, Route37HiddenEther -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_WEIRD_TREE, 12, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1 - person_event SPRITE_WEIRD_TREE, 12, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1 - person_event SPRITE_YOUNGSTER, 6, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerPsychicGreg, -1 - person_event SPRITE_FRUIT_TREE, 5, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1 - person_event SPRITE_BUG_CATCHER, 8, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY - person_event SPRITE_FRUIT_TREE, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1 - person_event SPRITE_FRUIT_TREE, 7, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0d, -1 + object_event SPRITE_WEIRD_TREE, 12, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1 + object_event SPRITE_WEIRD_TREE, 12, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1 + object_event SPRITE_YOUNGSTER, 6, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1 + object_event SPRITE_FRUIT_TREE, 5, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1 + object_event SPRITE_BUG_CATCHER, 8, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY + object_event SPRITE_FRUIT_TREE, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1 + object_event SPRITE_FRUIT_TREE, 7, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0d, -1 diff --git a/maps/Route38.asm b/maps/Route38.asm index 2ef07dee0..f2ae60489 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -8,38 +8,38 @@ const_value set 2 const ROUTE38_BUENA2 Route38_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerBird_keeperToby: - trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, 0, .script + trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, 0, .Script -.script +.Script end_if_just_battled opentext - writetext UnknownText_0x1a1f86 + writetext Bird_keeperTobyAfterBattleText waitbutton closetext end TrainerSailorHarry: - trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .script + trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script -.script +.Script end_if_just_battled opentext - writetext UnknownText_0x1a220c + writetext SailorHarryAfterBattleText waitbutton closetext end TrainerLassDana1: - trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .script + trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .Script -.script +.Script writecode VAR_CALLERID, PHONE_LASS_DANA end_if_just_battled opentext @@ -175,9 +175,9 @@ TrainerLassDana1: end TrainerSchoolboyChad1: - trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .script + trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .Script -.script +.Script writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD end_if_just_battled opentext @@ -292,23 +292,23 @@ TrainerSchoolboyChad1: end TrainerBeautyValerie: - trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .script + trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script -.script +.Script end_if_just_battled opentext - writetext UnknownText_0x1a2185 + writetext BeautyValerieAfterBattleText waitbutton closetext end TrainerBeautyOlivia: - trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .script + trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script -.script +.Script end_if_just_battled opentext - writetext UnknownText_0x1a229a + writetext BeautyOliviaAfterBattleText waitbutton closetext end @@ -333,7 +333,7 @@ Bird_keeperTobyBeatenText: line "flying away now." done -UnknownText_0x1a1f86: +Bird_keeperTobyAfterBattleText: text "I plan to train in" line "CIANWOOD CITY to" @@ -400,7 +400,7 @@ BeautyValerieBeatenText: line "see your #MON!" done -UnknownText_0x1a2185: +BeautyValerieAfterBattleText: text "When I see #-" line "MON, it seems to" cont "soothe my nerves." @@ -419,7 +419,7 @@ SailorHarryBeatenText: line "world class!" done -UnknownText_0x1a220c: +SailorHarryAfterBattleText: text "All kinds of peo-" line "ple around the" @@ -438,7 +438,7 @@ BeautyOliviaBeatenText: line "MILK every day." done -UnknownText_0x1a229a: +BeautyOliviaAfterBattleText: text "MOOMOO MILK is" line "good for beauty" @@ -481,20 +481,20 @@ Route38_MapEventHeader: warp_def $8, $23, 1, ROUTE_38_ECRUTEAK_GATE warp_def $9, $23, 2, ROUTE_38_ECRUTEAK_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 7, 33, SIGNPOST_READ, Route38Sign - signpost 13, 5, SIGNPOST_READ, Route38TrainerTips + bg_event 7, 33, BGEVENT_READ, Route38Sign + bg_event 13, 5, BGEVENT_READ, Route38TrainerTips -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_STANDING_YOUNGSTER, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1 - person_event SPRITE_LASS, 3, 15, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerLassDana1, -1 - person_event SPRITE_STANDING_YOUNGSTER, 15, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerBird_keeperToby, -1 - person_event SPRITE_BUENA, 9, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerBeautyValerie, -1 - person_event SPRITE_SAILOR, 5, 24, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerSailorHarry, -1 - person_event SPRITE_FRUIT_TREE, 10, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1 - person_event SPRITE_BUENA, 8, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerBeautyOlivia, -1 + object_event SPRITE_STANDING_YOUNGSTER, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1 + object_event SPRITE_LASS, 3, 15, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1 + object_event SPRITE_STANDING_YOUNGSTER, 15, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBird_keeperToby, -1 + object_event SPRITE_BUENA, 9, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1 + object_event SPRITE_SAILOR, 5, 24, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1 + object_event SPRITE_FRUIT_TREE, 10, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1 + object_event SPRITE_BUENA, 8, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index 7e376b413..a926c1e1c 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -2,16 +2,16 @@ const_value set 2 const ROUTE38ECRUTEAKGATE_OFFICER Route38EcruteakGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -OfficerScript_0x9cbd7: - jumptextfaceplayer UnknownText_0x9cbda +Route38EcruteakGateOfficerScript: + jumptextfaceplayer Route38EcruteakGateOfficerText -UnknownText_0x9cbda: +Route38EcruteakGateOfficerText: text "Where did you say" line "you're from?" @@ -35,12 +35,12 @@ Route38EcruteakGate_MapEventHeader: warp_def $4, $9, 14, ECRUTEAK_CITY warp_def $5, $9, 15, ECRUTEAK_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x9cbd7, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1 diff --git a/maps/Route39.asm b/maps/Route39.asm index 5f7d33279..1ab22b0d7 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -11,7 +11,7 @@ const_value set 2 const ROUTE39_POKEFAN_F2 Route39_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -26,9 +26,9 @@ Route39Miltank: end TrainerPokefanmDerek1: - trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, 0, PokefanmDerek1Script + trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, 0, .Script -PokefanmDerek1Script: +.Script: writecode VAR_CALLERID, PHONE_POKEFANM_DEREK end_if_just_battled opentext @@ -105,34 +105,34 @@ PackIsFull: end TrainerPokefanfRuth: - trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, PokefanfRuthScript + trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, .Script -PokefanfRuthScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a5db2 + writetext PokefanfRuthAfterBattleText waitbutton closetext end TrainerSailorEugene: - trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, SailorEugeneScript + trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, .Script -SailorEugeneScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a5c4d + writetext SailorEugeneAfterBattleText waitbutton closetext end TrainerPsychicNorman: - trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, PsychicNormanScript + trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, .Script -PsychicNormanScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a5e57 + writetext PsychicNormanAfterBattleText waitbutton closetext end @@ -199,7 +199,7 @@ SailorEugeneBeatenText: text "Awaaargh!" done -UnknownText_0x1a5c4d: +SailorEugeneAfterBattleText: text "My #MON were" line "caught and raised" cont "overseas." @@ -245,7 +245,7 @@ PokefanfRuthBeatenText: line "losing." done -UnknownText_0x1a5db2: +PokefanfRuthAfterBattleText: text "Do you know about" line "baby #MON?" @@ -269,7 +269,7 @@ PsychicNormanBeatenText: line "have potential." done -UnknownText_0x1a5e57: +PsychicNormanAfterBattleText: text "You know how #-" line "MON have different" cont "abilities?" @@ -353,25 +353,25 @@ Route39_MapEventHeader: warp_def $3, $1, 1, ROUTE_39_BARN warp_def $3, $5, 1, ROUTE_39_FARMHOUSE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 31, 5, SIGNPOST_READ, Route39TrainerTips - signpost 5, 9, SIGNPOST_READ, MoomooFarmSign - signpost 7, 15, SIGNPOST_READ, Route39Sign - signpost 13, 5, SIGNPOST_ITEM, Route39HiddenNugget + bg_event 31, 5, BGEVENT_READ, Route39TrainerTips + bg_event 5, 9, BGEVENT_READ, MoomooFarmSign + bg_event 7, 15, BGEVENT_READ, Route39Sign + bg_event 13, 5, BGEVENT_ITEM, Route39HiddenNugget -.PersonEvents: +.ObjectEvents: db 10 - person_event SPRITE_SAILOR, 29, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSailorEugene, -1 - person_event SPRITE_POKEFAN_M, 22, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanmDerek1, -1 - person_event SPRITE_POKEFAN_F, 19, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanfRuth, -1 - person_event SPRITE_TAUROS, 12, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1 - person_event SPRITE_TAUROS, 11, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1 - person_event SPRITE_TAUROS, 15, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1 - person_event SPRITE_TAUROS, 13, 8, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1 - person_event SPRITE_STANDING_YOUNGSTER, 7, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerPsychicNorman, -1 - person_event SPRITE_FRUIT_TREE, 3, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1 - person_event SPRITE_POKEFAN_F, 22, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x1a5bbe, -1 + object_event SPRITE_SAILOR, 29, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSailorEugene, -1 + object_event SPRITE_POKEFAN_M, 22, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek1, -1 + object_event SPRITE_POKEFAN_F, 19, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanfRuth, -1 + object_event SPRITE_TAUROS, 12, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 + object_event SPRITE_TAUROS, 11, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 + object_event SPRITE_TAUROS, 15, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 + object_event SPRITE_TAUROS, 13, 8, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 + object_event SPRITE_STANDING_YOUNGSTER, 7, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1 + object_event SPRITE_FRUIT_TREE, 3, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1 + object_event SPRITE_POKEFAN_F, 22, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x1a5bbe, -1 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index a057f2b5f..ba6f56c1f 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE39BARN_MOOMOO Route39Barn_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -197,14 +197,14 @@ Route39Barn_MapEventHeader: warp_def $7, $3, 1, ROUTE_39 warp_def $7, $4, 1, ROUTE_39 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_TWIN, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1 - person_event SPRITE_TWIN, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1 - person_event SPRITE_TAUROS, 3, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MooMoo, -1 + object_event SPRITE_TWIN, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1 + object_event SPRITE_TWIN, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1 + object_event SPRITE_TAUROS, 3, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 72a675718..194a43312 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE39FARMHOUSE_POKEFAN_F Route39Farmhouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -201,15 +201,15 @@ Route39Farmhouse_MapEventHeader: warp_def $7, $2, 2, ROUTE_39 warp_def $7, $3, 2, ROUTE_39 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, FarmhouseBookshelf - signpost 1, 1, SIGNPOST_READ, FarmhouseBookshelf + bg_event 1, 0, BGEVENT_READ, FarmhouseBookshelf + bg_event 1, 1, BGEVENT_READ, FarmhouseBookshelf -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKEFAN_M, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1 - person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1 + object_event SPRITE_POKEFAN_M, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1 + object_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1 diff --git a/maps/Route4.asm b/maps/Route4.asm index bfea8c8aa..cb1b18d69 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -5,41 +5,41 @@ const_value set 2 const ROUTE4_POKE_BALL Route4_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerBird_keeperHank: - trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, 0, Bird_keeperHankScript + trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, 0, .Script -Bird_keeperHankScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ae258 + writetext Bird_keeperHankAfterBattleText waitbutton closetext end TrainerPicnickerHope: - trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, PicnickerHopeScript + trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, .Script -PicnickerHopeScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ae320 + writetext PicnickerHopeAfterBattleText waitbutton closetext end TrainerPicnickerSharon: - trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, PicnickerSharonScript + trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, .Script -PicnickerSharonScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ae369 + writetext PicnickerSharonAfterBattleText waitbutton closetext end @@ -65,7 +65,7 @@ Bird_keeperHankBeatenText: line "one…" done -UnknownText_0x1ae258: +Bird_keeperHankAfterBattleText: text "If you have a" line "specific #MON" @@ -92,7 +92,7 @@ PicnickerHopeBeatenText: line "strong." done -UnknownText_0x1ae320: +PicnickerHopeAfterBattleText: text "I heard CLEFAIRY" line "appear at MT.MOON." @@ -109,7 +109,7 @@ PicnickerSharonBeatenText: text "…" done -UnknownText_0x1ae369: +PicnickerSharonAfterBattleText: text "……I'll go train" line "some more…" done @@ -129,17 +129,17 @@ Route4_MapEventHeader: db 1 warp_def $5, $2, 2, MOUNT_MOON -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 7, 3, SIGNPOST_READ, MtMoonSquareSign - signpost 3, 10, SIGNPOST_ITEM, Route4HiddenUltraBall + bg_event 7, 3, BGEVENT_READ, MtMoonSquareSign + bg_event 3, 10, BGEVENT_ITEM, Route4HiddenUltraBall -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperHank, -1 - person_event SPRITE_LASS, 8, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerHope, -1 - person_event SPRITE_LASS, 6, 21, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 - person_event SPRITE_POKE_BALL, 3, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP + object_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperHank, -1 + object_event SPRITE_LASS, 8, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1 + object_event SPRITE_LASS, 6, 21, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 + object_event SPRITE_POKE_BALL, 3, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP diff --git a/maps/Route40.asm b/maps/Route40.asm index 6ae3d5922..5b33783c5 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -13,17 +13,14 @@ const_value set 2 const ROUTE40_STANDING_YOUNGSTER Route40_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .MonicaCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, MonicaCallback - -MonicaCallback: +.MonicaCallback: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR checkcode VAR_WEEKDAY if_equal MONDAY, .MonicaAppears @@ -35,51 +32,51 @@ MonicaCallback: return TrainerSwimmerfElaine: - trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, SwimmerfElaineScript + trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script -SwimmerfElaineScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a637b + writetext SwimmerfElaineAfterBattleText waitbutton closetext end TrainerSwimmerfPaula: - trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, SwimmerfPaulaScript + trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, .Script -SwimmerfPaulaScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a63f5 + writetext SwimmerfPaulaAfterBattleText waitbutton closetext end TrainerSwimmermSimon: - trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, SwimmermSimonScript + trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, .Script -SwimmermSimonScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a6282 + writetext SwimmermSimonAfterBattleText waitbutton closetext end TrainerSwimmermRandall: - trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, SwimmermRandallScript + trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, .Script -SwimmermRandallScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a62fa + writetext SwimmermRandallAfterBattleText waitbutton closetext end -LassScript_0x1a61c4: - jumptextfaceplayer UnknownText_0x1a6429 +Route40Lass1Script: + jumptextfaceplayer Route40Lass1Text PokefanMScript_0x1a61c7: special Mobile_DummyReturnFalse @@ -89,11 +86,11 @@ PokefanMScript_0x1a61c7: .mobile jumptextfaceplayer UnknownText_0x1a649b -LassScript_0x1a61d3: - jumptextfaceplayer UnknownText_0x1a64e6 +Route40Lass2Script: + jumptextfaceplayer Route40Lass2Text -StandingYoungsterScript_0x1a61d6: - jumptextfaceplayer UnknownText_0x1a6564 +Route40StandingYoungsterScript: + jumptextfaceplayer Route40StandingYoungsterText MonicaScript: faceplayer @@ -177,7 +174,7 @@ SwimmermSimonBeatenText: text "OK! Uncle! I give!" done -UnknownText_0x1a6282: +SwimmermSimonAfterBattleText: text "CIANWOOD CITY is" line "a good distance" cont "away from here." @@ -195,7 +192,7 @@ SwimmermRandallBeatenText: text "Uh-oh. I lost…" done -UnknownText_0x1a62fa: +SwimmermRandallAfterBattleText: text "Swimming exercises" line "your entire body." cont "It's healthy." @@ -213,7 +210,7 @@ SwimmerfElaineBeatenText: text "I lost that one!" done -UnknownText_0x1a637b: +SwimmerfElaineAfterBattleText: text "I'd say I'm a bet-" line "ter swimmer than" cont "you. Yeah!" @@ -232,13 +229,13 @@ SwimmerfPaulaBeatenText: line "dizzy!" done -UnknownText_0x1a63f5: +SwimmerfPaulaAfterBattleText: text "While I float like" line "this, the waves" cont "carry me along." done -UnknownText_0x1a6429: +Route40Lass1Text: text "Although you can't" line "see it from here," @@ -262,7 +259,7 @@ UnknownText_0x1a649b: para "What? What?" done -UnknownText_0x1a64e6: +Route40Lass2Text: text "I came to OLIVINE" line "by ship to see the" @@ -274,7 +271,7 @@ UnknownText_0x1a64e6: cont "from a big city." done -UnknownText_0x1a6564: +Route40StandingYoungsterText: text "Have you gone to" line "the BATTLE TOWER?" @@ -348,25 +345,25 @@ Route40_MapEventHeader: db 1 warp_def $5, $9, 1, ROUTE_40_BATTLE_TOWER_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 10, 14, SIGNPOST_READ, Route40Sign - signpost 8, 7, SIGNPOST_ITEM, Route40HiddenHyperPotion + bg_event 10, 14, BGEVENT_READ, Route40Sign + bg_event 8, 7, BGEVENT_ITEM, Route40HiddenHyperPotion -.PersonEvents: +.ObjectEvents: db 12 - person_event SPRITE_OLIVINE_RIVAL, 15, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerSwimmermSimon, -1 - person_event SPRITE_OLIVINE_RIVAL, 30, 18, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerSwimmermRandall, -1 - person_event SPRITE_SWIMMER_GIRL, 19, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1 - person_event SPRITE_SWIMMER_GIRL, 25, 10, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfPaula, -1 - person_event SPRITE_ROCK, 11, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Rock, -1 - person_event SPRITE_ROCK, 9, 6, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Rock, -1 - person_event SPRITE_ROCK, 8, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Rock, -1 - person_event SPRITE_LASS, 13, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1a61c4, -1 - person_event SPRITE_BUENA, 10, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY - person_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1 - person_event SPRITE_LASS, 4, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x1a61d3, -1 - person_event SPRITE_STANDING_YOUNGSTER, 9, 16, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a61d6, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + object_event SPRITE_OLIVINE_RIVAL, 15, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSimon, -1 + object_event SPRITE_OLIVINE_RIVAL, 30, 18, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerSwimmermRandall, -1 + object_event SPRITE_SWIMMER_GIRL, 19, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1 + object_event SPRITE_SWIMMER_GIRL, 25, 10, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfPaula, -1 + object_event SPRITE_ROCK, 11, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 + object_event SPRITE_ROCK, 9, 6, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 + object_event SPRITE_ROCK, 8, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 + object_event SPRITE_LASS, 13, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Lass1Script, -1 + object_event SPRITE_BUENA, 10, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY + object_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1 + object_event SPRITE_LASS, 4, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1 + object_event SPRITE_STANDING_YOUNGSTER, 9, 16, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 4e6cfa8cb..6ffd98416 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -3,25 +3,22 @@ const_value set 2 const ROUTE40BATTLETOWERGATE_TWIN Route40BattleTowerGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .ShowSailor - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x9f665 - -UnknownScript_0x9f665: +.ShowSailor: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR return -RockerScript_0x9f669: - jumptextfaceplayer UnknownText_0x9f716 +Route40BattleTowerGateRockerScript: + jumptextfaceplayer Route40BattleTowerGateRockerText -TwinScript_0x9f66c: - jumptextfaceplayer UnknownText_0x9f7c8 +Route40BattleTowerGateTwinScript: + jumptextfaceplayer Route40BattleTowerGateTwinText UnknownText_0x9f66f: text "Did you come to" @@ -43,7 +40,7 @@ UnknownText_0x9f6ba: line "when I win." done -UnknownText_0x9f716: +Route40BattleTowerGateRockerText: text "Are you going to" line "the BATTLE TOWER?" @@ -62,7 +59,7 @@ UnknownText_0x9f783: line "the BATTLE TOWER." done -UnknownText_0x9f7c8: +Route40BattleTowerGateTwinText: text "The levels of the" line "#MON I want to" @@ -84,13 +81,13 @@ Route40BattleTowerGate_MapEventHeader: warp_def $0, $4, 1, BATTLE_TOWER_OUTSIDE warp_def $0, $5, 2, BATTLE_TOWER_OUTSIDE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_ROCKER, 3, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, RockerScript_0x9f669, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR - person_event SPRITE_TWIN, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, TwinScript_0x9f66c, -1 + object_event SPRITE_ROCKER, 3, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + object_event SPRITE_TWIN, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1 diff --git a/maps/Route41.asm b/maps/Route41.asm index 6c4b5c0d5..7ba8d9972 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -11,118 +11,118 @@ const_value set 2 const ROUTE41_SWIMMER_GIRL5 Route41_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerSwimmerfKaylee: - trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, SwimmerfKayleeScript + trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script -SwimmerfKayleeScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a6c7f + writetext SwimmerfKayleeAfterBattleText waitbutton closetext end TrainerSwimmerfSusie: - trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, SwimmerfSusieScript + trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, .Script -SwimmerfSusieScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a6d11 + writetext SwimmerfSusieAfterBattleText waitbutton closetext end TrainerSwimmerfDenise: - trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, SwimmerfDeniseScript + trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, .Script -SwimmerfDeniseScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a6d79 + writetext SwimmerfDeniseAfterBattleText waitbutton closetext end TrainerSwimmerfKara: - trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, SwimmerfKaraScript + trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, .Script -SwimmerfKaraScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a6e58 + writetext SwimmerfKaraAfterBattleText waitbutton closetext end TrainerSwimmerfWendy: - trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, SwimmerfWendyScript + trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, .Script -SwimmerfWendyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a6ec2 + writetext SwimmerfWendyAfterBattleText waitbutton closetext end TrainerSwimmermCharlie: - trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, SwimmermCharlieScript + trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, .Script -SwimmermCharlieScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a696e + writetext SwimmermCharlieAfterBattleText waitbutton closetext end TrainerSwimmermGeorge: - trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, SwimmermGeorgeScript + trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, .Script -SwimmermGeorgeScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a69d4 + writetext SwimmermGeorgeAfterBattleText waitbutton closetext end TrainerSwimmermBerke: - trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, SwimmermBerkeScript + trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, .Script -SwimmermBerkeScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a6aa4 + writetext SwimmermBerkeAfterBattleText waitbutton closetext end TrainerSwimmermKirk: - trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, SwimmermKirkScript + trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, .Script -SwimmermKirkScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a6b6c + writetext SwimmermKirkAfterBattleText waitbutton closetext end TrainerSwimmermMathew: - trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, SwimmermMathewScript + trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, .Script -SwimmermMathewScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a6bed + writetext SwimmermMathewAfterBattleText waitbutton closetext end @@ -148,7 +148,7 @@ SwimmermCharlieBeatenText: line "prune skin!" done -UnknownText_0x1a696e: +SwimmermCharlieAfterBattleText: text "Isn't it relaxing" line "just floating like" cont "this?" @@ -164,7 +164,7 @@ SwimmermGeorgeBeatenText: text "Pant, pant…" done -UnknownText_0x1a69d4: +SwimmermGeorgeAfterBattleText: text "It's so far to" line "CIANWOOD." @@ -189,7 +189,7 @@ SwimmermBerkeBeatenText: line "to your strength?" done -UnknownText_0x1a6aa4: +SwimmermBerkeAfterBattleText: text "It was a dark and" line "stormy night…" @@ -214,7 +214,7 @@ SwimmermKirkBeatenText: text "I'm beat!" done -UnknownText_0x1a6b6c: +SwimmermKirkAfterBattleText: text "The currents keep" line "me from reaching" cont "that island." @@ -231,7 +231,7 @@ SwimmermMathewBeatenText: line "great endurance!" done -UnknownText_0x1a6bed: +SwimmermMathewAfterBattleText: text "A secret about" line "WHIRL ISLANDS…" @@ -252,7 +252,7 @@ SwimmerfKayleeBeatenText: line "it?" done -UnknownText_0x1a6c7f: +SwimmerfKayleeAfterBattleText: text "There's supposed" line "to be a big #-" cont "MON deep beneath" @@ -272,7 +272,7 @@ SwimmerfSusieBeatenText: text "I'm crushed…" done -UnknownText_0x1a6d11: +SwimmerfSusieAfterBattleText: text "Wasn't there a hit" line "song about a boy" cont "riding a LAPRAS?" @@ -288,7 +288,7 @@ SwimmerfDeniseBeatenText: text "Ohhh!" done -UnknownText_0x1a6d79: +SwimmerfDeniseAfterBattleText: text "A sunburn is the" line "worst for skin." @@ -316,7 +316,7 @@ SwimmerfKaraBeatenText: line "energy than I do." done -UnknownText_0x1a6e58: +SwimmerfKaraAfterBattleText: text "I heard roars from" line "deep inside the" cont "ISLANDS." @@ -332,7 +332,7 @@ SwimmerfWendyBeatenText: text "Oh, dear…" done -UnknownText_0x1a6ec2: +SwimmerfWendyAfterBattleText: text "The clusters of" line "STARYU light up" cont "at the same time." @@ -352,22 +352,22 @@ Route41_MapEventHeader: warp_def $25, $c, 1, WHIRL_ISLAND_SW warp_def $2d, $24, 1, WHIRL_ISLAND_SE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 35, 9, SIGNPOST_ITEM, Route41HiddenMaxEther + bg_event 35, 9, BGEVENT_ITEM, Route41HiddenMaxEther -.PersonEvents: +.ObjectEvents: db 10 - person_event SPRITE_OLIVINE_RIVAL, 6, 32, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1 - person_event SPRITE_OLIVINE_RIVAL, 8, 46, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1 - person_event SPRITE_OLIVINE_RIVAL, 26, 20, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermBerke, -1 - person_event SPRITE_OLIVINE_RIVAL, 30, 32, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermKirk, -1 - person_event SPRITE_OLIVINE_RIVAL, 46, 19, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermMathew, -1 - person_event SPRITE_SWIMMER_GIRL, 4, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1 - person_event SPRITE_SWIMMER_GIRL, 19, 23, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfSusie, -1 - person_event SPRITE_SWIMMER_GIRL, 34, 27, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfDenise, -1 - person_event SPRITE_SWIMMER_GIRL, 28, 44, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerSwimmerfKara, -1 - person_event SPRITE_SWIMMER_GIRL, 50, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1 + object_event SPRITE_OLIVINE_RIVAL, 6, 32, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1 + object_event SPRITE_OLIVINE_RIVAL, 8, 46, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1 + object_event SPRITE_OLIVINE_RIVAL, 26, 20, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermBerke, -1 + object_event SPRITE_OLIVINE_RIVAL, 30, 32, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermKirk, -1 + object_event SPRITE_OLIVINE_RIVAL, 46, 19, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermMathew, -1 + object_event SPRITE_SWIMMER_GIRL, 4, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1 + object_event SPRITE_SWIMMER_GIRL, 19, 23, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfSusie, -1 + object_event SPRITE_SWIMMER_GIRL, 34, 27, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDenise, -1 + object_event SPRITE_SWIMMER_GIRL, 28, 44, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfKara, -1 + object_event SPRITE_SWIMMER_GIRL, 50, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1 diff --git a/maps/Route42.asm b/maps/Route42.asm index b9007bb08..40feaa927 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -10,20 +10,18 @@ const_value set 2 const ROUTE42_SUICUNE Route42_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x1a9216, 0 - dw UnknownScript_0x1a9217, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -UnknownScript_0x1a9216: +.DummyScene0: end -UnknownScript_0x1a9217: +.DummyScene1: end Route42SuicuneScript: @@ -33,15 +31,15 @@ Route42SuicuneScript: applymovement ROUTE42_SUICUNE, MovementData_0x1a9356 disappear ROUTE42_SUICUNE pause 10 - dotrigger $0 + setscene $0 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36 - domaptrigger ROUTE_36, $1 + setmapscene ROUTE_36, $1 end TrainerFisherTully1: - trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, 0, FisherTully1Script + trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, 0, .Script -FisherTully1Script: +.Script: writecode VAR_CALLERID, PHONE_FISHER_TULLY end_if_just_battled opentext @@ -165,23 +163,23 @@ UnknownScript_0x1a9311: end TrainerPokemaniacShane: - trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, PokemaniacShaneScript + trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, .Script -PokemaniacShaneScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a94d6 + writetext PokemaniacShaneAfterBattleText waitbutton closetext end TrainerHikerBenjamin: - trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, HikerBenjaminScript + trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, .Script -HikerBenjaminScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a943f + writetext HikerBenjaminAfterBattleText waitbutton closetext end @@ -260,7 +258,7 @@ HikerBenjaminBeatenText: text "Gahahah!" done -UnknownText_0x1a943f: +HikerBenjaminAfterBattleText: text "Losing feels in-" line "significant if you" @@ -281,7 +279,7 @@ PokemaniacShaneBeatenText: line "my MOON STONE…" done -UnknownText_0x1a94d6: +PokemaniacShaneAfterBattleText: text "You're working on" line "a #DEX?" @@ -333,26 +331,26 @@ Route42_MapEventHeader: warp_def $9, $1c, 2, MOUNT_MORTAR_1F_OUTSIDE warp_def $7, $2e, 3, MOUNT_MORTAR_1F_OUTSIDE -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 1, $e, $18, $0, Route42SuicuneScript, $0, $0 + coord_event 1, $e, $18, Route42SuicuneScript -.Signposts: +.BGEvents: db 5 - signpost 10, 4, SIGNPOST_READ, Route42Sign1 - signpost 5, 7, SIGNPOST_READ, MtMortarSign1 - signpost 9, 45, SIGNPOST_READ, MtMortarSign2 - signpost 8, 54, SIGNPOST_READ, Route42Sign2 - signpost 11, 16, SIGNPOST_ITEM, Route42HiddenMaxPotion + bg_event 10, 4, BGEVENT_READ, Route42Sign1 + bg_event 5, 7, BGEVENT_READ, MtMortarSign1 + bg_event 9, 45, BGEVENT_READ, MtMortarSign2 + bg_event 8, 54, BGEVENT_READ, Route42Sign2 + bg_event 11, 16, BGEVENT_ITEM, Route42HiddenMaxPotion -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_FISHER, 10, 40, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherTully1, -1 - person_event SPRITE_POKEFAN_M, 9, 51, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 - person_event SPRITE_SUPER_NERD, 8, 47, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 - person_event SPRITE_FRUIT_TREE, 16, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 - person_event SPRITE_FRUIT_TREE, 16, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1 - person_event SPRITE_FRUIT_TREE, 16, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1 - person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL - person_event SPRITE_POKE_BALL, 8, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION - person_event SPRITE_SUICUNE, 16, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 + object_event SPRITE_FISHER, 10, 40, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully1, -1 + object_event SPRITE_POKEFAN_M, 9, 51, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 + object_event SPRITE_SUPER_NERD, 8, 47, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 + object_event SPRITE_FRUIT_TREE, 16, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 + object_event SPRITE_FRUIT_TREE, 16, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1 + object_event SPRITE_FRUIT_TREE, 16, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1 + object_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL + object_event SPRITE_POKE_BALL, 8, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION + object_event SPRITE_SUICUNE, 16, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index df7927010..b7cbf6c6f 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -2,16 +2,16 @@ const_value set 2 const ROUTE42ECRUTEAKGATE_OFFICER Route42EcruteakGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -OfficerScript_0x19a4b5: - jumptextfaceplayer UnknownText_0x19a4b8 +Route42EcruteakGateOfficerScript: + jumptextfaceplayer Route42EcruteakGateOfficerText -UnknownText_0x19a4b8: +Route42EcruteakGateOfficerText: text "MT.MORTAR is like" line "a maze inside." @@ -30,12 +30,12 @@ Route42EcruteakGate_MapEventHeader: warp_def $4, $9, 1, ROUTE_42 warp_def $5, $9, 2, ROUTE_42 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19a4b5, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1 diff --git a/maps/Route43.asm b/maps/Route43.asm index b3c3da115..871cd133c 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -9,52 +9,49 @@ const_value set 2 const ROUTE43_POKE_BALL Route43_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 + dbw MAPCALLBACK_NEWMAP, .CheckIfRockets - ; callbacks - - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x19d051 - -UnknownScript_0x19d051: +.CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT - iftrue UnknownScript_0x19d05c - domaptrigger ROUTE_43_GATE, $0 + iftrue .NoRockets + setmapscene ROUTE_43_GATE, $0 return -UnknownScript_0x19d05c: - domaptrigger ROUTE_43_GATE, $1 +.NoRockets: + setmapscene ROUTE_43_GATE, $1 return TrainerCamperSpencer: - trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, CamperSpencerScript + trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script -CamperSpencerScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19d57e + writetext CamperSpencerAfterBattleText waitbutton closetext end TrainerPokemaniacBen: - trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, PokemaniacBenScript + trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, .Script -PokemaniacBenScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19d2d2 + writetext PokemaniacBenAfterBattleText waitbutton closetext end TrainerPokemaniacBrent1: - trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, 0, PokemaniacBrent1Script + trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, 0, .Script -PokemaniacBrent1Script: +.Script: writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT end_if_just_battled opentext @@ -157,31 +154,31 @@ UnknownScript_0x19d144: end TrainerPokemaniacRon: - trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, PokemaniacRonScript + trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, .Script -PokemaniacRonScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19d3f8 + writetext PokemaniacRonAfterBattleText waitbutton closetext end TrainerFisherMarvin: - trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, FisherMarvinScript + trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, .Script -FisherMarvinScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19d4d3 + writetext FisherMarvinAfterBattleText waitbutton closetext end TrainerPicnickerTiffany3: - trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, 0, PicnickerTiffany3Script + trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, 0, .Script -PicnickerTiffany3Script: +.Script: writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY end_if_just_battled opentext @@ -342,7 +339,7 @@ PokemaniacBenBeatenText: line "this to me?" done -UnknownText_0x19d2d2: +PokemaniacBenAfterBattleText: text "What else do I" line "like besides" cont "#MON?" @@ -384,7 +381,7 @@ PokemaniacRonBeatenText: line "pretty right on!" done -UnknownText_0x19d3f8: +PokemaniacRonAfterBattleText: text "It's okay for" line "people to like" @@ -411,7 +408,7 @@ FisherMarvinBeatenText: line "better anyway." done -UnknownText_0x19d4d3: +FisherMarvinAfterBattleText: text "KURT's LURE BALL" line "is the best for" @@ -434,7 +431,7 @@ CamperSpencerBeatenText: line "at all…" done -UnknownText_0x19d57e: +CamperSpencerAfterBattleText: text "What is going on" line "at LAKE OF RAGE?" @@ -515,22 +512,22 @@ Route43_MapEventHeader: warp_def $1f, $11, 1, ROUTE_43_GATE warp_def $1f, $12, 2, ROUTE_43_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 3, 13, SIGNPOST_READ, Route43Sign1 - signpost 49, 11, SIGNPOST_READ, Route43Sign2 - signpost 38, 16, SIGNPOST_READ, Route43TrainerTips + bg_event 3, 13, BGEVENT_READ, Route43Sign1 + bg_event 49, 11, BGEVENT_READ, Route43Sign2 + bg_event 38, 16, BGEVENT_READ, Route43TrainerTips -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_SUPER_NERD, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerPokemaniacBen, -1 - person_event SPRITE_SUPER_NERD, 20, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacBrent1, -1 - person_event SPRITE_SUPER_NERD, 7, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerPokemaniacRon, -1 - person_event SPRITE_FISHER, 16, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerFisherMarvin, -1 - person_event SPRITE_LASS, 25, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerTiffany3, -1 - person_event SPRITE_YOUNGSTER, 40, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperSpencer, -1 - person_event SPRITE_FRUIT_TREE, 26, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1 - person_event SPRITE_POKE_BALL, 32, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER + object_event SPRITE_SUPER_NERD, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1 + object_event SPRITE_SUPER_NERD, 20, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacBrent1, -1 + object_event SPRITE_SUPER_NERD, 7, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1 + object_event SPRITE_FISHER, 16, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerFisherMarvin, -1 + object_event SPRITE_LASS, 25, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany3, -1 + object_event SPRITE_YOUNGSTER, 40, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperSpencer, -1 + object_event SPRITE_FRUIT_TREE, 26, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1 + object_event SPRITE_POKE_BALL, 32, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index ee54a42c7..04542679b 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -1,46 +1,43 @@ +ROUTE43GATE_TOLL EQU 1000 + const_value set 2 const ROUTE43GATE_OFFICER const ROUTE43GATE_ROCKET1 const ROUTE43GATE_ROCKET2 Route43Gate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + scene_script .RocketShakedown + scene_script .DummyScene .MapCallbacks: db 1 + dbw MAPCALLBACK_NEWMAP, .CheckIfRockets - ; callbacks - - dbw MAPCALLBACK_NEWMAP, GateScript_CheckIfRockets - -.Trigger0: - priorityjump GateScript_RocketTakeover +.RocketShakedown: + priorityjump .RocketTakeover end -.Trigger1: +.DummyScene: end -GateScript_CheckIfRockets: +.CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT - iftrue GateScript_NoRockets - domaptrigger ROUTE_43, $0 + iftrue .NoRockets + setmapscene ROUTE_43, $0 return -GateScript_NoRockets: - domaptrigger ROUTE_43, $1 +.NoRockets: + setmapscene ROUTE_43, $1 return -GateScript_RocketTakeover: +.RocketTakeover: playmusic MUSIC_ROCKET_ENCOUNTER checkcode VAR_FACING if_equal DOWN, RocketScript_Southbound if_equal UP, RocketScript_Northbound - dotrigger $1 + setscene $1 end RocketScript_Southbound: @@ -53,17 +50,17 @@ RocketScript_Southbound: opentext writetext RocketText_TollFee buttonsound - checkmoney $0, 999 + checkmoney $0, ROUTE43GATE_TOLL - 1 if_equal $0, RocketScript_TollSouth jump RocketScript_YoureBrokeSouth RocketScript_TollSouth: - takemoney $0, 1000 + takemoney $0, ROUTE43GATE_TOLL writetext RocketText_ThankYou jump RocketScript_ShakeDownSouth RocketScript_YoureBrokeSouth: - takemoney $0, 1000 + takemoney $0, ROUTE43GATE_TOLL writetext RocketText_AllYouGot jump RocketScript_ShakeDownSouth @@ -72,7 +69,7 @@ RocketScript_ShakeDownSouth: closetext applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassSouth applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassSouth - dotrigger $1 + setscene $1 special RestartMapMusic end @@ -85,17 +82,17 @@ RocketScript_Northbound: opentext writetext RocketText_TollFee buttonsound - checkmoney $0, 999 + checkmoney $0, ROUTE43GATE_TOLL - 1 if_equal $0, RocketScript_TollNorth jump RocketScript_YoureBrokeNorth RocketScript_TollNorth: - takemoney $0, 1000 + takemoney $0, ROUTE43GATE_TOLL writetext RocketText_ThankYou jump RocketScript_ShakeDownNorth RocketScript_YoureBrokeNorth: - takemoney $0, 1000 + takemoney $0, ROUTE43GATE_TOLL writetext RocketText_AllYouGot jump RocketScript_ShakeDownNorth @@ -104,7 +101,7 @@ RocketScript_ShakeDownNorth: closetext applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassNorth applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassNorth - dotrigger $1 + setscene $1 special RestartMapMusic end @@ -261,14 +258,14 @@ Route43Gate_MapEventHeader: warp_def $7, $4, 3, ROUTE_43 warp_def $7, $5, 3, ROUTE_43 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS - person_event SPRITE_ROCKET, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS - person_event SPRITE_ROCKET, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS + object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS + object_event SPRITE_ROCKET, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS + object_event SPRITE_ROCKET, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index b60e5e160..e4b6396c1 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE43MAHOGANYGATE_OFFICER Route43MahoganyGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -49,12 +49,12 @@ Route43MahoganyGate_MapEventHeader: warp_def $7, $4, 5, MAHOGANY_TOWN warp_def $7, $5, 5, MAHOGANY_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19ab0b, -1 + object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ab0b, -1 diff --git a/maps/Route44.asm b/maps/Route44.asm index 48d7a2eb5..a12953ebc 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -12,16 +12,16 @@ const_value set 2 const ROUTE44_POKE_BALL3 Route44_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerBird_keeperVance1: - trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, Bird_keeperVance1SeenText, Bird_keeperVance1BeatenText, 0, Bird_keeperVance1Script + trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, Bird_keeperVance1SeenText, Bird_keeperVance1BeatenText, 0, .Script -Bird_keeperVance1Script: +.Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE end_if_just_battled opentext @@ -150,20 +150,20 @@ UnknownScript_0x19d90a: end TrainerPsychicPhil: - trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, PsychicPhilScript + trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, .Script -PsychicPhilScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19dcfc + writetext PsychicPhilAfterBattleText waitbutton closetext end TrainerFisherWilton1: - trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, 0, FisherWilton1Script + trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, 0, .Script -FisherWilton1Script: +.Script: writecode VAR_CALLERID, PHONE_FISHER_WILTON end_if_just_battled opentext @@ -256,45 +256,45 @@ UnknownScript_0x19d9e7: jump UnknownScript_0x19d8ff TrainerFisherEdgar: - trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, FisherEdgarScript + trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script -FisherEdgarScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19db6f + writetext FisherEdgarAfterBattleText waitbutton closetext end TrainerCooltrainerfCybil: - trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, CooltrainerfCybilScript + trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, .Script -CooltrainerfCybilScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19df4d + writetext CooltrainerfCybilAfterBattleText waitbutton closetext end TrainerPokemaniacZach: - trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, PokemaniacZachScript + trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, .Script -PokemaniacZachScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19dd7e + writetext PokemaniacZachAfterBattleText waitbutton closetext end TrainerCooltrainermAllen: - trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, CooltrainermAllenScript + trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, .Script -CooltrainermAllenScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19de66 + writetext CooltrainermAllenAfterBattleText waitbutton closetext end @@ -360,7 +360,7 @@ FisherEdgarBeatenText: line "This isn't right." done -UnknownText_0x19db6f: +FisherEdgarAfterBattleText: text "That's 100 wins" line "to 101 losses." @@ -412,7 +412,7 @@ PsychicPhilBeatenText: line "shocking loss…" done -UnknownText_0x19dcfc: +PsychicPhilAfterBattleText: text "It's important to" line "have conviction" cont "on your side." @@ -429,7 +429,7 @@ PokemaniacZachBeatenText: line "are so appealing." done -UnknownText_0x19dd7e: +PokemaniacZachAfterBattleText: text "If a #MON has" line "different colors" @@ -455,7 +455,7 @@ CooltrainermAllenBeatenText: line "loss on my part." done -UnknownText_0x19de66: +CooltrainermAllenAfterBattleText: text "Wow. You have a" line "lot of BADGES." @@ -485,7 +485,7 @@ CooltrainerfCybilBeatenText: line "do at all." done -UnknownText_0x19df4d: +CooltrainerfCybilAfterBattleText: text "We all get better" line "by experiencing" cont "many battles." @@ -515,25 +515,25 @@ Route44_MapEventHeader: db 1 warp_def $7, $38, 1, ICE_PATH_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 7, 53, SIGNPOST_READ, Route44Sign1 - signpost 10, 6, SIGNPOST_READ, Route44Sign2 - signpost 9, 32, SIGNPOST_ITEM, Route44HiddenElixer + bg_event 7, 53, BGEVENT_READ, Route44Sign1 + bg_event 10, 6, BGEVENT_READ, Route44Sign2 + bg_event 9, 32, BGEVENT_ITEM, Route44HiddenElixer -.PersonEvents: +.ObjectEvents: db 11 - person_event SPRITE_FISHER, 3, 35, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherWilton1, -1 - person_event SPRITE_FISHER, 13, 19, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherEdgar, -1 - person_event SPRITE_YOUNGSTER, 9, 10, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicPhil, -1 - person_event SPRITE_SUPER_NERD, 2, 43, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerPokemaniacZach, -1 - person_event SPRITE_YOUNGSTER, 5, 51, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerBird_keeperVance1, -1 - person_event SPRITE_COOLTRAINER_M, 15, 41, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1 - person_event SPRITE_COOLTRAINER_F, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1 - person_event SPRITE_FRUIT_TREE, 5, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1 - person_event SPRITE_POKE_BALL, 8, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE - person_event SPRITE_POKE_BALL, 4, 45, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL - person_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL + object_event SPRITE_FISHER, 3, 35, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1 + object_event SPRITE_FISHER, 13, 19, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherEdgar, -1 + object_event SPRITE_YOUNGSTER, 9, 10, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1 + object_event SPRITE_SUPER_NERD, 2, 43, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacZach, -1 + object_event SPRITE_YOUNGSTER, 5, 51, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBird_keeperVance1, -1 + object_event SPRITE_COOLTRAINER_M, 15, 41, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1 + object_event SPRITE_COOLTRAINER_F, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1 + object_event SPRITE_FRUIT_TREE, 5, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1 + object_event SPRITE_POKE_BALL, 8, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE + object_event SPRITE_POKE_BALL, 4, 45, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL + object_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 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 67459ad8b..592719890 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -14,16 +14,16 @@ const_value set 2 const ROUTE45_YOUNGSTER Route45_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerBlackbeltKenji: - trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, BlackbeltKenji3Script + trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script -BlackbeltKenji3Script: +.Script: writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI end_if_just_battled opentext @@ -125,31 +125,31 @@ UnknownScript_0x19e146: end TrainerHikerErik: - trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, 0, HikerErikScript + trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, 0, .Script -HikerErikScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19e301 + writetext HikerErikAfterBattleText waitbutton closetext end TrainerHikerMichael: - trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, HikerMichaelScript + trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, .Script -HikerMichaelScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19e3b1 + writetext HikerMichaelAfterBattleText waitbutton closetext end TrainerHikerParry: - trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, 0, HikerParry3Script + trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, 0, .Script -HikerParry3Script: +.Script: writecode VAR_CALLERID, PHONE_HIKER_PARRY end_if_just_battled opentext @@ -233,34 +233,34 @@ UnknownScript_0x19e219: jump UnknownScript_0x19e127 TrainerHikerTimothy: - trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, HikerTimothyScript + trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script -HikerTimothyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19e4f1 + writetext HikerTimothyAfterBattleText waitbutton closetext end TrainerCooltrainermRyan: - trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, CooltrainermRyanScript + trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, .Script -CooltrainermRyanScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19e70d + writetext CooltrainermRyanAfterBattleText waitbutton closetext end TrainerCooltrainerfKelly: - trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, CooltrainerfKellyScript + trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, .Script -CooltrainerfKellyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19e7d1 + writetext CooltrainerfKellyAfterBattleText waitbutton closetext end @@ -328,7 +328,7 @@ HikerErikBeatenText: text "Oh, I lost that!" done -UnknownText_0x19e301: +HikerErikAfterBattleText: text "I'll head back to" line "BLACKTHORN's ICE" @@ -350,7 +350,7 @@ HikerMichaelBeatenText: line "spunky enough!" done -UnknownText_0x19e3b1: +HikerMichaelAfterBattleText: text "Boy, do I love" line "HP UP! Mmmm, yum!" @@ -397,7 +397,7 @@ HikerTimothyBeatenText: line "They're there too!" done -UnknownText_0x19e4f1: +HikerTimothyAfterBattleText: text "The best thing to" line "ever happen to me" @@ -467,7 +467,7 @@ CooltrainermRyanBeatenText: line "respect." done -UnknownText_0x19e70d: +CooltrainermRyanAfterBattleText: text "I see you're rais-" line "ing your #MON" cont "with care." @@ -490,7 +490,7 @@ CooltrainerfKellyBeatenText: text "Fine. I lost." done -UnknownText_0x19e7d1: +CooltrainerfKellyAfterBattleText: text "I'm not in favor" line "of overly power-" cont "ful moves." @@ -540,26 +540,26 @@ Route45_MapEventHeader: db 1 warp_def $5, $2, 1, DARK_CAVE_BLACKTHORN_ENTRANCE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 4, 10, SIGNPOST_READ, Route45Sign - signpost 80, 13, SIGNPOST_ITEM, Route45HiddenPpUp + bg_event 4, 10, BGEVENT_READ, Route45Sign + bg_event 80, 13, BGEVENT_ITEM, Route45HiddenPpUp -.PersonEvents: +.ObjectEvents: db 13 - person_event SPRITE_POKEFAN_M, 16, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerHikerErik, -1 - person_event SPRITE_POKEFAN_M, 65, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerMichael, -1 - person_event SPRITE_POKEFAN_M, 28, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerParry, -1 - person_event SPRITE_POKEFAN_M, 65, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerHikerTimothy, -1 - person_event SPRITE_BLACK_BELT, 50, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerBlackbeltKenji, -1 - person_event SPRITE_COOLTRAINER_M, 18, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1 - person_event SPRITE_COOLTRAINER_F, 36, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1 - person_event SPRITE_FRUIT_TREE, 82, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1 - person_event SPRITE_POKE_BALL, 51, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET - person_event SPRITE_POKE_BALL, 66, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE - person_event SPRITE_POKE_BALL, 20, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER - person_event SPRITE_POKE_BALL, 33, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION - person_event SPRITE_YOUNGSTER, 70, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19e269, -1 + object_event SPRITE_POKEFAN_M, 16, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerErik, -1 + object_event SPRITE_POKEFAN_M, 65, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerMichael, -1 + object_event SPRITE_POKEFAN_M, 28, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerParry, -1 + object_event SPRITE_POKEFAN_M, 65, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerTimothy, -1 + object_event SPRITE_BLACK_BELT, 50, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltKenji, -1 + object_event SPRITE_COOLTRAINER_M, 18, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1 + object_event SPRITE_COOLTRAINER_F, 36, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1 + object_event SPRITE_FRUIT_TREE, 82, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1 + object_event SPRITE_POKE_BALL, 51, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET + object_event SPRITE_POKE_BALL, 66, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE + object_event SPRITE_POKE_BALL, 20, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER + object_event SPRITE_POKE_BALL, 33, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION + object_event SPRITE_YOUNGSTER, 70, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x19e269, -1 diff --git a/maps/Route46.asm b/maps/Route46.asm index ce4d4d5ec..89d6ac61e 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -7,27 +7,27 @@ const_value set 2 const ROUTE46_POKE_BALL Route46_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerCamperTed: - trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, 0, CamperTedScript + trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script -CamperTedScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a9851 + writetext CamperTedAfterBattleText waitbutton closetext end TrainerPicnickerErin1: - trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, PicnickerErin1Script + trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, .Script -PicnickerErin1Script: +.Script: writecode VAR_CALLERID, PHONE_PICNICKER_ERIN end_if_just_battled opentext @@ -148,12 +148,12 @@ UnknownScript_0x1a9772: end TrainerHikerBailey: - trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, HikerBaileyScript + trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, .Script -HikerBaileyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a97e8 + writetext HikerBaileyAfterBattleText waitbutton closetext end @@ -181,7 +181,7 @@ HikerBaileyBeatenText: line "me your power!" done -UnknownText_0x1a97e8: +HikerBaileyAfterBattleText: text "It's over. I don't" line "mind. We HIKERS" cont "are like that." @@ -199,7 +199,7 @@ CamperTedBeatenText: text "Wha…?" done -UnknownText_0x1a9851: +CamperTedAfterBattleText: text "I did my best but" line "came up short." @@ -260,18 +260,18 @@ Route46_MapEventHeader: warp_def $21, $8, 2, ROUTE_29_46_GATE warp_def $5, $e, 3, DARK_CAVE_VIOLET_ENTRANCE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 27, 9, SIGNPOST_READ, Route46Sign + bg_event 27, 9, BGEVENT_READ, Route46Sign -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_POKEFAN_M, 19, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerBailey, -1 - person_event SPRITE_YOUNGSTER, 14, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerCamperTed, -1 - person_event SPRITE_LASS, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerErin1, -1 - person_event SPRITE_FRUIT_TREE, 5, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1 - person_event SPRITE_FRUIT_TREE, 6, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1 - person_event SPRITE_POKE_BALL, 15, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED + object_event SPRITE_POKEFAN_M, 19, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1 + object_event SPRITE_YOUNGSTER, 14, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1 + object_event SPRITE_LASS, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1 + object_event SPRITE_FRUIT_TREE, 5, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1 + object_event SPRITE_FRUIT_TREE, 6, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1 + object_event SPRITE_POKE_BALL, 15, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED diff --git a/maps/Route5.asm b/maps/Route5.asm index 951bba75c..047774506 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -2,14 +2,14 @@ const_value set 2 const ROUTE5_POKEFAN_M Route5_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -PokefanMScript_0x1adb19: - jumptextfaceplayer UnknownText_0x1adb22 +Route5PokefanMScript: + jumptextfaceplayer Route5PokefanMText Route5UndergroundPathSign: jumptext Route5UndergroundPathSignText @@ -17,7 +17,7 @@ Route5UndergroundPathSign: HouseForSaleSign: jumptext HouseForSaleSignText -UnknownText_0x1adb22: +Route5PokefanMText: text "The road is closed" line "until the problem" @@ -45,19 +45,19 @@ Route5_MapEventHeader: .Warps: db 4 - warp_def $f, $11, 1, ROUTE_5_UNDERGROUND_ENTRANCE + warp_def $f, $11, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE warp_def $11, $8, 1, ROUTE_5_SAFFRON_CITY_GATE warp_def $11, $9, 2, ROUTE_5_SAFFRON_CITY_GATE warp_def $b, $a, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 17, 17, SIGNPOST_READ, Route5UndergroundPathSign - signpost 11, 10, SIGNPOST_READ, HouseForSaleSign + bg_event 17, 17, BGEVENT_READ, Route5UndergroundPathSign + bg_event 11, 10, BGEVENT_READ, HouseForSaleSign -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKEFAN_M, 16, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1adb19, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + object_event SPRITE_POKEFAN_M, 16, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index 299d80c76..513adfac2 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE5CLEANSETAGSPEECHHOUSE_TEACHER Route5CleanseTagSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -26,8 +26,8 @@ UnknownScript_0x18b64d: closetext end -TeacherScript_0x18b64f: - jumptextfaceplayer UnknownText_0x18b6de +Route5CleanseTagSpeechHouseTeacherScript: + jumptextfaceplayer Route5CleanseTagSpeechHouseTeacherText HouseForSaleBookshelf: jumpstd difficultbookshelf @@ -49,7 +49,7 @@ UnknownText_0x18b6a7: cont "are protected now." done -UnknownText_0x18b6de: +Route5CleanseTagSpeechHouseTeacherText: text "My grandma is into" line "warding off what" @@ -69,15 +69,15 @@ Route5CleanseTagSpeechHouse_MapEventHeader: warp_def $7, $2, 4, ROUTE_5 warp_def $7, $3, 4, ROUTE_5 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, HouseForSaleBookshelf - signpost 1, 1, SIGNPOST_READ, HouseForSaleBookshelf + bg_event 1, 0, BGEVENT_READ, HouseForSaleBookshelf + bg_event 1, 1, BGEVENT_READ, HouseForSaleBookshelf -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_GRANNY, 5, 2, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1 - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18b64f, -1 + object_event SPRITE_GRANNY, 5, 2, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1 + object_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagSpeechHouseTeacherScript, -1 diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm index cefe24e47..ebd84823e 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronCityGate.asm @@ -2,16 +2,16 @@ const_value set 2 const ROUTE5SAFFRONCITYGATE_OFFICER Route5SaffronCityGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -OfficerScript_0x18b5b9: - jumptextfaceplayer UnknownText_0x18b5bc +Route5SaffronCityGateOfficerScript: + jumptextfaceplayer Route5SaffronCityGateOfficerText -UnknownText_0x18b5bc: +Route5SaffronCityGateOfficerText: text "You're from JOHTO," line "aren't you?" @@ -31,12 +31,12 @@ Route5SaffronCityGate_MapEventHeader: warp_def $7, $4, 9, SAFFRON_CITY warp_def $7, $5, 9, SAFFRON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x18b5b9, -1 + object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronCityGateOfficerScript, -1 diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm deleted file mode 100644 index a9051d75b..000000000 --- a/maps/Route5UndergroundEntrance.asm +++ /dev/null @@ -1,40 +0,0 @@ -const_value set 2 - const ROUTE5UNDERGROUNDENTRANCE_TEACHER - -Route5UndergroundEntrance_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -TeacherScript_0x18b555: - jumptextfaceplayer UnknownText_0x18b558 - -UnknownText_0x18b558: - text "Many cities in" - line "JOHTO have long" - - para "histories. I'd" - line "love to visit!" - done - -Route5UndergroundEntrance_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def $7, $3, 1, ROUTE_5 - warp_def $7, $4, 1, ROUTE_5 - warp_def $3, $4, 1, UNDERGROUND - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 1 - person_event SPRITE_TEACHER, 2, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18b555, -1 diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm new file mode 100644 index 000000000..ee47e150e --- /dev/null +++ b/maps/Route5UndergroundPathEntrance.asm @@ -0,0 +1,40 @@ +const_value set 2 + const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER + +Route5UndergroundPathEntrance_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +Route5UndergroundPathEntranceTeacherScript: + jumptextfaceplayer Route5UndergroundPathEntranceTeacherText + +Route5UndergroundPathEntranceTeacherText: + text "Many cities in" + line "JOHTO have long" + + para "histories. I'd" + line "love to visit!" + done + +Route5UndergroundPathEntrance_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 3 + warp_def $7, $3, 1, ROUTE_5 + warp_def $7, $4, 1, ROUTE_5 + warp_def $3, $4, 1, UNDERGROUND_PATH + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 1 + object_event SPRITE_TEACHER, 2, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundPathEntranceTeacherScript, -1 diff --git a/maps/Route6.asm b/maps/Route6.asm index 335980dca..884470930 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -4,41 +4,41 @@ const_value set 2 const ROUTE6_POKEFAN_M3 Route6_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerPokefanmRex: - trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, PokefanmRexScript + trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script -PokefanmRexScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ad9ff + writetext PokefanmRexAfterBattleText waitbutton closetext end TrainerPokefanmAllan: - trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, PokefanmAllanScript + trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, .Script -PokefanmAllanScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ada88 + writetext PokefanmAllanAfterBattleText waitbutton closetext end -PokefanMScript_0x1ad951: - jumptextfaceplayer UnknownText_0x1ad957 +Route6PokefanMScript: + jumptextfaceplayer Route6PokefanMText Route6UndergroundPathSign: jumptext Route6UndergroundPathSignText -UnknownText_0x1ad957: +Route6PokefanMText: text "The road is closed" line "until the problem" @@ -63,7 +63,7 @@ PokefanmRexBeatenText: text "My PHANPY!" done -UnknownText_0x1ad9ff: +PokefanmRexAfterBattleText: text "Look how adorable" line "my PHANPY acts!" @@ -82,7 +82,7 @@ PokefanmAllanBeatenText: text "My TEDDIURSA!" done -UnknownText_0x1ada88: +PokefanmAllanAfterBattleText: text "Look how adorable" line "my TEDDIURSA acts!" @@ -97,18 +97,18 @@ Route6_MapEventHeader: .Warps: db 2 - warp_def $3, $11, 1, ROUTE_6_UNDERGROUND_ENTRANCE + warp_def $3, $11, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE warp_def $1, $6, 3, ROUTE_6_SAFFRON_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 5, 19, SIGNPOST_READ, Route6UndergroundPathSign + bg_event 5, 19, BGEVENT_READ, Route6UndergroundPathSign -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKEFAN_M, 4, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 2, PokefanMScript_0x1ad951, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH - person_event SPRITE_POKEFAN_M, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, TrainerPokefanmRex, -1 - person_event SPRITE_POKEFAN_M, 12, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, TrainerPokefanmAllan, -1 + object_event SPRITE_POKEFAN_M, 4, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + object_event SPRITE_POKEFAN_M, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1 + object_event SPRITE_POKEFAN_M, 12, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmAllan, -1 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 9e3275d97..25f234e82 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -2,16 +2,14 @@ const_value set 2 const ROUTE6SAFFRONGATE_OFFICER Route6SaffronGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - - ; triggers - dw UnknownScript_0x1926e9, 0 + scene_script .DummyScene .MapCallbacks: db 0 -UnknownScript_0x1926e9: +.DummyScene: end OfficerScript_0x1926ea: @@ -70,12 +68,12 @@ Route6SaffronGate_MapEventHeader: warp_def $7, $4, 2, ROUTE_6 warp_def $7, $5, 2, ROUTE_6 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x1926ea, -1 + object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1926ea, -1 diff --git a/maps/Route6UndergroundEntrance.asm b/maps/Route6UndergroundEntrance.asm deleted file mode 100644 index e1dbd1b86..000000000 --- a/maps/Route6UndergroundEntrance.asm +++ /dev/null @@ -1,25 +0,0 @@ -Route6UndergroundEntrance_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -Route6UndergroundEntrance_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def $7, $3, 1, ROUTE_6 - warp_def $7, $4, 1, ROUTE_6 - warp_def $3, $4, 2, UNDERGROUND - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 0 diff --git a/maps/Route6UndergroundPathEntrance.asm b/maps/Route6UndergroundPathEntrance.asm new file mode 100644 index 000000000..3088ae330 --- /dev/null +++ b/maps/Route6UndergroundPathEntrance.asm @@ -0,0 +1,25 @@ +Route6UndergroundPathEntrance_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +Route6UndergroundPathEntrance_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 3 + warp_def $7, $3, 1, ROUTE_6 + warp_def $7, $4, 1, ROUTE_6 + warp_def $3, $4, 2, UNDERGROUND_PATH + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 0 diff --git a/maps/Route7.asm b/maps/Route7.asm index 1b56ea3cf..c412b4a46 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -1,5 +1,5 @@ Route7_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -43,13 +43,13 @@ Route7_MapEventHeader: warp_def $6, $f, 1, ROUTE_7_SAFFRON_GATE warp_def $7, $f, 2, ROUTE_7_SAFFRON_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 11, 5, SIGNPOST_READ, Route7UndergroundPathSign - signpost 9, 6, SIGNPOST_READ, Route7LockedDoor + bg_event 11, 5, BGEVENT_READ, Route7UndergroundPathSign + bg_event 9, 6, BGEVENT_READ, Route7LockedDoor -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index df494e313..1b5a02785 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE7SAFFRONGATE_OFFICER Route7SaffronGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -56,12 +56,12 @@ Route7SaffronGate_MapEventHeader: warp_def $4, $9, 10, SAFFRON_CITY warp_def $5, $9, 11, SAFFRON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x73518, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x73518, -1 diff --git a/maps/Route8.asm b/maps/Route8.asm index 67318446c..66a207130 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -7,63 +7,63 @@ const_value set 2 const ROUTE8_FRUIT_TREE Route8_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerBikerDwayne: - trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, BikerDwayneScript + trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script -BikerDwayneScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x6c0c8 + writetext BikerDwayneAfterBattleText waitbutton closetext end TrainerBikerHarris: - trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, BikerHarrisScript + trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, .Script -BikerHarrisScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x6c143 + writetext BikerHarrisAfterBattleText waitbutton closetext end TrainerBikerZeke: - trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, BikerZekeScript + trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, .Script -BikerZekeScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x6c1a3 + writetext BikerZekeAfterBattleText waitbutton closetext end TrainerSupernerdSam: - trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, SupernerdSamScript + trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, .Script -SupernerdSamScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x6c219 + writetext SupernerdSamAfterBattleText waitbutton closetext end TrainerSupernerdTom: - trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, SupernerdTomScript + trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, .Script -SupernerdTomScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x6c27e + writetext SupernerdTomAfterBattleText waitbutton closetext end @@ -90,7 +90,7 @@ BikerDwayneBeatenText: text "S-sorry!" done -UnknownText_0x6c0c8: +BikerDwayneAfterBattleText: text "The KANTO #MON" line "FEDERATION will" cont "never fall!" @@ -108,7 +108,7 @@ BikerHarrisBeatenText: text "F-forgive me!" done -UnknownText_0x6c143: +BikerHarrisAfterBattleText: text "Wiped out by some" line "punk from JOHTO…" done @@ -124,7 +124,7 @@ BikerZekeBeatenText: text "Yikes! Sorry!" done -UnknownText_0x6c1a3: +BikerZekeAfterBattleText: text "We'll try not to" line "disturb anyone" cont "from now on…" @@ -140,7 +140,7 @@ SupernerdSamBeatenText: line "the MAGNET TRAIN…" done -UnknownText_0x6c219: +SupernerdSamAfterBattleText: text "The power of mag-" line "nets is awesome!" done @@ -155,7 +155,7 @@ SupernerdTomBeatenText: line "You're tough!" done -UnknownText_0x6c27e: +SupernerdTomAfterBattleText: text "GYM BADGES give" line "you advantages in" cont "battles." @@ -181,19 +181,19 @@ Route8_MapEventHeader: warp_def $4, $4, 3, ROUTE_8_SAFFRON_GATE warp_def $5, $4, 4, ROUTE_8_SAFFRON_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 7, 11, SIGNPOST_READ, Route8UndergroundPathSign - signpost 5, 10, SIGNPOST_READ, Route8LockedDoor + bg_event 7, 11, BGEVENT_READ, Route8UndergroundPathSign + bg_event 5, 10, BGEVENT_READ, Route8LockedDoor -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_BIKER, 8, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerBikerDwayne, -1 - person_event SPRITE_BIKER, 9, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 5, TrainerBikerHarris, -1 - person_event SPRITE_BIKER, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerBikerZeke, -1 - person_event SPRITE_SUPER_NERD, 2, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerSupernerdSam, -1 - person_event SPRITE_SUPER_NERD, 12, 31, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 4, TrainerSupernerdTom, -1 - person_event SPRITE_FRUIT_TREE, 5, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1 + object_event SPRITE_BIKER, 8, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1 + object_event SPRITE_BIKER, 9, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1 + object_event SPRITE_BIKER, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1 + object_event SPRITE_SUPER_NERD, 2, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdSam, -1 + object_event SPRITE_SUPER_NERD, 12, 31, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSupernerdTom, -1 + object_event SPRITE_FRUIT_TREE, 5, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index 6f871c5fd..5fc04c8ad 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -2,16 +2,16 @@ const_value set 2 const ROUTE8SAFFRONGATE_OFFICER Route8SaffronGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -OfficerScript_0x7f416: - jumptextfaceplayer UnknownText_0x7f419 +Route8SaffronGateOfficerScript: + jumptextfaceplayer Route8SaffronGateOfficerText -UnknownText_0x7f419: +Route8SaffronGateOfficerText: text "Have you been to" line "LAVENDER TOWN?" @@ -30,12 +30,12 @@ Route8SaffronGate_MapEventHeader: warp_def $4, $9, 1, ROUTE_8 warp_def $5, $9, 2, ROUTE_8 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7f416, -1 + object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1 diff --git a/maps/Route9.asm b/maps/Route9.asm index a8842e17b..d3a28a088 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -7,74 +7,74 @@ const_value set 2 const ROUTE9_POKEFAN_M2 Route9_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerCamperDean: - trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, CamperDeanScript + trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script -CamperDeanScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1aafd9 + writetext CamperDeanAfterBattleText waitbutton closetext end TrainerPicnickerHeidi: - trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, PicnickerHeidiScript + trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, .Script -PicnickerHeidiScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ab07c + writetext PicnickerHeidiAfterBattleText waitbutton closetext end TrainerCamperSid: - trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, 0, CamperSidScript + trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, 0, .Script -CamperSidScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ab0f6 + writetext CamperSidAfterBattleText waitbutton closetext end TrainerPicnickerEdna: - trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, PicnickerEdnaScript + trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, .Script -PicnickerEdnaScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ab15f + writetext PicnickerEdnaAfterBattleText waitbutton closetext end TrainerHikerTim: - trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, 0, HikerTimScript + trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, 0, .Script -HikerTimScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ab210 + writetext HikerTimAfterBattleText waitbutton closetext end TrainerHikerSidney: - trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, HikerSidneyScript + trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, .Script -HikerSidneyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ab278 + writetext HikerSidneyAfterBattleText waitbutton closetext end @@ -95,7 +95,7 @@ CamperDeanBeatenText: text "Whoa! Danger, man." done -UnknownText_0x1aafd9: +CamperDeanAfterBattleText: text "My #MON were" line "hurt before even" @@ -119,7 +119,7 @@ PicnickerHeidiBeatenText: text "Ohhhh!" done -UnknownText_0x1ab07c: +PicnickerHeidiAfterBattleText: text "We bake lots of" line "goodies and share" @@ -137,7 +137,7 @@ CamperSidBeatenText: line "ing out…" done -UnknownText_0x1ab0f6: +CamperSidAfterBattleText: text "Sorry. You weren't" line "littering. It was" cont "my mistake." @@ -153,7 +153,7 @@ PicnickerEdnaBeatenText: text "Ohh… I lost…" done -UnknownText_0x1ab15f: +PicnickerEdnaAfterBattleText: text "Conserving energy" line "is important, but" @@ -175,7 +175,7 @@ HikerTimBeatenText: line "singing…" done -UnknownText_0x1ab210: +HikerTimAfterBattleText: text "Battles are about" line "concentration." done @@ -193,7 +193,7 @@ HikerSidneyBeatenText: line "I lost that…" done -UnknownText_0x1ab278: +HikerSidneyAfterBattleText: text "The POWER PLANT is" line "across a small" cont "river." @@ -214,19 +214,19 @@ Route9_MapEventHeader: db 1 warp_def $f, $30, 1, ROCK_TUNNEL_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 7, 15, SIGNPOST_READ, Route9Sign - signpost 15, 41, SIGNPOST_ITEM, Route9HiddenEther + bg_event 7, 15, BGEVENT_READ, Route9Sign + bg_event 15, 41, BGEVENT_ITEM, Route9HiddenEther -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_YOUNGSTER, 11, 23, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperDean, -1 - person_event SPRITE_LASS, 8, 39, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1 - person_event SPRITE_YOUNGSTER, 4, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 5, TrainerCamperSid, -1 - person_event SPRITE_LASS, 15, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerEdna, -1 - person_event SPRITE_POKEFAN_M, 3, 28, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerTim, -1 - person_event SPRITE_POKEFAN_M, 15, 36, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 4, TrainerHikerSidney, -1 + object_event SPRITE_YOUNGSTER, 11, 23, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperDean, -1 + object_event SPRITE_LASS, 8, 39, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1 + object_event SPRITE_YOUNGSTER, 4, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1 + object_event SPRITE_LASS, 15, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerEdna, -1 + object_event SPRITE_POKEFAN_M, 3, 28, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerTim, -1 + object_event SPRITE_POKEFAN_M, 15, 36, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerHikerSidney, -1 diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 2106a7504..bf84025fe 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -1,45 +1,40 @@ -RuinsofAlphAerodactylChamber_MapScriptHeader: -.MapTriggers: +RuinsOfAlphAerodactylChamber_MapScriptHeader: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x58dad, 0 - dw UnknownScript_0x58db8, 0 + scene_script .CheckWall + scene_script .DummyScene .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .HiddenDoors - ; callbacks - - dbw MAPCALLBACK_TILES, UnknownScript_0x58db9 - -UnknownScript_0x58dad: +.CheckWall: checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER - iftrue UnknownScript_0x58db4 + iftrue .OpenWall end -UnknownScript_0x58db4: - priorityjump UnknownScript_0x58dd3 +.OpenWall: + priorityjump .WallOpenScript end -UnknownScript_0x58db8: +.DummyScene: end -UnknownScript_0x58db9: +.HiddenDoors: checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER - iftrue UnknownScript_0x58dc3 + iftrue .WallOpen changeblock $4, $0, $2e -UnknownScript_0x58dc3: +.WallOpen: checkevent EVENT_SOLVED_AERODACTYL_PUZZLE - iffalse UnknownScript_0x58dca + iffalse .FloorClosed return -UnknownScript_0x58dca: +.FloorClosed: changeblock $2, $2, $1 changeblock $4, $2, $2 return -UnknownScript_0x58dd3: +.WallOpenScript: pause 30 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 20 @@ -48,11 +43,11 @@ UnknownScript_0x58dd3: changeblock $4, $0, $30 reloadmappart earthquake 50 - dotrigger $1 + setscene $1 closetext end -MapRuinsofAlphAerodactylChamberSignpost2Script: +MapRuinsOfAlphAerodactylChamberSignpost2Script: refreshscreen $0 writebyte $2 special Special_UnownPuzzle @@ -64,7 +59,7 @@ UnknownScript_0x58df7: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_AERODACTYL_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_3 - domaptrigger RUINS_OF_ALPH_INNER_CHAMBER, $1 + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 changeblock $2, $2, $18 @@ -79,13 +74,13 @@ UnknownScript_0x58df7: warpcheck end -MapRuinsofAlphAerodactylChamberSignpost1Script: +MapRuinsOfAlphAerodactylChamberSignpost1Script: jumptext UnknownText_0x58ec2 -MapRuinsofAlphAerodactylChamberSignpost3Script: +MapRuinsOfAlphAerodactylChamberSignpost3Script: jumptext UnknownText_0x58ee7 -MapRuinsofAlphAerodactylChamberSignpost4Script: +MapRuinsOfAlphAerodactylChamberSignpost4Script: opentext writetext UnknownText_0x58e4f writebyte $1 @@ -93,7 +88,7 @@ MapRuinsofAlphAerodactylChamberSignpost4Script: closetext end -MapRuinsofAlphAerodactylChamberSignpost5Script: +MapRuinsOfAlphAerodactylChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER iftrue UnknownScript_0x58e46 opentext @@ -148,7 +143,7 @@ UnknownText_0x58ee7: line "fangs." done -RuinsofAlphAerodactylChamber_MapEventHeader: +RuinsOfAlphAerodactylChamber_MapEventHeader: ; filler db 0, 0 @@ -160,17 +155,17 @@ RuinsofAlphAerodactylChamber_MapEventHeader: warp_def $3, $4, 9, RUINS_OF_ALPH_INNER_CHAMBER warp_def $0, $4, 1, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphAerodactylChamberSignpost1Script - signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphAerodactylChamberSignpost1Script - signpost 2, 3, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost2Script - signpost 2, 4, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost3Script - signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost4Script - signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost5Script - -.PersonEvents: + bg_event 3, 2, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script + bg_event 3, 5, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script + bg_event 2, 3, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script + bg_event 2, 4, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost3Script + bg_event 0, 3, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script + bg_event 0, 4, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script + +.ObjectEvents: db 0 diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm new file mode 100644 index 000000000..56197802b --- /dev/null +++ b/maps/RuinsOfAlphAerodactylItemRoom.asm @@ -0,0 +1,59 @@ +const_value set 2 + const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL1 + const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL2 + const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3 + const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL4 + +RuinsOfAlphAerodactylItemRoom_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +RuinsOfAlphAerodactylItemRoomGoldBerry: + itemball GOLD_BERRY + +RuinsOfAlphAerodactylItemRoomMoonStone: + itemball MOON_STONE + +RuinsOfAlphAerodactylItemRoomHealPowder: + itemball HEAL_POWDER + +RuinsOfAlphAerodactylItemRoomEnergyRoot: + itemball ENERGY_ROOT + +MapRuinsOfAlphAerodactylItemRoomSignpost1Script: + jumptext UnknownText_0x59ac1 + +UnknownText_0x59ac1: + text "It's a replica of" + line "an ancient #-" + cont "MON." + done + +RuinsOfAlphAerodactylItemRoom_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 4 + warp_def $9, $3, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_def $9, $4, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_def $1, $3, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM + warp_def $1, $4, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM + +.CoordEvents: + db 0 + +.BGEvents: + db 2 + bg_event 1, 2, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script + bg_event 1, 5, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script + +.ObjectEvents: + db 4 + object_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM + object_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM + object_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM + object_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM diff --git a/maps/RuinsofAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm index e79ca5c21..c31cc563b 100644 --- a/maps/RuinsofAlphAerodactylWordRoom.asm +++ b/maps/RuinsOfAlphAerodactylWordRoom.asm @@ -1,11 +1,11 @@ -RuinsofAlphAerodactylWordRoom_MapScriptHeader: -.MapTriggers: +RuinsOfAlphAerodactylWordRoom_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: db 0 -RuinsofAlphAerodactylWordRoom_MapEventHeader: +RuinsOfAlphAerodactylWordRoom_MapEventHeader: ; filler db 0, 0 @@ -15,11 +15,11 @@ RuinsofAlphAerodactylWordRoom_MapEventHeader: warp_def $5, $a, 4, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM warp_def $b, $11, 8, RUINS_OF_ALPH_INNER_CHAMBER -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/RuinsofAlphAerodactylWordRoom.blk b/maps/RuinsOfAlphAerodactylWordRoom.blk index fb849e6ad..fb849e6ad 100644 --- a/maps/RuinsofAlphAerodactylWordRoom.blk +++ b/maps/RuinsOfAlphAerodactylWordRoom.blk diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 7df42fad2..ec334e397 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -1,46 +1,41 @@ -RuinsofAlphHoOhChamber_MapScriptHeader: -.MapTriggers: +RuinsOfAlphHoOhChamber_MapScriptHeader: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x5856d, 0 - dw UnknownScript_0x5857b, 0 + scene_script .CheckWall + scene_script .DummyScene .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .HiddenDoors - ; callbacks - - dbw MAPCALLBACK_TILES, UnknownScript_0x5857c - -UnknownScript_0x5856d: +.CheckWall: special SpecialHoOhChamber checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER - iftrue UnknownScript_0x58577 + iftrue .OpenWall end -UnknownScript_0x58577: - priorityjump UnknownScript_0x58596 +.OpenWall: + priorityjump .WallOpenScript end -UnknownScript_0x5857b: +.DummyScene: end -UnknownScript_0x5857c: +.HiddenDoors: checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER - iftrue UnknownScript_0x58586 + iftrue .WallOpen changeblock $4, $0, $2e -UnknownScript_0x58586: +.WallOpen: checkevent EVENT_SOLVED_HO_OH_PUZZLE - iffalse UnknownScript_0x5858d + iffalse .FloorClosed return -UnknownScript_0x5858d: +.FloorClosed: changeblock $2, $2, $1 changeblock $4, $2, $2 return -UnknownScript_0x58596: +.WallOpenScript: pause 30 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 20 @@ -49,11 +44,11 @@ UnknownScript_0x58596: changeblock $4, $0, $30 reloadmappart earthquake 50 - dotrigger $1 + setscene $1 closetext end -MapRuinsofAlphHoOhChamberSignpost2Script: +MapRuinsOfAlphHoOhChamberSignpost2Script: refreshscreen $0 writebyte $3 special Special_UnownPuzzle @@ -65,7 +60,7 @@ UnknownScript_0x585ba: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_HO_OH_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_4 - domaptrigger RUINS_OF_ALPH_INNER_CHAMBER, $1 + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 changeblock $2, $2, $18 @@ -80,13 +75,13 @@ UnknownScript_0x585ba: warpcheck end -MapRuinsofAlphHoOhChamberSignpost1Script: +MapRuinsOfAlphHoOhChamberSignpost1Script: jumptext UnknownText_0x58685 -MapRuinsofAlphHoOhChamberSignpost3Script: +MapRuinsOfAlphHoOhChamberSignpost3Script: jumptext UnknownText_0x586aa -MapRuinsofAlphHoOhChamberSignpost4Script: +MapRuinsOfAlphHoOhChamberSignpost4Script: opentext writetext UnknownText_0x58612 writebyte $3 @@ -94,7 +89,7 @@ MapRuinsofAlphHoOhChamberSignpost4Script: closetext end -MapRuinsofAlphHoOhChamberSignpost5Script: +MapRuinsOfAlphHoOhChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue UnknownScript_0x58609 opentext @@ -149,7 +144,7 @@ UnknownText_0x586aa: line "wings." done -RuinsofAlphHoOhChamber_MapEventHeader: +RuinsOfAlphHoOhChamber_MapEventHeader: ; filler db 0, 0 @@ -161,17 +156,17 @@ RuinsofAlphHoOhChamber_MapEventHeader: warp_def $3, $4, 3, RUINS_OF_ALPH_INNER_CHAMBER warp_def $0, $4, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphHoOhChamberSignpost1Script - signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphHoOhChamberSignpost1Script - signpost 2, 3, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost2Script - signpost 2, 4, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost3Script - signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost4Script - signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost5Script - -.PersonEvents: + bg_event 3, 2, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script + bg_event 3, 5, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script + bg_event 2, 3, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost2Script + bg_event 2, 4, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost3Script + bg_event 0, 3, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script + bg_event 0, 4, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script + +.ObjectEvents: db 0 diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm new file mode 100644 index 000000000..643dde195 --- /dev/null +++ b/maps/RuinsOfAlphHoOhItemRoom.asm @@ -0,0 +1,59 @@ +const_value set 2 + const RUINSOFALPHHOOHITEMROOM_POKE_BALL1 + const RUINSOFALPHHOOHITEMROOM_POKE_BALL2 + const RUINSOFALPHHOOHITEMROOM_POKE_BALL3 + const RUINSOFALPHHOOHITEMROOM_POKE_BALL4 + +RuinsOfAlphHoOhItemRoom_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +RuinsOfAlphHoOhItemRoomGoldBerry: + itemball GOLD_BERRY + +RuinsOfAlphHoOhItemRoomMysteryberry: + itemball MYSTERYBERRY + +RuinsOfAlphHoOhItemRoomRevivalHerb: + itemball REVIVAL_HERB + +RuinsOfAlphHoOhItemRoomCharcoal: + itemball CHARCOAL + +MapRuinsOfAlphHoOhItemRoomSignpost1Script: + jumptext UnknownText_0x59923 + +UnknownText_0x59923: + text "It's a replica of" + line "an ancient #-" + cont "MON." + done + +RuinsOfAlphHoOhItemRoom_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 4 + warp_def $9, $3, 5, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_def $9, $4, 5, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_def $1, $3, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM + warp_def $1, $4, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM + +.CoordEvents: + db 0 + +.BGEvents: + db 2 + bg_event 1, 2, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script + bg_event 1, 5, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script + +.ObjectEvents: + db 4 + object_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM + object_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM + object_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM + object_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM diff --git a/maps/RuinsofAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm index e0d35fa14..059025e6b 100644 --- a/maps/RuinsofAlphHoOhWordRoom.asm +++ b/maps/RuinsOfAlphHoOhWordRoom.asm @@ -1,11 +1,11 @@ -RuinsofAlphHoOhWordRoom_MapScriptHeader: -.MapTriggers: +RuinsOfAlphHoOhWordRoom_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: db 0 -RuinsofAlphHoOhWordRoom_MapEventHeader: +RuinsOfAlphHoOhWordRoom_MapEventHeader: ; filler db 0, 0 @@ -15,11 +15,11 @@ RuinsofAlphHoOhWordRoom_MapEventHeader: warp_def $9, $a, 4, RUINS_OF_ALPH_HO_OH_ITEM_ROOM warp_def $15, $11, 2, RUINS_OF_ALPH_INNER_CHAMBER -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/RuinsofAlphHoOhWordRoom.blk b/maps/RuinsOfAlphHoOhWordRoom.blk index d15ce28f9..d15ce28f9 100644 --- a/maps/RuinsofAlphHoOhWordRoom.blk +++ b/maps/RuinsOfAlphHoOhWordRoom.blk diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm new file mode 100644 index 000000000..5fa6714a5 --- /dev/null +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -0,0 +1,131 @@ +const_value set 2 + const RUINSOFALPHINNERCHAMBER_FISHER + const RUINSOFALPHINNERCHAMBER_TEACHER + const RUINSOFALPHINNERCHAMBER_GRAMPS + +RuinsOfAlphInnerChamber_MapScriptHeader: +.SceneScripts: + db 2 + scene_script .DummyScene0 + scene_script .UnownAppear + +.MapCallbacks: + db 0 + +.DummyScene0: + end + +.UnownAppear: + priorityjump .StrangePresenceScript + end + +.StrangePresenceScript: + opentext + writetext RuinsOfAlphStrangePresenceText + waitbutton + closetext + setscene $0 + setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS + clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER + end + +RuinsOfAlphInnerChamberFisherScript: + jumptextfaceplayer RuinsOfAlphInnerChamberFisherText + +RuinsOfAlphInnerChamberTeacherScript: + jumptextfaceplayer RuinsOfAlphInnerChamberTeacherText + +RuinsOfAlphInnerChamberGrampsScript: + jumptextfaceplayer RuinsOfAlphInnerChamberGrampsText + +RuinsOfAlphInnerChamberStatue: + jumptext RuinsOfAlphInnerChamberStatueText + +RuinsOfAlphStrangePresenceText: + text "There is a strange" + line "presence here…" + done + +RuinsOfAlphInnerChamberFisherText: + text "This is a big" + line "room, but there's" + cont "nothing here." + done + +RuinsOfAlphInnerChamberTeacherText: + text "This place has a" + line "mystical quality" + cont "to it." + + para "It feels sort of" + line "ethereal even." + done + +RuinsOfAlphInnerChamberGrampsText: + text "Ancient buildings" + line "are often tombs of" + cont "kings." + + para "Like the pyramids," + line "for instance." + done + +RuinsOfAlphInnerChamberStatueText: + text "It's a replica of" + line "an ancient #-" + cont "MON." + done + +RuinsOfAlphInnerChamber_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 9 + warp_def $d, $a, 5, RUINS_OF_ALPH_OUTSIDE + warp_def $f, $3, 3, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_def $f, $4, 4, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_def $3, $f, 3, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_def $3, $10, 4, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_def $15, $3, 3, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_def $15, $4, 4, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_def $18, $f, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_def $18, $10, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER + +.CoordEvents: + db 0 + +.BGEvents: + db 26 + bg_event 3, 2, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 3, 5, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 3, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 3, 11, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 3, 14, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 3, 17, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 2, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 5, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 11, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 14, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 17, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 13, 2, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 13, 17, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 18, 2, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 18, 5, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 18, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 18, 11, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 18, 14, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 18, 17, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 24, 2, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 24, 5, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 24, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 24, 11, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 24, 14, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 24, 17, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + +.ObjectEvents: + db 3 + object_event SPRITE_FISHER, 7, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + object_event SPRITE_TEACHER, 13, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + object_event SPRITE_GRAMPS, 19, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS diff --git a/maps/RuinsofAlphInnerChamber.blk b/maps/RuinsOfAlphInnerChamber.blk index ee907fc5e..ee907fc5e 100644 --- a/maps/RuinsofAlphInnerChamber.blk +++ b/maps/RuinsOfAlphInnerChamber.blk diff --git a/maps/RuinsofAlphItemRoom.blk b/maps/RuinsOfAlphItemRoom.blk index 54b53285d..54b53285d 100644 --- a/maps/RuinsofAlphItemRoom.blk +++ b/maps/RuinsOfAlphItemRoom.blk diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index c46daa6f3..15a9e90c4 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -2,50 +2,43 @@ const_value set 2 const RUINSOFALPHKABUTOCHAMBER_RECEPTIONIST const RUINSOFALPHKABUTOCHAMBER_SCIENTIST -RuinsofAlphKabutoChamber_MapScriptHeader: -.MapTriggers: +RuinsOfAlphKabutoChamber_MapScriptHeader: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x5872b, 0 - dw UnknownScript_0x58736, 0 + scene_script .CheckWall + scene_script .DummyScene .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .HiddenDoors - ; callbacks - - dbw MAPCALLBACK_TILES, UnknownScript_0x58737 - -UnknownScript_0x5872b: +.CheckWall: checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER - iftrue UnknownScript_0x58732 + iftrue .OpenWall end -UnknownScript_0x58732: - priorityjump UnknownScript_0x58751 - -UnknownScript_0x58735: +.OpenWall: + priorityjump .WallOpenScript end -UnknownScript_0x58736: +.DummyScene: end -UnknownScript_0x58737: +.HiddenDoors: checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER - iftrue UnknownScript_0x58741 + iftrue .WallOpen changeblock $4, $0, $2e -UnknownScript_0x58741: +.WallOpen: checkevent EVENT_SOLVED_KABUTO_PUZZLE - iffalse UnknownScript_0x58748 + iffalse .FloorClosed return -UnknownScript_0x58748: +.FloorClosed: changeblock $2, $2, $1 changeblock $4, $2, $2 return -UnknownScript_0x58751: +.WallOpenScript: pause 30 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 20 @@ -54,14 +47,14 @@ UnknownScript_0x58751: changeblock $4, $0, $30 reloadmappart earthquake 50 - dotrigger $1 + setscene $1 closetext end -ReceptionistScript_0x58769: - jumptextfaceplayer UnknownText_0x58800 +RuinsOfAlphKabutoChamberReceptionistScript: + jumptextfaceplayer RuinsOfAlphKabutoChamberReceptionistText -MapRuinsofAlphKabutoChamberSignpost2Script: +MapRuinsOfAlphKabutoChamberSignpost2Script: refreshscreen $0 writebyte $0 special Special_UnownPuzzle @@ -74,7 +67,7 @@ UnknownScript_0x58778: setevent EVENT_SOLVED_KABUTO_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_1 setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST - domaptrigger RUINS_OF_ALPH_INNER_CHAMBER, $1 + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 changeblock $2, $2, $18 @@ -119,13 +112,13 @@ UnknownScript_0x587cf: closetext end -MapRuinsofAlphKabutoChamberSignpost1Script: +MapRuinsOfAlphKabutoChamberSignpost1Script: jumptext UnknownText_0x58b1a -MapRuinsofAlphKabutoChamberSignpost3Script: +MapRuinsOfAlphKabutoChamberSignpost3Script: jumptext UnknownText_0x58b3f -MapRuinsofAlphKabutoChamberSignpost4Script: +MapRuinsOfAlphKabutoChamberSignpost4Script: opentext writetext UnknownText_0x58aa7 writebyte $0 @@ -133,7 +126,7 @@ MapRuinsofAlphKabutoChamberSignpost4Script: closetext end -MapRuinsofAlphKabutoChamberSignpost5Script: +MapRuinsOfAlphKabutoChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x587f7 opentext @@ -154,7 +147,7 @@ MovementData_0x587fe: db $59 ; movement step_end -UnknownText_0x58800: +RuinsOfAlphKabutoChamberReceptionistText: text "Welcome to this" line "chamber." @@ -262,7 +255,7 @@ UnknownText_0x58b3f: line "scanned the area." done -RuinsofAlphKabutoChamber_MapEventHeader: +RuinsOfAlphKabutoChamber_MapEventHeader: ; filler db 0, 0 @@ -274,19 +267,19 @@ RuinsofAlphKabutoChamber_MapEventHeader: warp_def $3, $4, 5, RUINS_OF_ALPH_INNER_CHAMBER warp_def $0, $4, 1, RUINS_OF_ALPH_KABUTO_ITEM_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphKabutoChamberSignpost1Script - signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphKabutoChamberSignpost1Script - signpost 2, 3, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost2Script - signpost 2, 4, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost3Script - signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost4Script - signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost5Script - -.PersonEvents: + bg_event 3, 2, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script + bg_event 3, 5, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script + bg_event 2, 3, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost2Script + bg_event 2, 4, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost3Script + bg_event 0, 3, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost4Script + bg_event 0, 4, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost5Script + +.ObjectEvents: db 2 - person_event SPRITE_RECEPTIONIST, 5, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x58769, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST - person_event SPRITE_SCIENTIST, 1, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1 + object_event SPRITE_RECEPTIONIST, 5, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST + object_event SPRITE_SCIENTIST, 1, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1 diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm new file mode 100644 index 000000000..45afbcc45 --- /dev/null +++ b/maps/RuinsOfAlphKabutoItemRoom.asm @@ -0,0 +1,59 @@ +const_value set 2 + const RUINSOFALPHKABUTOITEMROOM_POKE_BALL1 + const RUINSOFALPHKABUTOITEMROOM_POKE_BALL2 + const RUINSOFALPHKABUTOITEMROOM_POKE_BALL3 + const RUINSOFALPHKABUTOITEMROOM_POKE_BALL4 + +RuinsOfAlphKabutoItemRoom_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +RuinsOfAlphKabutoItemRoomBerry: + itemball BERRY + +RuinsOfAlphKabutoItemRoomPsncureberry: + itemball PSNCUREBERRY + +RuinsOfAlphKabutoItemRoomHealPowder: + itemball HEAL_POWDER + +RuinsOfAlphKabutoItemRoomEnergypowder: + itemball ENERGYPOWDER + +MapRuinsOfAlphKabutoItemRoomSignpost1Script: + jumptext UnknownText_0x599ad + +UnknownText_0x599ad: + text "It's a replica of" + line "an ancient #-" + cont "MON." + done + +RuinsOfAlphKabutoItemRoom_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 4 + warp_def $9, $3, 5, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_def $9, $4, 5, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_def $1, $3, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM + warp_def $1, $4, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM + +.CoordEvents: + db 0 + +.BGEvents: + db 2 + bg_event 1, 2, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script + bg_event 1, 5, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script + +.ObjectEvents: + db 4 + object_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM + object_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM + object_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM + object_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM diff --git a/maps/RuinsofAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm index 8d754f657..f872baedb 100644 --- a/maps/RuinsofAlphKabutoWordRoom.asm +++ b/maps/RuinsOfAlphKabutoWordRoom.asm @@ -1,11 +1,11 @@ -RuinsofAlphKabutoWordRoom_MapScriptHeader: -.MapTriggers: +RuinsOfAlphKabutoWordRoom_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: db 0 -RuinsofAlphKabutoWordRoom_MapEventHeader: +RuinsOfAlphKabutoWordRoom_MapEventHeader: ; filler db 0, 0 @@ -15,11 +15,11 @@ RuinsofAlphKabutoWordRoom_MapEventHeader: warp_def $5, $a, 4, RUINS_OF_ALPH_KABUTO_ITEM_ROOM warp_def $b, $11, 4, RUINS_OF_ALPH_INNER_CHAMBER -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/RuinsofAlphKabutoWordRoom.blk b/maps/RuinsOfAlphKabutoWordRoom.blk index fb849e6ad..fb849e6ad 100644 --- a/maps/RuinsofAlphKabutoWordRoom.blk +++ b/maps/RuinsOfAlphKabutoWordRoom.blk diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 5b5864d2f..80ad32c32 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -1,46 +1,41 @@ -RuinsofAlphOmanyteChamber_MapScriptHeader: -.MapTriggers: +RuinsOfAlphOmanyteChamber_MapScriptHeader: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x58be9, 0 - dw UnknownScript_0x58bf7, 0 + scene_script .CheckWall + scene_script .DummyScene .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .HiddenDoors - ; callbacks - - dbw MAPCALLBACK_TILES, UnknownScript_0x58bf8 - -UnknownScript_0x58be9: +.CheckWall: special SpecialOmanyteChamber checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER - iftrue UnknownScript_0x58bf3 + iftrue .OpenWall end -UnknownScript_0x58bf3: - priorityjump UnknownScript_0x58c12 +.OpenWall: + priorityjump .WallOpenScript end -UnknownScript_0x58bf7: +.DummyScene: end -UnknownScript_0x58bf8: +.HiddenDoors: checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER - iftrue UnknownScript_0x58c02 + iftrue .WallOpen changeblock $4, $0, $2e -UnknownScript_0x58c02: +.WallOpen: checkevent EVENT_SOLVED_OMANYTE_PUZZLE - iffalse UnknownScript_0x58c09 + iffalse .FloorClosed return -UnknownScript_0x58c09: +.FloorClosed: changeblock $2, $2, $1 changeblock $4, $2, $2 return -UnknownScript_0x58c12: +.WallOpenScript: pause 30 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 20 @@ -49,11 +44,11 @@ UnknownScript_0x58c12: changeblock $4, $0, $30 reloadmappart earthquake 50 - dotrigger $1 + setscene $1 closetext end -MapRuinsofAlphOmanyteChamberSignpost2Script: +MapRuinsOfAlphOmanyteChamberSignpost2Script: refreshscreen $0 writebyte $1 special Special_UnownPuzzle @@ -65,7 +60,7 @@ UnknownScript_0x58c36: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_OMANYTE_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_2 - domaptrigger RUINS_OF_ALPH_INNER_CHAMBER, $1 + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 changeblock $2, $2, $18 @@ -80,13 +75,13 @@ UnknownScript_0x58c36: warpcheck end -MapRuinsofAlphOmanyteChamberSignpost1Script: +MapRuinsOfAlphOmanyteChamberSignpost1Script: jumptext UnknownText_0x58d01 -MapRuinsofAlphOmanyteChamberSignpost3Script: +MapRuinsOfAlphOmanyteChamberSignpost3Script: jumptext UnknownText_0x58d26 -MapRuinsofAlphOmanyteChamberSignpost4Script: +MapRuinsOfAlphOmanyteChamberSignpost4Script: opentext writetext UnknownText_0x58c8e writebyte $2 @@ -94,7 +89,7 @@ MapRuinsofAlphOmanyteChamberSignpost4Script: closetext end -MapRuinsofAlphOmanyteChamberSignpost5Script: +MapRuinsOfAlphOmanyteChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue UnknownScript_0x58c85 opentext @@ -149,7 +144,7 @@ UnknownText_0x58d26: line "its ten tentacles." done -RuinsofAlphOmanyteChamber_MapEventHeader: +RuinsOfAlphOmanyteChamber_MapEventHeader: ; filler db 0, 0 @@ -161,17 +156,17 @@ RuinsofAlphOmanyteChamber_MapEventHeader: warp_def $3, $4, 7, RUINS_OF_ALPH_INNER_CHAMBER warp_def $0, $4, 1, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphOmanyteChamberSignpost1Script - signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphOmanyteChamberSignpost1Script - signpost 2, 3, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost2Script - signpost 2, 4, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost3Script - signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost4Script - signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost5Script - -.PersonEvents: + bg_event 3, 2, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script + bg_event 3, 5, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script + bg_event 2, 3, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost2Script + bg_event 2, 4, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost3Script + bg_event 0, 3, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script + bg_event 0, 4, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script + +.ObjectEvents: db 0 diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm new file mode 100644 index 000000000..0f3eb7e16 --- /dev/null +++ b/maps/RuinsOfAlphOmanyteItemRoom.asm @@ -0,0 +1,59 @@ +const_value set 2 + const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL1 + const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL2 + const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3 + const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4 + +RuinsOfAlphOmanyteItemRoom_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +RuinsOfAlphOmanyteItemRoomMysteryberry: + itemball MYSTERYBERRY + +RuinsOfAlphOmanyteItemRoomMysticWater: + itemball MYSTIC_WATER + +RuinsOfAlphOmanyteItemRoomStardust: + itemball STARDUST + +RuinsOfAlphOmanyteItemRoomStarPiece: + itemball STAR_PIECE + +MapRuinsOfAlphOmanyteItemRoomSignpost1Script: + jumptext UnknownText_0x59a37 + +UnknownText_0x59a37: + text "It's a replica of" + line "an ancient #-" + cont "MON." + done + +RuinsOfAlphOmanyteItemRoom_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 4 + warp_def $9, $3, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_def $9, $4, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_def $1, $3, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM + warp_def $1, $4, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM + +.CoordEvents: + db 0 + +.BGEvents: + db 2 + bg_event 1, 2, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script + bg_event 1, 5, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script + +.ObjectEvents: + db 4 + object_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM + object_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM + object_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM + object_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM diff --git a/maps/RuinsofAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm index 7600f41d9..205e7575d 100644 --- a/maps/RuinsofAlphOmanyteWordRoom.asm +++ b/maps/RuinsOfAlphOmanyteWordRoom.asm @@ -1,11 +1,11 @@ -RuinsofAlphOmanyteWordRoom_MapScriptHeader: -.MapTriggers: +RuinsOfAlphOmanyteWordRoom_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: db 0 -RuinsofAlphOmanyteWordRoom_MapEventHeader: +RuinsOfAlphOmanyteWordRoom_MapEventHeader: ; filler db 0, 0 @@ -15,11 +15,11 @@ RuinsofAlphOmanyteWordRoom_MapEventHeader: warp_def $7, $a, 4, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM warp_def $d, $11, 6, RUINS_OF_ALPH_INNER_CHAMBER -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/RuinsofAlphOmanyteWordRoom.blk b/maps/RuinsOfAlphOmanyteWordRoom.blk index 16c0b72b5..16c0b72b5 100644 --- a/maps/RuinsofAlphOmanyteWordRoom.blk +++ b/maps/RuinsOfAlphOmanyteWordRoom.blk diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 8cad45e29..8e6ecf49b 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -5,55 +5,50 @@ const_value set 2 const RUINSOFALPHOUTSIDE_YOUNGSTER2 const RUINSOFALPHOUTSIDE_YOUNGSTER3 -RuinsofAlphOutside_MapScriptHeader: -.MapTriggers: +RuinsOfAlphOutside_MapScriptHeader: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x5800d, 0 - dw UnknownScript_0x5800e, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .ScientistCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x5800f - -UnknownScript_0x5800d: +.DummyScene0: end -UnknownScript_0x5800e: +.DummyScene1: end -UnknownScript_0x5800f: +.ScientistCallback: checkflag ENGINE_UNOWN_DEX - iftrue UnknownScript_0x5802c + iftrue .NoScientist checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS - iftrue UnknownScript_0x5801e - jump UnknownScript_0x5802c + iftrue .MaybeScientist + jump .NoScientist -UnknownScript_0x5801e: +.MaybeScientist: checkcode VAR_UNOWNCOUNT - if_greater_than $2, UnknownScript_0x58027 - jump UnknownScript_0x5802c + if_greater_than $2, .YesScientist + jump .NoScientist -UnknownScript_0x58027: +.YesScientist: appear RUINSOFALPHOUTSIDE_SCIENTIST - dotrigger $1 + setscene $1 return -UnknownScript_0x5802c: +.NoScientist: disappear RUINSOFALPHOUTSIDE_SCIENTIST - dotrigger $0 + setscene $0 return -UnknownScript_0x58031: +RuinsOfAlphOutsideScientistScene1: spriteface RUINSOFALPHOUTSIDE_SCIENTIST, UP spriteface PLAYER, DOWN jump UnknownScript_0x58044 -UnknownScript_0x5803a: +RuinsOfAlphOutsideScientistScene2: spriteface RUINSOFALPHOUTSIDE_SCIENTIST, LEFT spriteface PLAYER, RIGHT jump UnknownScript_0x58044 @@ -71,7 +66,7 @@ UnknownScript_0x58044: disappear RUINSOFALPHOUTSIDE_SCIENTIST stopfollow applymovement PLAYER, MovementData_0x580c5 - domaptrigger RUINS_OF_ALPH_RESEARCH_CENTER, $1 + setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, $1 warpcheck end @@ -107,36 +102,36 @@ YoungsterScript_0x5807e: end TrainerPsychicNathan: - trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, PsychicNathanScript + trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, .Script -PsychicNathanScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5830e + writetext PsychicNathanAfterBattleText waitbutton closetext end TrainerSuperNerdStan: - trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, UnknownScript_0x580a9 + trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script -UnknownScript_0x580a9: +.Script: end_if_just_battled opentext - writetext UnknownText_0x58250 + writetext SuperNerdStanAfterBattleText waitbutton closetext end -MapRuinsofAlphOutsideSignpost0Script: +RuinsOfAlphOutsideSignpost0Script: jumptext UnknownText_0x58325 -MapRuinsofAlphOutsideSignpost1Script: +RuinsOfAlphOutsideSignpost1Script: jumptext UnknownText_0x58342 -MapRuinsofAlphOutsideSignpost2Script: +RuinsOfAlphOutsideSignpost2Script: jumptext UnknownText_0x58362 MovementData_0x580ba: @@ -199,7 +194,7 @@ UnknownText_0x58217: line "understanding…" done -UnknownText_0x58250: +SuperNerdStanAfterBattleText: text "The RUINS are from" line "about 1500 years" cont "ago." @@ -225,7 +220,7 @@ PsychicNathanBeatenText: text "…" done -UnknownText_0x5830e: +PsychicNathanAfterBattleText: text "I like thinking" line "here." done @@ -287,7 +282,7 @@ UnknownText_0x5848e: line "message!" done -RuinsofAlphOutside_MapEventHeader: +RuinsOfAlphOutside_MapEventHeader: ; filler db 0, 0 @@ -305,21 +300,21 @@ RuinsofAlphOutside_MapEventHeader: warp_def $14, $d, 1, ROUTE_32_RUINS_OF_ALPH_GATE warp_def $15, $d, 2, ROUTE_32_RUINS_OF_ALPH_GATE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 1, $e, $b, $0, UnknownScript_0x58031, $0, $0 - xy_trigger 1, $f, $a, $0, UnknownScript_0x5803a, $0, $0 + coord_event 1, $e, $b, RuinsOfAlphOutsideScientistScene1 + coord_event 1, $f, $a, RuinsOfAlphOutsideScientistScene2 -.Signposts: +.BGEvents: db 3 - signpost 8, 16, SIGNPOST_READ, MapRuinsofAlphOutsideSignpost0Script - signpost 16, 12, SIGNPOST_READ, MapRuinsofAlphOutsideSignpost1Script - signpost 12, 18, SIGNPOST_READ, MapRuinsofAlphOutsideSignpost2Script + bg_event 8, 16, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script + bg_event 16, 12, BGEVENT_READ, RuinsOfAlphOutsideSignpost1Script + bg_event 12, 18, BGEVENT_READ, RuinsOfAlphOutsideSignpost2Script -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_YOUNGSTER, 20, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 1, TrainerPsychicNathan, -1 - person_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST - person_event SPRITE_FISHER, 17, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER - person_event SPRITE_YOUNGSTER, 11, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS - person_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + object_event SPRITE_YOUNGSTER, 20, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1 + object_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST + object_event SPRITE_FISHER, 17, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER + object_event SPRITE_YOUNGSTER, 11, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + object_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS diff --git a/maps/RuinsofAlphOutside.blk b/maps/RuinsOfAlphOutside.blk index fd834deae..fd834deae 100644 --- a/maps/RuinsofAlphOutside.blk +++ b/maps/RuinsOfAlphOutside.blk diff --git a/maps/RuinsofAlphPuzzleChamber.blk b/maps/RuinsOfAlphPuzzleChamber.blk index 6560787d3..6560787d3 100644 --- a/maps/RuinsofAlphPuzzleChamber.blk +++ b/maps/RuinsOfAlphPuzzleChamber.blk diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index b1d0f45c5..f4b62563a 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -3,39 +3,34 @@ const_value set 2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST3 -RuinsofAlphResearchCenter_MapScriptHeader: -.MapTriggers: +RuinsOfAlphResearchCenter_MapScriptHeader: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x59180, 0 - dw UnknownScript_0x59181, 0 + scene_script .DummyScene0 + scene_script .GetUnownDex .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .ScientistCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x59185 - -UnknownScript_0x59180: +.DummyScene0: end -UnknownScript_0x59181: - priorityjump UnknownScript_0x59192 +.GetUnownDex: + priorityjump .GetUnownDexScript end -UnknownScript_0x59185: - checktriggers - if_equal $1, UnknownScript_0x5918b +.ScientistCallback: + checkscene + if_equal $1, .ShowScientist return -UnknownScript_0x5918b: - moveperson RUINSOFALPHRESEARCHCENTER_SCIENTIST3, $3, $7 +.ShowScientist: + moveobject RUINSOFALPHRESEARCHCENTER_SCIENTIST3, $3, $7 appear RUINSOFALPHRESEARCHCENTER_SCIENTIST3 return -UnknownScript_0x59192: +.GetUnownDexScript: applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x5926f playsound SFX_BOOT_PC pause 60 @@ -60,7 +55,7 @@ UnknownScript_0x59192: waitbutton closetext applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59276 - dotrigger $0 + setscene $0 special RestartMapMusic end @@ -137,7 +132,7 @@ UnknownScript_0x5922e: closetext end -MapRuinsofAlphResearchCenterSignpost1Script: +MapRuinsOfAlphResearchCenterSignpost1Script: opentext checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x59241 @@ -155,7 +150,7 @@ UnknownScript_0x59247: closetext end -MapRuinsofAlphResearchCenterSignpost2Script: +MapRuinsOfAlphResearchCenterSignpost2Script: opentext checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x5925a @@ -177,7 +172,7 @@ UnknownScript_0x59260: UnknownScript_0x59269: jumptext UnknownText_0x59848 -MapRuinsofAlphResearchCenterSignpost0Script: +MapRuinsOfAlphResearchCenterSignpost0Script: jumptext UnknownText_0x59886 MovementData_0x5926f: @@ -397,7 +392,7 @@ UnknownText_0x59886: cont "Ancients…" done -RuinsofAlphResearchCenter_MapEventHeader: +RuinsOfAlphResearchCenter_MapEventHeader: ; filler db 0, 0 @@ -406,17 +401,17 @@ RuinsofAlphResearchCenter_MapEventHeader: warp_def $7, $2, 6, RUINS_OF_ALPH_OUTSIDE warp_def $7, $3, 6, RUINS_OF_ALPH_OUTSIDE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 5, 6, SIGNPOST_READ, MapRuinsofAlphResearchCenterSignpost0Script - signpost 4, 3, SIGNPOST_READ, MapRuinsofAlphResearchCenterSignpost1Script - signpost 1, 7, SIGNPOST_READ, MapRuinsofAlphResearchCenterSignpost2Script + bg_event 5, 6, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost0Script + bg_event 4, 3, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost1Script + bg_event 1, 7, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost2Script -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_SCIENTIST, 5, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1 - person_event SPRITE_SCIENTIST, 2, 5, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x59214, -1 - person_event SPRITE_SCIENTIST, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST + object_event SPRITE_SCIENTIST, 5, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1 + object_event SPRITE_SCIENTIST, 2, 5, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1 + object_event SPRITE_SCIENTIST, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST diff --git a/maps/RuinsofAlphResearchCenter.blk b/maps/RuinsOfAlphResearchCenter.blk index 051b60237..051b60237 100644 --- a/maps/RuinsofAlphResearchCenter.blk +++ b/maps/RuinsOfAlphResearchCenter.blk diff --git a/maps/RuinsofAlphAerodactylItemRoom.asm b/maps/RuinsofAlphAerodactylItemRoom.asm deleted file mode 100644 index 5f9d5c9f0..000000000 --- a/maps/RuinsofAlphAerodactylItemRoom.asm +++ /dev/null @@ -1,59 +0,0 @@ -const_value set 2 - const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL1 - const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL2 - const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3 - const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL4 - -RuinsofAlphAerodactylItemRoom_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -RuinsofAlphAerodactylItemRoomGoldBerry: - itemball GOLD_BERRY - -RuinsofAlphAerodactylItemRoomMoonStone: - itemball MOON_STONE - -RuinsofAlphAerodactylItemRoomHealPowder: - itemball HEAL_POWDER - -RuinsofAlphAerodactylItemRoomEnergyRoot: - itemball ENERGY_ROOT - -MapRuinsofAlphAerodactylItemRoomSignpost1Script: - jumptext UnknownText_0x59ac1 - -UnknownText_0x59ac1: - text "It's a replica of" - line "an ancient #-" - cont "MON." - done - -RuinsofAlphAerodactylItemRoom_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def $9, $3, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def $9, $4, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def $1, $3, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM - warp_def $1, $4, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM - -.XYTriggers: - db 0 - -.Signposts: - db 2 - signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphAerodactylItemRoomSignpost1Script - signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphAerodactylItemRoomSignpost1Script - -.PersonEvents: - db 4 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM diff --git a/maps/RuinsofAlphHoOhItemRoom.asm b/maps/RuinsofAlphHoOhItemRoom.asm deleted file mode 100644 index 85e988ce5..000000000 --- a/maps/RuinsofAlphHoOhItemRoom.asm +++ /dev/null @@ -1,59 +0,0 @@ -const_value set 2 - const RUINSOFALPHHOOHITEMROOM_POKE_BALL1 - const RUINSOFALPHHOOHITEMROOM_POKE_BALL2 - const RUINSOFALPHHOOHITEMROOM_POKE_BALL3 - const RUINSOFALPHHOOHITEMROOM_POKE_BALL4 - -RuinsofAlphHoOhItemRoom_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -RuinsofAlphHoOhItemRoomGoldBerry: - itemball GOLD_BERRY - -RuinsofAlphHoOhItemRoomMysteryberry: - itemball MYSTERYBERRY - -RuinsofAlphHoOhItemRoomRevivalHerb: - itemball REVIVAL_HERB - -RuinsofAlphHoOhItemRoomCharcoal: - itemball CHARCOAL - -MapRuinsofAlphHoOhItemRoomSignpost1Script: - jumptext UnknownText_0x59923 - -UnknownText_0x59923: - text "It's a replica of" - line "an ancient #-" - cont "MON." - done - -RuinsofAlphHoOhItemRoom_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def $9, $3, 5, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def $9, $4, 5, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def $1, $3, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM - warp_def $1, $4, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM - -.XYTriggers: - db 0 - -.Signposts: - db 2 - signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphHoOhItemRoomSignpost1Script - signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphHoOhItemRoomSignpost1Script - -.PersonEvents: - db 4 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm deleted file mode 100644 index 1f900da9e..000000000 --- a/maps/RuinsofAlphInnerChamber.asm +++ /dev/null @@ -1,135 +0,0 @@ -const_value set 2 - const RUINSOFALPHINNERCHAMBER_FISHER - const RUINSOFALPHINNERCHAMBER_TEACHER - const RUINSOFALPHINNERCHAMBER_GRAMPS - -RuinsofAlphInnerChamber_MapScriptHeader: -.MapTriggers: - db 2 - - ; triggers - dw UnknownScript_0x58f69, 0 - dw UnknownScript_0x58f6a, 0 - -.MapCallbacks: - db 0 - -UnknownScript_0x58f69: - end - -UnknownScript_0x58f6a: - priorityjump UnknownScript_0x58f6e - -UnknownScript_0x58f6d: - end - -UnknownScript_0x58f6e: - opentext - writetext UnknownText_0x58f89 - waitbutton - closetext - dotrigger $0 - setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS - clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER - end - -FisherScript_0x58f7d: - jumptextfaceplayer UnknownText_0x58fac - -TeacherScript_0x58f80: - jumptextfaceplayer UnknownText_0x58fda - -GrampsScript_0x58f83: - jumptextfaceplayer UnknownText_0x59024 - -MapRuinsofAlphInnerChamberSignpost25Script: - jumptext UnknownText_0x59072 - -UnknownText_0x58f89: - text "There is a strange" - line "presence here…" - done - -UnknownText_0x58fac: - text "This is a big" - line "room, but there's" - cont "nothing here." - done - -UnknownText_0x58fda: - text "This place has a" - line "mystical quality" - cont "to it." - - para "It feels sort of" - line "ethereal even." - done - -UnknownText_0x59024: - text "Ancient buildings" - line "are often tombs of" - cont "kings." - - para "Like the pyramids," - line "for instance." - done - -UnknownText_0x59072: - text "It's a replica of" - line "an ancient #-" - cont "MON." - done - -RuinsofAlphInnerChamber_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def $d, $a, 5, RUINS_OF_ALPH_OUTSIDE - warp_def $f, $3, 3, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def $f, $4, 4, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def $3, $f, 3, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def $3, $10, 4, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def $15, $3, 3, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def $15, $4, 4, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def $18, $f, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def $18, $10, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER - -.XYTriggers: - db 0 - -.Signposts: - db 26 - signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 8, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 11, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 14, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 5, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 8, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 11, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 14, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 13, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 13, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 5, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 8, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 11, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 14, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 5, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 8, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 11, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 14, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - -.PersonEvents: - db 3 - person_event SPRITE_FISHER, 7, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x58f7d, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS - person_event SPRITE_TEACHER, 13, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x58f80, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS - person_event SPRITE_GRAMPS, 19, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x58f83, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS diff --git a/maps/RuinsofAlphKabutoItemRoom.asm b/maps/RuinsofAlphKabutoItemRoom.asm deleted file mode 100644 index 8b839efd9..000000000 --- a/maps/RuinsofAlphKabutoItemRoom.asm +++ /dev/null @@ -1,59 +0,0 @@ -const_value set 2 - const RUINSOFALPHKABUTOITEMROOM_POKE_BALL1 - const RUINSOFALPHKABUTOITEMROOM_POKE_BALL2 - const RUINSOFALPHKABUTOITEMROOM_POKE_BALL3 - const RUINSOFALPHKABUTOITEMROOM_POKE_BALL4 - -RuinsofAlphKabutoItemRoom_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -RuinsofAlphKabutoItemRoomBerry: - itemball BERRY - -RuinsofAlphKabutoItemRoomPsncureberry: - itemball PSNCUREBERRY - -RuinsofAlphKabutoItemRoomHealPowder: - itemball HEAL_POWDER - -RuinsofAlphKabutoItemRoomEnergypowder: - itemball ENERGYPOWDER - -MapRuinsofAlphKabutoItemRoomSignpost1Script: - jumptext UnknownText_0x599ad - -UnknownText_0x599ad: - text "It's a replica of" - line "an ancient #-" - cont "MON." - done - -RuinsofAlphKabutoItemRoom_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def $9, $3, 5, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def $9, $4, 5, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def $1, $3, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM - warp_def $1, $4, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM - -.XYTriggers: - db 0 - -.Signposts: - db 2 - signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphKabutoItemRoomSignpost1Script - signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphKabutoItemRoomSignpost1Script - -.PersonEvents: - db 4 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM diff --git a/maps/RuinsofAlphOmanyteItemRoom.asm b/maps/RuinsofAlphOmanyteItemRoom.asm deleted file mode 100644 index 55d4cf9b4..000000000 --- a/maps/RuinsofAlphOmanyteItemRoom.asm +++ /dev/null @@ -1,59 +0,0 @@ -const_value set 2 - const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL1 - const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL2 - const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3 - const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4 - -RuinsofAlphOmanyteItemRoom_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -RuinsofAlphOmanyteItemRoomMysteryberry: - itemball MYSTERYBERRY - -RuinsofAlphOmanyteItemRoomMysticWater: - itemball MYSTIC_WATER - -RuinsofAlphOmanyteItemRoomStardust: - itemball STARDUST - -RuinsofAlphOmanyteItemRoomStarPiece: - itemball STAR_PIECE - -MapRuinsofAlphOmanyteItemRoomSignpost1Script: - jumptext UnknownText_0x59a37 - -UnknownText_0x59a37: - text "It's a replica of" - line "an ancient #-" - cont "MON." - done - -RuinsofAlphOmanyteItemRoom_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def $9, $3, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def $9, $4, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def $1, $3, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM - warp_def $1, $4, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM - -.XYTriggers: - db 0 - -.Signposts: - db 2 - signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphOmanyteItemRoomSignpost1Script - signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphOmanyteItemRoomSignpost1Script - -.PersonEvents: - db 4 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index 2f5fbe2ab..77e40f8e2 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -1,5 +1,5 @@ SafariZoneBeta_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -14,11 +14,11 @@ SafariZoneBeta_MapEventHeader: warp_def $17, $9, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA warp_def $17, $a, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index 60b24d4e1..0ffc13b75 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -1,5 +1,5 @@ SafariZoneFuchsiaGateBeta_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,11 +16,11 @@ SafariZoneFuchsiaGateBeta_MapEventHeader: warp_def $7, $4, 7, FUCHSIA_CITY warp_def $7, $5, 7, FUCHSIA_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index a116519ba..1fd5e0b55 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -1,5 +1,5 @@ SafariZoneMainOffice_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -14,11 +14,11 @@ SafariZoneMainOffice_MapEventHeader: warp_def $7, $2, 2, FUCHSIA_CITY warp_def $7, $3, 2, FUCHSIA_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index f26931fd8..f1c768e33 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -2,7 +2,7 @@ const_value set 2 const SAFARIZONEWARDENSHOME_LASS SafariZoneWardensHome_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -85,16 +85,16 @@ SafariZoneWardensHome_MapEventHeader: warp_def $7, $2, 6, FUCHSIA_CITY warp_def $7, $3, 6, FUCHSIA_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 1, 0, SIGNPOST_READ, WardensHomeBookshelf - signpost 1, 1, SIGNPOST_READ, WardensHomeBookshelf - signpost 0, 7, SIGNPOST_READ, WardenPhoto - signpost 0, 9, SIGNPOST_READ, SafariZonePhoto + bg_event 1, 0, BGEVENT_READ, WardensHomeBookshelf + bg_event 1, 1, BGEVENT_READ, WardensHomeBookshelf + bg_event 0, 7, BGEVENT_READ, WardenPhoto + bg_event 0, 9, BGEVENT_READ, SafariZonePhoto -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_LASS, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, WardensGranddaughter, -1 + object_event SPRITE_LASS, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 121273939..14334d12d 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -9,13 +9,11 @@ const_value set 2 const SAFFRONCITY_LASS2 SaffronCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -54,11 +52,11 @@ UnknownScript_0x19934c: closetext end -CooltrainerMScript_0x199352: - jumptextfaceplayer UnknownText_0x1994fe +SaffronCityCooltrainerMScript: + jumptextfaceplayer SaffronCityCooltrainerMText -CooltrainerFScript_0x199355: - jumptextfaceplayer UnknownText_0x19958e +SaffronCityCooltrainerFScript: + jumptextfaceplayer SaffronCityCooltrainerFText FisherScript_0x199358: faceplayer @@ -76,14 +74,14 @@ UnknownScript_0x199366: closetext end -YoungsterScript_0x19936c: - jumptextfaceplayer UnknownText_0x1996a5 +SaffronCityYoungster1Script: + jumptextfaceplayer SaffronCityYoungster1Text -YoungsterScript_0x19936f: - jumptextfaceplayer UnknownText_0x1996e5 +SaffronCityYoungster2Script: + jumptextfaceplayer SaffronCityYoungster2Text -LassScript_0x199372: - jumptextfaceplayer UnknownText_0x199745 +SaffronCityLassScript: + jumptextfaceplayer SaffronCityLassText SaffronCitySign: jumptext SaffronCitySignText @@ -103,7 +101,7 @@ MrPsychicsHouseSign: SaffronCityMagnetTrainStationSign: jumptext SaffronCityMagnetTrainStationSignText -SaffronCityPokeCenterSign: +SaffronCityPokecenterSign: jumpstd pokecentersign SaffronCityMartSign: @@ -150,7 +148,7 @@ UnknownText_0x1994ae: cont "the MAGNET TRAIN." done -UnknownText_0x1994fe: +SaffronCityCooltrainerMText: text "I went to the GYM," line "raring for battles" cont "against trainers…" @@ -165,7 +163,7 @@ UnknownText_0x1994fe: line "embarrassed." done -UnknownText_0x19958e: +SaffronCityCooltrainerFText: text "This is SILPH CO.," line "famous for #MON" cont "merchandise." @@ -198,7 +196,7 @@ UnknownText_0x19964b: line "Haaah, I'm full!" done -UnknownText_0x1996a5: +SaffronCityYoungster1Text: text "Going into an" line "alley for the" @@ -206,7 +204,7 @@ UnknownText_0x1996a5: line "me sorta anxious." done -UnknownText_0x1996e5: +SaffronCityYoungster2Text: text "There's a place" line "called TRAINER" @@ -217,7 +215,7 @@ UnknownText_0x1996e5: line "over the place." done -UnknownText_0x199745: +SaffronCityLassText: text "Our city was" line "featured on a" cont "radio program." @@ -289,27 +287,27 @@ SaffronCity_MapEventHeader: warp_def $16, $27, 1, ROUTE_8_SAFFRON_GATE warp_def $17, $27, 2, ROUTE_8_SAFFRON_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 8 - signpost 5, 21, SIGNPOST_READ, SaffronCitySign - signpost 5, 33, SIGNPOST_READ, SaffronGymSign - signpost 5, 25, SIGNPOST_READ, FightingDojoSign - signpost 21, 15, SIGNPOST_READ, SilphCoSign - signpost 29, 25, SIGNPOST_READ, MrPsychicsHouseSign - signpost 5, 11, SIGNPOST_READ, SaffronCityMagnetTrainStationSign - signpost 29, 10, SIGNPOST_READ, SaffronCityPokeCenterSign - signpost 11, 26, SIGNPOST_READ, SaffronCityMartSign - -.PersonEvents: + bg_event 5, 21, BGEVENT_READ, SaffronCitySign + bg_event 5, 33, BGEVENT_READ, SaffronGymSign + bg_event 5, 25, BGEVENT_READ, FightingDojoSign + bg_event 21, 15, BGEVENT_READ, SilphCoSign + bg_event 29, 25, BGEVENT_READ, MrPsychicsHouseSign + bg_event 5, 11, BGEVENT_READ, SaffronCityMagnetTrainStationSign + bg_event 29, 10, BGEVENT_READ, SaffronCityPokecenterSign + bg_event 11, 26, BGEVENT_READ, SaffronCityMartSign + +.ObjectEvents: db 8 - person_event SPRITE_LASS, 14, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, LassScript_0x19932a, -1 - person_event SPRITE_POKEFAN_M, 30, 19, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1 - person_event SPRITE_COOLTRAINER_M, 7, 32, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x199352, -1 - person_event SPRITE_COOLTRAINER_F, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x199355, -1 - person_event SPRITE_FISHER, 12, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x199358, -1 - person_event SPRITE_YOUNGSTER, 19, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19936c, -1 - person_event SPRITE_YOUNGSTER, 22, 35, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19936f, -1 - person_event SPRITE_LASS, 8, 19, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x199372, -1 + object_event SPRITE_LASS, 14, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LassScript_0x19932a, -1 + object_event SPRITE_POKEFAN_M, 30, 19, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1 + object_event SPRITE_COOLTRAINER_M, 7, 32, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1 + object_event SPRITE_COOLTRAINER_F, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerFScript, -1 + object_event SPRITE_FISHER, 12, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x199358, -1 + object_event SPRITE_YOUNGSTER, 19, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster1Script, -1 + object_event SPRITE_YOUNGSTER, 22, 35, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster2Script, -1 + object_event SPRITE_LASS, 8, 19, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityLassScript, -1 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 8e7dce341..a780ef4da 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -7,7 +7,7 @@ const_value set 2 const SAFFRONGYM_GYM_GUY SaffronGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -47,45 +47,45 @@ SabrinaScript_0x189c2e: end TrainerMediumRebecca: - trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, MediumRebeccaScript + trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, .Script -MediumRebeccaScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x18a034 + writetext MediumRebeccaAfterBattleText waitbutton closetext end TrainerPsychicFranklin: - trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, PsychicFranklinScript + trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, .Script -PsychicFranklinScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x18a0a6 + writetext PsychicFranklinAfterBattleText waitbutton closetext end TrainerMediumDoris: - trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, MediumDorisScript + trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, .Script -MediumDorisScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x18a136 + writetext MediumDorisAfterBattleText waitbutton closetext end TrainerPsychicJared: - trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, PsychicJaredScript + trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, .Script -PsychicJaredScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x18a1b3 + writetext PsychicJaredAfterBattleText waitbutton closetext end @@ -206,7 +206,7 @@ MediumRebeccaBeatenText: line "Far too strong…" done -UnknownText_0x18a034: +MediumRebeccaAfterBattleText: text "What is the source" line "of your power?" done @@ -222,7 +222,7 @@ PsychicFranklinBeatenText: line "power than mine!" done -UnknownText_0x18a0a6: +PsychicFranklinAfterBattleText: text "You made your soul" line "stronger, not just" cont "your abilities." @@ -241,7 +241,7 @@ MediumDorisBeatenText: line "I still lost…" done -UnknownText_0x18a136: +MediumDorisAfterBattleText: text "Darn! I forgot" line "that I predicted I" cont "would lose to you." @@ -257,7 +257,7 @@ PsychicJaredBeatenText: text "I was no match…" done -UnknownText_0x18a1b3: +PsychicJaredAfterBattleText: text "KARATE KING, the" line "master of the" @@ -329,18 +329,18 @@ SaffronGym_MapEventHeader: warp_def $3, $1, 16, SAFFRON_GYM warp_def $9, $b, 17, SAFFRON_GYM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 15, 8, SIGNPOST_READ, SaffronGymStatue + bg_event 15, 8, BGEVENT_READ, SaffronGymStatue -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_SABRINA, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1 - person_event SPRITE_GRANNY, 16, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerMediumRebecca, -1 - person_event SPRITE_YOUNGSTER, 16, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicFranklin, -1 - person_event SPRITE_GRANNY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerMediumDoris, -1 - person_event SPRITE_YOUNGSTER, 4, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerPsychicJared, -1 - person_event SPRITE_GYM_GUY, 14, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SaffronGymGuyScript, -1 + object_event SPRITE_SABRINA, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1 + object_event SPRITE_GRANNY, 16, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1 + object_event SPRITE_YOUNGSTER, 16, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1 + object_event SPRITE_GRANNY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1 + object_event SPRITE_YOUNGSTER, 4, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicJared, -1 + object_event SPRITE_GYM_GUY, 14, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronGymGuyScript, -1 diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index ed13ef074..c1ce96b4f 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -4,7 +4,7 @@ const_value set 2 const SAFFRONMART_COOLTRAINER_F SaffronMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,19 +16,19 @@ ClerkScript_0x18a3bf: closetext end -CooltrainerMScript_0x18a3c6: - jumptextfaceplayer UnknownText_0x18a3cc +SaffronMartCooltrainerMScript: + jumptextfaceplayer SaffronMartCooltrainerMText -CooltrainerFScript_0x18a3c9: - jumptextfaceplayer UnknownText_0x18a3f3 +SaffronMartCooltrainerFScript: + jumptextfaceplayer SaffronMartCooltrainerFText -UnknownText_0x18a3cc: +SaffronMartCooltrainerMText: text "There's a big" line "RADIO TOWER in" cont "LAVENDER." done -UnknownText_0x18a3f3: +SaffronMartCooltrainerFText: text "I want to become" line "stronger, but I'm" cont "not good yet…" @@ -46,14 +46,14 @@ SaffronMart_MapEventHeader: warp_def $7, $2, 3, SAFFRON_CITY warp_def $7, $3, 3, SAFFRON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1 - person_event SPRITE_COOLTRAINER_M, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x18a3c6, -1 - person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x18a3c9, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1 + object_event SPRITE_COOLTRAINER_M, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1 + object_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1 diff --git a/maps/SaffronPokeCenter2FBeta.asm b/maps/SaffronPokeCenter2FBeta.asm deleted file mode 100644 index 987236d0b..000000000 --- a/maps/SaffronPokeCenter2FBeta.asm +++ /dev/null @@ -1,23 +0,0 @@ -SaffronPokeCenter2FBeta_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -SaffronPokeCenter2FBeta_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def $7, $0, 3, SAFFRON_POKECENTER_1F - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 0 diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokecenter1F.asm index aecafd6b7..9b4608e7b 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -4,8 +4,8 @@ const_value set 2 const SAFFRONPOKECENTER1F_FISHER const SAFFRONPOKECENTER1F_YOUNGSTER -SaffronPokeCenter1F_MapScriptHeader: -.MapTriggers: +SaffronPokecenter1F_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: @@ -38,8 +38,8 @@ FisherScript_0x18a48c: closetext end -YoungsterScript_0x18a4a0: - jumptextfaceplayer UnknownText_0x18a6c5 +SaffronPokecenter1FYoungsterScript: + jumptextfaceplayer SaffronPokecenter1FYoungsterText UnknownText_0x18a4a3: text "What are JOHTO's" @@ -100,7 +100,7 @@ UnknownText_0x18a62e: cont "knowledge." done -UnknownText_0x18a6c5: +SaffronPokecenter1FYoungsterText: text "SILPH CO.'s HEAD" line "OFFICE and the" @@ -111,7 +111,7 @@ UnknownText_0x18a6c5: line "SAFFRON." done -SaffronPokeCenter1F_MapEventHeader: +SaffronPokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -121,15 +121,15 @@ SaffronPokeCenter1F_MapEventHeader: warp_def $7, $4, 4, SAFFRON_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1 - person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1 - person_event SPRITE_FISHER, 6, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1 - person_event SPRITE_YOUNGSTER, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x18a4a0, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1 + object_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1 + object_event SPRITE_FISHER, 6, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1 + object_event SPRITE_YOUNGSTER, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1 diff --git a/maps/SaffronPokecenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm new file mode 100644 index 000000000..ea6adcb2f --- /dev/null +++ b/maps/SaffronPokecenter2FBeta.asm @@ -0,0 +1,23 @@ +SaffronPokecenter2FBeta_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +SaffronPokecenter2FBeta_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 1 + warp_def $7, $0, 3, SAFFRON_POKECENTER_1F + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 0 diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 5b14dc196..df7d7c6de 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -5,16 +5,14 @@ const_value set 2 const SAFFRONTRAINSTATION_LASS SaffronTrainStation_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - - ; triggers - maptrigger .Trigger0 + scene_script .DummyScene .MapCallbacks: db 0 -.Trigger0: +.DummyScene: end OfficerScript_0x18a81e: @@ -88,11 +86,11 @@ UnknownScript_0x18a883: closetext end -TeacherScript_0x18a889: - jumptextfaceplayer UnknownText_0x18aaab +SaffronTrainStationTeacherScript: + jumptextfaceplayer SaffronTrainStationTeacherText -LassScript_0x18a88c: - jumptextfaceplayer UnknownText_0x18ab20 +SaffronTrainStationLassScript: + jumptextfaceplayer SaffronTrainStationLassText MovementData_0x18a88f: step UP @@ -194,7 +192,7 @@ UnknownText_0x18aa61: line "KANTO and JOHTO?" done -UnknownText_0x18aaab: +SaffronTrainStationTeacherText: text "Before the MAGNET" line "TRAIN STATION was" @@ -206,7 +204,7 @@ UnknownText_0x18aaab: cont "to live there." done -UnknownText_0x18ab20: +SaffronTrainStationLassText: text "Hi. Do you have a" line "rail PASS? I have" @@ -228,16 +226,16 @@ SaffronTrainStation_MapEventHeader: warp_def $5, $6, 4, GOLDENROD_MAGNET_TRAIN_STATION warp_def $5, $b, 3, GOLDENROD_MAGNET_TRAIN_STATION -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $6, $b, $0, Script_ArriveFromGoldenrod, $0, $0 + coord_event 0, $6, $b, Script_ArriveFromGoldenrod -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_OFFICER, 9, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1 - person_event SPRITE_GYM_GUY, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1 - person_event SPRITE_TEACHER, 11, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18a889, EVENT_SAFFRON_TRAIN_STATION_POPULATION - person_event SPRITE_LASS, 10, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x18a88c, EVENT_SAFFRON_TRAIN_STATION_POPULATION + object_event SPRITE_OFFICER, 9, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1 + object_event SPRITE_GYM_GUY, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1 + object_event SPRITE_TEACHER, 11, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION + object_event SPRITE_LASS, 10, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index e9193a2fa..fc7806a0b 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -3,16 +3,14 @@ const_value set 2 const SEAFOAMGYM_GYM_GUY SeafoamGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - - ; triggers - dw UnknownScript_0x1ab4fa, 0 + scene_script .DummyScene .MapCallbacks: db 0 -UnknownScript_0x1ab4fa: +.DummyScene: end BlaineScript_0x1ab4fb: @@ -167,13 +165,13 @@ SeafoamGym_MapEventHeader: db 1 warp_def $5, $5, 1, ROUTE_20 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_BLAINE, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1 - person_event SPRITE_GYM_GUY, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY + object_event SPRITE_BLAINE, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1 + object_event SPRITE_GYM_GUY, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index dd3ea9dab..4b87d0df4 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -3,7 +3,7 @@ const_value set 2 const SILPHCO1F_OFFICER SilphCo1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -64,13 +64,13 @@ SilphCo1F_MapEventHeader: warp_def $7, $2, 7, SAFFRON_CITY warp_def $7, $3, 7, SAFFRON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_RECEPTIONIST, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SilphCoReceptionist, -1 - person_event SPRITE_OFFICER, 1, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1 + object_event SPRITE_RECEPTIONIST, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionist, -1 + object_event SPRITE_OFFICER, 1, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1 diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index 2996b9e84..b838c9349 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -3,7 +3,7 @@ const_value set 2 const SILVERCAVEITEMROOMS_POKE_BALL2 SilverCaveItemRooms_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -24,13 +24,13 @@ SilverCaveItemRooms_MapEventHeader: warp_def $3, $d, 3, SILVER_CAVE_ROOM_2 warp_def $f, $7, 4, SILVER_CAVE_ROOM_2 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE - person_event SPRITE_POKE_BALL, 11, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE + object_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE + object_event SPRITE_POKE_BALL, 11, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 37e24d730..798363c52 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -1,18 +1,16 @@ SilverCaveOutside_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_SILVER_CAVE return -MtSilverPokeCenterSign: +MtSilverPokecenterSign: jumpstd pokecentersign MtSilverSign: @@ -34,14 +32,14 @@ SilverCaveOutside_MapEventHeader: warp_def $13, $17, 1, SILVER_CAVE_POKECENTER_1F warp_def $b, $12, 1, SILVER_CAVE_ROOM_1 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 19, 24, SIGNPOST_READ, MtSilverPokeCenterSign - signpost 13, 17, SIGNPOST_READ, MtSilverSign - signpost 25, 9, SIGNPOST_ITEM, SilverCaveOutsideHiddenFullRestore + bg_event 19, 24, BGEVENT_READ, MtSilverPokecenterSign + bg_event 13, 17, BGEVENT_READ, MtSilverSign + bg_event 25, 9, BGEVENT_ITEM, SilverCaveOutsideHiddenFullRestore -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/SilverCavePokeCenter1F.asm b/maps/SilverCavePokecenter1F.asm index 7aba170fe..a1bc54a3f 100644 --- a/maps/SilverCavePokeCenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -2,8 +2,8 @@ const_value set 2 const SILVERCAVEPOKECENTER1F_NURSE const SILVERCAVEPOKECENTER1F_GRANNY -SilverCavePokeCenter1F_MapScriptHeader: -.MapTriggers: +SilverCavePokecenter1F_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: @@ -12,10 +12,10 @@ SilverCavePokeCenter1F_MapScriptHeader: NurseScript_0x1ae59a: jumpstd pokecenternurse -GrannyScript_0x1ae59d: - jumptextfaceplayer UnknownText_0x1ae5a0 +SilverCavePokecenter1FGrannyScript: + jumptextfaceplayer SilverCavePokecenter1FGrannyText -UnknownText_0x1ae5a0: +SilverCavePokecenter1FGrannyText: text "Trainers who seek" line "power climb MT." @@ -29,7 +29,7 @@ UnknownText_0x1ae5a0: line "anywhere…" done -SilverCavePokeCenter1F_MapEventHeader: +SilverCavePokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -39,13 +39,13 @@ SilverCavePokeCenter1F_MapEventHeader: warp_def $7, $4, 1, SILVER_CAVE_OUTSIDE warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1 - person_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_STANDING_LEFT, 1, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x1ae59d, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1 + object_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_STANDING_LEFT, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 84e05cdf7..57212bf38 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -5,7 +5,7 @@ const_value set 2 const SILVERCAVEROOM1_POKE_BALL4 SilverCaveRoom1_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -40,17 +40,17 @@ SilverCaveRoom1_MapEventHeader: warp_def $21, $9, 2, SILVER_CAVE_OUTSIDE warp_def $1, $f, 1, SILVER_CAVE_ROOM_2 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 23, 16, SIGNPOST_ITEM, SilverCaveRoom1HiddenDireHit - signpost 12, 17, SIGNPOST_ITEM, SilverCaveRoom1HiddenUltraBall + bg_event 23, 16, BGEVENT_ITEM, SilverCaveRoom1HiddenDireHit + bg_event 12, 17, BGEVENT_ITEM, SilverCaveRoom1HiddenUltraBall -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_POKE_BALL, 9, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER - person_event SPRITE_POKE_BALL, 29, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN - person_event SPRITE_POKE_BALL, 30, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE - person_event SPRITE_POKE_BALL, 18, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL + object_event SPRITE_POKE_BALL, 9, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER + object_event SPRITE_POKE_BALL, 29, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN + object_event SPRITE_POKE_BALL, 30, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE + object_event SPRITE_POKE_BALL, 18, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 8fe28cd86..5ee1d4bf6 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -4,7 +4,7 @@ const_value set 2 const SILVERCAVEROOM2_POKE_BALL3 SilverCaveRoom2_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -34,15 +34,15 @@ SilverCaveRoom2_MapEventHeader: warp_def $15, $d, 1, SILVER_CAVE_ITEM_ROOMS warp_def $3, $17, 2, SILVER_CAVE_ITEM_ROOMS -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 31, 14, SIGNPOST_ITEM, SilverCaveRoom2HiddenMaxPotion + bg_event 31, 14, BGEVENT_ITEM, SilverCaveRoom2HiddenMaxPotion -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKE_BALL, 10, 24, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM - person_event SPRITE_POKE_BALL, 24, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL - person_event SPRITE_POKE_BALL, 20, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP + object_event SPRITE_POKE_BALL, 10, 24, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM + object_event SPRITE_POKE_BALL, 24, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL + object_event SPRITE_POKE_BALL, 20, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 82575a93a..717f0532b 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -2,7 +2,7 @@ const_value set 2 const SILVERCAVEROOM3_RED SilverCaveRoom3_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -58,12 +58,12 @@ SilverCaveRoom3_MapEventHeader: db 1 warp_def $21, $9, 2, SILVER_CAVE_ROOM_2 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_RED, 10, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER + object_event SPRITE_RED, 10, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 5714d6340..bd77efe09 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -10,30 +10,30 @@ const_value set 2 const SLOWPOKEWELLB1F_POKE_BALL SlowpokeWellB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -KurtScript_0x5a5d5: - jumptextfaceplayer UnknownText_0x5a6b5 +SlowpokeWellB1FKurtScript: + jumptextfaceplayer SlowpokeWellB1FKurtText TrainerGruntM29: - trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, GruntM29Script + trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, .Script -GruntM29Script: +.Script: end_if_just_battled opentext - writetext TrainerGruntM29SlowpokeProfitText + writetext GruntM29AfterBattleText waitbutton closetext end TrainerGruntM1: - trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, GRUNTM_1, GruntM1SeenText, GruntM1BeatenText, 0, GruntM1Script + trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, GRUNTM_1, GruntM1SeenText, GruntM1BeatenText, 0, .Script -GruntM1Script: +.Script: opentext writetext TrainerGruntM1WhenTalkText waitbutton @@ -47,7 +47,7 @@ GruntM1Script: pause 15 special Special_FadeInQuickly disappear SLOWPOKEWELLB1F_KURT - moveperson SLOWPOKEWELLB1F_KURT, $b, $6 + moveobject SLOWPOKEWELLB1F_KURT, $b, $6 appear SLOWPOKEWELLB1F_KURT applymovement SLOWPOKEWELLB1F_KURT, KurtSlowpokeWellVictoryMovementData spriteface PLAYER, RIGHT @@ -57,7 +57,7 @@ GruntM1Script: closetext setevent EVENT_CLEARED_SLOWPOKE_WELL variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER - domaptrigger AZALEA_TOWN, $1 + setmapscene AZALEA_TOWN, $1 clearevent EVENT_ILEX_FOREST_APPRENTICE clearevent EVENT_ILEX_FOREST_FARFETCHD setevent EVENT_CHARCOAL_KILN_FARFETCH_D @@ -74,23 +74,23 @@ GruntM1Script: end TrainerGruntM2: - trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, GruntM2Script + trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, .Script -GruntM2Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5aaf2 + writetext GruntM2AfterBattleText waitbutton closetext end TrainerGruntF1: - trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, GruntF1Script + trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, .Script -GruntF1Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5ab8d + writetext GruntF1AfterBattleText waitbutton closetext end @@ -144,7 +144,7 @@ KurtSlowpokeWellVictoryMovementData: turn_head LEFT step_end -UnknownText_0x5a6b5: +SlowpokeWellB1FKurtText: text "KURT: Hey there," line "<PLAYER>!" @@ -207,7 +207,7 @@ GruntM29BeatenText: line "my day!" done -TrainerGruntM29SlowpokeProfitText: +GruntM29AfterBattleText: text "Sure, we've been" line "hacking the tails" @@ -266,7 +266,7 @@ GruntM2BeatenText: line "Too strong…" done -UnknownText_0x5aaf2: +GruntM2AfterBattleText: text "We need the money," line "but selling SLOW-" cont "POKETAILS?" @@ -286,7 +286,7 @@ GruntF1BeatenText: text "You rotten brat!" done -UnknownText_0x5ab8d: +GruntF1AfterBattleText: text "SLOWPOKETAILS" line "grow back fast!" @@ -329,20 +329,20 @@ SlowpokeWellB1F_MapEventHeader: warp_def $f, $11, 6, AZALEA_TOWN warp_def $b, $7, 1, SLOWPOKE_WELL_B2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_ROCKET, 7, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS - person_event SPRITE_ROCKET, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS - person_event SPRITE_ROCKET, 6, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS - person_event SPRITE_ROCKET_GIRL, 4, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS - person_event SPRITE_SLOWPOKE, 4, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x5a681, EVENT_SLOWPOKE_WELL_SLOWPOKES - person_event SPRITE_SLOWPOKE, 2, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES - person_event SPRITE_KURT, 14, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtScript_0x5a5d5, EVENT_SLOWPOKE_WELL_KURT - person_event SPRITE_BOULDER, 2, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1 - person_event SPRITE_POKE_BALL, 3, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION + object_event SPRITE_ROCKET, 7, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS + object_event SPRITE_ROCKET, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS + object_event SPRITE_ROCKET, 6, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS + object_event SPRITE_ROCKET_GIRL, 4, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS + object_event SPRITE_SLOWPOKE, 4, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeScript_0x5a681, EVENT_SLOWPOKE_WELL_SLOWPOKES + object_event SPRITE_SLOWPOKE, 2, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES + object_event SPRITE_KURT, 14, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FKurtScript, EVENT_SLOWPOKE_WELL_KURT + object_event SPRITE_BOULDER, 2, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1 + object_event SPRITE_POKE_BALL, 3, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 397203b94..21910a5fe 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -3,7 +3,7 @@ const_value set 2 const SLOWPOKEWELLB2F_POKE_BALL SlowpokeWellB2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -69,13 +69,13 @@ SlowpokeWellB2F_MapEventHeader: db 1 warp_def $b, $9, 2, SLOWPOKE_WELL_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_GYM_GUY, 4, 5, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1 - person_event SPRITE_POKE_BALL, 5, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE + object_event SPRITE_GYM_GUY, 4, 5, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1 + object_event SPRITE_POKE_BALL, 5, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 37041c88d..4a2ddc61a 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -5,7 +5,7 @@ const_value set 2 const SOULHOUSE_GRANNY SoulHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -14,14 +14,14 @@ SoulHouse_MapScriptHeader: MrFuji: jumptextfaceplayer MrFujiText -TeacherScript_0x7ec4a: - jumptextfaceplayer UnknownText_0x7ed4d +SoulHouseTeacherScript: + jumptextfaceplayer SoulHouseTeacherText -LassScript_0x7ec4d: - jumptextfaceplayer UnknownText_0x7edb1 +SoulHouseLassScript: + jumptextfaceplayer SoulHouseLassText -GrannyScript_0x7ec50: - jumptextfaceplayer UnknownText_0x7eddb +SoulHouseGrannyScript: + jumptextfaceplayer SoulHouseGrannyText MrFujiText: text "MR.FUJI: Welcome." @@ -48,7 +48,7 @@ MrFujiText: line "make them happy." done -UnknownText_0x7ed4d: +SoulHouseTeacherText: text "There are other" line "graves of #MON" cont "here, I think." @@ -58,13 +58,13 @@ UnknownText_0x7ed4d: cont "MR.FUJI may enter." done -UnknownText_0x7edb1: +SoulHouseLassText: text "I came with my mom" line "to visit #MON" cont "graves…" done -UnknownText_0x7eddb: +SoulHouseGrannyText: text "The #MON that" line "lived with me…" @@ -81,15 +81,15 @@ SoulHouse_MapEventHeader: warp_def $7, $4, 6, LAVENDER_TOWN warp_def $7, $5, 6, LAVENDER_TOWN -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_GRAMPS, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, MrFuji, -1 - person_event SPRITE_TEACHER, 3, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7ec4a, -1 - person_event SPRITE_LASS, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x7ec4d, -1 - person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GrannyScript_0x7ec50, -1 + object_event SPRITE_GRAMPS, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1 + object_event SPRITE_TEACHER, 3, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1 + object_event SPRITE_LASS, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1 + object_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseGrannyScript, -1 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index e32946903..a0345f72a 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -7,31 +7,31 @@ const_value set 2 const SPROUTTOWER1F_POKE_BALL SproutTower1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -SageScript_0x1844fe: - jumptextfaceplayer UnknownText_0x1845d8 +SproutTower1FSage1Script: + jumptextfaceplayer SproutTower1FSage1Text -SageScript_0x184501: - jumptextfaceplayer UnknownText_0x18460a +SproutTower1FSage2Script: + jumptextfaceplayer SproutTower1FSage2Text -GrannyScript_0x184504: - jumptextfaceplayer UnknownText_0x184649 +SproutTower1FGrannyScript: + jumptextfaceplayer SproutTower1FGrannyText -TeacherScript_0x184507: - jumptextfaceplayer UnknownText_0x18469d +SproutTower1FTeacherScript: + jumptextfaceplayer SproutTower1FTeacherText TrainerSageChow: - trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, 0, SageChowScript + trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, 0, .Script -SageChowScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x184583 + writetext SageChowAfterBattleText waitbutton closetext end @@ -55,7 +55,7 @@ SageChowBeatenText: text "Th-Thank you!" done -UnknownText_0x184583: +SageChowAfterBattleText: text "All living beings" line "coexist through" cont "cooperation." @@ -64,13 +64,13 @@ UnknownText_0x184583: line "thankful for this." done -UnknownText_0x1845d8: +SproutTower1FSage1Text: text "Only if you reach" line "the top will you" cont "obtain an HM." done -UnknownText_0x18460a: +SproutTower1FSage2Text: text "SPROUT TOWER was" line "built long ago" @@ -78,7 +78,7 @@ UnknownText_0x18460a: line "#MON training." done -UnknownText_0x184649: +SproutTower1FGrannyText: text "A BELLSPROUT over" line "100 feet tall…" @@ -87,7 +87,7 @@ UnknownText_0x184649: cont "pillar here." done -UnknownText_0x18469d: +SproutTower1FTeacherText: text "See the pillar" line "shaking?" @@ -114,19 +114,19 @@ SproutTower1F_MapEventHeader: warp_def $6, $2, 2, SPROUT_TOWER_2F warp_def $3, $11, 3, SPROUT_TOWER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 15, 7, SIGNPOST_READ, MapSproutTower1FSignpost1Script - signpost 15, 12, SIGNPOST_READ, MapSproutTower1FSignpost1Script + bg_event 15, 7, BGEVENT_READ, MapSproutTower1FSignpost1Script + bg_event 15, 12, BGEVENT_READ, MapSproutTower1FSignpost1Script -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_SAGE, 4, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SageScript_0x1844fe, -1 - person_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SageScript_0x184501, -1 - person_event SPRITE_GRANNY, 12, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x184504, -1 - person_event SPRITE_TEACHER, 9, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x184507, -1 - person_event SPRITE_SAGE, 5, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSageChow, -1 - person_event SPRITE_POKE_BALL, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL + object_event SPRITE_SAGE, 4, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1 + object_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1 + object_event SPRITE_GRANNY, 12, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FGrannyScript, -1 + object_event SPRITE_TEACHER, 9, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1 + object_event SPRITE_SAGE, 5, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageChow, -1 + object_event SPRITE_POKE_BALL, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 621693f99..4c202eb80 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -4,30 +4,30 @@ const_value set 2 const SPROUTTOWER2F_POKE_BALL SproutTower2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerSageNico: - trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, 0, SageNicoScript + trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script -SageNicoScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1847ff + writetext SageNicoAfterBattleText waitbutton closetext end TrainerSageEdmond: - trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, SageEdmondScript + trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, .Script -SageEdmondScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x18486f + writetext SageEdmondAfterBattleText waitbutton closetext end @@ -49,7 +49,7 @@ SageNicoBeatenText: line "I'm too weak." done -UnknownText_0x1847ff: +SageNicoAfterBattleText: text "The flexible pil-" line "lar protects the" @@ -66,7 +66,7 @@ SageEdmondBeatenText: text "Oh, I'm weak!" done -UnknownText_0x18486f: +SageEdmondAfterBattleText: text "I tried to copy" line "BELLSPROUT's" @@ -95,15 +95,15 @@ SproutTower2F_MapEventHeader: warp_def $3, $11, 5, SPROUT_TOWER_1F warp_def $e, $a, 1, SPROUT_TOWER_3F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 15, 12, SIGNPOST_READ, MapSproutTower2FSignpost0Script + bg_event 15, 12, BGEVENT_READ, MapSproutTower2FSignpost0Script -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_SAGE, 3, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSageNico, -1 - person_event SPRITE_SAGE, 14, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSageEdmond, -1 - person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY + object_event SPRITE_SAGE, 3, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1 + object_event SPRITE_SAGE, 14, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1 + object_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index ee6420d35..c92926585 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -8,20 +8,18 @@ const_value set 2 const SPROUTTOWER3F_SILVER SproutTower3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x184945, 0 - dw UnknownScript_0x184946, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -UnknownScript_0x184945: +.DummyScene0: end -UnknownScript_0x184946: +.DummyScene1: end UnknownScript_0x184947: @@ -61,7 +59,7 @@ UnknownScript_0x184947: disappear SPROUTTOWER3F_SILVER waitsfx special Special_FadeInQuickly - dotrigger $1 + setscene $1 special RestartMapMusic end @@ -95,34 +93,34 @@ UnknownScript_0x1849d1: end TrainerSageJin: - trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, 0, SageJinScript + trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, 0, .Script -SageJinScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x184dfa + writetext SageJinAfterBattleText waitbutton closetext end TrainerSageTroy: - trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, 0, SageTroyScript + trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, 0, .Script -SageTroyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x184ea4 + writetext SageTroyAfterBattleText waitbutton closetext end TrainerSageNeal: - trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, 0, SageNealScript + trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, 0, .Script -SageNealScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x184f12 + writetext SageNealAfterBattleText waitbutton closetext end @@ -274,7 +272,7 @@ SageJinBeatenText: line "incomplete…" done -UnknownText_0x184dfa: +SageJinAfterBattleText: text "As #MON grow" line "stronger, so does" cont "the trainer." @@ -297,7 +295,7 @@ SageTroyBeatenText: line "real!" done -UnknownText_0x184ea4: +SageTroyAfterBattleText: text "It is not far to" line "the ELDER." done @@ -313,7 +311,7 @@ SageNealBeatenText: line "is bright!" done -UnknownText_0x184f12: +SageNealAfterBattleText: text "Let there be light" line "on your journey." done @@ -339,25 +337,25 @@ SproutTower3F_MapEventHeader: db 1 warp_def $e, $a, 4, SPROUT_TOWER_2F -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $9, $b, $0, UnknownScript_0x184947, $0, $0 + coord_event 0, $9, $b, UnknownScript_0x184947 -.Signposts: +.BGEvents: db 6 - signpost 1, 8, SIGNPOST_READ, MapSproutTower3FSignpost5Script - signpost 1, 11, SIGNPOST_READ, MapSproutTower3FSignpost5Script - signpost 0, 9, SIGNPOST_READ, MapSproutTower3FSignpost3Script - signpost 0, 10, SIGNPOST_READ, MapSproutTower3FSignpost3Script - signpost 15, 5, SIGNPOST_READ, MapSproutTower3FSignpost5Script - signpost 15, 14, SIGNPOST_READ, MapSproutTower3FSignpost5Script - -.PersonEvents: + bg_event 1, 8, BGEVENT_READ, MapSproutTower3FSignpost5Script + bg_event 1, 11, BGEVENT_READ, MapSproutTower3FSignpost5Script + bg_event 0, 9, BGEVENT_READ, MapSproutTower3FSignpost3Script + bg_event 0, 10, BGEVENT_READ, MapSproutTower3FSignpost3Script + bg_event 15, 5, BGEVENT_READ, MapSproutTower3FSignpost5Script + bg_event 15, 14, BGEVENT_READ, MapSproutTower3FSignpost5Script + +.ObjectEvents: db 7 - person_event SPRITE_SAGE, 13, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSageJin, -1 - person_event SPRITE_SAGE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerSageTroy, -1 - person_event SPRITE_SAGE, 2, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SageLiScript, -1 - person_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSageNeal, -1 - person_event SPRITE_POKE_BALL, 14, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION - person_event SPRITE_POKE_BALL, 1, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE - person_event SPRITE_SILVER, 4, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER + object_event SPRITE_SAGE, 13, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1 + object_event SPRITE_SAGE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1 + object_event SPRITE_SAGE, 2, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1 + object_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageNeal, -1 + object_event SPRITE_POKE_BALL, 14, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION + object_event SPRITE_POKE_BALL, 1, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE + object_event SPRITE_SILVER, 4, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index a4fff5e88..c96d26104 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -7,23 +7,18 @@ const_value set 2 const TEAMROCKETBASEB1F_POKE_BALL3 TeamRocketBaseB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - - ; triggers - maptrigger .Trigger0 + scene_script .DummyScene .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .HideSecurityGrunt - ; callbacks - - dbw MAPCALLBACK_OBJECTS, .Callback1 - -.Trigger0: +.DummyScene: end -.Callback1: +.HideSecurityGrunt: disappear TEAMROCKETBASEB1F_ROCKET1 return @@ -35,7 +30,7 @@ SecurityCamera1a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $2 + moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $2 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -44,7 +39,7 @@ SecurityCamera1a: scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $2 + moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $2 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt2 @@ -60,7 +55,7 @@ SecurityCamera1b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $3 + moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $3 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -69,7 +64,7 @@ SecurityCamera1b: scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $3 + moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $3 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt2 @@ -85,7 +80,7 @@ SecurityCamera2a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $4, $7 + moveobject TEAMROCKETBASEB1F_ROCKET1, $4, $7 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement2 @@ -95,7 +90,7 @@ SecurityCamera2a: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson TEAMROCKETBASEB1F_ROCKET1, $c, $5 + moveobject TEAMROCKETBASEB1F_ROCKET1, $c, $5 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement3 scall TrainerCameraGrunt2 @@ -111,7 +106,7 @@ SecurityCamera2b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $4, $8 + moveobject TEAMROCKETBASEB1F_ROCKET1, $4, $8 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement4 @@ -121,7 +116,7 @@ SecurityCamera2b: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson TEAMROCKETBASEB1F_ROCKET1, $c, $5 + moveobject TEAMROCKETBASEB1F_ROCKET1, $c, $5 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement5 scall TrainerCameraGrunt2 @@ -137,7 +132,7 @@ SecurityCamera3a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $6 + moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $6 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -147,7 +142,7 @@ SecurityCamera3a: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson TEAMROCKETBASEB1F_ROCKET1, $19, $b + moveobject TEAMROCKETBASEB1F_ROCKET1, $19, $b appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement6 scall TrainerCameraGrunt2 @@ -163,7 +158,7 @@ SecurityCamera3b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $7 + moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $7 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -173,7 +168,7 @@ SecurityCamera3b: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson TEAMROCKETBASEB1F_ROCKET1, $19, $c + moveobject TEAMROCKETBASEB1F_ROCKET1, $19, $c appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement7 scall TrainerCameraGrunt2 @@ -189,7 +184,7 @@ SecurityCamera4: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $11, $10 + moveobject TEAMROCKETBASEB1F_ROCKET1, $11, $10 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -199,7 +194,7 @@ SecurityCamera4: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson TEAMROCKETBASEB1F_ROCKET1, $19, $b + moveobject TEAMROCKETBASEB1F_ROCKET1, $19, $b appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement8 scall TrainerCameraGrunt2 @@ -215,7 +210,7 @@ SecurityCamera5: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson TEAMROCKETBASEB1F_ROCKET1, $3, $10 + moveobject TEAMROCKETBASEB1F_ROCKET1, $3, $10 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -225,7 +220,7 @@ SecurityCamera5: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson TEAMROCKETBASEB1F_ROCKET1, $e, $10 + moveobject TEAMROCKETBASEB1F_ROCKET1, $e, $10 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement9 scall TrainerCameraGrunt2 @@ -486,23 +481,23 @@ NoExplodingTrap: end TrainerScientistJed: - trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, 0, ScientistJedScript + trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, 0, .Script -ScientistJedScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x6cc16 + writetext ScientistJedAfterBattleText waitbutton closetext end TrainerGruntM16: - trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, GruntM16Script + trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, .Script -GruntM16Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x6cd1b + writetext GruntM16AfterBattleText waitbutton closetext end @@ -673,7 +668,7 @@ ScientistJedBeatenText: text "I get it…" done -UnknownText_0x6cc16: +ScientistJedAfterBattleText: text "All right. I'll" line "divulge a secret" cont "about our hideout." @@ -704,7 +699,7 @@ GruntM16BeatenText: text "Kaboom!" done -UnknownText_0x6cd1b: +GruntM16AfterBattleText: text "I don't even know" line "where the traps" cont "are planted." @@ -743,60 +738,60 @@ TeamRocketBaseB1F_MapEventHeader: warp_def $f, $5, 4, TEAM_ROCKET_BASE_B1F warp_def $2, $19, 3, TEAM_ROCKET_BASE_B1F -.XYTriggers: +.CoordEvents: db 30 ; There are five security cameras in the base. ; Walking in front of one triggers two Rocket Grunts. - xy_trigger 0, $2, $18, $0, SecurityCamera1a, $0, $0 - xy_trigger 0, $3, $18, $0, SecurityCamera1b, $0, $0 - xy_trigger 0, $2, $6, $0, SecurityCamera2a, $0, $0 - xy_trigger 0, $3, $6, $0, SecurityCamera2b, $0, $0 - xy_trigger 0, $6, $18, $0, SecurityCamera3a, $0, $0 - xy_trigger 0, $7, $18, $0, SecurityCamera3b, $0, $0 - xy_trigger 0, $10, $16, $0, SecurityCamera4, $0, $0 - xy_trigger 0, $10, $8, $0, SecurityCamera5, $0, $0 + coord_event 0, $2, $18, SecurityCamera1a + coord_event 0, $3, $18, SecurityCamera1b + coord_event 0, $2, $6, SecurityCamera2a + coord_event 0, $3, $6, SecurityCamera2b + coord_event 0, $6, $18, SecurityCamera3a + coord_event 0, $7, $18, SecurityCamera3b + coord_event 0, $10, $16, SecurityCamera4 + coord_event 0, $10, $8, SecurityCamera5 ; There are spots on the floor that trigger a Pokémon battle. ; Each Pokémon (Voltorb, Koffing, Geodude) knows Selfdestruct. - xy_trigger 0, $7, $2, $0, ExplodingTrap1, $0, $0 - xy_trigger 0, $7, $3, $0, ExplodingTrap2, $0, $0 - xy_trigger 0, $7, $4, $0, ExplodingTrap3, $0, $0 - xy_trigger 0, $8, $1, $0, ExplodingTrap4, $0, $0 - xy_trigger 0, $8, $3, $0, ExplodingTrap5, $0, $0 - xy_trigger 0, $8, $5, $0, ExplodingTrap6, $0, $0 - xy_trigger 0, $9, $3, $0, ExplodingTrap7, $0, $0 - xy_trigger 0, $9, $4, $0, ExplodingTrap8, $0, $0 - xy_trigger 0, $a, $1, $0, ExplodingTrap9, $0, $0 - xy_trigger 0, $a, $2, $0, ExplodingTrap10, $0, $0 - xy_trigger 0, $a, $3, $0, ExplodingTrap11, $0, $0 - xy_trigger 0, $a, $5, $0, ExplodingTrap12, $0, $0 - xy_trigger 0, $b, $2, $0, ExplodingTrap13, $0, $0 - xy_trigger 0, $b, $4, $0, ExplodingTrap14, $0, $0 - xy_trigger 0, $c, $1, $0, ExplodingTrap15, $0, $0 - xy_trigger 0, $c, $2, $0, ExplodingTrap16, $0, $0 - xy_trigger 0, $c, $4, $0, ExplodingTrap17, $0, $0 - xy_trigger 0, $c, $5, $0, ExplodingTrap18, $0, $0 - xy_trigger 0, $d, $1, $0, ExplodingTrap19, $0, $0 - xy_trigger 0, $d, $3, $0, ExplodingTrap20, $0, $0 - xy_trigger 0, $d, $4, $0, ExplodingTrap21, $0, $0 - xy_trigger 0, $d, $5, $0, ExplodingTrap22, $0, $0 - -.Signposts: + coord_event 0, $7, $2, ExplodingTrap1 + coord_event 0, $7, $3, ExplodingTrap2 + coord_event 0, $7, $4, ExplodingTrap3 + coord_event 0, $8, $1, ExplodingTrap4 + coord_event 0, $8, $3, ExplodingTrap5 + coord_event 0, $8, $5, ExplodingTrap6 + coord_event 0, $9, $3, ExplodingTrap7 + coord_event 0, $9, $4, ExplodingTrap8 + coord_event 0, $a, $1, ExplodingTrap9 + coord_event 0, $a, $2, ExplodingTrap10 + coord_event 0, $a, $3, ExplodingTrap11 + coord_event 0, $a, $5, ExplodingTrap12 + coord_event 0, $b, $2, ExplodingTrap13 + coord_event 0, $b, $4, ExplodingTrap14 + coord_event 0, $c, $1, ExplodingTrap15 + coord_event 0, $c, $2, ExplodingTrap16 + coord_event 0, $c, $4, ExplodingTrap17 + coord_event 0, $c, $5, ExplodingTrap18 + coord_event 0, $d, $1, ExplodingTrap19 + coord_event 0, $d, $3, ExplodingTrap20 + coord_event 0, $d, $4, ExplodingTrap21 + coord_event 0, $d, $5, ExplodingTrap22 + +.BGEvents: db 9 - signpost 11, 19, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost0Script - signpost 1, 24, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script - signpost 1, 6, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script - signpost 15, 8, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script - signpost 15, 22, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script - signpost 5, 24, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script - signpost 11, 20, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script - signpost 11, 21, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script - signpost 11, 3, SIGNPOST_ITEM, TeamRocketBaseB1FHiddenRevive - -.PersonEvents: + bg_event 11, 19, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script + bg_event 1, 24, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 1, 6, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 15, 8, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 15, 22, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 5, 24, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 11, 20, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script + bg_event 11, 21, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script + bg_event 11, 3, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive + +.ObjectEvents: db 6 - person_event SPRITE_ROCKET, 0, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS - person_event SPRITE_ROCKET, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_SCIENTIST, 12, 18, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_POKE_BALL, 6, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION - person_event SPRITE_POKE_BALL, 15, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB1FNugget, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET - person_event SPRITE_POKE_BALL, 12, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC + object_event SPRITE_ROCKET, 0, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS + object_event SPRITE_ROCKET, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_SCIENTIST, 12, 18, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_POKE_BALL, 6, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION + object_event SPRITE_POKE_BALL, 15, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FNugget, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET + object_event SPRITE_POKE_BALL, 12, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 26adc801b..12930b544 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -15,35 +15,30 @@ const_value set 2 const TEAMROCKETBASEB2F_POKE_BALL TeamRocketBaseB2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 4 - - ; triggers - dw UnknownScript_0x6cf85, 0 - dw UnknownScript_0x6cf86, 0 - dw UnknownScript_0x6cf87, 0 - dw UnknownScript_0x6cf88, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 + scene_script .DummyScene2 + scene_script .DummyScene3 .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .TransmitterDoorCallback - ; callbacks - - dbw MAPCALLBACK_TILES, TransmitterDoorCallback - -UnknownScript_0x6cf85: +.DummyScene0: end -UnknownScript_0x6cf86: +.DummyScene1: end -UnknownScript_0x6cf87: +.DummyScene2: end -UnknownScript_0x6cf88: +.DummyScene3: end -TransmitterDoorCallback: +.TransmitterDoorCallback: checkevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER iftrue .Change return @@ -53,14 +48,14 @@ TransmitterDoorCallback: return UnknownScript_0x6cf95: - moveperson TEAMROCKETBASEB2F_LANCE, $9, $d + moveobject TEAMROCKETBASEB2F_LANCE, $9, $d jump UnknownScript_0x6cfac UnknownScript_0x6cf9c: - moveperson TEAMROCKETBASEB2F_ROCKET_GIRL, $15, $10 - moveperson TEAMROCKETBASEB2F_ROCKET1, $15, $10 - moveperson TEAMROCKETBASEB2F_DRAGON, $a, $d - moveperson TEAMROCKETBASEB2F_LANCE, $a, $d + moveobject TEAMROCKETBASEB2F_ROCKET_GIRL, $15, $10 + moveobject TEAMROCKETBASEB2F_ROCKET1, $15, $10 + moveobject TEAMROCKETBASEB2F_DRAGON, $a, $d + moveobject TEAMROCKETBASEB2F_LANCE, $a, $d UnknownScript_0x6cfac: appear TEAMROCKETBASEB2F_ROCKET_GIRL appear TEAMROCKETBASEB2F_ROCKET1 @@ -102,7 +97,7 @@ UnknownScript_0x6cfac: applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d248 winlosstext UnknownText_0x6d45c, 0 setlasttalked TEAMROCKETBASEB2F_ROCKET_GIRL - loadtrainer EXECUTIVEF, 2 + loadtrainer EXECUTIVEF, EXECUTIVEF_2 startbattle disappear TEAMROCKETBASEB2F_DRAGON setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE @@ -123,7 +118,7 @@ UnknownScript_0x6cfac: disappear TEAMROCKETBASEB2F_ROCKET4 pause 15 special Special_FadeInQuickly - dotrigger $2 + setscene $2 clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE spriteface TEAMROCKETBASEB2F_LANCE, DOWN opentext @@ -180,7 +175,7 @@ LanceHealsCommon: writetext LanceHealsText2 waitbutton closetext - dotrigger $1 + setscene $1 setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE checkcode VAR_FACING if_equal RIGHT, UnknownScript_0x6d0be @@ -194,34 +189,34 @@ UnknownScript_0x6d0be: end TrainerGruntM17: - trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, GruntM17Script + trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, .Script -GruntM17Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x6db88 + writetext GruntM17AfterBattleText waitbutton closetext end TrainerGruntM18: - trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, GruntM18Script + trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, .Script -GruntM18Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x6dc1a + writetext GruntM18AfterBattleText waitbutton closetext end TrainerGruntM19: - trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, GruntM19Script + trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, .Script -GruntM19Script: +.Script: end_if_just_battled opentext - writetext UnknownText_0x6dcd1 + writetext GruntM19AfterBattleText waitbutton closetext end @@ -285,7 +280,7 @@ UnknownScript_0x6d182: end UnknownScript_0x6d184: - moveperson TEAMROCKETBASEB2F_LANCE, $12, $6 + moveobject TEAMROCKETBASEB2F_LANCE, $12, $6 appear TEAMROCKETBASEB2F_LANCE applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a spriteface PLAYER, RIGHT @@ -309,7 +304,7 @@ UnknownScript_0x6d184: clearflag ENGINE_ROCKET_SIGNAL_ON_CH20 setevent EVENT_ROUTE_43_GATE_ROCKETS setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM - dotrigger $3 + setscene $3 clearevent EVENT_LAKE_OF_RAGE_CIVILIANS setevent EVENT_TURNED_OFF_SECURITY_CAMERAS setevent EVENT_SECURITY_CAMERA_1 @@ -319,12 +314,10 @@ UnknownScript_0x6d184: setevent EVENT_SECURITY_CAMERA_5 end -MapTeamRocketBaseB2FSignpostPtr1: - dw EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER - dw MapTeamRocketBaseB2FSignpost1Script - +TeamRocketBaseB2FLockedDoor: + dw EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER, .Script -MapTeamRocketBaseB2FSignpost1Script: +.Script: opentext checkevent EVENT_LEARNED_HAIL_GIOVANNI iftrue UnknownScript_0x6d1e8 @@ -344,16 +337,16 @@ UnknownScript_0x6d1e8: waitsfx end -MapTeamRocketBaseB2FSignpost21Script: +TeamRocketBaseB2FTransmitterScript: opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT - iftrue UnknownScript_0x6d207 + iftrue .Deactivated writetext UnknownText_0x6dda7 waitbutton closetext end -UnknownScript_0x6d207: +.Deactivated: writetext UnknownText_0x6de03 waitbutton closetext @@ -826,7 +819,7 @@ GruntM17BeatenText: text "What? I lost?" done -UnknownText_0x6db88: +GruntM17AfterBattleText: text "Heh, I'm just a" line "GRUNT." @@ -847,7 +840,7 @@ GruntM18BeatenText: text "I knew I'd lose…" done -UnknownText_0x6dc1a: +GruntM18AfterBattleText: text "I got wiped out on" line "the last mission" cont "by a kid too." @@ -871,7 +864,7 @@ GruntM19BeatenText: text "Grrrr…" done -UnknownText_0x6dcd1: +GruntM19AfterBattleText: text "Heh, only the boss" line "knows the password" cont "for that door." @@ -928,57 +921,57 @@ TeamRocketBaseB2F_MapEventHeader: warp_def $6, $3, 3, TEAM_ROCKET_BASE_B3F warp_def $e, $1b, 4, TEAM_ROCKET_BASE_B3F -.XYTriggers: +.CoordEvents: db 9 - xy_trigger 0, $e, $5, $0, LanceHealsScript1, $0, $0 - xy_trigger 0, $d, $4, $0, LanceHealsScript2, $0, $0 - xy_trigger 1, $b, $e, $0, UnknownScript_0x6cf95, $0, $0 - xy_trigger 1, $b, $f, $0, UnknownScript_0x6cf9c, $0, $0 - xy_trigger 2, $c, $e, $0, UnknownScript_0x6d075, $0, $0 - xy_trigger 2, $c, $f, $0, UnknownScript_0x6d075, $0, $0 - xy_trigger 2, $3, $c, $0, UnknownScript_0x6d07a, $0, $0 - xy_trigger 2, $a, $c, $0, UnknownScript_0x6d07a, $0, $0 - xy_trigger 2, $b, $c, $0, UnknownScript_0x6d07a, $0, $0 - -.Signposts: + coord_event 0, $e, $5, LanceHealsScript1 + coord_event 0, $d, $4, LanceHealsScript2 + coord_event 1, $b, $e, UnknownScript_0x6cf95 + coord_event 1, $b, $f, UnknownScript_0x6cf9c + coord_event 2, $c, $e, UnknownScript_0x6d075 + coord_event 2, $c, $f, UnknownScript_0x6d075 + coord_event 2, $3, $c, UnknownScript_0x6d07a + coord_event 2, $a, $c, UnknownScript_0x6d07a + coord_event 2, $b, $c, UnknownScript_0x6d07a + +.BGEvents: db 23 - signpost 12, 14, SIGNPOST_IFNOTSET, MapTeamRocketBaseB2FSignpostPtr1 - signpost 12, 15, SIGNPOST_IFNOTSET, MapTeamRocketBaseB2FSignpostPtr1 - signpost 9, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 16, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 15, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 14, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 13, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 8, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 7, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 6, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 5, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 13, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 14, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 15, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 16, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 5, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 6, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 7, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 8, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 7, 26, SIGNPOST_ITEM, TeamRocketBaseB2FHiddenFullHeal - -.PersonEvents: + bg_event 12, 14, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor + bg_event 12, 15, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor + bg_event 9, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 9, 16, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 9, 15, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 9, 14, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 9, 13, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 9, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 8, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 7, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 6, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 5, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 4, 12, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 4, 13, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 4, 14, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 4, 15, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 4, 16, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 4, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 5, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 6, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 7, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 8, 17, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 7, 26, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal + +.ObjectEvents: db 14 - person_event SPRITE_ROCKET, 16, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE - person_event SPRITE_ROCKET_GIRL, 16, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE - person_event SPRITE_LANCE, 13, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE - person_event SPRITE_DRAGON, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE - person_event SPRITE_VOLTORB, 5, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 - person_event SPRITE_VOLTORB, 7, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketElectrode2, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 - person_event SPRITE_VOLTORB, 9, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketElectrode3, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 - person_event SPRITE_VOLTORB, 5, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 - person_event SPRITE_VOLTORB, 7, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 - person_event SPRITE_VOLTORB, 9, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 - person_event SPRITE_ROCKET, 13, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_ROCKET, 1, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_ROCKET, 14, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_POKE_BALL, 10, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF + object_event SPRITE_ROCKET, 16, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE + object_event SPRITE_ROCKET_GIRL, 16, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE + object_event SPRITE_LANCE, 13, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE + object_event SPRITE_DRAGON, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE + object_event SPRITE_VOLTORB, 5, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + object_event SPRITE_VOLTORB, 7, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode2, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 + object_event SPRITE_VOLTORB, 9, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode3, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 + object_event SPRITE_VOLTORB, 5, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + object_event SPRITE_VOLTORB, 7, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 + object_event SPRITE_VOLTORB, 9, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 + object_event SPRITE_ROCKET, 13, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_ROCKET, 1, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_ROCKET, 14, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_POKE_BALL, 10, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 990e55608..f366f35aa 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -15,33 +15,28 @@ const_value set 2 const TEAMROCKETBASEB3F_POKE_BALL5 TeamRocketBaseB3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 4 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 - maptrigger .Trigger3 + scene_script .LanceGetsPassword + scene_script .DummyScene1 + scene_script .DummyScene2 + scene_script .DummyScene3 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .CheckGiovanniDoor -.Trigger0: +.LanceGetsPassword: priorityjump LanceGetPasswordScript end -.Trigger1: +.DummyScene1: end -.Trigger2: +.DummyScene2: end -.Trigger3: +.DummyScene3: end .CheckGiovanniDoor: @@ -65,7 +60,7 @@ LanceGetPasswordScript: closetext applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c disappear TEAMROCKETBASEB3F_LANCE - dotrigger $1 + setscene $1 end RocketBaseRival: @@ -84,12 +79,12 @@ RocketBaseRival: applymovement PLAYER, RocketBaseRivalShovesPlayerMovement applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalLeaveMovement disappear TEAMROCKETBASEB3F_SILVER - dotrigger $2 + setscene $2 special RestartMapMusic end -RocketScript_0x6e048: - jumptextfaceplayer UnknownText_0x6e235 +TeamRocketBaseB3FRocketScript: + jumptextfaceplayer TeamRocketBaseB3FRocketText UnknownScript_0x6e04b: applymovement PLAYER, MovementData_0x6e133 @@ -109,7 +104,7 @@ UnknownScript_0x6e056: applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e142 winlosstext UnknownText_0x6e511, 0 setlasttalked TEAMROCKETBASEB3F_ROCKET1 - loadtrainer EXECUTIVEM, 4 + loadtrainer EXECUTIVEM, EXECUTIVEM_4 startbattle reloadmapafterbattle setevent EVENT_BEAT_ROCKET_EXECUTIVEM_4 @@ -121,7 +116,7 @@ UnknownScript_0x6e056: playsound SFX_TACKLE applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e147 disappear TEAMROCKETBASEB3F_ROCKET1 - dotrigger $3 + setscene $3 end RocketBaseMurkrow: @@ -138,7 +133,7 @@ SlowpokeTailGrunt: GruntF5Script: end_if_just_battled opentext - writetext UnknownText_0x6e611 + writetext GruntF5AfterBattleText waitbutton closetext setevent EVENT_LEARNED_SLOWPOKETAIL @@ -150,37 +145,36 @@ RaticateTailGrunt: GruntM28Script: end_if_just_battled opentext - writetext UnknownText_0x6e737 + writetext GruntM28AfterBattleText waitbutton closetext setevent EVENT_LEARNED_RATICATE_TAIL end TrainerScientistRoss: - trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, ScientistRossScript + trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, .Script -ScientistRossScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x6e822 + writetext ScientistRossAfterBattleText waitbutton closetext end TrainerScientistMitch: - trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, ScientistMitchScript + trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, .Script -ScientistMitchScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x6e90a + writetext ScientistMitchAfterBattleText waitbutton closetext end -BossDoor: - dw EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE - dw .Script +TeamRocketBaseB3FLockedDoor: + dw EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE, .Script .Script: opentext @@ -207,7 +201,7 @@ BossDoor: waitsfx end -MapTeamRocketBaseB3FSignpost9Script: +TeamRocketBaseB3FOathScript: jumpstd teamrocketoath TeamRocketBaseB3FProtein: @@ -343,7 +337,7 @@ LanceGetPasswordText: line "get the passwords." done -UnknownText_0x6e235: +TeamRocketBaseB3FRocketText: text "Urrggh… The guy" line "in the cape is" cont "incredibly tough…" @@ -456,7 +450,7 @@ GruntF5BeatenText: line "I'll tell you." done -UnknownText_0x6e611: +GruntF5AfterBattleText: text "The password to" line "the boss's room is" @@ -490,7 +484,7 @@ GruntM28BeatenText: line "You're good!" done -UnknownText_0x6e737: +GruntM28AfterBattleText: text "Hyuck-hyuck-hyuck!" para "The password to" @@ -517,7 +511,7 @@ ScientistRossBeatenText: line "error cost me…" done -UnknownText_0x6e822: +ScientistRossAfterBattleText: text "A radio signal" line "that drives #-" cont "MON mad…" @@ -544,7 +538,7 @@ ScientistMitchBeatenText: cont "battling." done -UnknownText_0x6e90a: +ScientistMitchAfterBattleText: text "If we turn up the" line "power of our radio" @@ -582,38 +576,38 @@ TeamRocketBaseB3F_MapEventHeader: warp_def $6, $3, 4, TEAM_ROCKET_BASE_B2F warp_def $e, $1b, 5, TEAM_ROCKET_BASE_B2F -.XYTriggers: +.CoordEvents: db 3 - xy_trigger 2, $8, $a, $0, UnknownScript_0x6e04b, $0, $0 - xy_trigger 2, $8, $b, $0, UnknownScript_0x6e052, $0, $0 - xy_trigger 1, $a, $8, $0, RocketBaseRival, $0, $0 + coord_event 2, $8, $a, UnknownScript_0x6e04b + coord_event 2, $8, $b, UnknownScript_0x6e052 + coord_event 1, $a, $8, RocketBaseRival -.Signposts: +.BGEvents: db 10 - signpost 9, 10, SIGNPOST_IFNOTSET, BossDoor - signpost 9, 11, SIGNPOST_IFNOTSET, BossDoor - signpost 1, 10, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script - signpost 1, 11, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script - signpost 1, 12, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script - signpost 1, 13, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script - signpost 13, 4, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script - signpost 13, 5, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script - signpost 13, 6, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script - signpost 13, 7, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script - -.PersonEvents: + bg_event 9, 10, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor + bg_event 9, 11, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor + bg_event 1, 10, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 1, 11, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 1, 12, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 1, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 13, 4, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 13, 5, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 13, 6, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 13, 7, BGEVENT_READ, TeamRocketBaseB3FOathScript + +.ObjectEvents: db 14 - person_event SPRITE_LANCE, 14, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LanceGetPasswordScript, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS - person_event SPRITE_ROCKET, 3, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE - person_event SPRITE_MOLTRES, 2, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_ROCKET_GIRL, 7, 21, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, SlowpokeTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_ROCKET, 14, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_SCIENTIST, 11, 23, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_ROCKET, 14, 24, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x6e048, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_SILVER, 5, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE - person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN - person_event SPRITE_POKE_BALL, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL - person_event SPRITE_POKE_BALL, 9, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL - person_event SPRITE_POKE_BALL, 2, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL - person_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FUltraBall, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL + object_event SPRITE_LANCE, 14, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceGetPasswordScript, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS + object_event SPRITE_ROCKET, 3, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE + object_event SPRITE_MOLTRES, 2, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_ROCKET_GIRL, 7, 21, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, SlowpokeTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_ROCKET, 14, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_SCIENTIST, 11, 23, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_ROCKET, 14, 24, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeamRocketBaseB3FRocketScript, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event SPRITE_SILVER, 5, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE + object_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN + object_event SPRITE_POKE_BALL, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL + object_event SPRITE_POKE_BALL, 9, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL + object_event SPRITE_POKE_BALL, 2, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL + object_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FUltraBall, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 014e0d26b..03c22bad3 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -3,28 +3,23 @@ const_value set 2 const TIMECAPSULE_CHRIS2 TimeCapsule_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .InitializeTimeCapsule + scene_script .DummyScene .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .SetWhichChris - ; callbacks - - dbw MAPCALLBACK_OBJECTS, TimeCapsule_SetWhichChris - -.Trigger0: - priorityjump TimeCapsule_Initialize +.InitializeTimeCapsule: + priorityjump .InitializeAndPreparePokecenter2F end -.Trigger1: +.DummyScene: end -TimeCapsule_SetWhichChris: +.SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 disappear TIMECAPSULE_CHRIS2 @@ -36,9 +31,9 @@ TimeCapsule_SetWhichChris: appear TIMECAPSULE_CHRIS2 return -TimeCapsule_Initialize: - dotrigger $1 - domaptrigger POKECENTER_2F, $3 +.InitializeAndPreparePokecenter2F: + setscene $1 + setmapscene POKECENTER_2F, $3 end MapTimeCapsuleSignpost1Script: @@ -67,15 +62,15 @@ TimeCapsule_MapEventHeader: warp_def $7, $4, 4, POKECENTER_2F warp_def $7, $5, 4, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 4, 4, SIGNPOST_RIGHT, MapTimeCapsuleSignpost1Script - signpost 4, 5, SIGNPOST_LEFT, MapTimeCapsuleSignpost1Script + bg_event 4, 4, BGEVENT_RIGHT, MapTimeCapsuleSignpost1Script + bg_event 4, 5, BGEVENT_LEFT, MapTimeCapsuleSignpost1Script -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT + object_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS + object_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index c2b88b2a1..1d0340a0b 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -11,70 +11,64 @@ const_value set 2 const TINTOWER1F_SAGE6 TinTower1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x18502a, 0 - dw UnknownScript_0x18502e, 0 + scene_script .FaceSuicune + scene_script .DummyScene .MapCallbacks: db 2 + dbw MAPCALLBACK_OBJECTS, .NPCsCallback + dbw MAPCALLBACK_TILES, .StairsCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x18502f - - dbw MAPCALLBACK_TILES, TinTowerStairsCallback - -UnknownScript_0x18502a: - priorityjump SuicuneBattle +.FaceSuicune: + priorityjump .SuicuneBattle end -UnknownScript_0x18502e: +.DummyScene: end -UnknownScript_0x18502f: +.NPCsCallback: checkevent EVENT_GOT_RAINBOW_WING - iftrue UnknownScript_0x185047 + iftrue .GotRainbowWing checkevent EVENT_BEAT_ELITE_FOUR - iffalse UnknownScript_0x185050 + iffalse .FaceBeasts special SpecialBeastsCheck - iffalse UnknownScript_0x185050 + iffalse .FaceBeasts clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 -UnknownScript_0x185047: +.GotRainbowWing: checkevent EVENT_FOUGHT_HO_OH iffalse .Done appear TINTOWER1F_EUSINE .Done: return -UnknownScript_0x185050: +.FaceBeasts: checkevent EVENT_FOUGHT_SUICUNE - iftrue UnknownScript_0x185077 + iftrue .FoughtSuicune appear TINTOWER1F_SUICUNE writebyte RAIKOU special SpecialMonCheck - iftrue UnknownScript_0x185065 + iftrue .NoRaikou appear TINTOWER1F_RAIKOU - jump UnknownScript_0x185067 + jump .CheckEntei -UnknownScript_0x185065: +.NoRaikou: disappear TINTOWER1F_RAIKOU -UnknownScript_0x185067: +.CheckEntei: writebyte ENTEI special SpecialMonCheck - iftrue UnknownScript_0x185074 + iftrue .NoEntei appear TINTOWER1F_ENTEI - jump UnknownScript_0x185076 + jump .BeastsDone -UnknownScript_0x185074: +.NoEntei: disappear TINTOWER1F_ENTEI -UnknownScript_0x185076: +.BeastsDone: return -UnknownScript_0x185077: +.FoughtSuicune: disappear TINTOWER1F_SUICUNE disappear TINTOWER1F_RAIKOU disappear TINTOWER1F_ENTEI @@ -82,14 +76,14 @@ UnknownScript_0x185077: setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 return -TinTowerStairsCallback: +.StairsCallback: checkevent EVENT_GOT_RAINBOW_WING - iftrue .NoChange + iftrue .DontHideStairs changeblock $a, $2, $9 -.NoChange: +.DontHideStairs: return -SuicuneBattle: +.SuicuneBattle: applymovement PLAYER, TinTowerPlayerMovement1 pause 15 writebyte RAIKOU @@ -131,36 +125,36 @@ SuicuneBattle: disappear TINTOWER1F_SUICUNE setevent EVENT_FOUGHT_SUICUNE setevent EVENT_SAW_SUICUNE_ON_ROUTE_42 - domaptrigger ROUTE_42, $0 + setmapscene ROUTE_42, $0 setevent EVENT_SAW_SUICUNE_ON_ROUTE_36 - domaptrigger ROUTE_36, $0 + setmapscene ROUTE_36, $0 setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY - domaptrigger CIANWOOD_CITY, $0 - dotrigger $1 + setmapscene CIANWOOD_CITY, $0 + setscene $1 clearevent EVENT_SET_WHEN_FOUGHT_HO_OH reloadmapafterbattle pause 20 spriteface PLAYER, DOWN playmusic MUSIC_MYSTICALMAN_ENCOUNTER playsound SFX_ENTER_DOOR - moveperson TINTOWER1F_EUSINE, $a, $f + moveobject TINTOWER1F_EUSINE, $a, $f appear TINTOWER1F_EUSINE applymovement TINTOWER1F_EUSINE, MovementData_0x1851ec playsound SFX_ENTER_DOOR - moveperson TINTOWER1F_SAGE1, $9, $f + moveobject TINTOWER1F_SAGE1, $9, $f appear TINTOWER1F_SAGE1 applymovement TINTOWER1F_SAGE1, MovementData_0x1851f5 playsound SFX_ENTER_DOOR - moveperson TINTOWER1F_SAGE2, $9, $f + moveobject TINTOWER1F_SAGE2, $9, $f appear TINTOWER1F_SAGE2 applymovement TINTOWER1F_SAGE2, MovementData_0x1851fb playsound SFX_ENTER_DOOR - moveperson TINTOWER1F_SAGE3, $9, $f + moveobject TINTOWER1F_SAGE3, $9, $f appear TINTOWER1F_SAGE3 applymovement TINTOWER1F_SAGE3, MovementData_0x1851fe - moveperson TINTOWER1F_SAGE1, $7, $d - moveperson TINTOWER1F_SAGE2, $9, $d - moveperson TINTOWER1F_SAGE3, $b, $d + moveobject TINTOWER1F_SAGE1, $7, $d + moveobject TINTOWER1F_SAGE2, $9, $d + moveobject TINTOWER1F_SAGE3, $b, $d spriteface PLAYER, RIGHT opentext writetext TinTowerEusineSuicuneText @@ -175,31 +169,31 @@ SuicuneBattle: playmapmusic end -SageScript_0x185173: - jumptextfaceplayer UnknownText_0x185386 +TinTower1FSage1Script: + jumptextfaceplayer TinTower1FSage1Text -SageScript_0x185176: - jumptextfaceplayer UnknownText_0x185433 +TinTower1FSage2Script: + jumptextfaceplayer TinTower1FSage2Text -SageScript_0x185179: - jumptextfaceplayer UnknownText_0x185544 +TinTower1FSage3Script: + jumptextfaceplayer TinTower1FSage3Text -SageScript_0x18517c: +TinTower1FSage4Script: checkevent EVENT_FOUGHT_HO_OH - iftrue UnknownScript_0x185185 - jumptextfaceplayer UnknownText_0x1855ee + iftrue .FoughtHoOh + jumptextfaceplayer TinTower1FSage4Text1 -UnknownScript_0x185185: - jumptextfaceplayer UnknownText_0x185765 +.FoughtHoOh: + jumptextfaceplayer TinTower1FSage4Text2 -SageScript_0x185188: +TinTower1FSage5Script: faceplayer opentext checkevent EVENT_FOUGHT_HO_OH - iftrue UnknownScript_0x1851b6 + iftrue .FoughtHoOh checkevent EVENT_GOT_RAINBOW_WING - iftrue UnknownScript_0x1851b0 - writetext UnknownText_0x185629 + iftrue .GotRainbowWing + writetext TinTower1FSage5Text1 buttonsound verbosegiveitem RAINBOW_WING closetext @@ -212,25 +206,25 @@ SageScript_0x185188: setevent EVENT_GOT_RAINBOW_WING closetext opentext -UnknownScript_0x1851b0: - writetext UnknownText_0x18564a +.GotRainbowWing: + writetext TinTower1FSage5Text2 waitbutton closetext end -UnknownScript_0x1851b6: - writetext UnknownText_0x185803 +.FoughtHoOh: + writetext TinTower1FSage5Text3 waitbutton closetext end -SageScript_0x1851bc: +TinTower1FSage6Script: checkevent EVENT_FOUGHT_HO_OH - iftrue UnknownScript_0x1851c5 - jumptextfaceplayer UnknownText_0x185654 + iftrue .FoughtHoOh + jumptextfaceplayer TinTower1FSage6Text1 -UnknownScript_0x1851c5: - jumptextfaceplayer UnknownText_0x1858d0 +.FoughtHoOh: + jumptextfaceplayer TinTower1FSage6Text2 TinTowerEusine: jumptextfaceplayer TinTowerEusineHoOhText @@ -353,7 +347,7 @@ TinTowerEusineSuicuneText: para "Later, <PLAYER>!" done -UnknownText_0x185386: +TinTower1FSage1Text: text "According to" line "legend…" @@ -373,7 +367,7 @@ UnknownText_0x185386: line "humans?" done -UnknownText_0x185433: +TinTower1FSage2Text: text "When the BRASS" line "TOWER burned down," @@ -405,7 +399,7 @@ UnknownText_0x185433: line "say." done -UnknownText_0x185544: +TinTower1FSage3Text: text "The two TOWERS are" line "said to have been" @@ -422,7 +416,7 @@ UnknownText_0x185544: line "important today." done -UnknownText_0x1855ee: +TinTower1FSage4Text1: text "HO-OH appears to" line "have descended" @@ -430,16 +424,16 @@ UnknownText_0x1855ee: line "TOWER!" done -UnknownText_0x185629: +TinTower1FSage5Text1: text "This will protect" line "you. Take it." done -UnknownText_0x18564a: +TinTower1FSage5Text2: text "Now, go." done -UnknownText_0x185654: +TinTower1FSage6Text1: text "I believe you are" line "being tested." @@ -470,7 +464,7 @@ TinTowerEusineHoOhText: line "#MANIAC!" done -UnknownText_0x185765: +TinTower1FSage4Text2: text "The legendary" line "#MON are said" @@ -487,7 +481,7 @@ UnknownText_0x185765: line "put out the fire…" done -UnknownText_0x185803: +TinTower1FSage5Text3: text "When the legendary" line "#MON appeared…" @@ -508,7 +502,7 @@ UnknownText_0x185803: cont "frightened people." done -UnknownText_0x1858d0: +TinTower1FSage6Text2: text "Of the legendary" line "#MON, SUICUNE" @@ -538,21 +532,21 @@ TinTower1F_MapEventHeader: warp_def $f, $a, 12, ECRUTEAK_CITY warp_def $2, $a, 2, TIN_TOWER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 10 - person_event SPRITE_SUICUNE, 9, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE - person_event SPRITE_RAIKOU, 9, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU - person_event SPRITE_ENTEI, 9, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI - person_event SPRITE_SUPER_NERD, 3, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE - person_event SPRITE_SAGE, 9, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185173, EVENT_TIN_TOWER_1F_WISE_TRIO_1 - person_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185176, EVENT_TIN_TOWER_1F_WISE_TRIO_1 - person_event SPRITE_SAGE, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185179, EVENT_TIN_TOWER_1F_WISE_TRIO_1 - person_event SPRITE_SAGE, 2, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x18517c, EVENT_TIN_TOWER_1F_WISE_TRIO_2 - person_event SPRITE_SAGE, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185188, EVENT_TIN_TOWER_1F_WISE_TRIO_2 - person_event SPRITE_SAGE, 2, 14, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x1851bc, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + object_event SPRITE_SUICUNE, 9, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE + object_event SPRITE_RAIKOU, 9, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU + object_event SPRITE_ENTEI, 9, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI + object_event SPRITE_SUPER_NERD, 3, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE + object_event SPRITE_SAGE, 9, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + object_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage2Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + object_event SPRITE_SAGE, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + object_event SPRITE_SAGE, 2, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage4Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + object_event SPRITE_SAGE, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage5Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + object_event SPRITE_SAGE, 2, 14, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage6Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index 95c9724ea..e572e6907 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -1,5 +1,5 @@ TinTower2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -14,11 +14,11 @@ TinTower2F_MapEventHeader: warp_def $e, $a, 1, TIN_TOWER_3F warp_def $2, $a, 3, TIN_TOWER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 197859e64..c3d36d9cf 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -2,7 +2,7 @@ const_value set 2 const TINTOWER3F_POKE_BALL TinTower3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -20,12 +20,12 @@ TinTower3F_MapEventHeader: warp_def $e, $a, 1, TIN_TOWER_2F warp_def $2, $10, 2, TIN_TOWER_4F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 14, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL + object_event SPRITE_POKE_BALL, 14, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 5abc17a22..e04404c5d 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -4,7 +4,7 @@ const_value set 2 const TINTOWER4F_POKE_BALL3 TinTower4F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -34,15 +34,15 @@ TinTower4F_MapEventHeader: warp_def $e, $2, 3, TIN_TOWER_5F warp_def $f, $11, 4, TIN_TOWER_5F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 6, 11, SIGNPOST_ITEM, TinTower4FHiddenMaxPotion + bg_event 6, 11, BGEVENT_ITEM, TinTower4FHiddenMaxPotion -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL - person_event SPRITE_POKE_BALL, 14, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP - person_event SPRITE_POKE_BALL, 12, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE + object_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL + object_event SPRITE_POKE_BALL, 14, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP + object_event SPRITE_POKE_BALL, 12, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 8c9c09730..b3448203f 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -2,7 +2,7 @@ const_value set 2 const TINTOWER5F_POKE_BALL TinTower5F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -30,14 +30,14 @@ TinTower5F_MapEventHeader: warp_def $e, $2, 3, TIN_TOWER_4F warp_def $f, $11, 4, TIN_TOWER_4F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 14, 16, SIGNPOST_ITEM, TinTower5FHiddenFullRestore - signpost 15, 3, SIGNPOST_ITEM, TinTower5FHiddenCarbos + bg_event 14, 16, BGEVENT_ITEM, TinTower5FHiddenFullRestore + bg_event 15, 3, BGEVENT_ITEM, TinTower5FHiddenCarbos -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 9, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY + object_event SPRITE_POKE_BALL, 9, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index d95d20429..0d297498f 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -2,7 +2,7 @@ const_value set 2 const TINTOWER6F_POKE_BALL TinTower6F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -20,12 +20,12 @@ TinTower6F_MapEventHeader: warp_def $9, $3, 1, TIN_TOWER_7F warp_def $f, $b, 1, TIN_TOWER_5F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 8, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION + object_event SPRITE_POKE_BALL, 8, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 2baba56cd..f7be3a5d8 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -2,7 +2,7 @@ const_value set 2 const TINTOWER7F_POKE_BALL TinTower7F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -23,12 +23,12 @@ TinTower7F_MapEventHeader: warp_def $3, $8, 3, TIN_TOWER_7F warp_def $9, $6, 5, TIN_TOWER_9F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 1, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE + object_event SPRITE_POKE_BALL, 1, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 5156e92d1..bdbdca1b7 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -4,7 +4,7 @@ const_value set 2 const TINTOWER8F_POKE_BALL3 TinTower8F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -32,14 +32,14 @@ TinTower8F_MapEventHeader: warp_def $f, $e, 6, TIN_TOWER_9F warp_def $9, $6, 7, TIN_TOWER_9F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET - person_event SPRITE_POKE_BALL, 6, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER - person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE + object_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET + object_event SPRITE_POKE_BALL, 6, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER + object_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 728a94147..83431425c 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -2,7 +2,7 @@ const_value set 2 const TINTOWER9F_POKE_BALL TinTower9F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -11,11 +11,13 @@ TinTower9F_MapScriptHeader: TinTower9FHPUp: itemball HP_UP -UnknownText_0x185b8a: +; unused +TinTower9FUnusedHoOhText: text "HO-OH: Shaoooh!" done -UnknownText_0x185b9b: +; unused +TinTower9FUnusedLugiaText: text "LUGIA: Gyaaan!" done @@ -33,12 +35,12 @@ TinTower9F_MapEventHeader: warp_def $d, $6, 5, TIN_TOWER_8F warp_def $d, $8, 6, TIN_TOWER_8F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 1, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP + object_event SPRITE_POKE_BALL, 1, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index f1ab17ccf..0a70a58ee 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -2,14 +2,11 @@ const_value set 2 const TINTOWERROOF_HO_OH TinTowerRoof_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .HoOh .HoOh: @@ -55,12 +52,12 @@ TinTowerRoof_MapEventHeader: db 1 warp_def $d, $9, 4, TIN_TOWER_9F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_HO_OH, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH + object_event SPRITE_HO_OH, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 0360c8d08..2f3589e16 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -2,7 +2,7 @@ const_value set 2 const TOHJOFALLS_POKE_BALL TohjoFalls_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -20,12 +20,12 @@ TohjoFalls_MapEventHeader: warp_def $f, $d, 2, ROUTE_27 warp_def $f, $19, 3, ROUTE_27 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE + object_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 36f476de4..ebd3d8a3a 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -3,28 +3,23 @@ const_value set 2 const TRADECENTER_CHRIS2 TradeCenter_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .InitializeTradeCenter + scene_script .DummyScene .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .SetWhichChris - ; callbacks - - dbw MAPCALLBACK_OBJECTS, TradeCenter_SetWhichChris - -.Trigger0: - priorityjump TradeCenter_Initialize +.InitializeTradeCenter: + priorityjump .InitializeAndPreparePokecenter2F end -.Trigger1: +.DummyScene: end -TradeCenter_SetWhichChris: +.SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 disappear TRADECENTER_CHRIS2 @@ -36,9 +31,9 @@ TradeCenter_SetWhichChris: appear TRADECENTER_CHRIS2 return -TradeCenter_Initialize: - dotrigger $1 - domaptrigger POKECENTER_2F, $1 +.InitializeAndPreparePokecenter2F: + setscene $1 + setmapscene POKECENTER_2F, $1 end MapTradeCenterSignpost1Script: @@ -67,15 +62,15 @@ TradeCenter_MapEventHeader: warp_def $7, $4, 2, POKECENTER_2F warp_def $7, $5, 2, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 4, 4, SIGNPOST_RIGHT, MapTradeCenterSignpost1Script - signpost 4, 5, SIGNPOST_LEFT, MapTradeCenterSignpost1Script + bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script + bg_event 4, 5, BGEVENT_LEFT, MapTradeCenterSignpost1Script -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT + object_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS + object_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index d196d9a47..d62a0673f 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -6,26 +6,26 @@ const_value set 2 const TRAINERHOUSE1F_GENTLEMAN TrainerHouse1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -ReceptionistScript_0x9af67: - jumptextfaceplayer UnknownText_0x9af7f +TrainerHouse1FReceptionistScript: + jumptextfaceplayer TrainerHouse1FReceptionistText -CooltrainerMScript_0x9af6a: - jumptextfaceplayer UnknownText_0x9b025 +TrainerHouse1FCooltrainerMScript: + jumptextfaceplayer TrainerHouse1FCooltrainerMText -CooltrainerFScript_0x9af6d: - jumptextfaceplayer UnknownText_0x9b0b5 +TrainerHouse1FCooltrainerFScript: + jumptextfaceplayer TrainerHouse1FCooltrainerFText -YoungsterScript_0x9af70: - jumptextfaceplayer UnknownText_0x9b11d +TrainerHouse1FYoungsterScript: + jumptextfaceplayer TrainerHouse1FYoungsterText -GentlemanScript_0x9af73: - jumptextfaceplayer UnknownText_0x9b1c9 +TrainerHouse1FGentlemanScript: + jumptextfaceplayer TrainerHouse1FGentlemanText MapTrainerHouse1FSignpost0Script: jumptext UnknownText_0x9b1f4 @@ -36,7 +36,7 @@ MapTrainerHouse1FSignpost1Script: MapTrainerHouse1FSignpost2Script: jumptext UnknownText_0x9b2c1 -UnknownText_0x9af7f: +TrainerHouse1FReceptionistText: text "Welcome to TRAINER" line "HOUSE, the newest" @@ -53,7 +53,7 @@ UnknownText_0x9af7f: line "downstairs." done -UnknownText_0x9b025: +TrainerHouse1FCooltrainerMText: text "VIRIDIAN is the" line "town closest to" cont "INDIGO PLATEAU." @@ -68,7 +68,7 @@ UnknownText_0x9b025: line "PLATEAU." done -UnknownText_0x9b0b5: +TrainerHouse1FCooltrainerFText: text "They hold practice" line "battles downstairs" cont "here." @@ -80,7 +80,7 @@ UnknownText_0x9b0b5: line "battles." done -UnknownText_0x9b11d: +TrainerHouse1FYoungsterText: text "I guess you can't" line "become the CHAMP" @@ -97,7 +97,7 @@ UnknownText_0x9b11d: line "towns in KANTO." done -UnknownText_0x9b1c9: +TrainerHouse1FGentlemanText: text "Whew… I'm taking a" line "rest from #MON" cont "battles." @@ -147,19 +147,19 @@ TrainerHouse1F_MapEventHeader: warp_def $d, $3, 3, VIRIDIAN_CITY warp_def $2, $8, 1, TRAINER_HOUSE_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 0, 5, SIGNPOST_READ, MapTrainerHouse1FSignpost0Script - signpost 0, 7, SIGNPOST_READ, MapTrainerHouse1FSignpost1Script - signpost 10, 7, SIGNPOST_READ, MapTrainerHouse1FSignpost2Script + bg_event 0, 5, BGEVENT_READ, MapTrainerHouse1FSignpost0Script + bg_event 0, 7, BGEVENT_READ, MapTrainerHouse1FSignpost1Script + bg_event 10, 7, BGEVENT_READ, MapTrainerHouse1FSignpost2Script -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_RECEPTIONIST, 11, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x9af67, -1 - person_event SPRITE_COOLTRAINER_M, 11, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9af6a, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9af6d, -1 - person_event SPRITE_YOUNGSTER, 8, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x9af70, -1 - person_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x9af73, -1 + object_event SPRITE_RECEPTIONIST, 11, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1 + object_event SPRITE_COOLTRAINER_M, 11, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1 + object_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1 + object_event SPRITE_YOUNGSTER, 8, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FYoungsterScript, -1 + object_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FGentlemanScript, -1 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index c96f5973b..43d3bcd38 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -3,16 +3,14 @@ const_value set 2 const TRAINERHOUSEB1F_CHRIS TrainerHouseB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 1 - - ; triggers - dw Trigger0, 0 + scene_script .DummyScene .MapCallbacks: db 0 -Trigger0: +.DummyScene: end TrainerHouseReceptionistScript: @@ -179,14 +177,14 @@ TrainerHouseB1F_MapEventHeader: db 1 warp_def $4, $9, 3, TRAINER_HOUSE_1F -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $3, $7, $0, TrainerHouseReceptionistScript, $0, $0 + coord_event 0, $3, $7, TrainerHouseReceptionistScript -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_RECEPTIONIST, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 - person_event SPRITE_CHRIS, 11, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event SPRITE_RECEPTIONIST, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event SPRITE_CHRIS, 11, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/Underground.asm b/maps/Underground.asm deleted file mode 100644 index e3c1ec3ca..000000000 --- a/maps/Underground.asm +++ /dev/null @@ -1,34 +0,0 @@ -Underground_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -UndergroundHiddenFullRestore: - dwb EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE, FULL_RESTORE - - -UndergroundHiddenXSpecial: - dwb EVENT_UNDERGROUND_HIDDEN_X_SPECIAL, X_SPECIAL - - -Underground_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def $2, $3, 3, ROUTE_5_UNDERGROUND_ENTRANCE - warp_def $18, $3, 3, ROUTE_6_UNDERGROUND_ENTRANCE - -.XYTriggers: - db 0 - -.Signposts: - db 2 - signpost 9, 3, SIGNPOST_ITEM, UndergroundHiddenFullRestore - signpost 19, 1, SIGNPOST_ITEM, UndergroundHiddenXSpecial - -.PersonEvents: - db 0 diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm new file mode 100644 index 000000000..6bf10e6fa --- /dev/null +++ b/maps/UndergroundPath.asm @@ -0,0 +1,34 @@ +UndergroundPath_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +UndergroundPathHiddenFullRestore: + dwb EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE, FULL_RESTORE + + +UndergroundPathHiddenXSpecial: + dwb EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL + + +UndergroundPath_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 2 + warp_def $2, $3, 3, ROUTE_5_UNDERGROUND_PATH_ENTRANCE + warp_def $18, $3, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE + +.CoordEvents: + db 0 + +.BGEvents: + db 2 + bg_event 9, 3, BGEVENT_ITEM, UndergroundPathHiddenFullRestore + bg_event 19, 1, BGEVENT_ITEM, UndergroundPathHiddenXSpecial + +.ObjectEvents: + db 0 diff --git a/maps/Underground.blk b/maps/UndergroundPath.blk index a988dc5d8..a988dc5d8 100644 --- a/maps/Underground.blk +++ b/maps/UndergroundPath.blk diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 01875f6ae..54200c8d8 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -10,63 +10,63 @@ const_value set 2 const UNIONCAVE1F_POKE_BALL4 UnionCave1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerPokemaniacLarry: - trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, PokemaniacLarryScript + trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, .Script -PokemaniacLarryScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x59d31 + writetext PokemaniacLarryAfterBattleText waitbutton closetext end TrainerHikerRussell: - trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, HikerRussellScript + trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, .Script -HikerRussellScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x59c6c + writetext HikerRussellAfterBattleText waitbutton closetext end TrainerHikerDaniel: - trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, HikerDanielScript + trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, .Script -HikerDanielScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x59dc9 + writetext HikerDanielAfterBattleText waitbutton closetext end TrainerFirebreatherBill: - trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, FirebreatherBillScript + trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, .Script -FirebreatherBillScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x59e6f + writetext FirebreatherBillAfterBattleText waitbutton closetext end TrainerFirebreatherRay: - trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, FirebreatherRayScript + trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, .Script -FirebreatherRayScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x59efc + writetext FirebreatherRayAfterBattleText waitbutton closetext end @@ -99,7 +99,7 @@ HikerRussellBeatenText: text "Oh, oh, oh!" done -UnknownText_0x59c6c: +HikerRussellAfterBattleText: text "All right, then!" line "I've decided." @@ -125,7 +125,7 @@ PokemaniacLarryBeatenText: line "MON…" done -UnknownText_0x59d31: +PokemaniacLarryAfterBattleText: text "Every Friday, you" line "can hear #MON" @@ -146,7 +146,7 @@ HikerDanielBeatenText: line "big time!" done -UnknownText_0x59dc9: +HikerDanielAfterBattleText: text "I was conned into" line "buying a SLOWPOKE-" cont "TAIL." @@ -168,7 +168,7 @@ FirebreatherBillBeatenText: text "I flamed out!" done -UnknownText_0x59e6f: +FirebreatherBillAfterBattleText: text "On weekends, you" line "can hear strange" @@ -189,7 +189,7 @@ FirebreatherRayBeatenText: text "FLASH!" done -UnknownText_0x59efc: +FirebreatherRayAfterBattleText: text "It's my #MON's" line "fire that lights" cont "up this cave." @@ -210,20 +210,20 @@ UnionCave1F_MapEventHeader: warp_def $1f, $11, 1, ROUTE_33 warp_def $3, $11, 4, ROUTE_32 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 9 - person_event SPRITE_POKEFAN_M, 6, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerDaniel, -1 - person_event SPRITE_SUPER_NERD, 21, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1 - person_event SPRITE_POKEFAN_M, 8, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerHikerRussell, -1 - person_event SPRITE_FISHER, 27, 15, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerFirebreatherRay, -1 - person_event SPRITE_FISHER, 19, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerFirebreatherBill, -1 - person_event SPRITE_POKE_BALL, 21, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL - person_event SPRITE_POKE_BALL, 2, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK - person_event SPRITE_POKE_BALL, 17, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION - person_event SPRITE_POKE_BALL, 33, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING + object_event SPRITE_POKEFAN_M, 6, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerDaniel, -1 + object_event SPRITE_SUPER_NERD, 21, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1 + object_event SPRITE_POKEFAN_M, 8, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerRussell, -1 + object_event SPRITE_FISHER, 27, 15, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherRay, -1 + object_event SPRITE_FISHER, 19, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherBill, -1 + object_event SPRITE_POKE_BALL, 21, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL + object_event SPRITE_POKE_BALL, 2, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK + object_event SPRITE_POKE_BALL, 17, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION + object_event SPRITE_POKE_BALL, 33, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 26295aab0..e3c7ac5f0 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -8,52 +8,52 @@ const_value set 2 const UNIONCAVEB1F_POKE_BALL2 UnionCaveB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerPokemaniacAndrew: - trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, PokemaniacAndrewScript + trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, .Script -PokemaniacAndrewScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5a181 + writetext PokemaniacAndrewAfterBattleText waitbutton closetext end TrainerPokemaniacCalvin: - trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, PokemaniacCalvinScript + trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, .Script -PokemaniacCalvinScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5a230 + writetext PokemaniacCalvinAfterBattleText waitbutton closetext end TrainerHikerPhillip: - trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, HikerPhillipScript + trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, .Script -HikerPhillipScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5a073 + writetext HikerPhillipAfterBattleText waitbutton closetext end TrainerHikerLeonard: - trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, HikerLeonardScript + trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, .Script -HikerLeonardScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5a0fb + writetext HikerLeonardAfterBattleText waitbutton closetext end @@ -80,7 +80,7 @@ HikerPhillipBeatenText: text "Uurggh…" done -UnknownText_0x5a073: +HikerPhillipAfterBattleText: text "I've been lost for" line "a long time…" @@ -99,7 +99,7 @@ HikerLeonardBeatenText: line "feisty one!" done -UnknownText_0x5a0fb: +HikerLeonardAfterBattleText: text "I live down here." para "You can, too, if" @@ -121,7 +121,7 @@ PokemaniacAndrewBeatenText: line "Go away!" done -UnknownText_0x5a181: +PokemaniacAndrewAfterBattleText: text "Just me and my" line "#MON. I'm de-" cont "lirious with joy." @@ -142,7 +142,7 @@ PokemaniacCalvinBeatenText: line "on me!" done -UnknownText_0x5a230: +PokemaniacCalvinAfterBattleText: text "I should compile" line "and announce my" cont "study findings." @@ -164,18 +164,18 @@ UnionCaveB1F_MapEventHeader: warp_def $21, $3, 2, UNION_CAVE_1F warp_def $1f, $11, 1, UNION_CAVE_B2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 7 - person_event SPRITE_POKEFAN_M, 4, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerPhillip, -1 - person_event SPRITE_POKEFAN_M, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerLeonard, -1 - person_event SPRITE_SUPER_NERD, 32, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1 - person_event SPRITE_SUPER_NERD, 30, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacCalvin, -1 - person_event SPRITE_POKE_BALL, 16, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT - person_event SPRITE_BOULDER, 10, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, UnionCaveB1FBoulder, -1 - person_event SPRITE_POKE_BALL, 23, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB1FXDefend, EVENT_UNION_CAVE_B1F_X_DEFEND + object_event SPRITE_POKEFAN_M, 4, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerPhillip, -1 + object_event SPRITE_POKEFAN_M, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerLeonard, -1 + object_event SPRITE_SUPER_NERD, 32, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1 + object_event SPRITE_SUPER_NERD, 30, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacCalvin, -1 + object_event SPRITE_POKE_BALL, 16, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT + object_event SPRITE_BOULDER, 10, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, UnionCaveB1FBoulder, -1 + object_event SPRITE_POKE_BALL, 23, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FXDefend, EVENT_UNION_CAVE_B1F_X_DEFEND diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 68b3147f9..b08424670 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -7,14 +7,11 @@ const_value set 2 const UNIONCAVEB2F_LAPRAS UnionCaveB2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Lapras .Lapras: @@ -41,34 +38,34 @@ UnionCaveLapras: end TrainerCooltrainermNick: - trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, CooltrainermNickScript + trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, .Script -CooltrainermNickScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5a3f0 + writetext CooltrainermNickAfterBattleText waitbutton closetext end TrainerCooltrainerfGwen: - trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, CooltrainerfGwenScript + trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, .Script -CooltrainerfGwenScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5a488 + writetext CooltrainerfGwenAfterBattleText waitbutton closetext end TrainerCooltrainerfEmma: - trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, CooltrainerfEmmaScript + trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, .Script -CooltrainerfEmmaScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x5a52b + writetext CooltrainerfEmmaAfterBattleText waitbutton closetext end @@ -96,7 +93,7 @@ CooltrainermNickBeatenText: line "dazzling style!" done -UnknownText_0x5a3f0: +CooltrainermNickAfterBattleText: text "Your #MON style" line "is stunning and" cont "colorful, I admit." @@ -115,7 +112,7 @@ CooltrainerfGwenBeatenText: line "too good for me." done -UnknownText_0x5a488: +CooltrainerfGwenAfterBattleText: text "I'm going to train" line "by myself until I" cont "improve." @@ -135,7 +132,7 @@ CooltrainerfEmmaBeatenText: line "babies than this!" done -UnknownText_0x5a52b: +CooltrainerfEmmaAfterBattleText: text "Just once a week," line "a #MON comes to" cont "the water's edge." @@ -152,17 +149,17 @@ UnionCaveB2F_MapEventHeader: db 1 warp_def $3, $5, 5, UNION_CAVE_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_ROCKER, 19, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermNick, -1 - person_event SPRITE_COOLTRAINER_F, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 - person_event SPRITE_COOLTRAINER_F, 30, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 - person_event SPRITE_POKE_BALL, 2, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER - person_event SPRITE_POKE_BALL, 19, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION - person_event SPRITE_SURF, 31, 11, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS + object_event SPRITE_ROCKER, 19, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermNick, -1 + object_event SPRITE_COOLTRAINER_F, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 + object_event SPRITE_COOLTRAINER_F, 30, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 + object_event SPRITE_POKE_BALL, 2, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER + object_event SPRITE_POKE_BALL, 19, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION + object_event SPRITE_SURF, 31, 11, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 2840e4ca3..e9a683162 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -7,21 +7,19 @@ const_value set 2 const VERMILIONCITY_POKEFAN_M VermilionCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_VERMILION return -TeacherScript_0x1aa983: - jumptextfaceplayer UnknownText_0x1aaa15 +VermilionCityTeacherScript: + jumptextfaceplayer VermilionCityTeacherText VermilionMachopOwner: jumptextfaceplayer VermilionMachopOwnerText @@ -39,8 +37,8 @@ VermilionMachop: closetext end -SuperNerdScript_0x1aa99b: - jumptextfaceplayer UnknownText_0x1aab1a +VermilionCitySuperNerdScript: + jumptextfaceplayer VermilionCitySuperNerdText VermilionSnorlax: opentext @@ -118,7 +116,7 @@ VermilionCityDiglettsCaveSign: VermilionCityPortSign: jumptext VermilionCityPortSignText -VermilionCityPokeCenterSign: +VermilionCityPokecenterSign: jumpstd pokecentersign VermilionCityMartSign: @@ -127,7 +125,7 @@ VermilionCityMartSign: VermilionCityHiddenFullHeal: dwb EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL -UnknownText_0x1aaa15: +VermilionCityTeacherText: text "VERMILION PORT is" line "KANTO's seaside" cont "gateway." @@ -158,7 +156,7 @@ VermilionMachopText2: cont "the ground flat." done -UnknownText_0x1aab1a: +VermilionCitySuperNerdText: text "There are eight" line "GYMS in KANTO." @@ -286,25 +284,25 @@ VermilionCity_MapEventHeader: warp_def $1f, $14, 2, VERMILION_PORT_PASSAGE warp_def $7, $22, 1, DIGLETTS_CAVE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 8 - signpost 3, 25, SIGNPOST_READ, VermilionCitySign - signpost 19, 5, SIGNPOST_READ, VermilionGymSign - signpost 13, 5, SIGNPOST_READ, PokemonFanClubSign - signpost 9, 33, SIGNPOST_READ, VermilionCityDiglettsCaveSign - signpost 15, 27, SIGNPOST_READ, VermilionCityPortSign - signpost 5, 10, SIGNPOST_READ, VermilionCityPokeCenterSign - signpost 13, 22, SIGNPOST_READ, VermilionCityMartSign - signpost 19, 12, SIGNPOST_ITEM, VermilionCityHiddenFullHeal - -.PersonEvents: + bg_event 3, 25, BGEVENT_READ, VermilionCitySign + bg_event 19, 5, BGEVENT_READ, VermilionGymSign + bg_event 13, 5, BGEVENT_READ, PokemonFanClubSign + bg_event 9, 33, BGEVENT_READ, VermilionCityDiglettsCaveSign + bg_event 15, 27, BGEVENT_READ, VermilionCityPortSign + bg_event 5, 10, BGEVENT_READ, VermilionCityPokecenterSign + bg_event 13, 22, BGEVENT_READ, VermilionCityMartSign + bg_event 19, 12, BGEVENT_ITEM, VermilionCityHiddenFullHeal + +.ObjectEvents: db 6 - person_event SPRITE_TEACHER, 9, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1aa983, -1 - person_event SPRITE_GRAMPS, 6, 23, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionMachopOwner, -1 - person_event SPRITE_MACHOP, 7, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, VermilionMachop, -1 - person_event SPRITE_SUPER_NERD, 16, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1aa99b, -1 - person_event SPRITE_BIG_SNORLAX, 8, 34, SPRITEMOVEDATA_SNORLAX, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX - person_event SPRITE_POKEFAN_M, 12, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, VermilionGymBadgeGuy, -1 + object_event SPRITE_TEACHER, 9, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1 + object_event SPRITE_GRAMPS, 6, 23, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1 + object_event SPRITE_MACHOP, 7, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1 + object_event SPRITE_SUPER_NERD, 16, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionCitySuperNerdScript, -1 + object_event SPRITE_BIG_SNORLAX, 8, 34, SPRITEMOVEDATA_SNORLAX, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX + object_event SPRITE_POKEFAN_M, 12, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionGymBadgeGuy, -1 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 4a2af8fc1..3bd2a6590 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -6,7 +6,7 @@ const_value set 2 const VERMILIONGYM_GYM_GUY VermilionGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -45,34 +45,34 @@ SurgeScript_0x1920a5: end TrainerGentlemanGregory: - trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, GentlemanGregoryScript + trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, .Script -GentlemanGregoryScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1923b0 + writetext GentlemanGregoryAfterBattleText waitbutton closetext end TrainerGuitaristVincent: - trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, GuitaristVincentScript + trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, .Script -GuitaristVincentScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x19244b + writetext GuitaristVincentAfterBattleText waitbutton closetext end TrainerJugglerHorton: - trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, JugglerHortonScript + trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, .Script -JugglerHortonScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1924d6 + writetext JugglerHortonAfterBattleText waitbutton closetext end @@ -175,7 +175,7 @@ GentlemanGregoryBeatenText: cont "sir!" done -UnknownText_0x1923b0: +GentlemanGregoryAfterBattleText: text "When I was still" line "in the army, LT." @@ -198,7 +198,7 @@ GuitaristVincentBeatenText: text "Ooh, how shocking!" done -UnknownText_0x19244b: +GuitaristVincentAfterBattleText: text "If the GYM's traps" line "were working, you" @@ -217,7 +217,7 @@ JugglerHortonBeatenText: line "I was overpowered…" done -UnknownText_0x1924d6: +JugglerHortonAfterBattleText: text "Don't get too com-" line "fortable about" @@ -269,33 +269,33 @@ VermilionGym_MapEventHeader: warp_def $11, $4, 7, VERMILION_CITY warp_def $11, $5, 7, VERMILION_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 17 - signpost 7, 1, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 7, 3, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 7, 5, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 7, 7, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 7, 9, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 9, 1, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 9, 3, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 9, 5, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 9, 7, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 9, 9, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 11, 1, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 11, 3, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 11, 5, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 11, 7, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 11, 9, SIGNPOST_READ, MapVermilionGymSignpost14Script - signpost 15, 3, SIGNPOST_READ, VermilionGymStatue - signpost 15, 6, SIGNPOST_READ, VermilionGymStatue - -.PersonEvents: + bg_event 7, 1, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 7, 3, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 7, 5, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 7, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 7, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 1, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 3, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 5, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 11, 1, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 11, 3, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 11, 5, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 11, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 11, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 15, 3, BGEVENT_READ, VermilionGymStatue + bg_event 15, 6, BGEVENT_READ, VermilionGymStatue + +.ObjectEvents: db 5 - person_event SPRITE_SURGE, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1 - person_event SPRITE_GENTLEMAN, 8, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerGentlemanGregory, -1 - person_event SPRITE_ROCKER, 7, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 3, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerGuitaristVincent, -1 - person_event SPRITE_SUPER_NERD, 10, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerJugglerHorton, -1 - person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 1, VermilionGymGuyScript, -1 + object_event SPRITE_SURGE, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1 + object_event SPRITE_GENTLEMAN, 8, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1 + object_event SPRITE_ROCKER, 7, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 3, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1 + object_event SPRITE_SUPER_NERD, 10, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1 + object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuyScript, -1 diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index 1f1f42e66..0901e7670 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -2,16 +2,16 @@ const_value set 2 const VERMILIONHOUSEDIGLETTSCAVESPEECHHOUSE_GENTLEMAN VermilionHouseDiglettsCaveSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -GentlemanScript_0x192031: - jumptextfaceplayer UnknownText_0x192034 +VermilionHouseDiglettsCaveSpeechHouseGentlemanScript: + jumptextfaceplayer VermilionHouseDiglettsCaveSpeechHouseGentlemanText -UnknownText_0x192034: +VermilionHouseDiglettsCaveSpeechHouseGentlemanText: text "Over many years," line "DIGLETT dug a" cont "large tunnel." @@ -29,12 +29,12 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader: warp_def $7, $2, 6, VERMILION_CITY warp_def $7, $3, 6, VERMILION_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_GENTLEMAN, 3, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x192031, -1 + object_event SPRITE_GENTLEMAN, 3, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionHouseDiglettsCaveSpeechHouseGentlemanScript, -1 diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm index 3571d066f..58a058aa1 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionHouseFishingSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const VERMILIONHOUSEFISHINGSPEECHHOUSE_FISHING_GURU VermilionHouseFishingSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -59,13 +59,13 @@ VermilionHouseFishingSpeechHouse_MapEventHeader: warp_def $7, $2, 1, VERMILION_CITY warp_def $7, $3, 1, VERMILION_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 0, 3, SIGNPOST_READ, FishingDudesHousePhoto + bg_event 0, 3, BGEVENT_READ, FishingDudesHousePhoto -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHING_GURU, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FishingDude, -1 + object_event SPRITE_FISHING_GURU, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index c07f6ca28..7c5359ae3 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -3,22 +3,22 @@ const_value set 2 const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER VermilionMagnetTrainSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -PokefanFScript_0x191eb7: - jumptextfaceplayer UnknownText_0x191ec0 +VermilionMagnetTrainSpeechHousePokefanFScript: + jumptextfaceplayer VermilionMagnetTrainSpeechHousePokefanFText -YoungsterScript_0x191eba: - jumptextfaceplayer UnknownText_0x191f16 +VermilionMagnetTrainSpeechHouseYoungsterScript: + jumptextfaceplayer VermilionMagnetTrainSpeechHouseYoungsterText VermilionMagnetTrainSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x191ec0: +VermilionMagnetTrainSpeechHousePokefanFText: text "Do you know about" line "the MAGNET TRAIN?" @@ -27,7 +27,7 @@ UnknownText_0x191ec0: cont "DENROD in JOHTO." done -UnknownText_0x191f16: +VermilionMagnetTrainSpeechHouseYoungsterText: text "I want to go to" line "SAFFRON to see" cont "the MAGNET TRAIN." @@ -42,15 +42,15 @@ VermilionMagnetTrainSpeechHouse_MapEventHeader: warp_def $7, $2, 4, VERMILION_CITY warp_def $7, $3, 4, VERMILION_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, VermilionMagnetTrainSpeechHouseBookshelf - signpost 1, 1, SIGNPOST_READ, VermilionMagnetTrainSpeechHouseBookshelf + bg_event 1, 0, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x191eb7, -1 - person_event SPRITE_YOUNGSTER, 3, 0, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x191eba, -1 + object_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1 + object_event SPRITE_YOUNGSTER, 3, 0, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 7da93f1e2..0825c71d8 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -4,7 +4,7 @@ const_value set 2 const VERMILIONMART_BUENA VermilionMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,13 +16,13 @@ ClerkScript_0x191f7e: closetext end -SuperNerdScript_0x191f85: - jumptextfaceplayer UnknownText_0x191f8b +VermilionMartSuperNerdScript: + jumptextfaceplayer VermilionMartSuperNerdText -BuenaScript_0x191f88: - jumptextfaceplayer UnknownText_0x191fca +VermilionMartBuenaScript: + jumptextfaceplayer VermilionMartBuenaText -UnknownText_0x191f8b: +VermilionMartSuperNerdText: text "TEAM ROCKET is no" line "longer in KANTO." @@ -30,7 +30,7 @@ UnknownText_0x191f8b: line "me happy." done -UnknownText_0x191fca: +VermilionMartBuenaText: text "I'm thinking about" line "going shopping in" cont "SAFFRON." @@ -45,14 +45,14 @@ VermilionMart_MapEventHeader: warp_def $7, $2, 5, VERMILION_CITY warp_def $7, $3, 5, VERMILION_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1 - person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x191f85, -1 - person_event SPRITE_BUENA, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BuenaScript_0x191f88, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1 + object_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1 + object_event SPRITE_BUENA, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1 diff --git a/maps/VermilionPokeCenter2FBeta.asm b/maps/VermilionPokeCenter2FBeta.asm deleted file mode 100644 index 3d8ad1efc..000000000 --- a/maps/VermilionPokeCenter2FBeta.asm +++ /dev/null @@ -1,23 +0,0 @@ -VermilionPokeCenter2FBeta_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -VermilionPokeCenter2FBeta_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def $7, $0, 3, VERMILION_POKECENTER_1F - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 0 diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokecenter1F.asm index f3cc2d248..3cc524994 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -4,8 +4,8 @@ const_value set 2 const VERMILIONPOKECENTER1F_SAILOR const VERMILIONPOKECENTER1F_BUG_CATCHER -VermilionPokeCenter1F_MapScriptHeader: -.MapTriggers: +VermilionPokecenter1F_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: @@ -30,11 +30,11 @@ UnknownScript_0x191614: closetext end -SailorScript_0x19161a: - jumptextfaceplayer UnknownText_0x1916fe +VermilionPokecenter1FSailorScript: + jumptextfaceplayer VermilionPokecenter1FSailorText -BugCatcherScript_0x19161d: - jumptextfaceplayer UnknownText_0x19173b +VermilionPokecenter1FBugCatcherScript: + jumptextfaceplayer VermilionPokecenter1FBugCatcherText UnknownText_0x191620: text "A sleeping #MON" @@ -59,7 +59,7 @@ UnknownText_0x191698: line "have disappeared." done -UnknownText_0x1916fe: +VermilionPokecenter1FSailorText: text "The FAST SHIP is a" line "great place to" @@ -67,7 +67,7 @@ UnknownText_0x1916fe: line "trainers." done -UnknownText_0x19173b: +VermilionPokecenter1FBugCatcherText: text "Oh? You have some" line "BADGES I've never" cont "seen before." @@ -76,7 +76,7 @@ UnknownText_0x19173b: line "got them in JOHTO." done -VermilionPokeCenter1F_MapEventHeader: +VermilionPokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -86,15 +86,15 @@ VermilionPokeCenter1F_MapEventHeader: warp_def $7, $4, 2, VERMILION_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x191603, -1 - person_event SPRITE_FISHING_GURU, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1 - person_event SPRITE_SAILOR, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x19161a, -1 - person_event SPRITE_BUG_CATCHER, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x19161d, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x191603, -1 + object_event SPRITE_FISHING_GURU, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1 + object_event SPRITE_SAILOR, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1 + object_event SPRITE_BUG_CATCHER, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FBugCatcherScript, -1 diff --git a/maps/VermilionPokecenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm new file mode 100644 index 000000000..0fa256231 --- /dev/null +++ b/maps/VermilionPokecenter2FBeta.asm @@ -0,0 +1,23 @@ +VermilionPokecenter2FBeta_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +VermilionPokecenter2FBeta_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 1 + warp_def $7, $0, 3, VERMILION_POKECENTER_1F + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 0 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 4cbb78604..011f1560e 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -4,34 +4,30 @@ const_value set 2 const VERMILIONPORT_SUPER_NERD VermilionPort_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .DummyScene0 + scene_script .LeaveFastShip .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0: +.DummyScene0: end -.Trigger1: - priorityjump UnknownScript_0x74da6 +.LeaveFastShip: + priorityjump .LeaveFastShipScript end .FlyPoint: setflag ENGINE_FLYPOINT_VERMILION return -UnknownScript_0x74da6: +.LeaveFastShipScript: applymovement PLAYER, MovementData_0x74ef3 appear VERMILIONPORT_SAILOR1 - dotrigger $0 + setscene $0 setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP @@ -72,7 +68,7 @@ SailorScript_0x74dc4: clearevent EVENT_BEAT_SCHOOLBOY_RICKY setevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear VERMILIONPORT_SAILOR1 - domaptrigger FAST_SHIP_1F, $1 + setmapscene FAST_SHIP_1F, $1 warp FAST_SHIP_1F, $19, $1 end @@ -312,16 +308,16 @@ VermilionPort_MapEventHeader: warp_def $5, $9, 5, VERMILION_PORT_PASSAGE warp_def $11, $7, 1, FAST_SHIP_1F -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $b, $7, $0, UnknownScript_0x74e20, $0, $0 + coord_event 0, $b, $7, UnknownScript_0x74e20 -.Signposts: +.BGEvents: db 1 - signpost 13, 16, SIGNPOST_ITEM, VermilionPortHiddenIron + bg_event 13, 16, BGEVENT_ITEM, VermilionPortHiddenIron -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_SAILOR, 17, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - person_event SPRITE_SAILOR, 11, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x74e97, -1 - person_event SPRITE_SUPER_NERD, 11, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1 + object_event SPRITE_SAILOR, 17, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY + object_event SPRITE_SAILOR, 11, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1 + object_event SPRITE_SUPER_NERD, 11, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 8acb74505..1b6aa8ac1 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -2,16 +2,16 @@ const_value set 2 const VERMILIONPORTPASSAGE_TEACHER VermilionPortPassage_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -TeacherScript_0x7701a: - jumptextfaceplayer UnknownText_0x7701d +VermilionPortPassageTeacherScript: + jumptextfaceplayer VermilionPortPassageTeacherText -UnknownText_0x7701d: +VermilionPortPassageTeacherText: text "The FAST SHIP" line "sails on Wednes-" cont "days and Sundays" @@ -30,12 +30,12 @@ VermilionPortPassage_MapEventHeader: warp_def $2, $3, 3, VERMILION_PORT_PASSAGE warp_def $e, $3, 1, VERMILION_PORT -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_TEACHER, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7701a, -1 + object_event SPRITE_TEACHER, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 3b85a534a..a2533a2ed 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -7,24 +7,22 @@ const_value set 2 const VICTORYROAD_POKE_BALL5 VictoryRoad_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x74490, 0 - dw UnknownScript_0x74491, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -UnknownScript_0x74490: +.DummyScene0: end -UnknownScript_0x74491: +.DummyScene1: end UnknownScript_0x74492: - moveperson VICTORYROAD_SILVER, $12, $b + moveobject VICTORYROAD_SILVER, $12, $b spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -34,7 +32,7 @@ UnknownScript_0x74492: scall UnknownScript_0x744d4 applymovement VICTORYROAD_SILVER, MovementData_0x7454c disappear VICTORYROAD_SILVER - dotrigger $1 + setscene $1 playmapmusic end @@ -48,7 +46,7 @@ UnknownScript_0x744b5: scall UnknownScript_0x744d4 applymovement VICTORYROAD_SILVER, MovementData_0x74555 disappear VICTORYROAD_SILVER - dotrigger $1 + setscene $1 playmapmusic end @@ -66,7 +64,7 @@ UnknownScript_0x744d4: iftrue UnknownScript_0x7450f winlosstext UnknownText_0x7463d, UnknownText_0x747aa setlasttalked VICTORYROAD_SILVER - loadtrainer RIVAL1, RIVAL1_15 + loadtrainer RIVAL1, RIVAL1_5_TOTODILE startbattle dontrestartmapmusic reloadmapafterbattle @@ -75,7 +73,7 @@ UnknownScript_0x744d4: UnknownScript_0x744ff: winlosstext UnknownText_0x7463d, UnknownText_0x747aa setlasttalked VICTORYROAD_SILVER - loadtrainer RIVAL1, RIVAL1_13 + loadtrainer RIVAL1, RIVAL1_5_CHIKORITA startbattle dontrestartmapmusic reloadmapafterbattle @@ -84,7 +82,7 @@ UnknownScript_0x744ff: UnknownScript_0x7450f: winlosstext UnknownText_0x7463d, UnknownText_0x747aa setlasttalked VICTORYROAD_SILVER - loadtrainer RIVAL1, RIVAL1_14 + loadtrainer RIVAL1, RIVAL1_5_CYNDAQUIL startbattle dontrestartmapmusic reloadmapafterbattle @@ -259,21 +257,21 @@ VictoryRoad_MapEventHeader: warp_def $1b, $0, 8, VICTORY_ROAD warp_def $5, $d, 3, ROUTE_23 -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $8, $c, $0, UnknownScript_0x74492, $0, $0 - xy_trigger 0, $8, $d, $0, UnknownScript_0x744b5, $0, $0 + coord_event 0, $8, $c, UnknownScript_0x74492 + coord_event 0, $8, $d, UnknownScript_0x744b5 -.Signposts: +.BGEvents: db 2 - signpost 29, 3, SIGNPOST_ITEM, VictoryRoadHiddenMaxPotion - signpost 65, 3, SIGNPOST_ITEM, VictoryRoadHiddenFullHeal + bg_event 29, 3, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion + bg_event 65, 3, BGEVENT_ITEM, VictoryRoadHiddenFullHeal -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_SILVER, 13, 18, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD - person_event SPRITE_POKE_BALL, 28, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE - person_event SPRITE_POKE_BALL, 48, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE - person_event SPRITE_POKE_BALL, 29, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE - person_event SPRITE_POKE_BALL, 48, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL - person_event SPRITE_POKE_BALL, 38, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP + object_event SPRITE_SILVER, 13, 18, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD + object_event SPRITE_POKE_BALL, 28, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE + object_event SPRITE_POKE_BALL, 48, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE + object_event SPRITE_POKE_BALL, 29, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE + object_event SPRITE_POKE_BALL, 48, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL + object_event SPRITE_POKE_BALL, 38, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 08737c111..10bc70b99 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -4,64 +4,62 @@ const_value set 2 const VICTORYROADGATE_BLACK_BELT2 VictoryRoadGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x9b9fb, 0 - dw UnknownScript_0x9b9fc, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -UnknownScript_0x9b9fb: +.DummyScene0: end -UnknownScript_0x9b9fc: +.DummyScene1: end -UnknownScript_0x9b9fd: +VictoryRoadGateBadgeCheckScene: spriteface PLAYER, LEFT - jump UnknownScript_0x9ba04 + jump VictoryRoadGateBadgeCheckScript -OfficerScript_0x9ba03: +VictoryRoadGateOfficerScript: faceplayer -UnknownScript_0x9ba04: +VictoryRoadGateBadgeCheckScript: opentext - writetext UnknownText_0x9ba29 + writetext VictoryRoadGateOfficerText buttonsound checkcode VAR_BADGES - if_greater_than 7, UnknownScript_0x9ba19 - writetext UnknownText_0x9ba5f + if_greater_than 7, .AllEightBadges + writetext VictoryRoadGateNotEnoughBadgesText waitbutton closetext - applymovement PLAYER, MovementData_0x9ba27 + applymovement PLAYER, VictoryRoadGateStepDownMovement end -UnknownScript_0x9ba19: - writetext UnknownText_0x9bab4 +.AllEightBadges: + writetext VictoryRoadGateEightBadgesText waitbutton closetext - dotrigger $1 + setscene $1 end -BlackBeltScript_0x9ba21: - jumptextfaceplayer UnknownText_0x9baf1 +VictoryRoadGateLeftBlackBeltScript: + jumptextfaceplayer VictoryRoadGateLeftBlackBeltText -BlackBeltScript_0x9ba24: - jumptextfaceplayer UnknownText_0x9bb37 +VictoryRoadGateRightBlackBeltScript: + jumptextfaceplayer VictoryRoadGateRightBlackBeltText -MovementData_0x9ba27: +VictoryRoadGateStepDownMovement: step DOWN step_end -UnknownText_0x9ba29: +VictoryRoadGateOfficerText: text "Only trainers who" line "have proven them-" cont "selves may pass." done -UnknownText_0x9ba5f: +VictoryRoadGateNotEnoughBadgesText: text "You don't have all" line "the GYM BADGES of" cont "JOHTO." @@ -71,7 +69,7 @@ UnknownText_0x9ba5f: cont "through." done -UnknownText_0x9bab4: +VictoryRoadGateEightBadgesText: text "Oh! The eight" line "BADGES of JOHTO!" @@ -79,7 +77,7 @@ UnknownText_0x9bab4: line "on through!" done -UnknownText_0x9baf1: +VictoryRoadGateLeftBlackBeltText: text "This way leads to" line "MT.SILVER." @@ -88,7 +86,7 @@ UnknownText_0x9baf1: cont "there." done -UnknownText_0x9bb37: +VictoryRoadGateRightBlackBeltText: text "Off to the #MON" line "LEAGUE, are you?" @@ -114,15 +112,15 @@ VictoryRoadGate_MapEventHeader: warp_def $7, $1, 2, ROUTE_28 warp_def $7, $2, 2, ROUTE_28 -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $b, $a, $0, UnknownScript_0x9b9fd, $0, $0 + coord_event 0, $b, $a, VictoryRoadGateBadgeCheckScene -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_OFFICER, 11, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OfficerScript_0x9ba03, -1 - person_event SPRITE_BLACK_BELT, 5, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER - person_event SPRITE_BLACK_BELT, 5, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX + object_event SPRITE_OFFICER, 11, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1 + object_event SPRITE_BLACK_BELT, 5, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER + object_event SPRITE_BLACK_BELT, 5, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 87ec32077..e6ff519a4 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -9,13 +9,11 @@ const_value set 2 const VIOLETCITY_POKE_BALL2 VioletCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -84,7 +82,7 @@ SproutTowerSign: EarlsPokemonAcademySign: jumptext EarlsPokemonAcademySignText -VioletCityPokeCenterSign: +VioletCityPokecenterSign: jumpstd pokecentersign VioletCityMartSign: @@ -291,31 +289,31 @@ VioletCity_MapEventHeader: warp_def $11, $1e, 1, EARLS_POKEMON_ACADEMY warp_def $f, $3, 1, VIOLET_NICKNAME_SPEECH_HOUSE warp_def $19, $1f, 1, VIOLET_POKECENTER_1F - warp_def $1d, $15, 1, VIOLET_ONIX_TRADE_HOUSE + warp_def $1d, $15, 1, VIOLET_KYLES_HOUSE warp_def $5, $17, 1, SPROUT_TOWER_1F warp_def $18, $27, 1, ROUTE_31_VIOLET_GATE warp_def $19, $27, 2, ROUTE_31_VIOLET_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 7 - signpost 20, 24, SIGNPOST_READ, VioletCitySign - signpost 17, 15, SIGNPOST_READ, VioletGymSign - signpost 8, 24, SIGNPOST_READ, SproutTowerSign - signpost 17, 27, SIGNPOST_READ, EarlsPokemonAcademySign - signpost 25, 32, SIGNPOST_READ, VioletCityPokeCenterSign - signpost 17, 10, SIGNPOST_READ, VioletCityMartSign - signpost 14, 37, SIGNPOST_ITEM, VioletCityHiddenHyperPotion - -.PersonEvents: + bg_event 20, 24, BGEVENT_READ, VioletCitySign + bg_event 17, 15, BGEVENT_READ, VioletGymSign + bg_event 8, 24, BGEVENT_READ, SproutTowerSign + bg_event 17, 27, BGEVENT_READ, EarlsPokemonAcademySign + bg_event 25, 32, BGEVENT_READ, VioletCityPokecenterSign + bg_event 17, 10, BGEVENT_READ, VioletCityMartSign + bg_event 14, 37, BGEVENT_ITEM, VioletCityHiddenHyperPotion + +.ObjectEvents: db 8 - person_event SPRITE_FISHER, 16, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL - person_event SPRITE_LASS, 28, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityLassScript, -1 - person_event SPRITE_SUPER_NERD, 14, 24, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1 - person_event SPRITE_GRAMPS, 20, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletCityGrampsScript, -1 - person_event SPRITE_YOUNGSTER, 18, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1 - person_event SPRITE_FRUIT_TREE, 29, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1 - person_event SPRITE_POKE_BALL, 1, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP - person_event SPRITE_POKE_BALL, 5, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY + object_event SPRITE_FISHER, 16, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL + object_event SPRITE_LASS, 28, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityLassScript, -1 + object_event SPRITE_SUPER_NERD, 14, 24, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1 + object_event SPRITE_GRAMPS, 20, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityGrampsScript, -1 + object_event SPRITE_YOUNGSTER, 18, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1 + object_event SPRITE_FRUIT_TREE, 29, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1 + object_event SPRITE_POKE_BALL, 1, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP + object_event SPRITE_POKE_BALL, 5, 35, SPRITEMOVEDATA_ITEM_TREE, 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 b67784821..a40fe33db 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -5,7 +5,7 @@ const_value set 2 const VIOLETGYM_GYM_GUY VioletGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -30,13 +30,13 @@ FalknerScript_0x683c2: waitsfx setflag ENGINE_ZEPHYRBADGE checkcode VAR_BADGES - scall VioletGymTriggerRockets + scall VioletGymActivateRockets .FightDone: checkevent EVENT_GOT_TM31_MUD_SLAP iftrue .SpeechAfterTM setevent EVENT_BEAT_BIRD_KEEPER_ROD setevent EVENT_BEAT_BIRD_KEEPER_ABE - domaptrigger ELMS_LAB, $2 + setmapscene ELMS_LAB, $2 specialphonecall SPECIALCALL_ASSISTANT writetext UnknownText_0x685c8 buttonsound @@ -55,7 +55,7 @@ FalknerScript_0x683c2: closetext end -VioletGymTriggerRockets: +VioletGymActivateRockets: if_equal 7, .RadioTowerRockets if_equal 6, .GoldenrodRockets end @@ -67,23 +67,23 @@ VioletGymTriggerRockets: jumpstd radiotowerrockets TrainerBird_keeperRod: - trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, 0, Bird_keeperRodScript + trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, 0, .Script -Bird_keeperRodScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x68837 + writetext Bird_keeperRodAfterBattleText waitbutton closetext end TrainerBird_keeperAbe: - trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, 0, Bird_keeperAbeScript + trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, 0, .Script -Bird_keeperAbeScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x688c7 + writetext Bird_keeperAbeAfterBattleText waitbutton closetext end @@ -226,7 +226,7 @@ Bird_keeperRodBeatenText: text "Gaaah!" done -UnknownText_0x68837: +Bird_keeperRodAfterBattleText: text "FALKNER's skills" line "are for real!" @@ -246,7 +246,7 @@ Bird_keeperAbeBeatenText: line "true!" done -UnknownText_0x688c7: +Bird_keeperAbeAfterBattleText: text "This is pathetic," line "losing to some" cont "rookie trainer…" @@ -290,17 +290,17 @@ VioletGym_MapEventHeader: warp_def $f, $4, 2, VIOLET_CITY warp_def $f, $5, 2, VIOLET_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 13, 3, SIGNPOST_READ, VioletGymStatue - signpost 13, 6, SIGNPOST_READ, VioletGymStatue + bg_event 13, 3, BGEVENT_READ, VioletGymStatue + bg_event 13, 6, BGEVENT_READ, VioletGymStatue -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_FALKNER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1 - person_event SPRITE_YOUNGSTER, 6, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperRod, -1 - person_event SPRITE_YOUNGSTER, 10, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperAbe, -1 - person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, VioletGymGuyScript, -1 + object_event SPRITE_FALKNER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1 + object_event SPRITE_YOUNGSTER, 6, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperRod, -1 + object_event SPRITE_YOUNGSTER, 10, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperAbe, -1 + object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1 diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm new file mode 100644 index 000000000..fb3bfc5d5 --- /dev/null +++ b/maps/VioletKylesHouse.asm @@ -0,0 +1,53 @@ +const_value set 2 + const VIOLETKYLESHOUSE_POKEFAN_M + const VIOLETKYLESHOUSE_KYLE + +VioletKylesHouse_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +VioletKylesHousePokefanMScript: + jumptextfaceplayer VioletKylesHousePokefanMText + +Kyle: + faceplayer + opentext + trade NPCTRADE_KYLE + waitbutton + closetext + end + +VioletKylesHousePokefanMText: + text "A #MON you get" + line "in a trade grows" + cont "quickly." + + para "But if you don't" + line "have the right GYM" + + para "BADGE, they may" + line "disobey you." + done + +VioletKylesHouse_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 2 + warp_def $7, $3, 6, VIOLET_CITY + warp_def $7, $4, 6, VIOLET_CITY + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 2 + object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1 + object_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index 0513be044..c28c00869 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -4,7 +4,7 @@ const_value set 2 const VIOLETMART_COOLTRAINER_M VioletMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,13 +16,13 @@ ClerkScript_0x68295: closetext end -GrannyScript_0x6829c: - jumptextfaceplayer UnknownText_0x682a2 +VioletMartGrannyScript: + jumptextfaceplayer VioletMartGrannyText -CooltrainerMScript_0x6829f: - jumptextfaceplayer UnknownText_0x68323 +VioletMartCooltrainerMScript: + jumptextfaceplayer VioletMartCooltrainerMText -UnknownText_0x682a2: +VioletMartGrannyText: text "When you first" line "catch a #MON," cont "it may be weak." @@ -36,7 +36,7 @@ UnknownText_0x682a2: cont "love." done -UnknownText_0x68323: +VioletMartCooltrainerMText: text "#MON can hold" line "items like POTION" cont "and ANTIDOTE." @@ -57,14 +57,14 @@ VioletMart_MapEventHeader: warp_def $7, $2, 1, VIOLET_CITY warp_def $7, $3, 1, VIOLET_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x68295, -1 - person_event SPRITE_GRANNY, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x6829c, -1 - person_event SPRITE_COOLTRAINER_M, 2, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x6829f, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x68295, -1 + object_event SPRITE_GRANNY, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1 + object_event SPRITE_COOLTRAINER_M, 2, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 7717c7136..14cdb7c0f 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -4,17 +4,17 @@ const_value set 2 const VIOLETNICKNAMESPEECHHOUSE_BIRD VioletNicknameSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -TeacherScript_0x693e9: - jumptextfaceplayer UnknownText_0x693fa +VioletNicknameSpeechHouseTeacherScript: + jumptextfaceplayer VioletNicknameSpeechHouseTeacherText -LassScript_0x693ec: - jumptextfaceplayer UnknownText_0x6945e +VioletNicknameSpeechHouseLassScript: + jumptextfaceplayer VioletNicknameSpeechHouseLassText BirdScript_0x693ef: faceplayer @@ -25,7 +25,7 @@ BirdScript_0x693ef: closetext end -UnknownText_0x693fa: +VioletNicknameSpeechHouseTeacherText: text "She uses the names" line "of her favorite" cont "things to eat." @@ -35,7 +35,7 @@ UnknownText_0x693fa: cont "#MON, I mean." done -UnknownText_0x6945e: +VioletNicknameSpeechHouseLassText: text "I call my PIDGEY" line "STRAWBERRY!" done @@ -53,14 +53,14 @@ VioletNicknameSpeechHouse_MapEventHeader: warp_def $7, $3, 4, VIOLET_CITY warp_def $7, $4, 4, VIOLET_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x693e9, -1 - person_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x693ec, -1 - person_event SPRITE_BIRD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BirdScript_0x693ef, -1 + object_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1 + object_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1 + object_event SPRITE_BIRD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BirdScript_0x693ef, -1 diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm deleted file mode 100644 index 5824d6f4b..000000000 --- a/maps/VioletOnixTradeHouse.asm +++ /dev/null @@ -1,53 +0,0 @@ -const_value set 2 - const VIOLETONIXTRADEHOUSE_POKEFAN_M - const VIOLETONIXTRADEHOUSE_KYLE - -VioletOnixTradeHouse_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -PokefanMScript_0x6998d: - jumptextfaceplayer UnknownText_0x69997 - -Kyle: - faceplayer - opentext - trade $1 - waitbutton - closetext - end - -UnknownText_0x69997: - text "A #MON you get" - line "in a trade grows" - cont "quickly." - - para "But if you don't" - line "have the right GYM" - - para "BADGE, they may" - line "disobey you." - done - -VioletOnixTradeHouse_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def $7, $3, 6, VIOLET_CITY - warp_def $7, $4, 6, VIOLET_CITY - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 2 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x6998d, -1 - person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Kyle, -1 diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokecenter1F.asm index 607c8e915..8ddef8239 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -5,17 +5,17 @@ const_value set 2 const VIOLETPOKECENTER1F_YOUNGSTER const VIOLETPOKECENTER1F_SCIENTIST -VioletPokeCenter1F_MapScriptHeader: -.MapTriggers: +VioletPokecenter1F_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: db 0 -VioletPokeCenterNurse: +VioletPokecenterNurse: jumpstd pokecenternurse -VioletPokeCenter1F_ElmsAideScript: +VioletPokecenter1F_ElmsAideScript: faceplayer opentext checkevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE @@ -32,7 +32,7 @@ VioletPokeCenter1F_ElmsAideScript: setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE clearevent EVENT_ELMS_AIDE_IN_LAB clearevent EVENT_TOGEPI_HATCHED - domaptrigger ROUTE_32, $1 + setmapscene ROUTE_32, $1 writetext UnknownText_0x695c5 waitbutton closetext @@ -78,14 +78,14 @@ VioletPokeCenter1F_ElmsAideScript: writetext UnknownText_0x69712 jump .AskTakeEgg -GameboyKidScript_0x69540: - jumptextfaceplayer UnknownText_0x69809 +VioletPokecenter1FGameboyKidScript: + jumptextfaceplayer VioletPokecenter1FGameboyKidText -GentlemanScript_0x69543: - jumptextfaceplayer UnknownText_0x6983c +VioletPokecenter1FGentlemanScript: + jumptextfaceplayer VioletPokecenter1FGentlemanText -YoungsterScript_0x69546: - jumptextfaceplayer UnknownText_0x698b8 +VioletPokecenter1FYoungsterScript: + jumptextfaceplayer VioletPokecenter1FYoungsterText MovementData_AideWalksStraightOutOfPokecenter: step DOWN @@ -182,13 +182,13 @@ UnknownText_0x69791: line "a friend far away." done -UnknownText_0x69809: +VioletPokecenter1FGameboyKidText: text "A guy named BILL" line "made the #MON" cont "PC storage system." done -UnknownText_0x6983c: +VioletPokecenter1FGentlemanText: text "It was around" line "three years ago." @@ -201,7 +201,7 @@ UnknownText_0x6983c: cont "kid broke 'em up." done -UnknownText_0x698b8: +VioletPokecenter1FYoungsterText: text "#MON are smart." line "They won't obey a" @@ -215,7 +215,7 @@ UnknownText_0x698b8: line "they please." done -VioletPokeCenter1F_MapEventHeader: +VioletPokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -225,16 +225,16 @@ VioletPokeCenter1F_MapEventHeader: warp_def $7, $4, 5, VIOLET_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletPokeCenterNurse, -1 - person_event SPRITE_GAMEBOY_KID, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x69540, -1 - person_event SPRITE_GENTLEMAN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x69543, -1 - person_event SPRITE_YOUNGSTER, 1, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x69546, -1 - person_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, VioletPokeCenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1 + object_event SPRITE_GAMEBOY_KID, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1 + object_event SPRITE_GENTLEMAN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1 + object_event SPRITE_YOUNGSTER, 1, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1 + object_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index ced89061b..df827c91a 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -5,13 +5,11 @@ const_value set 2 const VIRIDIANCITY_YOUNGSTER ViridianCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -68,8 +66,8 @@ FisherScript_0x1a9a75: closetext end -YoungsterScript_0x1a9a90: - jumptextfaceplayer UnknownText_0x1a9daa +ViridianCityYoungsterScript: + jumptextfaceplayer ViridianCityYoungsterText ViridianCitySign: jumptext ViridianCitySignText @@ -83,7 +81,7 @@ ViridianCityWelcomeSign: TrainerHouseSign: jumptext TrainerHouseSignText -ViridianCityPokeCenterSign: +ViridianCityPokecenterSign: jumpstd pokecentersign ViridianCityMartSign: @@ -178,7 +176,7 @@ UnknownText_0x1a9d86: para "…Zzzzz…" done -UnknownText_0x1a9daa: +ViridianCityYoungsterText: text "I heard that there" line "are many items on" @@ -229,21 +227,21 @@ ViridianCity_MapEventHeader: warp_def $13, $1d, 2, VIRIDIAN_MART warp_def $19, $17, 1, VIRIDIAN_POKECENTER_1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 17, 17, SIGNPOST_READ, ViridianCitySign - signpost 7, 27, SIGNPOST_READ, ViridianGymSign - signpost 1, 19, SIGNPOST_READ, ViridianCityWelcomeSign - signpost 15, 21, SIGNPOST_READ, TrainerHouseSign - signpost 25, 24, SIGNPOST_READ, ViridianCityPokeCenterSign - signpost 19, 30, SIGNPOST_READ, ViridianCityMartSign - -.PersonEvents: + bg_event 17, 17, BGEVENT_READ, ViridianCitySign + bg_event 7, 27, BGEVENT_READ, ViridianGymSign + bg_event 1, 19, BGEVENT_READ, ViridianCityWelcomeSign + bg_event 15, 21, BGEVENT_READ, TrainerHouseSign + bg_event 25, 24, BGEVENT_READ, ViridianCityPokecenterSign + bg_event 19, 30, BGEVENT_READ, ViridianCityMartSign + +.ObjectEvents: db 4 - person_event SPRITE_GRAMPS, 5, 18, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9a4c, -1 - person_event SPRITE_GRAMPS, 8, 30, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9a61, -1 - person_event SPRITE_FISHER, 23, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a9a75, -1 - person_event SPRITE_YOUNGSTER, 21, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a9a90, -1 + object_event SPRITE_GRAMPS, 5, 18, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a4c, -1 + object_event SPRITE_GRAMPS, 8, 30, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a61, -1 + object_event SPRITE_FISHER, 23, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a9a75, -1 + object_event SPRITE_YOUNGSTER, 21, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianCityYoungsterScript, -1 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index f67289df9..3be7a126e 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -3,7 +3,7 @@ const_value set 2 const VIRIDIANGYM_GYM_GUY ViridianGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -178,15 +178,15 @@ ViridianGym_MapEventHeader: warp_def $11, $4, 1, VIRIDIAN_CITY warp_def $11, $5, 1, VIRIDIAN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 13, 3, SIGNPOST_READ, ViridianGymStatue - signpost 13, 6, SIGNPOST_READ, ViridianGymStatue + bg_event 13, 3, BGEVENT_READ, ViridianGymStatue + bg_event 13, 6, BGEVENT_READ, ViridianGymStatue -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_BLUE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE - person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE + object_event SPRITE_BLUE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE + object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 25764b0a5..c2235496a 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -4,7 +4,7 @@ const_value set 2 const VIRIDIANMART_COOLTRAINER_M ViridianMart_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,19 +16,19 @@ ClerkScript_0x9b5e7: closetext end -LassScript_0x9b5ee: - jumptextfaceplayer UnknownText_0x9b5f4 +ViridianMartLassScript: + jumptextfaceplayer ViridianMartLassText -CooltrainerMScript_0x9b5f1: - jumptextfaceplayer UnknownText_0x9b61a +ViridianMartCooltrainerMScript: + jumptextfaceplayer ViridianMartCooltrainerMText -UnknownText_0x9b5f4: +ViridianMartLassText: text "The GYM LEADER" line "here is totally" cont "cool." done -UnknownText_0x9b61a: +ViridianMartCooltrainerMText: text "Have you been to" line "CINNABAR?" @@ -45,14 +45,14 @@ ViridianMart_MapEventHeader: warp_def $7, $2, 4, VIRIDIAN_CITY warp_def $7, $3, 4, VIRIDIAN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1 - person_event SPRITE_LASS, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x9b5ee, -1 - person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9b5f1, -1 + object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1 + object_event SPRITE_LASS, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1 + object_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 8166fb3a1..f5df4ad2f 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -5,17 +5,17 @@ const_value set 2 const VIRIDIANNICKNAMESPEECHHOUSE_RATTEY ViridianNicknameSpeechHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 -PokefanMScript_0x9ae3a: - jumptextfaceplayer UnknownText_0x9ae54 +ViridianNicknameSpeechHousePokefanMScript: + jumptextfaceplayer ViridianNicknameSpeechHousePokefanMText -LassScript_0x9ae3d: - jumptextfaceplayer UnknownText_0x9aecb +ViridianNicknameSpeechHouseLassScript: + jumptextfaceplayer ViridianNicknameSpeechHouseLassText Speary: opentext @@ -33,7 +33,7 @@ Rattey: closetext end -UnknownText_0x9ae54: +ViridianNicknameSpeechHousePokefanMText: text "Do you put a lot" line "of thought into" @@ -47,7 +47,7 @@ UnknownText_0x9ae54: line "with others." done -UnknownText_0x9aecb: +ViridianNicknameSpeechHouseLassText: text "They're SPEARY--" line "a SPEAROW--and" cont "RATTEY--a RATTATA." @@ -70,15 +70,15 @@ ViridianNicknameSpeechHouse_MapEventHeader: warp_def $7, $2, 2, VIRIDIAN_CITY warp_def $7, $3, 2, VIRIDIAN_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_POKEFAN_M, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x9ae3a, -1 - person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x9ae3d, -1 - person_event SPRITE_MOLTRES, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, Speary, -1 - person_event SPRITE_GROWLITHE, 3, 6, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Rattey, -1 + object_event SPRITE_POKEFAN_M, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1 + object_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1 + object_event SPRITE_MOLTRES, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1 + object_event SPRITE_GROWLITHE, 3, 6, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Rattey, -1 diff --git a/maps/ViridianPokeCenter2FBeta.asm b/maps/ViridianPokeCenter2FBeta.asm deleted file mode 100644 index c545a50bc..000000000 --- a/maps/ViridianPokeCenter2FBeta.asm +++ /dev/null @@ -1,23 +0,0 @@ -ViridianPokeCenter2FBeta_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -ViridianPokeCenter2FBeta_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def $7, $0, 3, VIRIDIAN_POKECENTER_1F - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 0 diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokecenter1F.asm index a19338f05..213e64962 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -4,8 +4,8 @@ const_value set 2 const VIRIDIANPOKECENTER1F_COOLTRAINER_F const VIRIDIANPOKECENTER1F_BUG_CATCHER -ViridianPokeCenter1F_MapScriptHeader: -.MapTriggers: +ViridianPokecenter1F_MapScriptHeader: +.SceneScripts: db 0 .MapCallbacks: @@ -30,11 +30,11 @@ CooltrainerMScript_0x9b693: closetext end -CooltrainerFScript_0x9b6a7: - jumptextfaceplayer UnknownText_0x9b76b +ViridianPokecenter1FCooltrainerFScript: + jumptextfaceplayer ViridianPokecenter1FCooltrainerFText -BugCatcherScript_0x9b6aa: - jumptextfaceplayer UnknownText_0x9b7c8 +ViridianPokecenter1FBugCatcherScript: + jumptextfaceplayer ViridianPokecenter1FBugCatcherText UnknownText_0x9b6ad: text "Where in the world" @@ -56,7 +56,7 @@ UnknownText_0x9b6f5: line "any underlings." done -UnknownText_0x9b76b: +ViridianPokecenter1FCooltrainerFText: text "I heard that the" line "GYM in CINNABAR is" cont "gone." @@ -66,12 +66,12 @@ UnknownText_0x9b76b: cont "the GYM LEADER." done -UnknownText_0x9b7c8: +ViridianPokecenter1FBugCatcherText: text "My dream is to be-" line "come a GYM LEADER." done -ViridianPokeCenter1F_MapEventHeader: +ViridianPokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -81,15 +81,15 @@ ViridianPokeCenter1F_MapEventHeader: warp_def $7, $4, 5, VIRIDIAN_CITY warp_def $7, $0, 1, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x9b690, -1 - person_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1 - person_event SPRITE_COOLTRAINER_F, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9b6a7, -1 - person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x9b6aa, -1 + object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9b690, -1 + object_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1 + object_event SPRITE_COOLTRAINER_F, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1 + object_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FBugCatcherScript, -1 diff --git a/maps/ViridianPokecenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm new file mode 100644 index 000000000..037160cb3 --- /dev/null +++ b/maps/ViridianPokecenter2FBeta.asm @@ -0,0 +1,23 @@ +ViridianPokecenter2FBeta_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +ViridianPokecenter2FBeta_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 1 + warp_def $7, $0, 3, VIRIDIAN_POKECENTER_1F + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 0 diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index bc6e06e6d..be315317c 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -7,7 +7,7 @@ const_value set 2 const WHIRLISLANDB1F_BOULDER WhirlIslandB1F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -59,20 +59,20 @@ WhirlIslandB1F_MapEventHeader: warp_def $1b, $d, 2, WHIRL_ISLAND_B2F warp_def $15, $11, 1, WHIRL_ISLAND_CAVE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 3 - signpost 4, 30, SIGNPOST_ITEM, WhirlIslandB1FHiddenRareCandy - signpost 18, 36, SIGNPOST_ITEM, WhirlIslandB1FHiddenUltraBall - signpost 23, 2, SIGNPOST_ITEM, WhirlIslandB1FHiddenFullRestore + bg_event 4, 30, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy + bg_event 18, 36, BGEVENT_ITEM, WhirlIslandB1FHiddenUltraBall + bg_event 23, 2, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE - person_event SPRITE_POKE_BALL, 18, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS - person_event SPRITE_POKE_BALL, 23, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM - person_event SPRITE_POKE_BALL, 8, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET - person_event SPRITE_POKE_BALL, 26, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE - person_event SPRITE_BOULDER, 26, 23, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WhirlIslandB1FBoulder, -1 + object_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE + object_event SPRITE_POKE_BALL, 18, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS + object_event SPRITE_POKE_BALL, 23, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM + object_event SPRITE_POKE_BALL, 8, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET + object_event SPRITE_POKE_BALL, 26, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE + object_event SPRITE_BOULDER, 26, 23, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhirlIslandB1FBoulder, -1 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index 0ff3a9e78..c8cda6d8f 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -4,7 +4,7 @@ const_value set 2 const WHIRLISLANDB2F_POKE_BALL3 WhirlIslandB2F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -30,14 +30,14 @@ WhirlIslandB2F_MapEventHeader: warp_def $19, $7, 1, WHIRL_ISLAND_LUGIA_CHAMBER warp_def $1f, $d, 5, WHIRL_ISLAND_SW -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_POKE_BALL, 11, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE - person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE - person_event SPRITE_POKE_BALL, 12, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER + object_event SPRITE_POKE_BALL, 11, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE + object_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE + object_event SPRITE_POKE_BALL, 12, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index 3b2b6f0e7..c46746119 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -1,5 +1,5 @@ WhirlIslandCave_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -14,11 +14,11 @@ WhirlIslandCave_MapEventHeader: warp_def $5, $7, 9, WHIRL_ISLAND_B1F warp_def $d, $3, 4, WHIRL_ISLAND_NW -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 79b9eb2aa..86402b6ab 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -2,14 +2,11 @@ const_value set 2 const WHIRLISLANDLUGIACHAMBER_LUGIA WhirlIslandLugiaChamber_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Lugia .Lugia: @@ -54,12 +51,12 @@ WhirlIslandLugiaChamber_MapEventHeader: db 1 warp_def $d, $9, 3, WHIRL_ISLAND_B2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_LUGIA, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA + object_event SPRITE_LUGIA, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 9da9eaeaf..fa3b019fd 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -2,7 +2,7 @@ const_value set 2 const WHIRLISLANDNE_POKE_BALL WhirlIslandNE_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -21,12 +21,12 @@ WhirlIslandNE_MapEventHeader: warp_def $3, $11, 2, WHIRL_ISLAND_B1F warp_def $b, $d, 3, WHIRL_ISLAND_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 11, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL + object_event SPRITE_POKE_BALL, 11, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index 60eafae8e..ce64f2154 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -1,5 +1,5 @@ WhirlIslandNW_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -16,11 +16,11 @@ WhirlIslandNW_MapEventHeader: warp_def $f, $3, 4, WHIRL_ISLAND_SW warp_def $f, $7, 2, WHIRL_ISLAND_CAVE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index 32cad9594..7e03568d1 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -1,5 +1,5 @@ WhirlIslandSE_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -14,11 +14,11 @@ WhirlIslandSE_MapEventHeader: warp_def $d, $5, 4, ROUTE_41 warp_def $3, $5, 6, WHIRL_ISLAND_B1F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 0 diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 1902ecbfd..c66f05245 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -2,7 +2,7 @@ const_value set 2 const WHIRLISLANDSW_POKE_BALL WhirlIslandSW_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -23,12 +23,12 @@ WhirlIslandSW_MapEventHeader: warp_def $f, $3, 3, WHIRL_ISLAND_NW warp_def $f, $11, 4, WHIRL_ISLAND_B2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL + object_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index bb8b8b974..55b132356 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -2,36 +2,31 @@ const_value set 2 const WILLSROOM_WILL WillsRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + scene_script .LockDoor + scene_script .DummyScene .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .WillsRoomDoors -.Trigger0: +.LockDoor: priorityjump .WillsDoorLocksBehindYou end -.Trigger1: +.DummyScene: end .WillsRoomDoors: checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED - iffalse .KeepDoorClosed + iffalse .KeepDoorsClosed changeblock $4, $e, $2a -.KeepDoorClosed: +.KeepDoorsClosed: checkevent EVENT_WILLS_ROOM_EXIT_OPEN - iffalse .OpenDoor + iffalse .OpenDoors changeblock $4, $2, $16 -.OpenDoor: +.OpenDoors: return .WillsDoorLocksBehindYou: @@ -42,7 +37,7 @@ WillsRoom_MapScriptHeader: changeblock $4, $e, $2a reloadmappart closetext - dotrigger $1 + setscene $1 setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -143,12 +138,12 @@ WillsRoom_MapEventHeader: warp_def $2, $4, 1, KOGAS_ROOM warp_def $2, $5, 2, KOGAS_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_WILL, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, WillScript_Battle, -1 + object_event SPRITE_WILL, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 2aab72239..593638297 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -7,55 +7,50 @@ const_value set 2 const WISETRIOSROOM_SAGE6 WiseTriosRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x98572, 0 - dw UnknownScript_0x98573, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .WiseTrioCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x98574 - -UnknownScript_0x98572: +.DummyScene0: end -UnknownScript_0x98573: +.DummyScene1: end -UnknownScript_0x98574: +.WiseTrioCallback: checkevent EVENT_FOUGHT_SUICUNE - iftrue UnknownScript_0x98593 + iftrue .NoWiseTrio checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - iftrue UnknownScript_0x9858c + iftrue .WiseTrio2 checkitem CLEAR_BELL - iftrue UnknownScript_0x9858c + iftrue .WiseTrio2 clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return -UnknownScript_0x9858c: +.WiseTrio2: setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return -UnknownScript_0x98593: +.NoWiseTrio: setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return -SageScript_0x9859a: - jumptextfaceplayer UnknownText_0x9862b +WiseTriosRoomSage1Script: + jumptextfaceplayer WiseTriosRoomSage1Text -SageScript_0x9859d: - jumptextfaceplayer UnknownText_0x9868b +WiseTriosRoomSage2Script: + jumptextfaceplayer WiseTriosRoomSage2Text -SageScript_0x985a0: - jumptextfaceplayer UnknownText_0x987af +WiseTriosRoomSage3Script: + jumptextfaceplayer WiseTriosRoomSage3Text UnknownScript_0x985a3: spriteface WISETRIOSROOM_SAGE3, UP @@ -74,9 +69,9 @@ UnknownScript_0x985a3: end TrainerSageGaku: - trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, 0, SageGakuScript + trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, 0, .Script -SageGakuScript: +.Script: opentext writetext UnknownText_0x98938 waitbutton @@ -84,9 +79,9 @@ SageGakuScript: end TrainerSageMasa: - trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, 0, SageMasaScript + trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, 0, .Script -SageMasaScript: +.Script: opentext writetext UnknownText_0x98a35 waitbutton @@ -94,9 +89,9 @@ SageMasaScript: end TrainerSageKoji: - trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, 0, SageKojiScript + trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, 0, .Script -SageKojiScript: +.Script: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x9861b pause 10 @@ -110,7 +105,7 @@ SageKojiScript: applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628 spriteface WISETRIOSROOM_SAGE6, UP setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - dotrigger $1 + setscene $1 end UnknownScript_0x9861b: @@ -135,7 +130,7 @@ MovementData_0x98628: step DOWN step_end -UnknownText_0x9862b: +WiseTriosRoomSage1Text: text "Astounding…" para "SUICUNE, ENTEI and" @@ -146,7 +141,7 @@ UnknownText_0x9862b: line "coming true?" done -UnknownText_0x9868b: +WiseTriosRoomSage2Text: text "We train at the" line "BURNED TOWER, but" @@ -177,7 +172,7 @@ UnknownText_0x98712: line "entering!" done -UnknownText_0x987af: +WiseTriosRoomSage3Text: text "We, the WISE TRIO," line "are the protectors" @@ -359,18 +354,18 @@ WiseTriosRoom_MapEventHeader: warp_def $5, $7, 5, ECRUTEAK_CITY warp_def $4, $1, 5, ECRUTEAK_HOUSE -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $4, $7, $0, UnknownScript_0x985a3, $0, $0 + coord_event 0, $4, $7, UnknownScript_0x985a3 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_SAGE, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x9859a, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - person_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x9859d, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - person_event SPRITE_SAGE, 5, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x985a0, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - person_event SPRITE_SAGE, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 - person_event SPRITE_SAGE, 6, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 - person_event SPRITE_SAGE, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + object_event SPRITE_SAGE, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + object_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + object_event SPRITE_SAGE, 5, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + object_event SPRITE_SAGE, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + object_event SPRITE_SAGE, 6, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + object_event SPRITE_SAGE, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 diff --git a/maps/blockdata.asm b/maps/blockdata.asm new file mode 100644 index 000000000..9e44798ad --- /dev/null +++ b/maps/blockdata.asm @@ -0,0 +1,1047 @@ +SECTION "Map Blockdata 1", ROMX + +Route32_BlockData: + INCBIN "maps/Route32.blk" + +Route40_BlockData: + INCBIN "maps/Route40.blk" + +Route36_BlockData: + INCBIN "maps/Route36.blk" + +Route44_BlockData: + INCBIN "maps/Route44.blk" + +Route28_BlockData: + INCBIN "maps/Route28.blk" + +BetaHerosHouse_BlockData: + INCBIN "maps/BetaHerosHouse.blk" + +CeladonCity_BlockData: + INCBIN "maps/CeladonCity.blk" + +SaffronCity_BlockData: + INCBIN "maps/SaffronCity.blk" + +Route2_BlockData: + INCBIN "maps/Route2.blk" + +ElmsHouse_BlockData: + INCBIN "maps/ElmsHouse.blk" + +BetaSproutTower1_BlockData: + INCBIN "maps/BetaSproutTower1.blk" + +Route11_BlockData: + INCBIN "maps/Route11.blk" + +BetaSproutTower5_BlockData: + INCBIN "maps/BetaSproutTower5.blk" + +Route15_BlockData: + INCBIN "maps/Route15.blk" + +BetaSproutTower9_BlockData: + INCBIN "maps/BetaSproutTower9.blk" + +Route19_BlockData: + INCBIN "maps/Route19.blk" + +BetaBlackthornCity_BlockData: + INCBIN "maps/BetaBlackthornCity.blk" + +Route10South_BlockData: + INCBIN "maps/Route10South.blk" + +Pokecenter2F_BlockData: +CinnabarPokecenter2FBeta_BlockData: +CeruleanPokecenter2FBeta_BlockData: +Route10Pokecenter2FBeta_BlockData: +VermilionPokecenter2FBeta_BlockData: +PewterPokecenter2FBeta_BlockData: +FuchsiaPokecenter2FBeta_BlockData: +LavenderPokecenter2FBeta_BlockData: +CeladonPokecenter2FBeta_BlockData: +ViridianPokecenter2FBeta_BlockData: +SaffronPokecenter2FBeta_BlockData: + INCBIN "maps/Pokecenter2F.blk" + +Route41_BlockData: + INCBIN "maps/Route41.blk" + +Route33_BlockData: + INCBIN "maps/Route33.blk" + +Route45_BlockData: + INCBIN "maps/Route45.blk" + +Route29_BlockData: + INCBIN "maps/Route29.blk" + +Route37_BlockData: + INCBIN "maps/Route37.blk" + +LavenderTown_BlockData: + INCBIN "maps/LavenderTown.blk" + +PalletTown_BlockData: + INCBIN "maps/PalletTown.blk" + +Route25_BlockData: + INCBIN "maps/Route25.blk" + +Route24_BlockData: + INCBIN "maps/Route24.blk" + +BetaVioletCity_BlockData: + INCBIN "maps/BetaVioletCity.blk" + +Route3_BlockData: + INCBIN "maps/Route3.blk" + +PewterCity_BlockData: + INCBIN "maps/PewterCity.blk" + +BetaIlexForest_BlockData: + INCBIN "maps/BetaIlexForest.blk" + +BetaSproutTower2_BlockData: + INCBIN "maps/BetaSproutTower2.blk" + +Route12_BlockData: + INCBIN "maps/Route12.blk" + +BetaGoldenrodCity_BlockData: + INCBIN "maps/BetaGoldenrodCity.blk" + +Route20_BlockData: + INCBIN "maps/Route20.blk" + +BetaSproutTower6_BlockData: + INCBIN "maps/BetaSproutTower6.blk" + +BetaPokecenterMainHouse_BlockData: + INCBIN "maps/BetaPokecenterMainHouse.blk" + +Route30_BlockData: + INCBIN "maps/Route30.blk" + +Route26_BlockData: + INCBIN "maps/Route26.blk" + +Route42_BlockData: + INCBIN "maps/Route42.blk" + +Route34_BlockData: + INCBIN "maps/Route34.blk" + +Route46_BlockData: + INCBIN "maps/Route46.blk" + +FuchsiaCity_BlockData: + INCBIN "maps/FuchsiaCity.blk" + +Route38_BlockData: + INCBIN "maps/Route38.blk" + +BetaCianwoodCity_BlockData: + INCBIN "maps/BetaCianwoodCity.blk" + +OlivineTimsHouse_BlockData: +OlivineHouseBeta_BlockData: +OlivinePunishmentSpeechHouse_BlockData: +OlivineGoodRodHouse_BlockData: +Route39Farmhouse_BlockData: +MahoganyRedGyaradosSpeechHouse_BlockData: +BlackthornDragonSpeechHouse_BlockData: +BlackthornEmysHouse_BlockData: +MoveDeletersHouse_BlockData: +CeruleanGymBadgeSpeechHouse_BlockData: +CeruleanPoliceStation_BlockData: +CeruleanTradeSpeechHouse_BlockData: +BillsHouse_BlockData: +CharcoalKiln_BlockData: +LakeOfRageHiddenPowerHouse_BlockData: +LakeOfRageMagikarpHouse_BlockData: +GoldenrodHappinessRater_BlockData: +GoldenrodBillsHouse_BlockData: +GoldenrodPPSpeechHouse_BlockData: +GoldenrodNameRater_BlockData: +VermilionHouseFishingSpeechHouse_BlockData: +VermilionMagnetTrainSpeechHouse_BlockData: +VermilionHouseDiglettsCaveSpeechHouse_BlockData: +BluesHouse_BlockData: +PewterNidoranSpeechHouse_BlockData: +PewterSnoozeSpeechHouse_BlockData: +FuchsiaBillSpeechHouse_BlockData: +LavenderTownSpeechHouse_BlockData: +LavenderNameRater_BlockData: +Route12SuperRodHouse_BlockData: +Route28FamousSpeechHouse_BlockData: +CeladonMansionRoofHouse_BlockData: +Route16FuchsiaSpeechHouse_BlockData: +ManiasHouse_BlockData: +CianwoodPharmacy_BlockData: +CianwoodCityPhotoStudio_BlockData: +CianwoodLugiaSpeechHouse_BlockData: +PokeSeersHouse_BlockData: +ViridianNicknameSpeechHouse_BlockData: +Route2NuggetSpeechHouse_BlockData: +KrissNeighborsHouse_BlockData: +Route26HealSpeechHouse_BlockData: +Route26DayofWeekSiblingsHouse_BlockData: +Route27SandstormHouse_BlockData: +MrPsychicsHouse_BlockData: +Route5CleanseTagSpeechHouse_BlockData: +CherrygroveGymSpeechHouse_BlockData: +GuideGentsHouse_BlockData: +CherrygroveEvolutionSpeechHouse_BlockData: +Route30BerrySpeechHouse_BlockData: + INCBIN "maps/House1.blk" + +SafariZoneFuchsiaGateBeta_BlockData: +Route19FuchsiaGate_BlockData: +Route43MahoganyGate_BlockData: +Route43Gate_BlockData: +Route35GoldenrodGate_BlockData: +Route36RuinsOfAlphGate_BlockData: +Route34IlexForestGate_BlockData: +Route6SaffronGate_BlockData: +Route40BattleTowerGate_BlockData: +Route2Gate_BlockData: +Route2946Gate_BlockData: +Route5SaffronCityGate_BlockData: + INCBIN "maps/NorthSouthGate.blk" + +BetaTeakCity_BlockData: + INCBIN "maps/BetaTeakCity.blk" + +BetaCherrygroveCity_BlockData: + INCBIN "maps/BetaCherrygroveCity.blk" + +CinnabarIsland_BlockData: + INCBIN "maps/CinnabarIsland.blk" + +Route4_BlockData: + INCBIN "maps/Route4.blk" + +Route8_BlockData: + INCBIN "maps/Route8.blk" + +BetaSproutTower3_BlockData: + INCBIN "maps/BetaSproutTower3.blk" + +ViridianCity_BlockData: + INCBIN "maps/ViridianCity.blk" + +Route13_BlockData: + INCBIN "maps/Route13.blk" + +Route21_BlockData: + INCBIN "maps/Route21.blk" + +BetaSproutTower7_BlockData: + INCBIN "maps/BetaSproutTower7.blk" + +Route17_BlockData: + INCBIN "maps/Route17.blk" + +BetaMahoganyTown_BlockData: + INCBIN "maps/BetaMahoganyTown.blk" + +Route31_BlockData: + INCBIN "maps/Route31.blk" + +Route27_BlockData: + INCBIN "maps/Route27.blk" + +Route35_BlockData: + INCBIN "maps/Route35.blk" + +Route43_BlockData: + INCBIN "maps/Route43.blk" + +Route39_BlockData: + INCBIN "maps/Route39.blk" + +KrissHouse1F_BlockData: + INCBIN "maps/KrissHouse1F.blk" + +Route38EcruteakGate_BlockData: +Route42EcruteakGate_BlockData: +Route32RuinsOfAlphGate_BlockData: +IlexForestAzaleaGate_BlockData: +Route15FuchsiaGate_BlockData: +Route8SaffronGate_BlockData: +Route16Gate_BlockData: +Route7SaffronGate_BlockData: +Route1718Gate_BlockData: +Route31VioletGate_BlockData: + INCBIN "maps/EastWestGate.blk" + +BetaAzaleaTown_BlockData: + INCBIN "maps/BetaAzaleaTown.blk" + +VermilionCity_BlockData: + INCBIN "maps/VermilionCity.blk" + +BetaOlivineCity_BlockData: + INCBIN "maps/BetaOlivineCity.blk" + +BetaNewBarkTown_BlockData: + INCBIN "maps/BetaNewBarkTown.blk" + +ElmsLab_BlockData: + INCBIN "maps/ElmsLab.blk" + +CeruleanCity_BlockData: + INCBIN "maps/CeruleanCity.blk" + +Route1_BlockData: + INCBIN "maps/Route1.blk" + +Route5_BlockData: + INCBIN "maps/Route5.blk" + +Route9_BlockData: + INCBIN "maps/Route9.blk" + +Route22_BlockData: + INCBIN "maps/Route22.blk" + + +SECTION "Map Blockdata 2", ROMX + +Route14_BlockData: + INCBIN "maps/Route14.blk" + +BetaSproutTower8_BlockData: + INCBIN "maps/BetaSproutTower8.blk" + +OlivineMart_BlockData: +EcruteakMart_BlockData: +BlackthornMart_BlockData: +CeruleanMart_BlockData: +AzaleaMart_BlockData: +VioletMart_BlockData: +VermilionMart_BlockData: +PewterMart_BlockData: +FuchsiaMart_BlockData: +LavenderMart_BlockData: +ViridianMart_BlockData: +SaffronMart_BlockData: +CherrygroveMart_BlockData: + INCBIN "maps/Mart.blk" + +Route10North_BlockData: + INCBIN "maps/Route10North.blk" + +BetaLakeOfRage_BlockData: + INCBIN "maps/BetaLakeOfRage.blk" + +OlivinePokecenter1F_BlockData: +MahoganyPokecenter1F_BlockData: +EcruteakPokecenter1F_BlockData: +BlackthornPokecenter1F_BlockData: +CinnabarPokecenter1F_BlockData: +CeruleanPokecenter1F_BlockData: +Route10Pokecenter1F_BlockData: +AzaleaPokecenter1F_BlockData: +VioletPokecenter1F_BlockData: +Route32Pokecenter1F_BlockData: +GoldenrodPokecenter1F_BlockData: +VermilionPokecenter1F_BlockData: +PewterPokecenter1F_BlockData: +FuchsiaPokecenter1F_BlockData: +LavenderPokecenter1F_BlockData: +SilverCavePokecenter1F_BlockData: +CeladonPokecenter1F_BlockData: +CianwoodPokecenter1F_BlockData: +ViridianPokecenter1F_BlockData: +SaffronPokecenter1F_BlockData: +CherrygrovePokecenter1F_BlockData: + INCBIN "maps/Pokecenter1F.blk" + +BetaPewterMuseumOfScience1F_BlockData: + INCBIN "maps/BetaPewterMuseumOfScience1F.blk" + +BetaPewterMuseumOfScience2F_BlockData: + INCBIN "maps/BetaPewterMuseumOfScience2F.blk" + +EarlsPokemonAcademy_BlockData: + INCBIN "maps/EarlsPokemonAcademy.blk" + +BetaCinnabarIslandPokemonLabHallway_BlockData: + INCBIN "maps/BetaCinnabarIslandPokemonLabHallway.blk" + +BetaCinnabarIslandPokemonLabRoom1_BlockData: + INCBIN "maps/BetaCinnabarIslandPokemonLabRoom1.blk" + +BetaCinnabarIslandPokemonLabRoom2_BlockData: + INCBIN "maps/BetaCinnabarIslandPokemonLabRoom2.blk" + +BetaCinnabarIslandPokemonLabRoom3_BlockData: + INCBIN "maps/BetaCinnabarIslandPokemonLabRoom3.blk" + +GoldenrodDeptStore1F_BlockData: +CeladonDeptStore1F_BlockData: + INCBIN "maps/DeptStore1F.blk" + +GoldenrodDeptStore2F_BlockData: +CeladonDeptStore2F_BlockData: + INCBIN "maps/DeptStore2F.blk" + +GoldenrodDeptStore3F_BlockData: +CeladonDeptStore3F_BlockData: + INCBIN "maps/DeptStore3F.blk" + +GoldenrodDeptStore4F_BlockData: +CeladonDeptStore4F_BlockData: + INCBIN "maps/DeptStore4F.blk" + +GoldenrodDeptStore5F_BlockData: +CeladonDeptStore5F_BlockData: + INCBIN "maps/DeptStore5F.blk" + +GoldenrodDeptStore6F_BlockData: +CeladonDeptStore6F_BlockData: + INCBIN "maps/DeptStore6F.blk" + +GoldenrodDeptStoreElevator_BlockData: +CeladonDeptStoreElevator_BlockData: + INCBIN "maps/DeptStoreElevator.blk" + +CeladonMansion1F_BlockData: + INCBIN "maps/CeladonMansion1F.blk" + +CeladonMansion2F_BlockData: + INCBIN "maps/CeladonMansion2F.blk" + +CeladonMansion3F_BlockData: + INCBIN "maps/CeladonMansion3F.blk" + +CeladonMansionRoof_BlockData: + INCBIN "maps/CeladonMansionRoof.blk" + +BetaHouse_BlockData: + INCBIN "maps/BetaHouse.blk" + +CeladonGameCorner_BlockData: + INCBIN "maps/CeladonGameCorner.blk" + +CeladonGameCornerPrizeRoom_BlockData: + INCBIN "maps/CeladonGameCornerPrizeRoom.blk" + +Colosseum_BlockData: + INCBIN "maps/Colosseum.blk" + +TradeCenter_BlockData: +TimeCapsule_BlockData: + INCBIN "maps/TradeCenter.blk" + +EcruteakLugiaSpeechHouse_BlockData: +EcruteakItemfinderHouse_BlockData: +VioletNicknameSpeechHouse_BlockData: +VioletKylesHouse_BlockData: + INCBIN "maps/House2.blk" + +BetaCave_BlockData: + INCBIN "maps/BetaCave.blk" + +UnionCaveB1F_BlockData: + INCBIN "maps/UnionCaveB1F.blk" + +UnionCaveB2F_BlockData: + INCBIN "maps/UnionCaveB2F.blk" + +UnionCave1F_BlockData: + INCBIN "maps/UnionCave1F.blk" + +NationalPark_BlockData: +NationalParkBugContest_BlockData: + INCBIN "maps/NationalPark.blk" + +Route5UndergroundPathEntrance_BlockData: +Route6UndergroundPathEntrance_BlockData: + INCBIN "maps/UndergroundPathEntrance.blk" + +BetaPokecenterTradeStation_BlockData: + INCBIN "maps/BetaPokecenterTradeStation.blk" + +KurtsHouse_BlockData: + INCBIN "maps/KurtsHouse.blk" + +GoldenrodMagnetTrainStation_BlockData: + INCBIN "maps/GoldenrodMagnetTrainStation.blk" + +RuinsOfAlphOutside_BlockData: + INCBIN "maps/RuinsOfAlphOutside.blk" + +BetaRuinsOfAlphUnsolvedPuzzleRoom_BlockData: + INCBIN "maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk" + +RuinsOfAlphInnerChamber_BlockData: + INCBIN "maps/RuinsOfAlphInnerChamber.blk" + +RuinsOfAlphHoOhChamber_BlockData: +RuinsOfAlphKabutoChamber_BlockData: +RuinsOfAlphOmanyteChamber_BlockData: +RuinsOfAlphAerodactylChamber_BlockData: + INCBIN "maps/RuinsOfAlphPuzzleChamber.blk" + +SproutTower1F_BlockData: + INCBIN "maps/SproutTower1F.blk" + +BetaSproutTowerCutOut1_BlockData: + INCBIN "maps/BetaSproutTowerCutOut1.blk" + +SproutTower2F_BlockData: + INCBIN "maps/SproutTower2F.blk" + +BetaSproutTowerCutOut2_BlockData: + INCBIN "maps/BetaSproutTowerCutOut2.blk" + +SproutTower3F_BlockData: + INCBIN "maps/SproutTower3F.blk" + +BetaSproutTowerCutOut3_BlockData: + INCBIN "maps/BetaSproutTowerCutOut3.blk" + +RadioTower1F_BlockData: + INCBIN "maps/RadioTower1F.blk" + +RadioTower2F_BlockData: + INCBIN "maps/RadioTower2F.blk" + +RadioTower3F_BlockData: + INCBIN "maps/RadioTower3F.blk" + +RadioTower4F_BlockData: + INCBIN "maps/RadioTower4F.blk" + +RadioTower5F_BlockData: + INCBIN "maps/RadioTower5F.blk" + +NewBarkTown_BlockData: + INCBIN "maps/NewBarkTown.blk" + +CherrygroveCity_BlockData: + INCBIN "maps/CherrygroveCity.blk" + +VioletCity_BlockData: + INCBIN "maps/VioletCity.blk" + +AzaleaTown_BlockData: + INCBIN "maps/AzaleaTown.blk" + +CianwoodCity_BlockData: + INCBIN "maps/CianwoodCity.blk" + +GoldenrodCity_BlockData: + INCBIN "maps/GoldenrodCity.blk" + +OlivineCity_BlockData: + INCBIN "maps/OlivineCity.blk" + +EcruteakCity_BlockData: + INCBIN "maps/EcruteakCity.blk" + +MahoganyTown_BlockData: + INCBIN "maps/MahoganyTown.blk" + +LakeOfRage_BlockData: + INCBIN "maps/LakeOfRage.blk" + +BlackthornCity_BlockData: + INCBIN "maps/BlackthornCity.blk" + +SilverCaveOutside_BlockData: + INCBIN "maps/SilverCaveOutside.blk" + +Route6_BlockData: + INCBIN "maps/Route6.blk" + +Route7_BlockData: + INCBIN "maps/Route7.blk" + +Route16_BlockData: + INCBIN "maps/Route16.blk" + +Route18_BlockData: + INCBIN "maps/Route18.blk" + +GoldenrodUnderground_BlockData: + INCBIN "maps/GoldenrodUnderground.blk" + +GoldenrodUndergroundSwitchRoomEntrances_BlockData: + INCBIN "maps/GoldenrodUndergroundSwitchRoomEntrances.blk" + +GoldenrodDeptStoreB1F_BlockData: + INCBIN "maps/GoldenrodDeptStoreB1F.blk" + +GoldenrodUndergroundWarehouse_BlockData: + INCBIN "maps/GoldenrodUndergroundWarehouse.blk" + +BetaElevator_BlockData: + INCBIN "maps/BetaElevator.blk" + +TinTower1F_BlockData: + INCBIN "maps/TinTower1F.blk" + +TinTower2F_BlockData: + INCBIN "maps/TinTower2F.blk" + +TinTower3F_BlockData: + INCBIN "maps/TinTower3F.blk" + +TinTower4F_BlockData: + INCBIN "maps/TinTower4F.blk" + +TinTower5F_BlockData: + INCBIN "maps/TinTower5F.blk" + +TinTower6F_BlockData: + INCBIN "maps/TinTower6F.blk" + +TinTower7F_BlockData: + INCBIN "maps/TinTower7F.blk" + +TinTower8F_BlockData: + INCBIN "maps/TinTower8F.blk" + +TinTower9F_BlockData: + INCBIN "maps/TinTower9F.blk" + +TinTowerRoof_BlockData: + INCBIN "maps/TinTowerRoof.blk" + +BurnedTower1F_BlockData: + INCBIN "maps/BurnedTower1F.blk" + +BurnedTowerB1F_BlockData: + INCBIN "maps/BurnedTowerB1F.blk" + +BetaCaveTestMap_BlockData: + INCBIN "maps/BetaCaveTestMap.blk" + +MountMortar1FOutside_BlockData: + INCBIN "maps/MountMortar1FOutside.blk" + +MountMortar1FInside_BlockData: + INCBIN "maps/MountMortar1FInside.blk" + +MountMortar2FInside_BlockData: + INCBIN "maps/MountMortar2FInside.blk" + +MountMortarB1F_BlockData: + INCBIN "maps/MountMortarB1F.blk" + +IcePath1F_BlockData: + INCBIN "maps/IcePath1F.blk" + +IcePathB1F_BlockData: + INCBIN "maps/IcePathB1F.blk" + +IcePathB2FMahoganySide_BlockData: + INCBIN "maps/IcePathB2FMahoganySide.blk" + +IcePathB2FBlackthornSide_BlockData: + INCBIN "maps/IcePathB2FBlackthornSide.blk" + +IcePathB3F_BlockData: + INCBIN "maps/IcePathB3F.blk" + +WhirlIslandNW_BlockData: + INCBIN "maps/WhirlIslandNW.blk" + +WhirlIslandNE_BlockData: + INCBIN "maps/WhirlIslandNE.blk" + +WhirlIslandSW_BlockData: + INCBIN "maps/WhirlIslandSW.blk" + +WhirlIslandCave_BlockData: + INCBIN "maps/WhirlIslandCave.blk" + +WhirlIslandSE_BlockData: + INCBIN "maps/WhirlIslandSE.blk" + +WhirlIslandB1F_BlockData: + INCBIN "maps/WhirlIslandB1F.blk" + +WhirlIslandB2F_BlockData: + INCBIN "maps/WhirlIslandB2F.blk" + +WhirlIslandLugiaChamber_BlockData: + INCBIN "maps/WhirlIslandLugiaChamber.blk" + +SilverCaveRoom1_BlockData: + INCBIN "maps/SilverCaveRoom1.blk" + +SilverCaveRoom2_BlockData: + INCBIN "maps/SilverCaveRoom2.blk" + +SilverCaveRoom3_BlockData: + INCBIN "maps/SilverCaveRoom3.blk" + +BetaRocketHideout1_BlockData: + INCBIN "maps/BetaRocketHideout1.blk" + +BetaRocketHideout2_BlockData: + INCBIN "maps/BetaRocketHideout2.blk" + +BetaEmptyHouse_BlockData: + INCBIN "maps/BetaEmptyHouse.blk" + +BetaRocketHideout3_BlockData: + INCBIN "maps/BetaRocketHideout3.blk" + +MahoganyMart1F_BlockData: +MountMoonGiftShop_BlockData: + INCBIN "maps/GiftShop.blk" + +TeamRocketBaseB1F_BlockData: + INCBIN "maps/TeamRocketBaseB1F.blk" + +TeamRocketBaseB2F_BlockData: + INCBIN "maps/TeamRocketBaseB2F.blk" + +TeamRocketBaseB3F_BlockData: + INCBIN "maps/TeamRocketBaseB3F.blk" + +BetaRoute23EarlyVersion_BlockData: + INCBIN "maps/BetaRoute23EarlyVersion.blk" + +IndigoPlateauPokecenter1F_BlockData: + INCBIN "maps/IndigoPlateauPokecenter1F.blk" + +WillsRoom_BlockData: + INCBIN "maps/WillsRoom.blk" + +KogasRoom_BlockData: + INCBIN "maps/KogasRoom.blk" + +BrunosRoom_BlockData: + INCBIN "maps/BrunosRoom.blk" + +KarensRoom_BlockData: + INCBIN "maps/KarensRoom.blk" + +AzaleaGym_BlockData: + INCBIN "maps/AzaleaGym.blk" + +VioletGym_BlockData: + INCBIN "maps/VioletGym.blk" + +GoldenrodGym_BlockData: + INCBIN "maps/GoldenrodGym.blk" + +EcruteakGym_BlockData: + INCBIN "maps/EcruteakGym.blk" + +MahoganyGym_BlockData: + INCBIN "maps/MahoganyGym.blk" + +OlivineGym_BlockData: + INCBIN "maps/OlivineGym.blk" + +BetaUnknown_BlockData: + INCBIN "maps/BetaUnknown.blk" + +CianwoodGym_BlockData: + INCBIN "maps/CianwoodGym.blk" + +BlackthornGym1F_BlockData: + INCBIN "maps/BlackthornGym1F.blk" + +BlackthornGym2F_BlockData: + INCBIN "maps/BlackthornGym2F.blk" + +OlivineLighthouse1F_BlockData: + INCBIN "maps/OlivineLighthouse1F.blk" + +OlivineLighthouse2F_BlockData: + INCBIN "maps/OlivineLighthouse2F.blk" + +OlivineLighthouse3F_BlockData: + INCBIN "maps/OlivineLighthouse3F.blk" + +OlivineLighthouse4F_BlockData: + INCBIN "maps/OlivineLighthouse4F.blk" + +OlivineLighthouse5F_BlockData: + INCBIN "maps/OlivineLighthouse5F.blk" + +OlivineLighthouse6F_BlockData: + INCBIN "maps/OlivineLighthouse6F.blk" + + +SECTION "Map Blockdata 3", ROMX + +BetaCave2_BlockData: + INCBIN "maps/BetaCave2.blk" + +SlowpokeWellB1F_BlockData: + INCBIN "maps/SlowpokeWellB1F.blk" + +SlowpokeWellB2F_BlockData: + INCBIN "maps/SlowpokeWellB2F.blk" + +IlexForest_BlockData: + INCBIN "maps/IlexForest.blk" + +DarkCaveVioletEntrance_BlockData: + INCBIN "maps/DarkCaveVioletEntrance.blk" + +DarkCaveBlackthornEntrance_BlockData: + INCBIN "maps/DarkCaveBlackthornEntrance.blk" + +RuinsOfAlphResearchCenter_BlockData: + INCBIN "maps/RuinsOfAlphResearchCenter.blk" + +GoldenrodBikeShop_BlockData: + INCBIN "maps/GoldenrodBikeShop.blk" + +DanceTheatre_BlockData: + INCBIN "maps/DanceTheatre.blk" + +EcruteakHouse_BlockData: + INCBIN "maps/EcruteakHouse.blk" + +GoldenrodGameCorner_BlockData: + INCBIN "maps/GoldenrodGameCorner.blk" + +Route35NationalParkGate_BlockData: + INCBIN "maps/Route35NationalParkGate.blk" + +Route36NationalParkGate_BlockData: + INCBIN "maps/Route36NationalParkGate.blk" + +FastShip1F_BlockData: + INCBIN "maps/FastShip1F.blk" + +FastShipB1F_BlockData: + INCBIN "maps/FastShipB1F.blk" + +BetaSSAquaInsideCutOut_BlockData: + INCBIN "maps/BetaSSAquaInsideCutOut.blk" + +FastShipCabins_NNW_NNE_NE_BlockData: + INCBIN "maps/FastShipCabins_NNW_NNE_NE.blk" + +FastShipCabins_SW_SSW_NW_BlockData: + INCBIN "maps/FastShipCabins_SW_SSW_NW.blk" + +FastShipCabins_SE_SSE_CaptainsCabin_BlockData: + INCBIN "maps/FastShipCabins_SE_SSE_CaptainsCabin.blk" + +OlivinePort_BlockData: + INCBIN "maps/OlivinePort.blk" + +VermilionPort_BlockData: + INCBIN "maps/VermilionPort.blk" + +OlivineCafe_BlockData: +SafariZoneMainOffice_BlockData: + INCBIN "maps/OlivineCafe.blk" + +KrissHouse2F_BlockData: + INCBIN "maps/KrissHouse2F.blk" + +SaffronTrainStation_BlockData: + INCBIN "maps/SaffronTrainStation.blk" + +CeruleanGym_BlockData: + INCBIN "maps/CeruleanGym.blk" + +VermilionGym_BlockData: + INCBIN "maps/VermilionGym.blk" + +SaffronGym_BlockData: + INCBIN "maps/SaffronGym.blk" + +PowerPlant_BlockData: + INCBIN "maps/PowerPlant.blk" + +PokemonFanClub_BlockData: +SafariZoneWardensHome_BlockData: + INCBIN "maps/PokemonFanClub.blk" + +FightingDojo_BlockData: + INCBIN "maps/FightingDojo.blk" + +SilphCo1F_BlockData: + INCBIN "maps/SilphCo1F.blk" + +ViridianGym_BlockData: + INCBIN "maps/ViridianGym.blk" + +TrainerHouse1F_BlockData: + INCBIN "maps/TrainerHouse1F.blk" + +TrainerHouseB1F_BlockData: + INCBIN "maps/TrainerHouseB1F.blk" + +RedsHouse1F_BlockData: + INCBIN "maps/RedsHouse1F.blk" + +RedsHouse2F_BlockData: + INCBIN "maps/RedsHouse2F.blk" + +OaksLab_BlockData: + INCBIN "maps/OaksLab.blk" + +MrFujisHouse_BlockData: + INCBIN "maps/MrFujisHouse.blk" + +LavRadioTower1F_BlockData: + INCBIN "maps/LavRadioTower1F.blk" + +SilverCaveItemRooms_BlockData: + INCBIN "maps/SilverCaveItemRooms.blk" + +DayCare_BlockData: + INCBIN "maps/DayCare.blk" + +SoulHouse_BlockData: + INCBIN "maps/SoulHouse.blk" + +PewterGym_BlockData: + INCBIN "maps/PewterGym.blk" + +CeladonGym_BlockData: + INCBIN "maps/CeladonGym.blk" + +BetaHouse2_BlockData: + INCBIN "maps/BetaHouse2.blk" + +CeladonCafe_BlockData: + INCBIN "maps/CeladonCafe.blk" + +BetaCeladonMansion_BlockData: + INCBIN "maps/BetaCeladonMansion.blk" + +RockTunnel1F_BlockData: + INCBIN "maps/RockTunnel1F.blk" + +RockTunnelB1F_BlockData: + INCBIN "maps/RockTunnelB1F.blk" + +DiglettsCave_BlockData: + INCBIN "maps/DiglettsCave.blk" + +MountMoon_BlockData: + INCBIN "maps/MountMoon.blk" + +SeafoamGym_BlockData: + INCBIN "maps/SeafoamGym.blk" + +MrPokemonsHouse_BlockData: + INCBIN "maps/MrPokemonsHouse.blk" + +VictoryRoadGate_BlockData: + INCBIN "maps/VictoryRoadGate.blk" + +OlivinePortPassage_BlockData: +VermilionPortPassage_BlockData: + INCBIN "maps/PortPassage.blk" + +FuchsiaGym_BlockData: + INCBIN "maps/FuchsiaGym.blk" + +SafariZoneBeta_BlockData: + INCBIN "maps/SafariZoneBeta.blk" + +UndergroundPath_BlockData: + INCBIN "maps/UndergroundPath.blk" + +Route39Barn_BlockData: + INCBIN "maps/Route39Barn.blk" + +VictoryRoad_BlockData: + INCBIN "maps/VictoryRoad.blk" + +Route23_BlockData: + INCBIN "maps/Route23.blk" + +LancesRoom_BlockData: + INCBIN "maps/LancesRoom.blk" + +HallOfFame_BlockData: + INCBIN "maps/HallOfFame.blk" + +CopycatsHouse1F_BlockData: + INCBIN "maps/CopycatsHouse1F.blk" + +CopycatsHouse2F_BlockData: + INCBIN "maps/CopycatsHouse2F.blk" + +GoldenrodFlowerShop_BlockData: + INCBIN "maps/GoldenrodFlowerShop.blk" + +MountMoonSquare_BlockData: + INCBIN "maps/MountMoonSquare.blk" + +WiseTriosRoom_BlockData: + INCBIN "maps/WiseTriosRoom.blk" + +DragonsDen1F_BlockData: + INCBIN "maps/DragonsDen1F.blk" + +DragonsDenB1F_BlockData: + INCBIN "maps/DragonsDenB1F.blk" + +TohjoFalls_BlockData: + INCBIN "maps/TohjoFalls.blk" + +RuinsOfAlphHoOhItemRoom_BlockData: +RuinsOfAlphKabutoItemRoom_BlockData: +RuinsOfAlphOmanyteItemRoom_BlockData: +RuinsOfAlphAerodactylItemRoom_BlockData: + INCBIN "maps/RuinsOfAlphItemRoom.blk" + +RuinsOfAlphHoOhWordRoom_BlockData: + INCBIN "maps/RuinsOfAlphHoOhWordRoom.blk" + +RuinsOfAlphKabutoWordRoom_BlockData: + INCBIN "maps/RuinsOfAlphKabutoWordRoom.blk" + +RuinsOfAlphOmanyteWordRoom_BlockData: + INCBIN "maps/RuinsOfAlphOmanyteWordRoom.blk" + +RuinsOfAlphAerodactylWordRoom_BlockData: + INCBIN "maps/RuinsOfAlphAerodactylWordRoom.blk" + +DragonShrine_BlockData: + INCBIN "maps/DragonShrine.blk" + +BattleTower1F_BlockData: + INCBIN "maps/BattleTower1F.blk" + +BattleTowerBattleRoom_BlockData: + INCBIN "maps/BattleTowerBattleRoom.blk" + +GoldenrodPokeComCenter2FMobile_BlockData: + INCBIN "maps/GoldenrodPokeComCenter2FMobile.blk" + +MobileTradeRoomMobile_BlockData: + INCBIN "maps/MobileTradeRoomMobile.blk" + +MobileBattleRoom_BlockData: + INCBIN "maps/MobileBattleRoom.blk" + +BattleTowerHallway_BlockData: + INCBIN "maps/BattleTowerHallway.blk" + +BattleTowerElevator_BlockData: + INCBIN "maps/BattleTowerElevator.blk" + +BattleTowerOutside_BlockData: + INCBIN "maps/BattleTowerOutside.blk" + +BetaBlank_BlockData: + INCBIN "maps/BetaBlank.blk" + +GoldenrodDeptStoreRoof_BlockData: + INCBIN "maps/GoldenrodDeptStoreRoof.blk" diff --git a/maps/blockdata_1.asm b/maps/blockdata_1.asm deleted file mode 100644 index be9abbcc1..000000000 --- a/maps/blockdata_1.asm +++ /dev/null @@ -1,309 +0,0 @@ -Route32_BlockData: - INCBIN "maps/Route32.blk" - -Route40_BlockData: - INCBIN "maps/Route40.blk" - -Route36_BlockData: - INCBIN "maps/Route36.blk" - -Route44_BlockData: - INCBIN "maps/Route44.blk" - -Route28_BlockData: - INCBIN "maps/Route28.blk" - -BetaHerosHouse_BlockData: - INCBIN "maps/BetaHerosHouse.blk" - -CeladonCity_BlockData: - INCBIN "maps/CeladonCity.blk" - -SaffronCity_BlockData: - INCBIN "maps/SaffronCity.blk" - -Route2_BlockData: - INCBIN "maps/Route2.blk" - -ElmsHouse_BlockData: - INCBIN "maps/ElmsHouse.blk" - -BetaSproutTower1_BlockData: - INCBIN "maps/BetaSproutTower1.blk" - -Route11_BlockData: - INCBIN "maps/Route11.blk" - -BetaSproutTower5_BlockData: - INCBIN "maps/BetaSproutTower5.blk" - -Route15_BlockData: - INCBIN "maps/Route15.blk" - -BetaSproutTower9_BlockData: - INCBIN "maps/BetaSproutTower9.blk" - -Route19_BlockData: - INCBIN "maps/Route19.blk" - -BetaBlackthornCity_BlockData: - INCBIN "maps/BetaBlackthornCity.blk" - -Route10South_BlockData: - INCBIN "maps/Route10South.blk" - -PokeCenter2F_BlockData: -CinnabarPokeCenter2FBeta_BlockData: -CeruleanPokeCenter2FBeta_BlockData: -Route10PokeCenter2FBeta_BlockData: -VermilionPokeCenter2FBeta_BlockData: -PewterPokeCenter2FBeta_BlockData: -FuchsiaPokeCenter2FBeta_BlockData: -LavenderPokeCenter2FBeta_BlockData: -CeladonPokeCenter2FBeta_BlockData: -ViridianPokeCenter2FBeta_BlockData: -SaffronPokeCenter2FBeta_BlockData: - INCBIN "maps/PokeCenter2F.blk" - -Route41_BlockData: - INCBIN "maps/Route41.blk" - -Route33_BlockData: - INCBIN "maps/Route33.blk" - -Route45_BlockData: - INCBIN "maps/Route45.blk" - -Route29_BlockData: - INCBIN "maps/Route29.blk" - -Route37_BlockData: - INCBIN "maps/Route37.blk" - -LavenderTown_BlockData: - INCBIN "maps/LavenderTown.blk" - -PalletTown_BlockData: - INCBIN "maps/PalletTown.blk" - -Route25_BlockData: - INCBIN "maps/Route25.blk" - -Route24_BlockData: - INCBIN "maps/Route24.blk" - -BetaVioletCity_BlockData: - INCBIN "maps/BetaVioletCity.blk" - -Route3_BlockData: - INCBIN "maps/Route3.blk" - -PewterCity_BlockData: - INCBIN "maps/PewterCity.blk" - -BetaIlexForest_BlockData: - INCBIN "maps/BetaIlexForest.blk" - -BetaSproutTower2_BlockData: - INCBIN "maps/BetaSproutTower2.blk" - -Route12_BlockData: - INCBIN "maps/Route12.blk" - -BetaGoldenrodCity_BlockData: - INCBIN "maps/BetaGoldenrodCity.blk" - -Route20_BlockData: - INCBIN "maps/Route20.blk" - -BetaSproutTower6_BlockData: - INCBIN "maps/BetaSproutTower6.blk" - -BetaPokecenterMainHouse_BlockData: - INCBIN "maps/BetaPokecenterMainHouse.blk" - -Route30_BlockData: - INCBIN "maps/Route30.blk" - -Route26_BlockData: - INCBIN "maps/Route26.blk" - -Route42_BlockData: - INCBIN "maps/Route42.blk" - -Route34_BlockData: - INCBIN "maps/Route34.blk" - -Route46_BlockData: - INCBIN "maps/Route46.blk" - -FuchsiaCity_BlockData: - INCBIN "maps/FuchsiaCity.blk" - -Route38_BlockData: - INCBIN "maps/Route38.blk" - -BetaCianwoodCity_BlockData: - INCBIN "maps/BetaCianwoodCity.blk" - -OlivineTimsHouse_BlockData: -OlivineHouseBeta_BlockData: -OlivinePunishmentSpeechHouse_BlockData: -OlivineGoodRodHouse_BlockData: -Route39Farmhouse_BlockData: -MahoganyRedGyaradosSpeechHouse_BlockData: -BlackthornDragonSpeechHouse_BlockData: -BlackthornEmysHouse_BlockData: -MoveDeletersHouse_BlockData: -CeruleanGymBadgeSpeechHouse_BlockData: -CeruleanPoliceStation_BlockData: -CeruleanTradeSpeechHouse_BlockData: -BillsHouse_BlockData: -CharcoalKiln_BlockData: -LakeofRageHiddenPowerHouse_BlockData: -LakeofRageMagikarpHouse_BlockData: -GoldenrodHappinessRater_BlockData: -GoldenrodBillsHouse_BlockData: -GoldenrodPPSpeechHouse_BlockData: -GoldenrodNameRater_BlockData: -VermilionHouseFishingSpeechHouse_BlockData: -VermilionMagnetTrainSpeechHouse_BlockData: -VermilionHouseDiglettsCaveSpeechHouse_BlockData: -BluesHouse_BlockData: -PewterNidoranSpeechHouse_BlockData: -PewterSnoozeSpeechHouse_BlockData: -FuchsiaBillSpeechHouse_BlockData: -LavenderTownSpeechHouse_BlockData: -LavenderNameRater_BlockData: -Route12SuperRodHouse_BlockData: -Route28FamousSpeechHouse_BlockData: -CeladonMansionRoofHouse_BlockData: -Route16FuchsiaSpeechHouse_BlockData: -ManiasHouse_BlockData: -CianwoodPharmacy_BlockData: -CianwoodCityPhotoStudio_BlockData: -CianwoodLugiaSpeechHouse_BlockData: -PokeSeersHouse_BlockData: -ViridianNicknameSpeechHouse_BlockData: -Route2NuggetSpeechHouse_BlockData: -KrissNeighborsHouse_BlockData: -Route26HealSpeechHouse_BlockData: -Route26DayofWeekSiblingsHouse_BlockData: -Route27SandstormHouse_BlockData: -MrPsychicsHouse_BlockData: -Route5CleanseTagSpeechHouse_BlockData: -CherrygroveGymSpeechHouse_BlockData: -GuideGentsHouse_BlockData: -CherrygroveEvolutionSpeechHouse_BlockData: -Route30BerrySpeechHouse_BlockData: - INCBIN "maps/House1.blk" - -SafariZoneFuchsiaGateBeta_BlockData: -Route19FuchsiaGate_BlockData: -Route43MahoganyGate_BlockData: -Route43Gate_BlockData: -Route35Goldenrodgate_BlockData: -Route36RuinsofAlphgate_BlockData: -Route34IlexForestGate_BlockData: -Route6SaffronGate_BlockData: -Route40BattleTowerGate_BlockData: -Route2Gate_BlockData: -Route2946Gate_BlockData: -Route5SaffronCityGate_BlockData: - INCBIN "maps/NorthSouthGate.blk" - -BetaTeakCity_BlockData: - INCBIN "maps/BetaTeakCity.blk" - -BetaCherrygroveCity_BlockData: - INCBIN "maps/BetaCherrygroveCity.blk" - -CinnabarIsland_BlockData: - INCBIN "maps/CinnabarIsland.blk" - -Route4_BlockData: - INCBIN "maps/Route4.blk" - -Route8_BlockData: - INCBIN "maps/Route8.blk" - -BetaSproutTower3_BlockData: - INCBIN "maps/BetaSproutTower3.blk" - -ViridianCity_BlockData: - INCBIN "maps/ViridianCity.blk" - -Route13_BlockData: - INCBIN "maps/Route13.blk" - -Route21_BlockData: - INCBIN "maps/Route21.blk" - -BetaSproutTower7_BlockData: - INCBIN "maps/BetaSproutTower7.blk" - -Route17_BlockData: - INCBIN "maps/Route17.blk" - -BetaMahoganyTown_BlockData: - INCBIN "maps/BetaMahoganyTown.blk" - -Route31_BlockData: - INCBIN "maps/Route31.blk" - -Route27_BlockData: - INCBIN "maps/Route27.blk" - -Route35_BlockData: - INCBIN "maps/Route35.blk" - -Route43_BlockData: - INCBIN "maps/Route43.blk" - -Route39_BlockData: - INCBIN "maps/Route39.blk" - -KrissHouse1F_BlockData: - INCBIN "maps/KrissHouse1F.blk" - -Route38EcruteakGate_BlockData: -Route42EcruteakGate_BlockData: -Route32RuinsofAlphGate_BlockData: -IlexForestAzaleaGate_BlockData: -Route15FuchsiaGate_BlockData: -Route8SaffronGate_BlockData: -Route16Gate_BlockData: -Route7SaffronGate_BlockData: -Route1718Gate_BlockData: -Route31VioletGate_BlockData: - INCBIN "maps/EastWestGate.blk" - -BetaAzaleaTown_BlockData: - INCBIN "maps/BetaAzaleaTown.blk" - -VermilionCity_BlockData: - INCBIN "maps/VermilionCity.blk" - -BetaOlivineCity_BlockData: - INCBIN "maps/BetaOlivineCity.blk" - -BetaNewBarkTown_BlockData: - INCBIN "maps/BetaNewBarkTown.blk" - -ElmsLab_BlockData: - INCBIN "maps/ElmsLab.blk" - -CeruleanCity_BlockData: - INCBIN "maps/CeruleanCity.blk" - -Route1_BlockData: - INCBIN "maps/Route1.blk" - -Route5_BlockData: - INCBIN "maps/Route5.blk" - -Route9_BlockData: - INCBIN "maps/Route9.blk" - -Route22_BlockData: - INCBIN "maps/Route22.blk" diff --git a/maps/blockdata_2.asm b/maps/blockdata_2.asm deleted file mode 100644 index a5e567e9f..000000000 --- a/maps/blockdata_2.asm +++ /dev/null @@ -1,462 +0,0 @@ -Route14_BlockData: - INCBIN "maps/Route14.blk" - -BetaSproutTower8_BlockData: - INCBIN "maps/BetaSproutTower8.blk" - -OlivineMart_BlockData: -EcruteakMart_BlockData: -BlackthornMart_BlockData: -CeruleanMart_BlockData: -AzaleaMart_BlockData: -VioletMart_BlockData: -VermilionMart_BlockData: -PewterMart_BlockData: -FuchsiaMart_BlockData: -LavenderMart_BlockData: -ViridianMart_BlockData: -SaffronMart_BlockData: -CherrygroveMart_BlockData: - INCBIN "maps/Mart.blk" - -Route10North_BlockData: - INCBIN "maps/Route10North.blk" - -BetaLakeOfRage_BlockData: - INCBIN "maps/BetaLakeOfRage.blk" - -OlivinePokeCenter1F_BlockData: -MahoganyPokeCenter1F_BlockData: -EcruteakPokeCenter1F_BlockData: -BlackthornPokeCenter1F_BlockData: -CinnabarPokeCenter1F_BlockData: -CeruleanPokeCenter1F_BlockData: -Route10PokeCenter1F_BlockData: -AzaleaPokeCenter1F_BlockData: -VioletPokeCenter1F_BlockData: -Route32PokeCenter1F_BlockData: -GoldenrodPokeCenter1F_BlockData: -VermilionPokeCenter1F_BlockData: -PewterPokeCenter1F_BlockData: -FuchsiaPokeCenter1F_BlockData: -LavenderPokeCenter1F_BlockData: -SilverCavePokeCenter1F_BlockData: -CeladonPokeCenter1F_BlockData: -CianwoodPokeCenter1F_BlockData: -ViridianPokeCenter1F_BlockData: -SaffronPokeCenter1F_BlockData: -CherrygrovePokeCenter1F_BlockData: - INCBIN "maps/PokeCenter1F.blk" - -BetaPewterMuseumOfScience1F_BlockData: - INCBIN "maps/BetaPewterMuseumOfScience1F.blk" - -BetaPewterMuseumOfScience2F_BlockData: - INCBIN "maps/BetaPewterMuseumOfScience2F.blk" - -EarlsPokemonAcademy_BlockData: - INCBIN "maps/EarlsPokemonAcademy.blk" - -BetaCinnabarIslandPokemonLabHallway_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabHallway.blk" - -BetaCinnabarIslandPokemonLabRoom1_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabRoom1.blk" - -BetaCinnabarIslandPokemonLabRoom2_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabRoom2.blk" - -BetaCinnabarIslandPokemonLabRoom3_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabRoom3.blk" - -GoldenrodDeptStore1F_BlockData: -CeladonDeptStore1F_BlockData: - INCBIN "maps/DeptStore1F.blk" - -GoldenrodDeptStore2F_BlockData: -CeladonDeptStore2F_BlockData: - INCBIN "maps/DeptStore2F.blk" - -GoldenrodDeptStore3F_BlockData: -CeladonDeptStore3F_BlockData: - INCBIN "maps/DeptStore3F.blk" - -GoldenrodDeptStore4F_BlockData: -CeladonDeptStore4F_BlockData: - INCBIN "maps/DeptStore4F.blk" - -GoldenrodDeptStore5F_BlockData: -CeladonDeptStore5F_BlockData: - INCBIN "maps/DeptStore5F.blk" - -GoldenrodDeptStore6F_BlockData: -CeladonDeptStore6F_BlockData: - INCBIN "maps/DeptStore6F.blk" - -GoldenrodDeptStoreElevator_BlockData: -CeladonDeptStoreElevator_BlockData: - INCBIN "maps/DeptStoreElevator.blk" - -CeladonMansion1F_BlockData: - INCBIN "maps/CeladonMansion1F.blk" - -CeladonMansion2F_BlockData: - INCBIN "maps/CeladonMansion2F.blk" - -CeladonMansion3F_BlockData: - INCBIN "maps/CeladonMansion3F.blk" - -CeladonMansionRoof_BlockData: - INCBIN "maps/CeladonMansionRoof.blk" - -BetaHouse_BlockData: - INCBIN "maps/BetaHouse.blk" - -CeladonGameCorner_BlockData: - INCBIN "maps/CeladonGameCorner.blk" - -CeladonGameCornerPrizeRoom_BlockData: - INCBIN "maps/CeladonGameCornerPrizeRoom.blk" - -Colosseum_BlockData: - INCBIN "maps/Colosseum.blk" - -TradeCenter_BlockData: -TimeCapsule_BlockData: - INCBIN "maps/TradeCenter.blk" - -EcruteakLugiaSpeechHouse_BlockData: -EcruteakItemfinderHouse_BlockData: -VioletNicknameSpeechHouse_BlockData: -VioletOnixTradeHouse_BlockData: - INCBIN "maps/House2.blk" - -BetaCave_BlockData: - INCBIN "maps/BetaCave.blk" - -UnionCaveB1F_BlockData: - INCBIN "maps/UnionCaveB1F.blk" - -UnionCaveB2F_BlockData: - INCBIN "maps/UnionCaveB2F.blk" - -UnionCave1F_BlockData: - INCBIN "maps/UnionCave1F.blk" - -NationalPark_BlockData: -NationalParkBugContest_BlockData: - INCBIN "maps/NationalPark.blk" - -Route6UndergroundEntrance_BlockData: -Route5UndergroundEntrance_BlockData: - INCBIN "maps/UndergroundPathEntrance.blk" - -BetaPokecenterTradeStation_BlockData: - INCBIN "maps/BetaPokecenterTradeStation.blk" - -KurtsHouse_BlockData: - INCBIN "maps/KurtsHouse.blk" - -GoldenrodMagnetTrainStation_BlockData: - INCBIN "maps/GoldenrodMagnetTrainStation.blk" - -RuinsofAlphOutside_BlockData: - INCBIN "maps/RuinsofAlphOutside.blk" - -BetaAlphRuinUnsolvedPuzzleRoom_BlockData: - INCBIN "maps/BetaAlphRuinUnsolvedPuzzleRoom.blk" - -RuinsofAlphInnerChamber_BlockData: - INCBIN "maps/RuinsofAlphInnerChamber.blk" - -RuinsofAlphHoOhChamber_BlockData: -RuinsofAlphKabutoChamber_BlockData: -RuinsofAlphOmanyteChamber_BlockData: -RuinsofAlphAerodactylChamber_BlockData: - INCBIN "maps/RuinsofAlphPuzzleChamber.blk" - -SproutTower1F_BlockData: - INCBIN "maps/SproutTower1F.blk" - -BetaSproutTowerCutOut1_BlockData: - INCBIN "maps/BetaSproutTowerCutOut1.blk" - -SproutTower2F_BlockData: - INCBIN "maps/SproutTower2F.blk" - -BetaSproutTowerCutOut2_BlockData: - INCBIN "maps/BetaSproutTowerCutOut2.blk" - -SproutTower3F_BlockData: - INCBIN "maps/SproutTower3F.blk" - -BetaSproutTowerCutOut3_BlockData: - INCBIN "maps/BetaSproutTowerCutOut3.blk" - -RadioTower1F_BlockData: - INCBIN "maps/RadioTower1F.blk" - -RadioTower2F_BlockData: - INCBIN "maps/RadioTower2F.blk" - -RadioTower3F_BlockData: - INCBIN "maps/RadioTower3F.blk" - -RadioTower4F_BlockData: - INCBIN "maps/RadioTower4F.blk" - -RadioTower5F_BlockData: - INCBIN "maps/RadioTower5F.blk" - -NewBarkTown_BlockData: - INCBIN "maps/NewBarkTown.blk" - -CherrygroveCity_BlockData: - INCBIN "maps/CherrygroveCity.blk" - -VioletCity_BlockData: - INCBIN "maps/VioletCity.blk" - -AzaleaTown_BlockData: - INCBIN "maps/AzaleaTown.blk" - -CianwoodCity_BlockData: - INCBIN "maps/CianwoodCity.blk" - -GoldenrodCity_BlockData: - INCBIN "maps/GoldenrodCity.blk" - -OlivineCity_BlockData: - INCBIN "maps/OlivineCity.blk" - -EcruteakCity_BlockData: - INCBIN "maps/EcruteakCity.blk" - -MahoganyTown_BlockData: - INCBIN "maps/MahoganyTown.blk" - -LakeofRage_BlockData: - INCBIN "maps/LakeofRage.blk" - -BlackthornCity_BlockData: - INCBIN "maps/BlackthornCity.blk" - -SilverCaveOutside_BlockData: - INCBIN "maps/SilverCaveOutside.blk" - -Route6_BlockData: - INCBIN "maps/Route6.blk" - -Route7_BlockData: - INCBIN "maps/Route7.blk" - -Route16_BlockData: - INCBIN "maps/Route16.blk" - -Route18_BlockData: - INCBIN "maps/Route18.blk" - -WarehouseEntrance_BlockData: - INCBIN "maps/WarehouseEntrance.blk" - -UndergroundPathSwitchRoomEntrances_BlockData: - INCBIN "maps/UndergroundPathSwitchRoomEntrances.blk" - -GoldenrodDeptStoreB1F_BlockData: - INCBIN "maps/GoldenrodDeptStoreB1F.blk" - -UndergroundWarehouse_BlockData: - INCBIN "maps/UndergroundWarehouse.blk" - -BetaElevator_BlockData: - INCBIN "maps/BetaElevator.blk" - -TinTower1F_BlockData: - INCBIN "maps/TinTower1F.blk" - -TinTower2F_BlockData: - INCBIN "maps/TinTower2F.blk" - -TinTower3F_BlockData: - INCBIN "maps/TinTower3F.blk" - -TinTower4F_BlockData: - INCBIN "maps/TinTower4F.blk" - -TinTower5F_BlockData: - INCBIN "maps/TinTower5F.blk" - -TinTower6F_BlockData: - INCBIN "maps/TinTower6F.blk" - -TinTower7F_BlockData: - INCBIN "maps/TinTower7F.blk" - -TinTower8F_BlockData: - INCBIN "maps/TinTower8F.blk" - -TinTower9F_BlockData: - INCBIN "maps/TinTower9F.blk" - -TinTowerRoof_BlockData: - INCBIN "maps/TinTowerRoof.blk" - -BurnedTower1F_BlockData: - INCBIN "maps/BurnedTower1F.blk" - -BurnedTowerB1F_BlockData: - INCBIN "maps/BurnedTowerB1F.blk" - -BetaCaveTestMap_BlockData: - INCBIN "maps/BetaCaveTestMap.blk" - -MountMortar1FOutside_BlockData: - INCBIN "maps/MountMortar1FOutside.blk" - -MountMortar1FInside_BlockData: - INCBIN "maps/MountMortar1FInside.blk" - -MountMortar2FInside_BlockData: - INCBIN "maps/MountMortar2FInside.blk" - -MountMortarB1F_BlockData: - INCBIN "maps/MountMortarB1F.blk" - -IcePath1F_BlockData: - INCBIN "maps/IcePath1F.blk" - -IcePathB1F_BlockData: - INCBIN "maps/IcePathB1F.blk" - -IcePathB2FMahoganySide_BlockData: - INCBIN "maps/IcePathB2FMahoganySide.blk" - -IcePathB2FBlackthornSide_BlockData: - INCBIN "maps/IcePathB2FBlackthornSide.blk" - -IcePathB3F_BlockData: - INCBIN "maps/IcePathB3F.blk" - -WhirlIslandNW_BlockData: - INCBIN "maps/WhirlIslandNW.blk" - -WhirlIslandNE_BlockData: - INCBIN "maps/WhirlIslandNE.blk" - -WhirlIslandSW_BlockData: - INCBIN "maps/WhirlIslandSW.blk" - -WhirlIslandCave_BlockData: - INCBIN "maps/WhirlIslandCave.blk" - -WhirlIslandSE_BlockData: - INCBIN "maps/WhirlIslandSE.blk" - -WhirlIslandB1F_BlockData: - INCBIN "maps/WhirlIslandB1F.blk" - -WhirlIslandB2F_BlockData: - INCBIN "maps/WhirlIslandB2F.blk" - -WhirlIslandLugiaChamber_BlockData: - INCBIN "maps/WhirlIslandLugiaChamber.blk" - -SilverCaveRoom1_BlockData: - INCBIN "maps/SilverCaveRoom1.blk" - -SilverCaveRoom2_BlockData: - INCBIN "maps/SilverCaveRoom2.blk" - -SilverCaveRoom3_BlockData: - INCBIN "maps/SilverCaveRoom3.blk" - -BetaRocketHideout1_BlockData: - INCBIN "maps/BetaRocketHideout1.blk" - -BetaRocketHideout2_BlockData: - INCBIN "maps/BetaRocketHideout2.blk" - -BetaEmptyHouse_BlockData: - INCBIN "maps/BetaEmptyHouse.blk" - -BetaRocketHideout3_BlockData: - INCBIN "maps/BetaRocketHideout3.blk" - -MahoganyMart1F_BlockData: -MountMoonGiftShop_BlockData: - INCBIN "maps/GiftShop.blk" - -TeamRocketBaseB1F_BlockData: - INCBIN "maps/TeamRocketBaseB1F.blk" - -TeamRocketBaseB2F_BlockData: - INCBIN "maps/TeamRocketBaseB2F.blk" - -TeamRocketBaseB3F_BlockData: - INCBIN "maps/TeamRocketBaseB3F.blk" - -BetaRoute23EarlyVersion_BlockData: - INCBIN "maps/BetaRoute23EarlyVersion.blk" - -IndigoPlateauPokeCenter1F_BlockData: - INCBIN "maps/IndigoPlateauPokeCenter1F.blk" - -WillsRoom_BlockData: - INCBIN "maps/WillsRoom.blk" - -KogasRoom_BlockData: - INCBIN "maps/KogasRoom.blk" - -BrunosRoom_BlockData: - INCBIN "maps/BrunosRoom.blk" - -KarensRoom_BlockData: - INCBIN "maps/KarensRoom.blk" - -AzaleaGym_BlockData: - INCBIN "maps/AzaleaGym.blk" - -VioletGym_BlockData: - INCBIN "maps/VioletGym.blk" - -GoldenrodGym_BlockData: - INCBIN "maps/GoldenrodGym.blk" - -EcruteakGym_BlockData: - INCBIN "maps/EcruteakGym.blk" - -MahoganyGym_BlockData: - INCBIN "maps/MahoganyGym.blk" - -OlivineGym_BlockData: - INCBIN "maps/OlivineGym.blk" - -BetaUnknown_BlockData: - INCBIN "maps/BetaUnknown.blk" - -CianwoodGym_BlockData: - INCBIN "maps/CianwoodGym.blk" - -BlackthornGym1F_BlockData: - INCBIN "maps/BlackthornGym1F.blk" - -BlackthornGym2F_BlockData: - INCBIN "maps/BlackthornGym2F.blk" - -OlivineLighthouse1F_BlockData: - INCBIN "maps/OlivineLighthouse1F.blk" - -OlivineLighthouse2F_BlockData: - INCBIN "maps/OlivineLighthouse2F.blk" - -OlivineLighthouse3F_BlockData: - INCBIN "maps/OlivineLighthouse3F.blk" - -OlivineLighthouse4F_BlockData: - INCBIN "maps/OlivineLighthouse4F.blk" - -OlivineLighthouse5F_BlockData: - INCBIN "maps/OlivineLighthouse5F.blk" - -OlivineLighthouse6F_BlockData: - INCBIN "maps/OlivineLighthouse6F.blk" diff --git a/maps/blockdata_3.asm b/maps/blockdata_3.asm deleted file mode 100644 index 9a64caf5c..000000000 --- a/maps/blockdata_3.asm +++ /dev/null @@ -1,266 +0,0 @@ -BetaCave2_BlockData: - INCBIN "maps/BetaCave2.blk" - -SlowpokeWellB1F_BlockData: - INCBIN "maps/SlowpokeWellB1F.blk" - -SlowpokeWellB2F_BlockData: - INCBIN "maps/SlowpokeWellB2F.blk" - -IlexForest_BlockData: - INCBIN "maps/IlexForest.blk" - -DarkCaveVioletEntrance_BlockData: - INCBIN "maps/DarkCaveVioletEntrance.blk" - -DarkCaveBlackthornEntrance_BlockData: - INCBIN "maps/DarkCaveBlackthornEntrance.blk" - -RuinsofAlphResearchCenter_BlockData: - INCBIN "maps/RuinsofAlphResearchCenter.blk" - -GoldenrodBikeShop_BlockData: - INCBIN "maps/GoldenrodBikeShop.blk" - -DanceTheatre_BlockData: - INCBIN "maps/DanceTheatre.blk" - -EcruteakHouse_BlockData: - INCBIN "maps/EcruteakHouse.blk" - -GoldenrodGameCorner_BlockData: - INCBIN "maps/GoldenrodGameCorner.blk" - -Route35NationalParkgate_BlockData: - INCBIN "maps/Route35NationalParkgate.blk" - -Route36NationalParkgate_BlockData: - INCBIN "maps/Route36NationalParkgate.blk" - -FastShip1F_BlockData: - INCBIN "maps/FastShip1F.blk" - -FastShipB1F_BlockData: - INCBIN "maps/FastShipB1F.blk" - -BetaSsAquaInsideCutOut_BlockData: - INCBIN "maps/BetaSsAquaInsideCutOut.blk" - -FastShipCabins_NNW_NNE_NE_BlockData: - INCBIN "maps/FastShipCabins_NNW_NNE_NE.blk" - -FastShipCabins_SW_SSW_NW_BlockData: - INCBIN "maps/FastShipCabins_SW_SSW_NW.blk" - -FastShipCabins_SE_SSE_CaptainsCabin_BlockData: - INCBIN "maps/FastShipCabins_SE_SSE_CaptainsCabin.blk" - -OlivinePort_BlockData: - INCBIN "maps/OlivinePort.blk" - -VermilionPort_BlockData: - INCBIN "maps/VermilionPort.blk" - -OlivineCafe_BlockData: -SafariZoneMainOffice_BlockData: - INCBIN "maps/OlivineCafe.blk" - -KrissHouse2F_BlockData: - INCBIN "maps/KrissHouse2F.blk" - -SaffronTrainStation_BlockData: - INCBIN "maps/SaffronTrainStation.blk" - -CeruleanGym_BlockData: - INCBIN "maps/CeruleanGym.blk" - -VermilionGym_BlockData: - INCBIN "maps/VermilionGym.blk" - -SaffronGym_BlockData: - INCBIN "maps/SaffronGym.blk" - -PowerPlant_BlockData: - INCBIN "maps/PowerPlant.blk" - -PokemonFanClub_BlockData: -SafariZoneWardensHome_BlockData: - INCBIN "maps/PokemonFanClub.blk" - -FightingDojo_BlockData: - INCBIN "maps/FightingDojo.blk" - -SilphCo1F_BlockData: - INCBIN "maps/SilphCo1F.blk" - -ViridianGym_BlockData: - INCBIN "maps/ViridianGym.blk" - -TrainerHouse1F_BlockData: - INCBIN "maps/TrainerHouse1F.blk" - -TrainerHouseB1F_BlockData: - INCBIN "maps/TrainerHouseB1F.blk" - -RedsHouse1F_BlockData: - INCBIN "maps/RedsHouse1F.blk" - -RedsHouse2F_BlockData: - INCBIN "maps/RedsHouse2F.blk" - -OaksLab_BlockData: - INCBIN "maps/OaksLab.blk" - -MrFujisHouse_BlockData: - INCBIN "maps/MrFujisHouse.blk" - -LavRadioTower1F_BlockData: - INCBIN "maps/LavRadioTower1F.blk" - -SilverCaveItemRooms_BlockData: - INCBIN "maps/SilverCaveItemRooms.blk" - -DayCare_BlockData: - INCBIN "maps/DayCare.blk" - -SoulHouse_BlockData: - INCBIN "maps/SoulHouse.blk" - -PewterGym_BlockData: - INCBIN "maps/PewterGym.blk" - -CeladonGym_BlockData: - INCBIN "maps/CeladonGym.blk" - -BetaHouse2_BlockData: - INCBIN "maps/BetaHouse2.blk" - -CeladonCafe_BlockData: - INCBIN "maps/CeladonCafe.blk" - -BetaCeladonMansion_BlockData: - INCBIN "maps/BetaCeladonMansion.blk" - -RockTunnel1F_BlockData: - INCBIN "maps/RockTunnel1F.blk" - -RockTunnelB1F_BlockData: - INCBIN "maps/RockTunnelB1F.blk" - -DiglettsCave_BlockData: - INCBIN "maps/DiglettsCave.blk" - -MountMoon_BlockData: - INCBIN "maps/MountMoon.blk" - -SeafoamGym_BlockData: - INCBIN "maps/SeafoamGym.blk" - -MrPokemonsHouse_BlockData: - INCBIN "maps/MrPokemonsHouse.blk" - -VictoryRoadGate_BlockData: - INCBIN "maps/VictoryRoadGate.blk" - -OlivinePortPassage_BlockData: -VermilionPortPassage_BlockData: - INCBIN "maps/PortPassage.blk" - -FuchsiaGym_BlockData: - INCBIN "maps/FuchsiaGym.blk" - -SafariZoneBeta_BlockData: - INCBIN "maps/SafariZoneBeta.blk" - -Underground_BlockData: - INCBIN "maps/Underground.blk" - -Route39Barn_BlockData: - INCBIN "maps/Route39Barn.blk" - -VictoryRoad_BlockData: - INCBIN "maps/VictoryRoad.blk" - -Route23_BlockData: - INCBIN "maps/Route23.blk" - -LancesRoom_BlockData: - INCBIN "maps/LancesRoom.blk" - -HallOfFame_BlockData: - INCBIN "maps/HallOfFame.blk" - -CopycatsHouse1F_BlockData: - INCBIN "maps/CopycatsHouse1F.blk" - -CopycatsHouse2F_BlockData: - INCBIN "maps/CopycatsHouse2F.blk" - -GoldenrodFlowerShop_BlockData: - INCBIN "maps/GoldenrodFlowerShop.blk" - -MountMoonSquare_BlockData: - INCBIN "maps/MountMoonSquare.blk" - -WiseTriosRoom_BlockData: - INCBIN "maps/WiseTriosRoom.blk" - -DragonsDen1F_BlockData: - INCBIN "maps/DragonsDen1F.blk" - -DragonsDenB1F_BlockData: - INCBIN "maps/DragonsDenB1F.blk" - -TohjoFalls_BlockData: - INCBIN "maps/TohjoFalls.blk" - -RuinsofAlphHoOhItemRoom_BlockData: -RuinsofAlphKabutoItemRoom_BlockData: -RuinsofAlphOmanyteItemRoom_BlockData: -RuinsofAlphAerodactylItemRoom_BlockData: - INCBIN "maps/RuinsofAlphItemRoom.blk" - -RuinsofAlphHoOhWordRoom_BlockData: - INCBIN "maps/RuinsofAlphHoOhWordRoom.blk" - -RuinsofAlphKabutoWordRoom_BlockData: - INCBIN "maps/RuinsofAlphKabutoWordRoom.blk" - -RuinsofAlphOmanyteWordRoom_BlockData: - INCBIN "maps/RuinsofAlphOmanyteWordRoom.blk" - -RuinsofAlphAerodactylWordRoom_BlockData: - INCBIN "maps/RuinsofAlphAerodactylWordRoom.blk" - -DragonShrine_BlockData: - INCBIN "maps/DragonShrine.blk" - -BattleTower1F_BlockData: - INCBIN "maps/BattleTower1F.blk" - -BattleTowerBattleRoom_BlockData: - INCBIN "maps/BattleTowerBattleRoom.blk" - -GoldenrodPokeComCenter2FMobile_BlockData: - INCBIN "maps/GoldenrodPokeComCenter2FMobile.blk" - -MobileTradeRoomMobile_BlockData: - INCBIN "maps/MobileTradeRoomMobile.blk" - -MobileBattleRoom_BlockData: - INCBIN "maps/MobileBattleRoom.blk" - -BattleTowerHallway_BlockData: - INCBIN "maps/BattleTowerHallway.blk" - -BattleTowerElevator_BlockData: - INCBIN "maps/BattleTowerElevator.blk" - -BattleTowerOutside_BlockData: - INCBIN "maps/BattleTowerOutside.blk" - -BetaBlank_BlockData: - INCBIN "maps/BetaBlank.blk" - -GoldenrodDeptStoreRoof_BlockData: - INCBIN "maps/GoldenrodDeptStoreRoof.blk" diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 95909baa8..d3724aa22 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -1,35 +1,51 @@ +map_header: macro +;\1: map label +;\2: tileset: a TILESET_* constant +;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON +;\4: location: from constants/landmark_constants.asm +;\5: music: a MUSIC_* constant +;\6: phone service flag: 1 to prevent phone calls +;\7: time of day: a PALETTE_* constant +;\8: fishing group: a FISHGROUP_* constant +\1_MapHeader: + db BANK(\1_SecondMapHeader), \2, \3 + dw \1_SecondMapHeader + db \4, \5 + dn \6, \7 + db \8 +endm + MapGroupPointers:: ; pointers to the first map header of each map group - dw MapGroup1 - dw MapGroup2 - dw MapGroup3 - dw MapGroup4 - dw MapGroup5 - dw MapGroup6 - dw MapGroup7 - dw MapGroup8 - dw MapGroup9 - dw MapGroup10 - dw MapGroup11 - dw MapGroup12 - dw MapGroup13 - dw MapGroup14 - dw MapGroup15 - dw MapGroup16 - dw MapGroup17 - dw MapGroup18 - dw MapGroup19 - dw MapGroup20 - dw MapGroup21 - dw MapGroup22 - dw MapGroup23 - dw MapGroup24 - dw MapGroup25 - dw MapGroup26 - - -MapGroup1: - map_header OlivinePokeCenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + dw MapGroup_Olivine ; 1 + dw MapGroup_Mahogany ; 2 + dw MapGroup_Dungeons ; 3 + dw MapGroup_Ecruteak ; 4 + dw MapGroup_Blackthorn ; 5 + dw MapGroup_Cinnabar ; 6 + dw MapGroup_Cerulean ; 7 + dw MapGroup_Azalea ; 8 + dw MapGroup_LakeOfRage ; 9 + dw MapGroup_Violet ; 10 + dw MapGroup_Goldenrod ; 11 + dw MapGroup_Vermilion ; 12 + dw MapGroup_Pallet ; 13 + dw MapGroup_Pewter ; 14 + dw MapGroup_FastShip ; 15 + dw MapGroup_Indigo ; 16 + dw MapGroup_Fuchsia ; 17 + dw MapGroup_Lavender ; 18 + dw MapGroup_Silver ; 19 + dw MapGroup_CableClub ; 20 + dw MapGroup_Celadon ; 21 + dw MapGroup_Cianwood ; 22 + dw MapGroup_Viridian ; 23 + dw MapGroup_NewBark ; 24 + dw MapGroup_Saffron ; 25 + dw MapGroup_Cherrygrove ; 26 + +MapGroup_Olivine: + map_header OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineGym, TILESET_OLIVINE_GYM, INDOOR, OLIVINE_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineTimsHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineHouseBeta, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -38,24 +54,24 @@ MapGroup1: map_header OlivineCafe, TILESET_GAME_CORNER, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineMart, TILESET_MART, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route38EcruteakGate, TILESET_GATE, GATE, ROUTE_38, MUSIC_ROUTE_37, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route39Barn, TILESET_KURT_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route39Barn, TILESET_KURTS_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route39Farmhouse, TILESET_HOUSE_1, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route38, TILESET_JOHTO_1, ROUTE, ROUTE_38, MUSIC_ROUTE_37, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route39, TILESET_JOHTO_1, ROUTE, ROUTE_39, MUSIC_ROUTE_37, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header OlivineCity, TILESET_JOHTO_1, TOWN, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE -MapGroup2: +MapGroup_Mahogany: map_header MahoganyRedGyaradosSpeechHouse, TILESET_HOUSE_1, INDOOR, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header MahoganyGym, TILESET_GYM_1, INDOOR, MAHOGANY_TOWN, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header MahoganyPokeCenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route42EcruteakGate, TILESET_GATE, GATE, ROUTE_42, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route42, TILESET_JOHTO_1, ROUTE, ROUTE_42, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, FISHGROUP_LAKE map_header Route44, TILESET_JOHTO_1, ROUTE, ROUTE_44, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, FISHGROUP_POND map_header MahoganyTown, TILESET_JOHTO_1, TOWN, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE -MapGroup3: +MapGroup_Dungeons: map_header SproutTower1F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SproutTower2F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SproutTower3F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -72,26 +88,26 @@ MapGroup3: map_header BurnedTowerB1F, TILESET_CAVE, CAVE, BURNED_TOWER, MUSIC_BURNED_TOWER, 1, PALETTE_NITE, FISHGROUP_SHORE map_header NationalPark, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_NATIONAL_PARK, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header NationalParkBugContest, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_BUG_CATCHING_CONTEST, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header RadioTower1F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, 1<<7 | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RadioTower2F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, 1<<7 | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RadioTower3F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, 1<<7 | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RadioTower4F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, 1<<7 | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RadioTower5F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, 1<<7 | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphOutside, TILESET_JOHTO_1, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 0, PALETTE_AUTO, FISHGROUP_POND - map_header RuinsofAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphOmanyteChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphAerodactylChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphInnerChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_RUINS_OF_ALPH_INTERIOR, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphResearchCenter, TILESET_POWER_PLANT, INDOOR, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphHoOhItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphKabutoItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphOmanyteItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphAerodactylItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphHoOhWordRoom, TILESET_HO_OH_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphKabutoWordRoom, TILESET_KABUTO_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphOmanyteWordRoom, TILESET_OMANYTE_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphAerodactylWordRoom, TILESET_AERODACTYL_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RadioTower1F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RadioTower2F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RadioTower3F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RadioTower4F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RadioTower5F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphOutside, TILESET_JOHTO_1, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 0, PALETTE_AUTO, FISHGROUP_POND + map_header RuinsOfAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphOmanyteChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphAerodactylChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphInnerChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_RUINS_OF_ALPH_INTERIOR, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphResearchCenter, TILESET_POWER_PLANT, INDOOR, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphHoOhItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphKabutoItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphOmanyteItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphAerodactylItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphHoOhWordRoom, TILESET_HO_OH_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphKabutoWordRoom, TILESET_KABUTO_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphOmanyteWordRoom, TILESET_OMANYTE_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphAerodactylWordRoom, TILESET_AERODACTYL_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE map_header UnionCave1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE map_header UnionCaveB1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE map_header UnionCaveB2F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_SHORE @@ -103,15 +119,15 @@ MapGroup3: map_header OlivineLighthouse4F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineLighthouse5F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineLighthouse6F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header MahoganyMart1F, TILESET_KURT_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header MahoganyMart1F, TILESET_KURTS_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, 1, PALETTE_DAY, FISHGROUP_SHORE map_header TeamRocketBaseB1F, TILESET_UNDERGROUND, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE map_header TeamRocketBaseB2F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE map_header TeamRocketBaseB3F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE map_header IlexForest, TILESET_ILEX_FOREST, CAVE, ILEX_FOREST, MUSIC_UNION_CAVE, 0, PALETTE_NITE, FISHGROUP_POND - map_header WarehouseEntrance, TILESET_GATE, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header UndergroundPathSwitchRoomEntrances, TILESET_GYM_1, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header GoldenrodUnderground, TILESET_GATE, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header GoldenrodUndergroundSwitchRoomEntrances, TILESET_GYM_1, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE map_header GoldenrodDeptStoreB1F, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header UndergroundWarehouse, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header GoldenrodUndergroundWarehouse, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE map_header MountMortar1FOutside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE map_header MountMortar1FInside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE map_header MountMortar2FInside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE @@ -141,7 +157,7 @@ MapGroup3: map_header TohjoFalls, TILESET_CAVE, CAVE, TOHJO_FALLS, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE map_header DiglettsCave, TILESET_CAVE, CAVE, DIGLETTS_CAVE, MUSIC_MT_MOON, 1, PALETTE_NITE, FISHGROUP_SHORE map_header MountMoon, TILESET_CAVE, CAVE, MT_MOON, MUSIC_MT_MOON, 1, PALETTE_NITE, FISHGROUP_SHORE - map_header Underground, TILESET_UNDERGROUND, GATE, UNDERGROUND, MUSIC_MT_MOON, 0, PALETTE_NITE, FISHGROUP_SHORE + map_header UndergroundPath, TILESET_UNDERGROUND, GATE, UNDERGROUND_PATH, MUSIC_MT_MOON, 0, PALETTE_NITE, FISHGROUP_SHORE map_header RockTunnel1F, TILESET_WHIRL_ISLANDS, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, 1, PALETTE_DARK, FISHGROUP_SHORE map_header RockTunnelB1F, TILESET_WHIRL_ISLANDS, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, 1, PALETTE_DARK, FISHGROUP_SHORE map_header SafariZoneFuchsiaGateBeta, TILESET_GATE, INDOOR, FUCHSIA_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -149,34 +165,34 @@ MapGroup3: map_header VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, 1, PALETTE_NITE, FISHGROUP_SHORE -MapGroup4: +MapGroup_Ecruteak: map_header EcruteakHouse, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header WiseTriosRoom, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header EcruteakPokeCenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header EcruteakLugiaSpeechHouse, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header DanceTheatre, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header WiseTriosRoom, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header EcruteakLugiaSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header DanceTheatre, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, 0, PALETTE_DAY, FISHGROUP_SHORE map_header EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header EcruteakGym, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header EcruteakItemfinderHouse, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header EcruteakItemfinderHouse, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header EcruteakCity, TILESET_JOHTO_1, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_AUTO, FISHGROUP_POND -MapGroup5: +MapGroup_Blackthorn: map_header BlackthornGym1F, TILESET_GYM_1, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header BlackthornGym2F, TILESET_GYM_1, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header BlackthornDragonSpeechHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header BlackthornEmysHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header BlackthornMart, TILESET_MART, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header BlackthornPokeCenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header BlackthornPokecenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header MoveDeletersHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route45, TILESET_JOHTO_1, ROUTE, ROUTE_45, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_DRATINI_2 map_header Route46, TILESET_JOHTO_1, ROUTE, ROUTE_46, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header BlackthornCity, TILESET_JOHTO_1, TOWN, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_AUTO, FISHGROUP_POND -MapGroup6: - map_header CinnabarPokeCenter1F, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CinnabarPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE +MapGroup_Cinnabar: + map_header CinnabarPokecenter1F, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CinnabarPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route19FuchsiaGate, TILESET_GATE, GATE, ROUTE_19, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SeafoamGym, TILESET_CAVE, INDOOR, SEAFOAM_ISLANDS, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header Route19, TILESET_KANTO, ROUTE, ROUTE_19, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE @@ -185,16 +201,16 @@ MapGroup6: map_header CinnabarIsland, TILESET_KANTO, TOWN, CINNABAR_ISLAND, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, FISHGROUP_OCEAN -MapGroup7: +MapGroup_Cerulean: map_header CeruleanGymBadgeSpeechHouse, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeruleanPoliceStation, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeruleanTradeSpeechHouse, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeruleanPokeCenter1F, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeruleanPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CeruleanPokecenter1F, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CeruleanPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeruleanGym, TILESET_PORT, INDOOR, CERULEAN_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_NONE map_header CeruleanMart, TILESET_MART, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route10PokeCenter1F, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route10PokeCenter2FBeta, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route10Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route10Pokecenter2FBeta, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header PowerPlant, TILESET_POWER_PLANT, INDOOR, POWER_PLANT, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header BillsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_25, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route4, TILESET_KANTO, ROUTE, ROUTE_4, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_NONE @@ -205,26 +221,26 @@ MapGroup7: map_header CeruleanCity, TILESET_KANTO, TOWN, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, FISHGROUP_NONE -MapGroup8: - map_header AzaleaPokeCenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE +MapGroup_Azalea: + map_header AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CharcoalKiln, TILESET_HOUSE_1, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header KurtsHouse, TILESET_KURT_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header KurtsHouse, TILESET_KURTS_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header AzaleaGym, TILESET_GYM_1, INDOOR, AZALEA_TOWN, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header Route33, TILESET_JOHTO_2, ROUTE, ROUTE_33, MUSIC_ROUTE_30, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header AzaleaTown, TILESET_JOHTO_2, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_AUTO, FISHGROUP_SHORE -MapGroup9: - map_header LakeofRageHiddenPowerHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header LakeofRageMagikarpHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE +MapGroup_LakeOfRage: + map_header LakeOfRageHiddenPowerHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header LakeOfRageMagikarpHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route43MahoganyGate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route43Gate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route43, TILESET_JOHTO_1, ROUTE, ROUTE_43, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, FISHGROUP_POND - map_header LakeofRage, TILESET_JOHTO_1, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, FISHGROUP_GYARADOS + map_header LakeOfRage, TILESET_JOHTO_1, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, FISHGROUP_GYARADOS -MapGroup10: +MapGroup_Violet: map_header Route32, TILESET_JOHTO_1, ROUTE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_AUTO, FISHGROUP_QWILFISH map_header Route35, TILESET_JOHTO_1, ROUTE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_POND map_header Route36, TILESET_JOHTO_1, ROUTE, ROUTE_36, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_SHORE @@ -233,18 +249,18 @@ MapGroup10: map_header VioletMart, TILESET_MART, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VioletGym, TILESET_GYM_1, INDOOR, VIOLET_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VioletNicknameSpeechHouse, TILESET_KURT_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VioletPokeCenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VioletOnixTradeHouse, TILESET_KURT_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route32RuinsofAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route32PokeCenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route35Goldenrodgate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route35NationalParkgate, TILESET_GATE, INDOOR, ROUTE_35, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route36RuinsofAlphgate, TILESET_GATE, GATE, ROUTE_36, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route36NationalParkgate, TILESET_GATE, INDOOR, ROUTE_36, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - - -MapGroup11: + map_header VioletNicknameSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header VioletKylesHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route35NationalParkGate, TILESET_GATE, INDOOR, ROUTE_35, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route36RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_36, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route36NationalParkGate, TILESET_GATE, INDOOR, ROUTE_36, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + + +MapGroup_Goldenrod: map_header Route34, TILESET_JOHTO_2, ROUTE, ROUTE_34, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header GoldenrodCity, TILESET_JOHTO_2, TOWN, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header GoldenrodGym, TILESET_GYM_1, INDOOR, GOLDENROD_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE @@ -264,50 +280,50 @@ MapGroup11: map_header GoldenrodDeptStoreElevator, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodPokeCenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header GoldenrodPokeComCenter2FMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE map_header DayCare, TILESET_HOUSE_1, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup12: +MapGroup_Vermilion: map_header Route6, TILESET_KANTO, ROUTE, ROUTE_6, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_POND map_header Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_AUTO, FISHGROUP_OCEAN map_header VermilionHouseFishingSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VermilionPokeCenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VermilionPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header VermilionPokecenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header VermilionPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header PokemonFanClub, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VermilionMagnetTrainSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VermilionMart, TILESET_MART, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VermilionHouseDiglettsCaveSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VermilionGym, TILESET_GAME_CORNER, INDOOR, VERMILION_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header Route6SaffronGate, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route6UndergroundEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route6UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup13: +MapGroup_Pallet: map_header Route1, TILESET_KANTO, ROUTE, ROUTE_1, MUSIC_ROUTE_1, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header PalletTown, TILESET_KANTO, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_AUTO, FISHGROUP_OCEAN - map_header RedsHouse1F, TILESET_KRISS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header RedsHouse2F, TILESET_KRISS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header RedsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header RedsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header BluesHouse, TILESET_HOUSE_1, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OaksLab, TILESET_LAB, INDOOR, PALLET_TOWN, MUSIC_POKEMON_TALK, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup14: +MapGroup_Pewter: map_header Route3, TILESET_KANTO, ROUTE, ROUTE_3, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header PewterCity, TILESET_KANTO, TOWN, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header PewterNidoranSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header PewterGym, TILESET_SPROUT_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header PewterMart, TILESET_MART, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header PewterPokeCenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header PewterPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header PewterPokecenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header PewterPokecenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header PewterSnoozeSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup15: +MapGroup_FastShip: map_header OlivinePort, TILESET_PORT, ROUTE, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_AUTO, FISHGROUP_OCEAN map_header VermilionPort, TILESET_PORT, ROUTE, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_AUTO, FISHGROUP_OCEAN map_header FastShip1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -318,13 +334,13 @@ MapGroup15: map_header OlivinePortPassage, TILESET_UNDERGROUND, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VermilionPortPassage, TILESET_UNDERGROUND, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header MountMoonSquare, TILESET_KANTO, ROUTE, MT_MOON, MUSIC_MT_MOON_SQUARE, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header MountMoonGiftShop, TILESET_KURT_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header MountMoonGiftShop, TILESET_KURTS_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header TinTowerRoof, TILESET_SPROUT_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_AUTO, FISHGROUP_SHORE -MapGroup16: +MapGroup_Indigo: map_header Route23, TILESET_KANTO, TOWN, ROUTE_23, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header IndigoPlateauPokeCenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header IndigoPlateauPokecenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 0, PALETTE_DAY, FISHGROUP_SHORE map_header WillsRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, FISHGROUP_SHORE map_header KogasRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, FISHGROUP_SHORE map_header BrunosRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, FISHGROUP_SHORE @@ -333,7 +349,7 @@ MapGroup16: map_header HallOfFame, TILESET_ICE_PATH, INDOOR, INDIGO_PLATEAU, MUSIC_NEW_BARK_TOWN, 1, PALETTE_DAY, FISHGROUP_SHORE -MapGroup17: +MapGroup_Fuchsia: map_header Route13, TILESET_KANTO, ROUTE, ROUTE_13, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM map_header Route14, TILESET_KANTO, ROUTE, ROUTE_14, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route15, TILESET_KANTO, ROUTE, ROUTE_15, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_SHORE @@ -343,19 +359,19 @@ MapGroup17: map_header SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header FuchsiaBillSpeechHouse, TILESET_HOUSE_1, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header FuchsiaPokeCenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header FuchsiaPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SafariZoneWardensHome, TILESET_HOUSE_1, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route15FuchsiaGate, TILESET_GATE, GATE, ROUTE_15, MUSIC_ROUTE_12, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup18: +MapGroup_Lavender: map_header Route8, TILESET_KANTO, ROUTE, ROUTE_8, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route12, TILESET_KANTO, ROUTE, ROUTE_12, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM map_header Route10South, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_LAKE map_header LavenderTown, TILESET_KANTO, TOWN, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header LavenderPokeCenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header LavenderPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header LavenderPokecenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header LavenderPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header MrFujisHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header LavenderTownSpeechHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header LavenderNameRater, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -366,15 +382,15 @@ MapGroup18: map_header Route12SuperRodHouse, TILESET_HOUSE_1, INDOOR, ROUTE_12, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup19: +MapGroup_Silver : map_header Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_POND map_header SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_POND - map_header SilverCavePokeCenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route28FamousSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup20: - map_header PokeCenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, 1, PALETTE_DAY, FISHGROUP_SHORE +MapGroup_CableClub: + map_header Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, 1, PALETTE_DAY, FISHGROUP_SHORE map_header TradeCenter, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE map_header Colosseum, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE map_header TimeCapsule, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE @@ -382,7 +398,7 @@ MapGroup20: map_header MobileBattleRoom, TILESET_CELADON_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE -MapGroup21: +MapGroup_Celadon: map_header Route7, TILESET_KANTO, ROUTE, ROUTE_7, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route16, TILESET_KANTO, ROUTE, ROUTE_16, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route17, TILESET_KANTO, ROUTE, ROUTE_17, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_NONE @@ -399,8 +415,8 @@ MapGroup21: map_header CeladonMansion3F, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeladonMansionRoof, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeladonMansionRoofHouse, TILESET_HOUSE_1, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonPokeCenter1F, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CeladonPokecenter1F, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CeladonPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeladonGameCorner, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_GAME_CORNER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeladonGameCornerPrizeRoom, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeladonGym, TILESET_TRAIN_STATION, INDOOR, CELADON_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE @@ -411,13 +427,13 @@ MapGroup21: map_header Route1718Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup22: +MapGroup_Cianwood: map_header Route40, TILESET_JOHTO_1, ROUTE, ROUTE_40, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route41, TILESET_JOHTO_1, ROUTE, ROUTE_41, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_OCEAN map_header CianwoodCity, TILESET_JOHTO_1, TOWN, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header ManiasHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CianwoodGym, TILESET_SPROUT_TOWER, INDOOR, CIANWOOD_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header CianwoodPokeCenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CianwoodPokecenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CianwoodPharmacy, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CianwoodCityPhotoStudio, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CianwoodLugiaSpeechHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -430,7 +446,7 @@ MapGroup22: map_header BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, 0, PALETTE_AUTO, FISHGROUP_SHORE -MapGroup23: +MapGroup_Viridian: map_header Route2, TILESET_KANTO, ROUTE, ROUTE_2, MUSIC_ROUTE_2, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route22, TILESET_KANTO, ROUTE, ROUTE_22, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_POND map_header ViridianCity, TILESET_KANTO, TOWN, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, FISHGROUP_POND @@ -439,53 +455,53 @@ MapGroup23: map_header TrainerHouse1F, TILESET_HOUSE_1, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header TrainerHouseB1F, TILESET_POWER_PLANT, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header ViridianMart, TILESET_MART, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header ViridianPokeCenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header ViridianPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route2NuggetSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route2Gate, TILESET_GATE, GATE, ROUTE_2, MUSIC_ROUTE_2, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup24: +MapGroup_NewBark: map_header Route26, TILESET_JOHTO_1, ROUTE, ROUTE_26, MUSIC_ROUTE_26, 0, PALETTE_AUTO, FISHGROUP_OCEAN map_header Route27, TILESET_JOHTO_1, ROUTE, ROUTE_27, MUSIC_ROUTE_26, 0, PALETTE_AUTO, FISHGROUP_OCEAN map_header Route29, TILESET_JOHTO_1, ROUTE, ROUTE_29, MUSIC_ROUTE_29, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header NewBarkTown, TILESET_JOHTO_1, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_AUTO, FISHGROUP_OCEAN map_header ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header KrissHouse1F, TILESET_KRISS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header KrissHouse2F, TILESET_KRISS_HOUSE_2F, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header KrissHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header KrissHouse2F, TILESET_PLAYERS_HOUSE_2F, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header KrissNeighborsHouse, TILESET_HOUSE_1, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header ElmsHouse, TILESET_KRISS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route26HealSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route26DayofWeekSiblingsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route27SandstormHouse, TILESET_HOUSE_1, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route2946Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup25: +MapGroup_Saffron: map_header Route5, TILESET_KANTO, ROUTE, ROUTE_5, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header SaffronCity, TILESET_KANTO, TOWN, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header FightingDojo, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SaffronGym, TILESET_UNDERGROUND, INDOOR, SAFFRON_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header SaffronMart, TILESET_MART, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header SaffronPokeCenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header SaffronPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header SaffronPokecenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header SaffronPokecenter2FBeta, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header MrPsychicsHouse, TILESET_HOUSE_1, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SaffronTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SilphCo1F, TILESET_POWER_PLANT, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CopycatsHouse1F, TILESET_KRISS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CopycatsHouse2F, TILESET_KRISS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route5UndergroundEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route5SaffronCityGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route5CleanseTagSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup26: +MapGroup_Cherrygrove: map_header Route30, TILESET_JOHTO_1, ROUTE, ROUTE_30, MUSIC_ROUTE_30, 0, PALETTE_AUTO, FISHGROUP_POND map_header Route31, TILESET_JOHTO_1, ROUTE, ROUTE_31, MUSIC_ROUTE_30, 0, PALETTE_AUTO, FISHGROUP_POND map_header CherrygroveCity, TILESET_JOHTO_1, TOWN, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header CherrygroveMart, TILESET_MART, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CherrygrovePokeCenter1F, TILESET_POKECENTER, INDOOR, CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CherrygrovePokecenter1F, TILESET_POKECENTER, INDOOR, CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CherrygroveGymSpeechHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header GuideGentsHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CherrygroveEvolutionSpeechHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 1bf8b80a2..7503e72ae 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -1,3 +1,90 @@ +map_header_2: macro +;\1: map label +;\2: map id +;\3: border block +;\4: connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none +\1_SecondMapHeader:: + db \3 + db \2_HEIGHT, \2_WIDTH + db BANK(\1_BlockData) + dw \1_BlockData + db BANK(\1_MapScriptHeader) + dw \1_MapScriptHeader + dw \1_MapEventHeader + db \4 +endm + +connection: macro +if "\1" == "north" +;\2: map id +;\3: map label (eventually will be rolled into map id) +;\4: x +;\5: offset? +;\6: strip length +;\7: this map id + map \2 + dw \3_BlockData + \2_WIDTH * (\2_HEIGHT - 3) + \5 + dw OverworldMap + \4 + 3 + db \6 + db \2_WIDTH + db \2_HEIGHT * 2 - 1 + db (\4 - \5) * -2 + dw OverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1 +endc + +if "\1" == "south" +;\2: map id +;\3: map label (eventually will be rolled into map id) +;\4: x +;\5: offset? +;\6: strip length +;\7: this map id + map \2 + dw \3_BlockData + \5 + dw OverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3 + db \6 + db \2_WIDTH + db 0 + db (\4 - \5) * -2 + dw OverworldMap + \2_WIDTH + 7 +endc + +if "\1" == "west" +;\2: map id +;\3: map label (eventually will be rolled into map id) +;\4: y +;\5: offset? +;\6: strip length +;\7: this map id + map \2 + dw \3_BlockData + (\2_WIDTH * \5) + \2_WIDTH - 3 + dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3) + db \6 + db \2_WIDTH + db (\4 - \5) * -2 + db \2_WIDTH * 2 - 1 + dw OverworldMap + \2_WIDTH * 2 + 6 +endc + +if "\1" == "east" +;\2: map id +;\3: map label (eventually will be rolled into map id) +;\4: y +;\5: offset? +;\6: strip length +;\7: this map id + map \2 + dw \3_BlockData + (\2_WIDTH * \5) + dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3 + db \6 + db \2_WIDTH + db (\4 - \5) * -2 + db 0 + dw OverworldMap + \2_WIDTH + 7 +endc +endm + + map_header_2 NewBarkTown, NEW_BARK_TOWN, $5, WEST | EAST connection west, ROUTE_29, Route29, 0, 0, 9, NEW_BARK_TOWN connection east, ROUTE_27, Route27, 0, 0, 9, NEW_BARK_TOWN @@ -36,7 +123,7 @@ connection west, ROUTE_42, Route42, 0, 0, 9, MAHOGANY_TOWN connection east, ROUTE_44, Route44, 0, 0, 9, MAHOGANY_TOWN - map_header_2 LakeofRage, LAKE_OF_RAGE, $5, SOUTH + map_header_2 LakeOfRage, LAKE_OF_RAGE, $5, SOUTH connection south, ROUTE_43, Route43, 5, 0, 10, LAKE_OF_RAGE map_header_2 BlackthornCity, BLACKTHORN_CITY, $71, SOUTH | WEST @@ -115,7 +202,7 @@ connection east, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_42 map_header_2 Route43, ROUTE_43, $5, NORTH | SOUTH - connection north, LAKE_OF_RAGE, LakeofRage, -3, 2, 16, ROUTE_43 + connection north, LAKE_OF_RAGE, LakeOfRage, -3, 2, 16, ROUTE_43 connection south, MAHOGANY_TOWN, MahoganyTown, 0, 0, 10, ROUTE_43 map_header_2 Route44, ROUTE_44, $71, WEST | EAST @@ -298,21 +385,21 @@ map_header_2 RadioTower3F, RADIO_TOWER_3F, $0, 0 map_header_2 RadioTower4F, RADIO_TOWER_4F, $0, 0 map_header_2 RadioTower5F, RADIO_TOWER_5F, $0, 0 - map_header_2 RuinsofAlphOutside, RUINS_OF_ALPH_OUTSIDE, $5, 0 - map_header_2 RuinsofAlphHoOhChamber, RUINS_OF_ALPH_HO_OH_CHAMBER, $0, 0 - map_header_2 RuinsofAlphKabutoChamber, RUINS_OF_ALPH_KABUTO_CHAMBER, $0, 0 - map_header_2 RuinsofAlphOmanyteChamber, RUINS_OF_ALPH_OMANYTE_CHAMBER, $0, 0 - map_header_2 RuinsofAlphAerodactylChamber, RUINS_OF_ALPH_AERODACTYL_CHAMBER, $0, 0 - map_header_2 RuinsofAlphInnerChamber, RUINS_OF_ALPH_INNER_CHAMBER, $0, 0 - map_header_2 RuinsofAlphResearchCenter, RUINS_OF_ALPH_RESEARCH_CENTER, $0, 0 - map_header_2 RuinsofAlphHoOhItemRoom, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, $0, 0 - map_header_2 RuinsofAlphKabutoItemRoom, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, $0, 0 - map_header_2 RuinsofAlphOmanyteItemRoom, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, $0, 0 - map_header_2 RuinsofAlphAerodactylItemRoom, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, $0, 0 - map_header_2 RuinsofAlphHoOhWordRoom, RUINS_OF_ALPH_HO_OH_WORD_ROOM, $0, 0 - map_header_2 RuinsofAlphKabutoWordRoom, RUINS_OF_ALPH_KABUTO_WORD_ROOM, $0, 0 - map_header_2 RuinsofAlphOmanyteWordRoom, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, $0, 0 - map_header_2 RuinsofAlphAerodactylWordRoom, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, $0, 0 + map_header_2 RuinsOfAlphOutside, RUINS_OF_ALPH_OUTSIDE, $5, 0 + map_header_2 RuinsOfAlphHoOhChamber, RUINS_OF_ALPH_HO_OH_CHAMBER, $0, 0 + map_header_2 RuinsOfAlphKabutoChamber, RUINS_OF_ALPH_KABUTO_CHAMBER, $0, 0 + map_header_2 RuinsOfAlphOmanyteChamber, RUINS_OF_ALPH_OMANYTE_CHAMBER, $0, 0 + map_header_2 RuinsOfAlphAerodactylChamber, RUINS_OF_ALPH_AERODACTYL_CHAMBER, $0, 0 + map_header_2 RuinsOfAlphInnerChamber, RUINS_OF_ALPH_INNER_CHAMBER, $0, 0 + map_header_2 RuinsOfAlphResearchCenter, RUINS_OF_ALPH_RESEARCH_CENTER, $0, 0 + map_header_2 RuinsOfAlphHoOhItemRoom, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, $0, 0 + map_header_2 RuinsOfAlphKabutoItemRoom, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, $0, 0 + map_header_2 RuinsOfAlphOmanyteItemRoom, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, $0, 0 + map_header_2 RuinsOfAlphAerodactylItemRoom, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, $0, 0 + map_header_2 RuinsOfAlphHoOhWordRoom, RUINS_OF_ALPH_HO_OH_WORD_ROOM, $0, 0 + map_header_2 RuinsOfAlphKabutoWordRoom, RUINS_OF_ALPH_KABUTO_WORD_ROOM, $0, 0 + map_header_2 RuinsOfAlphOmanyteWordRoom, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, $0, 0 + map_header_2 RuinsOfAlphAerodactylWordRoom, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, $0, 0 map_header_2 UnionCave1F, UNION_CAVE_1F, $9, 0 map_header_2 UnionCaveB1F, UNION_CAVE_B1F, $9, 0 map_header_2 UnionCaveB2F, UNION_CAVE_B2F, $9, 0 @@ -329,10 +416,10 @@ map_header_2 TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $0, 0 map_header_2 TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $0, 0 map_header_2 IlexForest, ILEX_FOREST, $5, 0 - map_header_2 WarehouseEntrance, WAREHOUSE_ENTRANCE, $0, 0 - map_header_2 UndergroundPathSwitchRoomEntrances, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, $0, 0 + map_header_2 GoldenrodUnderground, GOLDENROD_UNDERGROUND, $0, 0 + map_header_2 GoldenrodUndergroundSwitchRoomEntrances, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, $0, 0 map_header_2 GoldenrodDeptStoreB1F, GOLDENROD_DEPT_STORE_B1F, $0, 0 - map_header_2 UndergroundWarehouse, UNDERGROUND_WAREHOUSE, $0, 0 + map_header_2 GoldenrodUndergroundWarehouse, GOLDENROD_UNDERGROUND_WAREHOUSE, $0, 0 map_header_2 MountMortar1FOutside, MOUNT_MORTAR_1F_OUTSIDE, $9, 0 map_header_2 MountMortar1FInside, MOUNT_MORTAR_1F_INSIDE, $9, 0 map_header_2 MountMortar2FInside, MOUNT_MORTAR_2F_INSIDE, $9, 0 @@ -360,7 +447,7 @@ map_header_2 DragonsDenB1F, DRAGONS_DEN_B1F, $71, 0 map_header_2 DragonShrine, DRAGON_SHRINE, $0, 0 map_header_2 TohjoFalls, TOHJO_FALLS, $9, 0 - map_header_2 OlivinePokeCenter1F, OLIVINE_POKECENTER_1F, $0, 0 + map_header_2 OlivinePokecenter1F, OLIVINE_POKECENTER_1F, $0, 0 map_header_2 OlivineGym, OLIVINE_GYM, $0, 0 map_header_2 OlivineTimsHouse, OLIVINE_TIMS_HOUSE, $0, 0 map_header_2 OlivineHouseBeta, OLIVINE_HOUSE_BETA, $0, 0 @@ -373,11 +460,11 @@ map_header_2 Route39Farmhouse, ROUTE_39_FARMHOUSE, $0, 0 map_header_2 MahoganyRedGyaradosSpeechHouse, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, $0, 0 map_header_2 MahoganyGym, MAHOGANY_GYM, $0, 0 - map_header_2 MahoganyPokeCenter1F, MAHOGANY_POKECENTER_1F, $0, 0 + map_header_2 MahoganyPokecenter1F, MAHOGANY_POKECENTER_1F, $0, 0 map_header_2 Route42EcruteakGate, ROUTE_42_ECRUTEAK_GATE, $0, 0 map_header_2 DiglettsCave, DIGLETTS_CAVE, $9, 0 map_header_2 MountMoon, MOUNT_MOON, $9, 0 - map_header_2 Underground, UNDERGROUND, $0, 0 + map_header_2 UndergroundPath, UNDERGROUND_PATH, $0, 0 map_header_2 RockTunnel1F, ROCK_TUNNEL_1F, $9, 0 map_header_2 RockTunnelB1F, ROCK_TUNNEL_B1F, $9, 0 map_header_2 SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $0, 0 @@ -385,7 +472,7 @@ map_header_2 VictoryRoad, VICTORY_ROAD, $1d, 0 map_header_2 EcruteakHouse, ECRUTEAK_HOUSE, $0, 0 map_header_2 WiseTriosRoom, WISE_TRIOS_ROOM, $0, 0 - map_header_2 EcruteakPokeCenter1F, ECRUTEAK_POKECENTER_1F, $0, 0 + map_header_2 EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $0, 0 map_header_2 EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $0, 0 map_header_2 DanceTheatre, DANCE_THEATRE, $0, 0 map_header_2 EcruteakMart, ECRUTEAK_MART, $0, 0 @@ -396,44 +483,44 @@ map_header_2 BlackthornDragonSpeechHouse, BLACKTHORN_DRAGON_SPEECH_HOUSE, $0, 0 map_header_2 BlackthornEmysHouse, BLACKTHORN_EMYS_HOUSE, $0, 0 map_header_2 BlackthornMart, BLACKTHORN_MART, $0, 0 - map_header_2 BlackthornPokeCenter1F, BLACKTHORN_POKECENTER_1F, $0, 0 + map_header_2 BlackthornPokecenter1F, BLACKTHORN_POKECENTER_1F, $0, 0 map_header_2 MoveDeletersHouse, MOVE_DELETERS_HOUSE, $0, 0 - map_header_2 CinnabarPokeCenter1F, CINNABAR_POKECENTER_1F, $0, 0 - map_header_2 CinnabarPokeCenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $0, 0 + map_header_2 CinnabarPokecenter1F, CINNABAR_POKECENTER_1F, $0, 0 + map_header_2 CinnabarPokecenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $0, 0 map_header_2 Route19FuchsiaGate, ROUTE_19___FUCHSIA_GATE, $0, 0 map_header_2 SeafoamGym, SEAFOAM_GYM, $9, 0 map_header_2 CeruleanGymBadgeSpeechHouse, CERULEAN_GYM_BADGE_SPEECH_HOUSE, $0, 0 map_header_2 CeruleanPoliceStation, CERULEAN_POLICE_STATION, $0, 0 map_header_2 CeruleanTradeSpeechHouse, CERULEAN_TRADE_SPEECH_HOUSE, $0, 0 - map_header_2 CeruleanPokeCenter1F, CERULEAN_POKECENTER_1F, $0, 0 - map_header_2 CeruleanPokeCenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $0, 0 + map_header_2 CeruleanPokecenter1F, CERULEAN_POKECENTER_1F, $0, 0 + map_header_2 CeruleanPokecenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $0, 0 map_header_2 CeruleanGym, CERULEAN_GYM, $0, 0 map_header_2 CeruleanMart, CERULEAN_MART, $0, 0 - map_header_2 Route10PokeCenter1F, ROUTE_10_POKECENTER_1F, $0, 0 - map_header_2 Route10PokeCenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $0, 0 + map_header_2 Route10Pokecenter1F, ROUTE_10_POKECENTER_1F, $0, 0 + map_header_2 Route10Pokecenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $0, 0 map_header_2 PowerPlant, POWER_PLANT, $0, 0 map_header_2 BillsHouse, BILLS_HOUSE, $0, 0 - map_header_2 AzaleaPokeCenter1F, AZALEA_POKECENTER_1F, $0, 0 + map_header_2 AzaleaPokecenter1F, AZALEA_POKECENTER_1F, $0, 0 map_header_2 CharcoalKiln, CHARCOAL_KILN, $0, 0 map_header_2 AzaleaMart, AZALEA_MART, $0, 0 map_header_2 KurtsHouse, KURTS_HOUSE, $0, 0 map_header_2 AzaleaGym, AZALEA_GYM, $0, 0 - map_header_2 LakeofRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $0, 0 - map_header_2 LakeofRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $0, 0 + map_header_2 LakeOfRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $0, 0 + map_header_2 LakeOfRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $0, 0 map_header_2 Route43MahoganyGate, ROUTE_43_MAHOGANY_GATE, $0, 0 map_header_2 Route43Gate, ROUTE_43_GATE, $0, 0 map_header_2 VioletMart, VIOLET_MART, $0, 0 map_header_2 VioletGym, VIOLET_GYM, $0, 0 map_header_2 EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $0, 0 map_header_2 VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $0, 0 - map_header_2 VioletPokeCenter1F, VIOLET_POKECENTER_1F, $0, 0 - map_header_2 VioletOnixTradeHouse, VIOLET_ONIX_TRADE_HOUSE, $0, 0 - map_header_2 Route32RuinsofAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $0, 0 - map_header_2 Route32PokeCenter1F, ROUTE_32_POKECENTER_1F, $0, 0 - map_header_2 Route35Goldenrodgate, ROUTE_35_GOLDENROD_GATE, $0, 0 - map_header_2 Route35NationalParkgate, ROUTE_35_NATIONAL_PARK_GATE, $0, 0 - map_header_2 Route36RuinsofAlphgate, ROUTE_36_RUINS_OF_ALPH_GATE, $0, 0 - map_header_2 Route36NationalParkgate, ROUTE_36_NATIONAL_PARK_GATE, $0, 0 + map_header_2 VioletPokecenter1F, VIOLET_POKECENTER_1F, $0, 0 + map_header_2 VioletKylesHouse, VIOLET_KYLES_HOUSE, $0, 0 + map_header_2 Route32RuinsOfAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $0, 0 + map_header_2 Route32Pokecenter1F, ROUTE_32_POKECENTER_1F, $0, 0 + map_header_2 Route35GoldenrodGate, ROUTE_35_GOLDENROD_GATE, $0, 0 + map_header_2 Route35NationalParkGate, ROUTE_35_NATIONAL_PARK_GATE, $0, 0 + map_header_2 Route36RuinsOfAlphGate, ROUTE_36_RUINS_OF_ALPH_GATE, $0, 0 + map_header_2 Route36NationalParkGate, ROUTE_36_NATIONAL_PARK_GATE, $0, 0 map_header_2 GoldenrodGym, GOLDENROD_GYM, $0, 0 map_header_2 GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $0, 0 map_header_2 GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $0, 0 @@ -451,21 +538,21 @@ map_header_2 GoldenrodDeptStoreElevator, GOLDENROD_DEPT_STORE_ELEVATOR, $0, 0 map_header_2 GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0 map_header_2 GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $0, 0 - map_header_2 GoldenrodPokeCenter1F, GOLDENROD_POKECENTER_1F, $0, 0 + map_header_2 GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $0, 0 map_header_2 GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $0, 0 map_header_2 IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $0, 0 map_header_2 Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $0, 0 - map_header_2 DayCare, DAYCARE, $0, 0 + map_header_2 DayCare, DAY_CARE, $0, 0 map_header_2 VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $0, 0 - map_header_2 VermilionPokeCenter1F, VERMILION_POKECENTER_1F, $0, 0 - map_header_2 VermilionPokeCenter2FBeta, VERMILION_POKECENTER_2F_BETA, $0, 0 + map_header_2 VermilionPokecenter1F, VERMILION_POKECENTER_1F, $0, 0 + map_header_2 VermilionPokecenter2FBeta, VERMILION_POKECENTER_2F_BETA, $0, 0 map_header_2 PokemonFanClub, POKEMON_FAN_CLUB, $0, 0 map_header_2 VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $0, 0 map_header_2 VermilionMart, VERMILION_MART, $0, 0 map_header_2 VermilionHouseDiglettsCaveSpeechHouse, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, $0, 0 map_header_2 VermilionGym, VERMILION_GYM, $0, 0 map_header_2 Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $0, 0 - map_header_2 Route6UndergroundEntrance, ROUTE_6_UNDERGROUND_ENTRANCE, $0, 0 + map_header_2 Route6UndergroundPathEntrance, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, $0, 0 map_header_2 RedsHouse1F, REDS_HOUSE_1F, $0, 0 map_header_2 RedsHouse2F, REDS_HOUSE_2F, $0, 0 map_header_2 BluesHouse, BLUES_HOUSE, $0, 0 @@ -473,8 +560,8 @@ map_header_2 PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $0, 0 map_header_2 PewterGym, PEWTER_GYM, $0, 0 map_header_2 PewterMart, PEWTER_MART, $0, 0 - map_header_2 PewterPokeCenter1F, PEWTER_POKECENTER_1F, $0, 0 - map_header_2 PewterPokeCenter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, 0 + map_header_2 PewterPokecenter1F, PEWTER_POKECENTER_1F, $0, 0 + map_header_2 PewterPokecenter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, 0 map_header_2 PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $0, 0 map_header_2 OlivinePort, OLIVINE_PORT, $a, 0 map_header_2 VermilionPort, VERMILION_PORT, $a, 0 @@ -488,7 +575,7 @@ map_header_2 MountMoonSquare, MOUNT_MOON_SQUARE, $2d, 0 map_header_2 MountMoonGiftShop, MOUNT_MOON_GIFT_SHOP, $0, 0 map_header_2 TinTowerRoof, TIN_TOWER_ROOF, $0, 0 - map_header_2 IndigoPlateauPokeCenter1F, INDIGO_PLATEAU_POKECENTER_1F, $0, 0 + map_header_2 IndigoPlateauPokecenter1F, INDIGO_PLATEAU_POKECENTER_1F, $0, 0 map_header_2 WillsRoom, WILLS_ROOM, $0, 0 map_header_2 KogasRoom, KOGAS_ROOM, $0, 0 map_header_2 BrunosRoom, BRUNOS_ROOM, $0, 0 @@ -499,12 +586,12 @@ map_header_2 SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $0, 0 map_header_2 FuchsiaGym, FUCHSIA_GYM, $0, 0 map_header_2 FuchsiaBillSpeechHouse, FUCHSIA_BILL_SPEECH_HOUSE, $0, 0 - map_header_2 FuchsiaPokeCenter1F, FUCHSIA_POKECENTER_1F, $0, 0 - map_header_2 FuchsiaPokeCenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $0, 0 + map_header_2 FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $0, 0 + map_header_2 FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $0, 0 map_header_2 SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $0, 0 map_header_2 Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $0, 0 - map_header_2 LavenderPokeCenter1F, LAVENDER_POKECENTER_1F, $0, 0 - map_header_2 LavenderPokeCenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $0, 0 + map_header_2 LavenderPokecenter1F, LAVENDER_POKECENTER_1F, $0, 0 + map_header_2 LavenderPokecenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $0, 0 map_header_2 MrFujisHouse, MR_FUJIS_HOUSE, $0, 0 map_header_2 LavenderTownSpeechHouse, LAVENDER_TOWN_SPEECH_HOUSE, $0, 0 map_header_2 LavenderNameRater, LAVENDER_NAME_RATER, $0, 0 @@ -513,9 +600,9 @@ map_header_2 LavRadioTower1F, LAV_RADIO_TOWER_1F, $0, 0 map_header_2 Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $0, 0 map_header_2 Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $0, 0 - map_header_2 SilverCavePokeCenter1F, SILVER_CAVE_POKECENTER_1F, $0, 0 + map_header_2 SilverCavePokecenter1F, SILVER_CAVE_POKECENTER_1F, $0, 0 map_header_2 Route28FamousSpeechHouse, ROUTE_28_FAMOUS_SPEECH_HOUSE, $0, 0 - map_header_2 PokeCenter2F, POKECENTER_2F, $0, 0 + map_header_2 Pokecenter2F, POKECENTER_2F, $0, 0 map_header_2 TradeCenter, TRADE_CENTER, $0, 0 map_header_2 Colosseum, COLOSSEUM, $0, 0 map_header_2 TimeCapsule, TIME_CAPSULE, $0, 0 @@ -533,8 +620,8 @@ map_header_2 CeladonMansion3F, CELADON_MANSION_3F, $0, 0 map_header_2 CeladonMansionRoof, CELADON_MANSION_ROOF, $1, 0 map_header_2 CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, $0, 0 - map_header_2 CeladonPokeCenter1F, CELADON_POKECENTER_1F, $0, 0 - map_header_2 CeladonPokeCenter2FBeta, CELADON_POKECENTER_2F_BETA, $0, 0 + map_header_2 CeladonPokecenter1F, CELADON_POKECENTER_1F, $0, 0 + map_header_2 CeladonPokecenter2FBeta, CELADON_POKECENTER_2F_BETA, $0, 0 map_header_2 CeladonGameCorner, CELADON_GAME_CORNER, $0, 0 map_header_2 CeladonGameCornerPrizeRoom, CELADON_GAME_CORNER_PRIZE_ROOM, $0, 0 map_header_2 CeladonGym, CELADON_GYM, $0, 0 @@ -545,7 +632,7 @@ map_header_2 Route1718Gate, ROUTE_17_18_GATE, $0, 0 map_header_2 ManiasHouse, MANIAS_HOUSE, $0, 0 map_header_2 CianwoodGym, CIANWOOD_GYM, $0, 0 - map_header_2 CianwoodPokeCenter1F, CIANWOOD_POKECENTER_1F, $0, 0 + map_header_2 CianwoodPokecenter1F, CIANWOOD_POKECENTER_1F, $0, 0 map_header_2 CianwoodPharmacy, CIANWOOD_PHARMACY, $0, 0 map_header_2 CianwoodCityPhotoStudio, CIANWOOD_CITY_PHOTO_STUDIO, $0, 0 map_header_2 CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $0, 0 @@ -561,8 +648,8 @@ map_header_2 TrainerHouse1F, TRAINER_HOUSE_1F, $0, 0 map_header_2 TrainerHouseB1F, TRAINER_HOUSE_B1F, $0, 0 map_header_2 ViridianMart, VIRIDIAN_MART, $0, 0 - map_header_2 ViridianPokeCenter1F, VIRIDIAN_POKECENTER_1F, $0, 0 - map_header_2 ViridianPokeCenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $0, 0 + map_header_2 ViridianPokecenter1F, VIRIDIAN_POKECENTER_1F, $0, 0 + map_header_2 ViridianPokecenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $0, 0 map_header_2 Route2NuggetSpeechHouse, ROUTE_2_NUGGET_SPEECH_HOUSE, $0, 0 map_header_2 Route2Gate, ROUTE_2_GATE, $0, 0 map_header_2 VictoryRoadGate, VICTORY_ROAD_GATE, $0, 0 @@ -578,18 +665,18 @@ map_header_2 FightingDojo, FIGHTING_DOJO, $0, 0 map_header_2 SaffronGym, SAFFRON_GYM, $0, 0 map_header_2 SaffronMart, SAFFRON_MART, $0, 0 - map_header_2 SaffronPokeCenter1F, SAFFRON_POKECENTER_1F, $0, 0 - map_header_2 SaffronPokeCenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $0, 0 + map_header_2 SaffronPokecenter1F, SAFFRON_POKECENTER_1F, $0, 0 + map_header_2 SaffronPokecenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $0, 0 map_header_2 MrPsychicsHouse, MR_PSYCHICS_HOUSE, $0, 0 map_header_2 SaffronTrainStation, SAFFRON_TRAIN_STATION, $0, 0 map_header_2 SilphCo1F, SILPH_CO_1F, $0, 0 map_header_2 CopycatsHouse1F, COPYCATS_HOUSE_1F, $0, 0 map_header_2 CopycatsHouse2F, COPYCATS_HOUSE_2F, $0, 0 - map_header_2 Route5UndergroundEntrance, ROUTE_5_UNDERGROUND_ENTRANCE, $0, 0 + map_header_2 Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $0, 0 map_header_2 Route5SaffronCityGate, ROUTE_5_SAFFRON_CITY_GATE, $0, 0 map_header_2 Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $0, 0 map_header_2 CherrygroveMart, CHERRYGROVE_MART, $0, 0 - map_header_2 CherrygrovePokeCenter1F, CHERRYGROVE_POKECENTER_1F, $0, 0 + map_header_2 CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $0, 0 map_header_2 CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $0, 0 map_header_2 GuideGentsHouse, GUIDE_GENTS_HOUSE, $0, 0 map_header_2 CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $0, 0 |