From 985946740ef07583b485986f58d14b66ff1e4989 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 1 Jan 2018 18:08:18 -0500 Subject: Consistent map naming ("Town" and "City" are left out in houses and gates) --- maps/BetaCinnabarIslandPokemonLabHallway.blk | 2 - maps/BetaCinnabarIslandPokemonLabRoom1.blk | 2 - maps/BetaCinnabarIslandPokemonLabRoom2.blk | 1 - maps/BetaCinnabarIslandPokemonLabRoom3.blk | 1 - maps/BetaCinnabarPokemonLabHallway.blk | 2 + maps/BetaCinnabarPokemonLabRoom1.blk | 2 + maps/BetaCinnabarPokemonLabRoom2.blk | 1 + maps/BetaCinnabarPokemonLabRoom3.blk | 1 + maps/BetaEcruteakCity.blk | 1 + maps/BetaFastShipInsideCutOut.blk | 1 + maps/BetaSSAquaInsideCutOut.blk | 1 - maps/BetaTeakCity.blk | 1 - maps/CianwoodCity.asm | 2 +- maps/CianwoodCityPhotoStudio.asm | 68 ---------------------------- maps/CianwoodPhotoStudio.asm | 68 ++++++++++++++++++++++++++++ maps/LavenderSpeechHouse.asm | 50 ++++++++++++++++++++ maps/LavenderTown.asm | 2 +- maps/LavenderTownSpeechHouse.asm | 50 -------------------- maps/Route5.asm | 4 +- maps/Route5SaffronCityGate.asm | 42 ----------------- maps/Route5SaffronGate.asm | 42 +++++++++++++++++ maps/SaffronCity.asm | 2 +- maps/blockdata.asm | 30 ++++++------ maps/map_headers.asm | 6 +-- maps/second_map_headers.asm | 6 +-- 25 files changed, 194 insertions(+), 194 deletions(-) delete mode 100644 maps/BetaCinnabarIslandPokemonLabHallway.blk delete mode 100644 maps/BetaCinnabarIslandPokemonLabRoom1.blk delete mode 100644 maps/BetaCinnabarIslandPokemonLabRoom2.blk delete mode 100644 maps/BetaCinnabarIslandPokemonLabRoom3.blk create mode 100644 maps/BetaCinnabarPokemonLabHallway.blk create mode 100644 maps/BetaCinnabarPokemonLabRoom1.blk create mode 100644 maps/BetaCinnabarPokemonLabRoom2.blk create mode 100644 maps/BetaCinnabarPokemonLabRoom3.blk create mode 100644 maps/BetaEcruteakCity.blk create mode 100644 maps/BetaFastShipInsideCutOut.blk delete mode 100644 maps/BetaSSAquaInsideCutOut.blk delete mode 100644 maps/BetaTeakCity.blk delete mode 100644 maps/CianwoodCityPhotoStudio.asm create mode 100644 maps/CianwoodPhotoStudio.asm create mode 100644 maps/LavenderSpeechHouse.asm delete mode 100644 maps/LavenderTownSpeechHouse.asm delete mode 100644 maps/Route5SaffronCityGate.asm create mode 100644 maps/Route5SaffronGate.asm (limited to 'maps') diff --git a/maps/BetaCinnabarIslandPokemonLabHallway.blk b/maps/BetaCinnabarIslandPokemonLabHallway.blk deleted file mode 100644 index 7a6502a26..000000000 --- a/maps/BetaCinnabarIslandPokemonLabHallway.blk +++ /dev/null @@ -1,2 +0,0 @@ -  -  \ No newline at end of file diff --git a/maps/BetaCinnabarIslandPokemonLabRoom1.blk b/maps/BetaCinnabarIslandPokemonLabRoom1.blk deleted file mode 100644 index ef77b6561..000000000 --- a/maps/BetaCinnabarIslandPokemonLabRoom1.blk +++ /dev/null @@ -1,2 +0,0 @@ -  -  \ No newline at end of file diff --git a/maps/BetaCinnabarIslandPokemonLabRoom2.blk b/maps/BetaCinnabarIslandPokemonLabRoom2.blk deleted file mode 100644 index 822db175b..000000000 --- a/maps/BetaCinnabarIslandPokemonLabRoom2.blk +++ /dev/null @@ -1 +0,0 @@ -  \ No newline at end of file diff --git a/maps/BetaCinnabarIslandPokemonLabRoom3.blk b/maps/BetaCinnabarIslandPokemonLabRoom3.blk deleted file mode 100644 index d9a64a5da..000000000 --- a/maps/BetaCinnabarIslandPokemonLabRoom3.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/BetaCinnabarPokemonLabHallway.blk b/maps/BetaCinnabarPokemonLabHallway.blk new file mode 100644 index 000000000..7a6502a26 --- /dev/null +++ b/maps/BetaCinnabarPokemonLabHallway.blk @@ -0,0 +1,2 @@ +  +  \ No newline at end of file diff --git a/maps/BetaCinnabarPokemonLabRoom1.blk b/maps/BetaCinnabarPokemonLabRoom1.blk new file mode 100644 index 000000000..ef77b6561 --- /dev/null +++ b/maps/BetaCinnabarPokemonLabRoom1.blk @@ -0,0 +1,2 @@ +  +  \ No newline at end of file diff --git a/maps/BetaCinnabarPokemonLabRoom2.blk b/maps/BetaCinnabarPokemonLabRoom2.blk new file mode 100644 index 000000000..822db175b --- /dev/null +++ b/maps/BetaCinnabarPokemonLabRoom2.blk @@ -0,0 +1 @@ +  \ No newline at end of file diff --git a/maps/BetaCinnabarPokemonLabRoom3.blk b/maps/BetaCinnabarPokemonLabRoom3.blk new file mode 100644 index 000000000..d9a64a5da --- /dev/null +++ b/maps/BetaCinnabarPokemonLabRoom3.blk @@ -0,0 +1 @@ +   \ No newline at end of file diff --git a/maps/BetaEcruteakCity.blk b/maps/BetaEcruteakCity.blk new file mode 100644 index 000000000..ce448c2ef --- /dev/null +++ b/maps/BetaEcruteakCity.blk @@ -0,0 +1 @@ +?eeeeeeeeeeeb !bb$%b>$%`&;',-&'`$%`*"+#/*+aE$%dg,-b()#/tuWZWVWVWVWZ@AABGTU !FXY$%&'XYa$%*+VVZVVVVVVZaa()EatuIIJ~{@AAAAA HII \ No newline at end of file diff --git a/maps/BetaFastShipInsideCutOut.blk b/maps/BetaFastShipInsideCutOut.blk new file mode 100644 index 000000000..b385b0198 --- /dev/null +++ b/maps/BetaFastShipInsideCutOut.blk @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/maps/BetaSSAquaInsideCutOut.blk b/maps/BetaSSAquaInsideCutOut.blk deleted file mode 100644 index b385b0198..000000000 --- a/maps/BetaSSAquaInsideCutOut.blk +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/maps/BetaTeakCity.blk b/maps/BetaTeakCity.blk deleted file mode 100644 index ce448c2ef..000000000 --- a/maps/BetaTeakCity.blk +++ /dev/null @@ -1 +0,0 @@ -?eeeeeeeeeeeb !bb$%b>$%`&;',-&'`$%`*"+#/*+aE$%dg,-b()#/tuWZWVWVWVWZ@AABGTU !FXY$%&'XYa$%*+VVZVVVVVVZaa()EatuIIJ~{@AAAAA HII \ No newline at end of file diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 86c958205..75c34f6e1 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -390,7 +390,7 @@ CianwoodCity_MapEventHeader: warp_def 8, 43, 1, CIANWOOD_GYM warp_def 23, 43, 1, CIANWOOD_POKECENTER_1F warp_def 15, 47, 1, CIANWOOD_PHARMACY - warp_def 9, 31, 1, CIANWOOD_CITY_PHOTO_STUDIO + warp_def 9, 31, 1, CIANWOOD_PHOTO_STUDIO warp_def 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE warp_def 5, 17, 1, POKE_SEERS_HOUSE diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm deleted file mode 100644 index 3a20c63e6..000000000 --- a/maps/CianwoodCityPhotoStudio.asm +++ /dev/null @@ -1,68 +0,0 @@ -const_value set 2 - const CIANWOODCITYPHOTOSTUDIO_FISHING_GURU - -CianwoodCityPhotoStudio_MapScriptHeader: -.SceneScripts: - db 0 - -.MapCallbacks: - db 0 - -FishingGuruScript_0x9e0e0: - faceplayer - opentext - writetext UnknownText_0x9e0f9 - yesorno - iffalse UnknownScript_0x9e0f3 - writetext UnknownText_0x9e142 - waitbutton - special PhotoStudio - waitbutton - closetext - end - -UnknownScript_0x9e0f3: - writetext UnknownText_0x9e156 - waitbutton - closetext - end - -UnknownText_0x9e0f9: - text "You have magnifi-" - line "cent #MON with" - cont "you." - - para "How about a photo" - line "for a souvenir?" - done - -UnknownText_0x9e142: - text "OK! Big smile now!" - done - -UnknownText_0x9e156: - text "Oh, that's too" - line "bad. I thought it" - - para "would be a great" - line "memento…" - done - -CianwoodCityPhotoStudio_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 5, CIANWOOD_CITY - warp_def 3, 7, 5, CIANWOOD_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1 diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm new file mode 100644 index 000000000..1d8b6dbae --- /dev/null +++ b/maps/CianwoodPhotoStudio.asm @@ -0,0 +1,68 @@ +const_value set 2 + const CIANWOODPHOTOSTUDIO_FISHING_GURU + +CianwoodPhotoStudio_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +FishingGuruScript_0x9e0e0: + faceplayer + opentext + writetext UnknownText_0x9e0f9 + yesorno + iffalse UnknownScript_0x9e0f3 + writetext UnknownText_0x9e142 + waitbutton + special PhotoStudio + waitbutton + closetext + end + +UnknownScript_0x9e0f3: + writetext UnknownText_0x9e156 + waitbutton + closetext + end + +UnknownText_0x9e0f9: + text "You have magnifi-" + line "cent #MON with" + cont "you." + + para "How about a photo" + line "for a souvenir?" + done + +UnknownText_0x9e142: + text "OK! Big smile now!" + done + +UnknownText_0x9e156: + text "Oh, that's too" + line "bad. I thought it" + + para "would be a great" + line "memento…" + done + +CianwoodPhotoStudio_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 2 + warp_def 2, 7, 5, CIANWOOD_CITY + warp_def 3, 7, 5, CIANWOOD_CITY + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 1 + object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1 diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm new file mode 100644 index 000000000..ac9decf52 --- /dev/null +++ b/maps/LavenderSpeechHouse.asm @@ -0,0 +1,50 @@ +const_value set 2 + const LAVENDERSPEECHHOUSE_POKEFAN_F + +LavenderSpeechHouse_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +LavenderSpeechHousePokefanFScript: + jumptextfaceplayer LavenderSpeechHousePokefanFText + +LavenderSpeechHouseBookshelf: + jumpstd picturebookshelf + +LavenderSpeechHousePokefanFText: + text "LAVENDER is a" + line "tiny, quiet town" + + para "at the foot of the" + line "mountains." + + para "It's gotten a bit" + line "busier since the" + + para "RADIO TOWER was" + line "built." + done + +LavenderSpeechHouse_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 2 + warp_def 2, 7, 3, LAVENDER_TOWN + warp_def 3, 7, 3, LAVENDER_TOWN + +.CoordEvents: + db 0 + +.BGEvents: + db 2 + bg_event 0, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf + +.ObjectEvents: + db 1 + object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderSpeechHousePokefanFScript, -1 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index e75726abd..35bfdb12a 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -113,7 +113,7 @@ LavenderTown_MapEventHeader: db 7 warp_def 5, 5, 1, LAVENDER_POKECENTER_1F warp_def 5, 9, 1, MR_FUJIS_HOUSE - warp_def 3, 13, 1, LAVENDER_TOWN_SPEECH_HOUSE + warp_def 3, 13, 1, LAVENDER_SPEECH_HOUSE warp_def 7, 13, 1, LAVENDER_NAME_RATER warp_def 1, 5, 2, LAVENDER_MART warp_def 13, 11, 1, SOUL_HOUSE diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm deleted file mode 100644 index 1cb093dda..000000000 --- a/maps/LavenderTownSpeechHouse.asm +++ /dev/null @@ -1,50 +0,0 @@ -const_value set 2 - const LAVENDERTOWNSPEECHHOUSE_POKEFAN_F - -LavenderTownSpeechHouse_MapScriptHeader: -.SceneScripts: - db 0 - -.MapCallbacks: - db 0 - -LavenderTownSpeechHousePokefanFScript: - jumptextfaceplayer LavenderTownSpeechHousePokefanFText - -LavenderTownSpeechHouseBookshelf: - jumpstd picturebookshelf - -LavenderTownSpeechHousePokefanFText: - text "LAVENDER is a" - line "tiny, quiet town" - - para "at the foot of the" - line "mountains." - - para "It's gotten a bit" - line "busier since the" - - para "RADIO TOWER was" - line "built." - done - -LavenderTownSpeechHouse_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 3, LAVENDER_TOWN - warp_def 3, 7, 3, LAVENDER_TOWN - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, LavenderTownSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, LavenderTownSpeechHouseBookshelf - -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownSpeechHousePokefanFScript, -1 diff --git a/maps/Route5.asm b/maps/Route5.asm index 7976fbe79..1e2ea7741 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -46,8 +46,8 @@ Route5_MapEventHeader: .Warps: db 4 warp_def 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE - warp_def 8, 17, 1, ROUTE_5_SAFFRON_CITY_GATE - warp_def 9, 17, 2, ROUTE_5_SAFFRON_CITY_GATE + warp_def 8, 17, 1, ROUTE_5_SAFFRON_GATE + warp_def 9, 17, 2, ROUTE_5_SAFFRON_GATE warp_def 10, 11, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE .CoordEvents: diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm deleted file mode 100644 index e47ce7628..000000000 --- a/maps/Route5SaffronCityGate.asm +++ /dev/null @@ -1,42 +0,0 @@ -const_value set 2 - const ROUTE5SAFFRONCITYGATE_OFFICER - -Route5SaffronCityGate_MapScriptHeader: -.SceneScripts: - db 0 - -.MapCallbacks: - db 0 - -Route5SaffronCityGateOfficerScript: - jumptextfaceplayer Route5SaffronCityGateOfficerText - -Route5SaffronCityGateOfficerText: - text "You're from JOHTO," - line "aren't you?" - - para "How do you like" - line "KANTO? It's nice," - cont "don't you agree?" - done - -Route5SaffronCityGate_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 4, 0, 2, ROUTE_5 - warp_def 5, 0, 3, ROUTE_5 - warp_def 4, 7, 9, SAFFRON_CITY - warp_def 5, 7, 9, SAFFRON_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronCityGateOfficerScript, -1 diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm new file mode 100644 index 000000000..cf945b7dc --- /dev/null +++ b/maps/Route5SaffronGate.asm @@ -0,0 +1,42 @@ +const_value set 2 + const ROUTE5SAFFRONGATE_OFFICER + +Route5SaffronGate_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +Route5SaffronGateOfficerScript: + jumptextfaceplayer Route5SaffronGateOfficerText + +Route5SaffronGateOfficerText: + text "You're from JOHTO," + line "aren't you?" + + para "How do you like" + line "KANTO? It's nice," + cont "don't you agree?" + done + +Route5SaffronGate_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 4 + warp_def 4, 0, 2, ROUTE_5 + warp_def 5, 0, 3, ROUTE_5 + warp_def 4, 7, 9, SAFFRON_CITY + warp_def 5, 7, 9, SAFFRON_CITY + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 1 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronGateOfficerScript, -1 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 490a269b9..06eaf59a5 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -279,7 +279,7 @@ SaffronCity_MapEventHeader: warp_def 8, 3, 2, SAFFRON_TRAIN_STATION warp_def 18, 21, 1, SILPH_CO_1F warp_def 9, 11, 1, COPYCATS_HOUSE_1F - warp_def 18, 3, 3, ROUTE_5_SAFFRON_CITY_GATE + warp_def 18, 3, 3, ROUTE_5_SAFFRON_GATE warp_def 0, 24, 3, ROUTE_7_SAFFRON_GATE warp_def 0, 25, 4, ROUTE_7_SAFFRON_GATE warp_def 16, 33, 1, ROUTE_6_SAFFRON_GATE diff --git a/maps/blockdata.asm b/maps/blockdata.asm index 9e44798ad..8ee9d2aa5 100644 --- a/maps/blockdata.asm +++ b/maps/blockdata.asm @@ -175,7 +175,7 @@ BluesHouse_BlockData: PewterNidoranSpeechHouse_BlockData: PewterSnoozeSpeechHouse_BlockData: FuchsiaBillSpeechHouse_BlockData: -LavenderTownSpeechHouse_BlockData: +LavenderSpeechHouse_BlockData: LavenderNameRater_BlockData: Route12SuperRodHouse_BlockData: Route28FamousSpeechHouse_BlockData: @@ -183,7 +183,7 @@ CeladonMansionRoofHouse_BlockData: Route16FuchsiaSpeechHouse_BlockData: ManiasHouse_BlockData: CianwoodPharmacy_BlockData: -CianwoodCityPhotoStudio_BlockData: +CianwoodPhotoStudio_BlockData: CianwoodLugiaSpeechHouse_BlockData: PokeSeersHouse_BlockData: ViridianNicknameSpeechHouse_BlockData: @@ -211,11 +211,11 @@ Route6SaffronGate_BlockData: Route40BattleTowerGate_BlockData: Route2Gate_BlockData: Route2946Gate_BlockData: -Route5SaffronCityGate_BlockData: +Route5SaffronGate_BlockData: INCBIN "maps/NorthSouthGate.blk" -BetaTeakCity_BlockData: - INCBIN "maps/BetaTeakCity.blk" +BetaEcruteakCity_BlockData: + INCBIN "maps/BetaEcruteakCity.blk" BetaCherrygroveCity_BlockData: INCBIN "maps/BetaCherrygroveCity.blk" @@ -372,17 +372,17 @@ BetaPewterMuseumOfScience2F_BlockData: EarlsPokemonAcademy_BlockData: INCBIN "maps/EarlsPokemonAcademy.blk" -BetaCinnabarIslandPokemonLabHallway_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabHallway.blk" +BetaCinnabarPokemonLabHallway_BlockData: + INCBIN "maps/BetaCinnabarPokemonLabHallway.blk" -BetaCinnabarIslandPokemonLabRoom1_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabRoom1.blk" +BetaCinnabarPokemonLabRoom1_BlockData: + INCBIN "maps/BetaCinnabarPokemonLabRoom1.blk" -BetaCinnabarIslandPokemonLabRoom2_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabRoom2.blk" +BetaCinnabarPokemonLabRoom2_BlockData: + INCBIN "maps/BetaCinnabarPokemonLabRoom2.blk" -BetaCinnabarIslandPokemonLabRoom3_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabRoom3.blk" +BetaCinnabarPokemonLabRoom3_BlockData: + INCBIN "maps/BetaCinnabarPokemonLabRoom3.blk" GoldenrodDeptStore1F_BlockData: CeladonDeptStore1F_BlockData: @@ -824,8 +824,8 @@ FastShip1F_BlockData: FastShipB1F_BlockData: INCBIN "maps/FastShipB1F.blk" -BetaSSAquaInsideCutOut_BlockData: - INCBIN "maps/BetaSSAquaInsideCutOut.blk" +BetaFastShipInsideCutOut_BlockData: + INCBIN "maps/BetaFastShipInsideCutOut.blk" FastShipCabins_NNW_NNE_NE_BlockData: INCBIN "maps/FastShipCabins_NNW_NNE_NE.blk" diff --git a/maps/map_headers.asm b/maps/map_headers.asm index ac4b20ece..ac0007f0d 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -373,7 +373,7 @@ MapGroup_Lavender: 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 LavenderSpeechHouse, 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 map_header LavenderMart, TILESET_MART, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SoulHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -435,7 +435,7 @@ MapGroup_Cianwood: 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 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 CianwoodPhotoStudio, 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 map_header PokeSeersHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, 1, PALETTE_DAY, FISHGROUP_SHORE @@ -492,7 +492,7 @@ MapGroup_Saffron: 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 Route5SaffronGate, 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 diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 3628babd2..6982df6d1 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -593,7 +593,7 @@ ENDM 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 LavenderSpeechHouse, LAVENDER_SPEECH_HOUSE, $0, 0 map_header_2 LavenderNameRater, LAVENDER_NAME_RATER, $0, 0 map_header_2 LavenderMart, LAVENDER_MART, $0, 0 map_header_2 SoulHouse, SOUL_HOUSE, $0, 0 @@ -634,7 +634,7 @@ ENDM map_header_2 CianwoodGym, CIANWOOD_GYM, $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 CianwoodPhotoStudio, CIANWOOD_PHOTO_STUDIO, $0, 0 map_header_2 CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $0, 0 map_header_2 PokeSeersHouse, POKE_SEERS_HOUSE, $0, 0 map_header_2 BattleTower1F, BATTLE_TOWER_1F, $0, 0 @@ -673,7 +673,7 @@ ENDM map_header_2 CopycatsHouse1F, COPYCATS_HOUSE_1F, $0, 0 map_header_2 CopycatsHouse2F, COPYCATS_HOUSE_2F, $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 Route5SaffronGate, ROUTE_5_SAFFRON_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 -- cgit v1.2.3 From eb8e55a01a2ea47e7e6ddba460d1de077333e85a Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 1 Jan 2018 18:19:32 -0500 Subject: Route 17-18 Gate and Route 29-46 Gate --- maps/Route17.asm | 4 +-- maps/Route1718Gate.asm | 75 --------------------------------------------- maps/Route17Route18Gate.asm | 75 +++++++++++++++++++++++++++++++++++++++++++++ maps/Route18.asm | 4 +-- maps/Route29.asm | 2 +- maps/Route2946Gate.asm | 59 ----------------------------------- maps/Route29Route46Gate.asm | 59 +++++++++++++++++++++++++++++++++++ maps/Route46.asm | 4 +-- maps/blockdata.asm | 4 +-- maps/map_headers.asm | 4 +-- maps/second_map_headers.asm | 4 +-- 11 files changed, 147 insertions(+), 147 deletions(-) delete mode 100644 maps/Route1718Gate.asm create mode 100644 maps/Route17Route18Gate.asm delete mode 100644 maps/Route2946Gate.asm create mode 100644 maps/Route29Route46Gate.asm (limited to 'maps') diff --git a/maps/Route17.asm b/maps/Route17.asm index c8be61da2..0f8d17b3a 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -140,8 +140,8 @@ Route17_MapEventHeader: .Warps: db 2 - warp_def 17, 82, 1, ROUTE_17_18_GATE - warp_def 17, 83, 2, ROUTE_17_18_GATE + warp_def 17, 82, 1, ROUTE_17_ROUTE_18_GATE + warp_def 17, 83, 2, ROUTE_17_ROUTE_18_GATE .CoordEvents: db 0 diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm deleted file mode 100644 index 9a8a076dd..000000000 --- a/maps/Route1718Gate.asm +++ /dev/null @@ -1,75 +0,0 @@ -const_value set 2 - const ROUTE1718GATE_OFFICER - -Route1718Gate_MapScriptHeader: -.SceneScripts: - db 1 - scene_script .DummyScene - -.MapCallbacks: - db 0 - -.DummyScene: - end - -Route1718GateOfficerScript: - jumptextfaceplayer Route1718GateOfficerText - -UnknownScript_0x73611: - checkitem BICYCLE - iffalse UnknownScript_0x73617 - end - -UnknownScript_0x73617: - showemote EMOTE_SHOCK, ROUTE1718GATE_OFFICER, 15 - spriteface PLAYER, UP - opentext - writetext UnknownText_0x7364d - waitbutton - closetext - applymovement PLAYER, MovementData_0x73629 - end - -MovementData_0x73629: - step RIGHT - turn_head LEFT - step_end - -Route1718GateOfficerText: - text "CYCLING ROAD" - line "Uphill Starts Here" - done - -UnknownText_0x7364d: - text "Hang on! Don't you" - line "have a BICYCLE?" - - para "The CYCLING ROAD" - line "is beyond here." - - para "You have to have a" - line "BICYCLE to go on." - done - -Route1718Gate_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 0, 4, 1, ROUTE_17 - warp_def 0, 5, 2, ROUTE_17 - warp_def 9, 4, 1, ROUTE_18 - warp_def 9, 5, 2, ROUTE_18 - -.CoordEvents: - db 2 - coord_event 5, 4, 0, UnknownScript_0x73611 - coord_event 5, 5, 0, UnknownScript_0x73611 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route1718GateOfficerScript, -1 diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm new file mode 100644 index 000000000..6596d3809 --- /dev/null +++ b/maps/Route17Route18Gate.asm @@ -0,0 +1,75 @@ +const_value set 2 + const ROUTE17ROUTE18GATE_OFFICER + +Route17Route18Gate_MapScriptHeader: +.SceneScripts: + db 1 + scene_script .DummyScene + +.MapCallbacks: + db 0 + +.DummyScene: + end + +Route17Route18GateOfficerScript: + jumptextfaceplayer Route17Route18GateOfficerText + +UnknownScript_0x73611: + checkitem BICYCLE + iffalse UnknownScript_0x73617 + end + +UnknownScript_0x73617: + showemote EMOTE_SHOCK, ROUTE17ROUTE18GATE_OFFICER, 15 + spriteface PLAYER, UP + opentext + writetext UnknownText_0x7364d + waitbutton + closetext + applymovement PLAYER, MovementData_0x73629 + end + +MovementData_0x73629: + step RIGHT + turn_head LEFT + step_end + +Route17Route18GateOfficerText: + text "CYCLING ROAD" + line "Uphill Starts Here" + done + +UnknownText_0x7364d: + text "Hang on! Don't you" + line "have a BICYCLE?" + + para "The CYCLING ROAD" + line "is beyond here." + + para "You have to have a" + line "BICYCLE to go on." + done + +Route17Route18Gate_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 4 + warp_def 0, 4, 1, ROUTE_17 + warp_def 0, 5, 2, ROUTE_17 + warp_def 9, 4, 1, ROUTE_18 + warp_def 9, 5, 2, ROUTE_18 + +.CoordEvents: + db 2 + coord_event 5, 4, 0, UnknownScript_0x73611 + coord_event 5, 5, 0, UnknownScript_0x73611 + +.BGEvents: + db 0 + +.ObjectEvents: + db 1 + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route17Route18GateOfficerScript, -1 diff --git a/maps/Route18.asm b/maps/Route18.asm index 04a0cc843..0487cc797 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -83,8 +83,8 @@ Route18_MapEventHeader: .Warps: db 2 - warp_def 2, 6, 3, ROUTE_17_18_GATE - warp_def 2, 7, 4, ROUTE_17_18_GATE + warp_def 2, 6, 3, ROUTE_17_ROUTE_18_GATE + warp_def 2, 7, 4, ROUTE_17_ROUTE_18_GATE .CoordEvents: db 0 diff --git a/maps/Route29.asm b/maps/Route29.asm index cd91a1f3e..6d564f083 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -421,7 +421,7 @@ Route29_MapEventHeader: .Warps: db 1 - warp_def 27, 1, 3, ROUTE_29_46_GATE + warp_def 27, 1, 3, ROUTE_29_ROUTE_46_GATE .CoordEvents: db 2 diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm deleted file mode 100644 index c90aa3150..000000000 --- a/maps/Route2946Gate.asm +++ /dev/null @@ -1,59 +0,0 @@ -const_value set 2 - const ROUTE2946GATE_OFFICER - const ROUTE2946GATE_YOUNGSTER - -Route2946Gate_MapScriptHeader: -.SceneScripts: - db 0 - -.MapCallbacks: - db 0 - -Route2946GateOfficerScript: - jumptextfaceplayer Route2946GateOfficerText - -Route2946GateYoungsterScript: - jumptextfaceplayer Route2946GateYoungsterText - -Route2946GateOfficerText: - text "You can't climb" - line "ledges." - - para "But you can jump" - line "down from them to" - cont "take a shortcut." - done - -Route2946GateYoungsterText: - text "Different kinds of" - line "#MON appear" - cont "past here." - - para "If you want to" - line "catch them all," - - para "you have to look" - line "everywhere." - done - -Route2946Gate_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 4, 0, 1, ROUTE_46 - warp_def 5, 0, 2, ROUTE_46 - warp_def 4, 7, 1, ROUTE_29 - warp_def 5, 7, 1, ROUTE_29 - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 2 - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route2946GateOfficerScript, -1 - object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route2946GateYoungsterScript, -1 diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm new file mode 100644 index 000000000..e3366fae7 --- /dev/null +++ b/maps/Route29Route46Gate.asm @@ -0,0 +1,59 @@ +const_value set 2 + const ROUTE29ROUTE46GATE_OFFICER + const ROUTE29ROUTE46GATE_YOUNGSTER + +Route29Route46Gate_MapScriptHeader: +.SceneScripts: + db 0 + +.MapCallbacks: + db 0 + +Route29Route46GateOfficerScript: + jumptextfaceplayer Route29Route46GateOfficerText + +Route29Route46GateYoungsterScript: + jumptextfaceplayer Route29Route46GateYoungsterText + +Route29Route46GateOfficerText: + text "You can't climb" + line "ledges." + + para "But you can jump" + line "down from them to" + cont "take a shortcut." + done + +Route29Route46GateYoungsterText: + text "Different kinds of" + line "#MON appear" + cont "past here." + + para "If you want to" + line "catch them all," + + para "you have to look" + line "everywhere." + done + +Route29Route46Gate_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 4 + warp_def 4, 0, 1, ROUTE_46 + warp_def 5, 0, 2, ROUTE_46 + warp_def 4, 7, 1, ROUTE_29 + warp_def 5, 7, 1, ROUTE_29 + +.CoordEvents: + db 0 + +.BGEvents: + db 0 + +.ObjectEvents: + db 2 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29Route46GateOfficerScript, -1 + object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29Route46GateYoungsterScript, -1 diff --git a/maps/Route46.asm b/maps/Route46.asm index 36dad82d3..3ecab00f1 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -256,8 +256,8 @@ Route46_MapEventHeader: .Warps: db 3 - warp_def 7, 33, 1, ROUTE_29_46_GATE - warp_def 8, 33, 2, ROUTE_29_46_GATE + warp_def 7, 33, 1, ROUTE_29_ROUTE_46_GATE + warp_def 8, 33, 2, ROUTE_29_ROUTE_46_GATE warp_def 14, 5, 3, DARK_CAVE_VIOLET_ENTRANCE .CoordEvents: diff --git a/maps/blockdata.asm b/maps/blockdata.asm index 8ee9d2aa5..3214b7971 100644 --- a/maps/blockdata.asm +++ b/maps/blockdata.asm @@ -210,7 +210,7 @@ Route34IlexForestGate_BlockData: Route6SaffronGate_BlockData: Route40BattleTowerGate_BlockData: Route2Gate_BlockData: -Route2946Gate_BlockData: +Route29Route46Gate_BlockData: Route5SaffronGate_BlockData: INCBIN "maps/NorthSouthGate.blk" @@ -276,7 +276,7 @@ Route15FuchsiaGate_BlockData: Route8SaffronGate_BlockData: Route16Gate_BlockData: Route7SaffronGate_BlockData: -Route1718Gate_BlockData: +Route17Route18Gate_BlockData: Route31VioletGate_BlockData: INCBIN "maps/EastWestGate.blk" diff --git a/maps/map_headers.asm b/maps/map_headers.asm index ac0007f0d..563eaf4ac 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -424,7 +424,7 @@ MapGroup_Celadon: map_header Route16FuchsiaSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_16, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route16Gate, TILESET_GATE, GATE, ROUTE_16, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route7SaffronGate, TILESET_GATE, GATE, ROUTE_7, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route1718Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route17Route18Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE MapGroup_Cianwood: @@ -475,7 +475,7 @@ MapGroup_NewBark: 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 + map_header Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, 0, PALETTE_DAY, FISHGROUP_SHORE MapGroup_Saffron: diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 6982df6d1..8b6bbdfc5 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -629,7 +629,7 @@ ENDM map_header_2 Route16FuchsiaSpeechHouse, ROUTE_16_FUCHSIA_SPEECH_HOUSE, $0, 0 map_header_2 Route16Gate, ROUTE_16_GATE, $0, 0 map_header_2 Route7SaffronGate, ROUTE_7_SAFFRON_GATE, $0, 0 - map_header_2 Route1718Gate, ROUTE_17_18_GATE, $0, 0 + map_header_2 Route17Route18Gate, ROUTE_17_ROUTE_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 @@ -661,7 +661,7 @@ ENDM map_header_2 Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $0, 0 map_header_2 Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $0, 0 map_header_2 Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $0, 0 - map_header_2 Route2946Gate, ROUTE_29_46_GATE, $0, 0 + map_header_2 Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $0, 0 map_header_2 FightingDojo, FIGHTING_DOJO, $0, 0 map_header_2 SaffronGym, SAFFRON_GYM, $0, 0 map_header_2 SaffronMart, SAFFRON_MART, $0, 0 -- cgit v1.2.3 From 6f0b81504d6471afe7df6adae83791cc81933ca6 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 16:04:21 +0100 Subject: More unreferenced labels cleanup --- maps/CeladonGameCorner.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'maps') diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index d35b1a45b..3a24f893c 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -144,7 +144,7 @@ MapCeladonGameCornerSignpost9Script: end MovementData_0x721cd: -; Unreferenced. +; unused step RIGHT turn_head LEFT step_end -- cgit v1.2.3 From f1ea15bbfe8528143ace793b050891a9b1f99d03 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 17:13:57 +0100 Subject: Consolidate Special function names --- maps/BattleTowerBattleRoom.asm | 10 +++++----- maps/BluesHouse.asm | 6 +++--- maps/BurnedTowerB1F.asm | 2 +- maps/CeladonDeptStore6F.asm | 2 +- maps/CianwoodCityPhotoStudio.asm | 2 +- maps/CopycatsHouse2F.asm | 10 +++++----- maps/EcruteakGym.asm | 2 +- maps/ElmsLab.asm | 4 ++-- maps/FastShip1F.asm | 4 ++-- maps/FuchsiaGym.asm | 10 +++++----- maps/FuchsiaPokecenter1F.asm | 4 ++-- maps/GoldenrodDeptStore5F.asm | 4 ++-- maps/GoldenrodDeptStore6F.asm | 2 +- maps/GoldenrodHappinessRater.asm | 2 +- maps/GoldenrodNameRater.asm | 2 +- maps/GoldenrodUnderground.asm | 22 +++++++++++----------- maps/HallOfFame.asm | 2 +- maps/IndigoPlateauPokecenter1F.asm | 2 +- maps/KrissHouse2F.asm | 4 ++-- maps/LancesRoom.asm | 2 +- maps/LavenderNameRater.asm | 2 +- maps/MahoganyTown.asm | 4 ++-- maps/ManiasHouse.asm | 4 ++-- maps/MobileBattleRoom.asm | 4 ++-- maps/MoveDeletersHouse.asm | 2 +- maps/OaksLab.asm | 2 +- maps/OlivineCity.asm | 4 ++-- maps/OlivineLighthouse6F.asm | 14 +++++++------- maps/OlivinePort.asm | 2 +- maps/Pokecenter2F.asm | 18 +++++++++--------- maps/Route27SandstormHouse.asm | 2 +- maps/Route35NationalParkGate.asm | 10 +++++----- maps/Route36.asm | 2 +- maps/Route36NationalParkGate.asm | 10 +++++----- maps/Route39Barn.asm | 2 +- maps/Route39Farmhouse.asm | 4 ++-- maps/SlowpokeWellB1F.asm | 2 +- maps/TeamRocketBaseB1F.asm | 12 ++++++------ maps/TeamRocketBaseB2F.asm | 4 ++-- maps/TrainerHouseB1F.asm | 4 ++-- maps/VermilionCity.asm | 2 +- maps/VermilionPort.asm | 2 +- 42 files changed, 105 insertions(+), 105 deletions(-) (limited to 'maps') diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index acd8bfa66..f2e5f1116 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -33,7 +33,7 @@ Script_BattleRoomLoop: ; 0x9f425 buttonsound closetext special BattleTowerBattle ; calls predef startbattle - special FadeOutPalettes + special Special_FadeOutPalettes reloadmap if_not_equal $0, Script_FailedBattleTowerChallenge copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64 @@ -48,10 +48,10 @@ Script_BattleRoomLoop: ; 0x9f425 waitbutton closetext playmusic MUSIC_HEAL - special FadeOutPalettes + special Special_FadeOutPalettes special LoadMapPalettes pause 60 - special FadeInPalettes + special Special_FadeInPalettes special RestartMapMusic opentext writetext Text_NextUpOpponentNo @@ -75,7 +75,7 @@ Script_DontBattleNextOpponent: ; 0x9f483 special BattleTowerAction playsound SFX_SAVE waitsfx - special FadeOutPalettes + special Special_FadeOutPalettes special Reset Script_DontSaveAndEndTheSession: ; 0x9f4a3 writetext Text_CancelYourBattleRoomChallenge @@ -86,7 +86,7 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3 writebyte BATTLETOWERACTION_06 special BattleTowerAction closetext - special FadeOutPalettes + special Special_FadeOutPalettes warpfacing UP, BATTLE_TOWER_1F, $7, $7 opentext jump Script_BattleTowerHopeToServeYouAgain diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 9a40a68f6..6cd7f460d 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -33,14 +33,14 @@ DaisyScript: writetext DaisyAlrightText waitbutton closetext - special FadeOutPalettes + special Special_FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special FadeInPalettes + special Special_FadeInPalettes special RestartMapMusic opentext writetext GroomedMonLooksContentText - special PlayCurMonCry + special Special_PlayCurMonCry buttonsound writetext DaisyAllDoneText waitbutton diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 07f5c3d6e..536c0172b 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -83,7 +83,7 @@ ReleaseTheBeasts: special RestartMapMusic setscene $1 setevent EVENT_RELEASED_THE_BEASTS - special InitRoamMons + special Special_InitRoamMons setmapscene ECRUTEAK_GYM, $1 setmapscene CIANWOOD_CITY, $1 clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index c94ef993e..a86bbaf66 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -24,7 +24,7 @@ CeladonDeptStore6FVendingMachine: opentext writetext CeladonVendingText .Start: - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight loadmenudata .MenuData verticalmenu closewindow diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index 3a20c63e6..040c7dd98 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -16,7 +16,7 @@ FishingGuruScript_0x9e0e0: iffalse UnknownScript_0x9e0f3 writetext UnknownText_0x9e142 waitbutton - special PhotoStudio + special Special_PhotoStudio waitbutton closetext end diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 5456973dc..8d378a820 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -46,7 +46,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Default_Merge_1: - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX checkevent EVENT_RETURNED_MACHINE_PART iftrue .TalkAboutLostItem opentext @@ -70,7 +70,7 @@ Copycat: .Default_Merge_3a: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX opentext writetext CopycatText_QuickMimicking waitbutton @@ -99,7 +99,7 @@ Copycat: .Default_Merge_3b: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX opentext writetext CopycatText_Worried waitbutton @@ -142,7 +142,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .GotPass_Merge_1: - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX opentext checkflag ENGINE_PLAYER_IS_FEMALE iftrue .GotPass_Female_2 @@ -164,7 +164,7 @@ Copycat: .GotPass_Merge_3: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX opentext writetext CopycatText_ItsAScream waitbutton diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 491aaff7b..a46a6316a 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -91,7 +91,7 @@ EcruteakGymClosed: follow PLAYER, ECRUTEAKGYM_GRAMPS applymovement PLAYER, MovementData_0x99e5f stopfollow - special FadeOutPalettes + special Special_FadeOutPalettes playsound SFX_ENTER_DOOR waitsfx warp ECRUTEAK_CITY, $6, $1b diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 13c8b367e..754222323 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -312,7 +312,7 @@ ElmsLabHealingMachine_HealParty: special HealParty playmusic MUSIC_NONE writebyte 1 ; Machine is in Elm's Lab - special HealMachineAnim + special Special_HealMachineAnim pause 30 special RestartMapMusic closetext @@ -556,7 +556,7 @@ CopScript: opentext writetext ElmsLabOfficerText1 buttonsound - special SpecialNameRival + special Special_NameRival writetext ElmsLabOfficerText2 waitbutton closetext diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 869cb147c..f08a75cc1 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -68,7 +68,7 @@ SailorScript_0x75160: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY setmapscene VERMILION_PORT, $1 @@ -81,7 +81,7 @@ SailorScript_0x75160: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY setmapscene OLIVINE_PORT, $1 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 8aaf6e364..505f5ca53 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -35,7 +35,7 @@ FuchsiaGymJanineScript: variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX opentext writetext Text_ReceivedSoulBadge playsound SFX_GET_BADGE @@ -65,7 +65,7 @@ LassAliceScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_1, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX .AliceUnmasked: faceplayer opentext @@ -99,7 +99,7 @@ LassLindaScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_2, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX .LindaUnmasked: faceplayer opentext @@ -133,7 +133,7 @@ PicnickerCindyScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_3, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX .CindyUnmasked: faceplayer opentext @@ -167,7 +167,7 @@ CamperBarryScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_4, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX .BarryUnmasked: faceplayer opentext diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index eca4aa8e0..f82fbb26e 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -33,7 +33,7 @@ JanineImpersonatorScript_0x196462: applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX opentext writetext UnknownText_0x19654e waitbutton @@ -41,7 +41,7 @@ JanineImpersonatorScript_0x196462: applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX end MovementData_0x196486: diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 70e7ab046..e183d81bb 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -65,7 +65,7 @@ ReceptionistScript_0x560ce: if_not_equal SUNDAY, .EventIsOver checkflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT iftrue .EventIsOver - special GetFirstPokemonHappiness + special Special_GetFirstPokemonHappiness writetext UnknownText_0x56143 buttonsound if_greater_than $95, .VeryHappy @@ -106,7 +106,7 @@ ReceptionistScript_0x560ce: Carrie: faceplayer opentext - special SpecialGameboyCheck + special Special_GameboyCheck if_not_equal $2, .NotGBC ; This is a dummy check from Gold and Silver. In normal gameplay, this would not be checked. writetext UnknownText_0x56241 waitbutton diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 82d04ccc8..c84b29cae 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -13,7 +13,7 @@ GoldenrodVendingMachine: opentext writetext GoldenrodVendingText .Start: - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight loadmenudata .MenuData verticalmenu closewindow diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 667698662..cf560c8dd 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -13,7 +13,7 @@ GoldenrodHappinessRater_MapScriptHeader: TeacherScript_0x54953: faceplayer opentext - special GetFirstPokemonHappiness + special Special_GetFirstPokemonHappiness writetext UnknownText_0x549a3 buttonsound if_greater_than $f9, UnknownScript_0x54973 diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index 259e0fbb7..23d641d10 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -11,7 +11,7 @@ GoldenrodNameRater_MapScriptHeader: GoldenrodNameRater: faceplayer opentext - special SpecialNameRater + special Special_NameRater waitbutton closetext end diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index debf98bfa..8408079ad 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -192,7 +192,7 @@ OlderHaircutBrotherScript: .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight writetext UnknownText_0x7c5f9 yesorno iffalse .Refused @@ -228,14 +228,14 @@ OlderHaircutBrotherScript: .then takemoney $0, 500 - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight writetext UnknownText_0x7c6b8 waitbutton closetext - special FadeOutPalettes + special Special_FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special FadeInPalettes + special Special_FadeInPalettes special RestartMapMusic opentext writetext UnknownText_0x7c6d8 @@ -275,7 +275,7 @@ YoungerHaircutBrotherScript: .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight writetext UnknownText_0x7c75c yesorno iffalse .Refused @@ -311,14 +311,14 @@ YoungerHaircutBrotherScript: .then takemoney $0, 300 - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight writetext UnknownText_0x7c80e waitbutton closetext - special FadeOutPalettes + special Special_FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special FadeInPalettes + special Special_FadeInPalettes special RestartMapMusic opentext writetext UnknownText_0x7c82a @@ -349,21 +349,21 @@ YoungerHaircutBrotherScript: UnknownScript_0x7c2bb: writetext HaircutBrosText_SlightlyHappier - special PlayCurMonCry + special Special_PlayCurMonCry waitbutton closetext end UnknownScript_0x7c2c4: writetext HaircutBrosText_Happier - special PlayCurMonCry + special Special_PlayCurMonCry waitbutton closetext end UnknownScript_0x7c2cd: writetext HaircutBrosText_MuchHappier - special PlayCurMonCry + special Special_PlayCurMonCry waitbutton closetext end diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index c9bfdac9d..7596802a8 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -31,7 +31,7 @@ HallOfFame_MapScriptHeader: setscene $1 pause 15 writebyte 2 ; Machine is in the Hall of Fame - special HealMachineAnim + special Special_HealMachineAnim setevent EVENT_BEAT_ELITE_FOUR setevent EVENT_TELEPORT_GUY setevent EVENT_RIVAL_SPROUT_TOWER diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 879e1dd8b..e6d46fbe8 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -158,7 +158,7 @@ TeleportGuyScript: waitbutton closetext playsound SFX_WARP_TO - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx warp NEW_BARK_TOWN, $d, $6 end diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 65d5fdaee..c36a19d17 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -17,7 +17,7 @@ KrissHouse2F_MapScriptHeader: end .InitializeRoom: - special ToggleDecorationsVisibility + special Special_ToggleDecorationsVisibility setevent EVENT_IN_YOUR_ROOM checkevent EVENT_INITIALIZED_EVENTS iftrue .SkipInizialization @@ -28,7 +28,7 @@ KrissHouse2F_MapScriptHeader: return .SetSpawn: - special ToggleMaptileDecorations + special Special_ToggleMaptileDecorations return diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index f185af0dc..db14274f5 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -125,7 +125,7 @@ LanceScript_0x180e7b: pause 30 closetext applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth - special FadeOutPalettes + special Special_FadeOutPalettes pause 15 warpfacing UP, HALL_OF_FAME, $4, $d end diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index d41354143..9b7435312 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -15,7 +15,7 @@ LavenderNameRater_MapScriptHeader: LavenderNameRater: faceplayer opentext - special SpecialNameRater + special Special_NameRater waitbutton closetext end diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index ba907383d..dad47275a 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -53,7 +53,7 @@ UnknownScript_0x190039: UnknownScript_0x190040: opentext writetext UnknownText_0x1900b0 - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight yesorno iffalse UnknownScript_0x190072 checkmoney $0, 300 @@ -63,7 +63,7 @@ UnknownScript_0x190040: waitsfx playsound SFX_TRANSACTION takemoney $0, 300 - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight writetext UnknownText_0x19014a waitbutton closetext diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index d60d1081d..d4ce0d46e 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -18,7 +18,7 @@ ManiaScript: writetext ManiaText_AskLookAfterShuckle yesorno iffalse .refusetotakeshuckie - special SpecialGiveShuckle + special Special_GiveShuckle iffalse .partyfull writetext ManiaText_TakeCareOfShuckle buttonsound @@ -54,7 +54,7 @@ ManiaScript: writetext ManiaText_CanIHaveMyMonBack yesorno iffalse .refused - special SpecialReturnShuckle + special Special_ReturnShuckle if_equal $0, .wrong if_equal $1, .refused if_equal $3, .superhappy diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 870321f3d..2073a7eda 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -33,11 +33,11 @@ MapMobileBattleRoomSignpost0Script: writetext MobileBattleRoom_HealText pause 20 closetext - special FadeOutPalettes + special Special_FadeOutPalettes playmusic MUSIC_HEAL special LoadMapPalettes pause 60 - special FadeInPalettes + special Special_FadeInPalettes special RestartMapMusic refreshscreen $0 .two_ diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index a6a50d2dd..c51f0a9e1 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -11,7 +11,7 @@ MoveDeletersHouse_MapScriptHeader: MoveDeleter: faceplayer opentext - special MoveDeletion + special Special_MoveDeletion waitbutton closetext end diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 17da0485d..1fb30c187 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -33,7 +33,7 @@ Oak: .CheckPokedex: writetext OakLabDexCheckText waitbutton - special ProfOaksPCBoot + special Special_ProfOaksPCBoot writetext OakLabGoodbyeText waitbutton closetext diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 2e5129bc5..d90d2900e 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -45,7 +45,7 @@ UnknownScript_0x1a8833: disappear OLIVINECITY_OLIVINE_RIVAL special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX end UnknownScript_0x1a886b: @@ -69,7 +69,7 @@ UnknownScript_0x1a886b: setscene $1 special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX end OlivineCitySailor1Script: diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 686764bfd..e0bd4febf 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -47,9 +47,9 @@ UnknownScript_0x60bab: closetext special RestartMapMusic cry AMPHAROS - special FadeOutPalettes + special Special_FadeOutPalettes pause 10 - special FadeInPalettes + special Special_FadeInPalettes opentext writetext UnknownText_0x60f3d waitbutton @@ -109,7 +109,7 @@ MonsterScript_0x60c3a: iftrue UnknownScript_0x60c51 writetext UnknownText_0x60f03 writebyte AMPHAROS - special PlaySlowCry + special Special_PlaySlowCry buttonsound writetext UnknownText_0x60f19 waitbutton @@ -121,10 +121,10 @@ UnknownScript_0x60c51: cry AMPHAROS waitbutton closetext - special FadeOutPalettes - special FadeInPalettes - special FadeOutPalettes - special FadeInPalettes + special Special_FadeOutPalettes + special Special_FadeInPalettes + special Special_FadeOutPalettes + special Special_FadeInPalettes end OlivineLighthouse6FSuperPotion: diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index f34281e43..505334afb 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -46,7 +46,7 @@ SailorScript_0x748c0: waitsfx applymovement PLAYER, MovementData_0x74a30 playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7490a diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index ece34605d..79b526cda 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -107,7 +107,7 @@ LinkReceptionistScript_Trade: end .FriendNotReady: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end @@ -132,7 +132,7 @@ LinkReceptionistScript_Trade: .DidNotSave: writetext Text_PleaseComeAgain .AbortLink: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit .Cancel: closetext end @@ -209,7 +209,7 @@ LinkReceptionistScript_Battle: end .FriendNotReady: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end @@ -234,7 +234,7 @@ LinkReceptionistScript_Battle: .DidNotSave: writetext Text_PleaseComeAgain .AbortLink: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit .Cancel: closetext end @@ -342,7 +342,7 @@ LinkReceptionistScript_TimeCapsule: end .FriendNotReady: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end @@ -354,7 +354,7 @@ LinkReceptionistScript_TimeCapsule: .DidNotSave: writetext Text_PleaseComeAgain .Cancel: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit closetext end @@ -374,7 +374,7 @@ LinkReceptionistScript_TimeCapsule: end Script_LeftCableTradeCenter: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit scall Script_WalkOutOfLinkTradeRoom setscene $0 setmapscene TRADE_CENTER, $0 @@ -394,7 +394,7 @@ Script_WalkOutOfMobileTradeRoom: end Script_LeftCableColosseum: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit scall Script_WalkOutOfLinkBattleRoom setscene $0 setmapscene COLOSSEUM, $0 @@ -558,7 +558,7 @@ TimeCapsuleScript_CheckPlayerGender: end Script_LeftTimeCapsule: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index e66f41f4e..4fc874439 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -13,7 +13,7 @@ SandstormHouseWoman: opentext checkevent EVENT_GOT_TM37_SANDSTORM iftrue .AlreadyGotItem - special GetFirstPokemonHappiness + special Special_GetFirstPokemonHappiness writetext SandstormHouseWomanText1 buttonsound if_greater_than $95, .Loyal diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index cf68bbcc2..8b18e3838 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -74,7 +74,7 @@ Route35NationalParkGate_MapScriptHeader: closetext scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f end @@ -95,7 +95,7 @@ OfficerScript_0x6a204: iffalse Route35NationalParkGate_DeclinedToParticipate checkcode VAR_PARTYCOUNT if_greater_than $1, Route35NationalParkGate_LeaveTheRestBehind - special ContestDropOffMons + special Special_ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER Route35NationalParkGate_OkayToProceed: setflag ENGINE_BUG_CONTEST_TIMER @@ -111,7 +111,7 @@ Route35NationalParkGate_OkayToProceed: special Special_GiveParkBalls scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx special Special_SelectRandomBugContestContestants warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f @@ -134,12 +134,12 @@ Route35NationalParkGate_LeaveTheRestBehind: if_equal 0, Route35NationalParkGate_NoRoomInBox Route35NationalParkGate_LessThanFullParty: ; 6a27d - special CheckFirstMonIsEgg + special Special_CheckFirstMonIsEgg if_equal $1, Route35NationalParkGate_FirstMonIsEgg writetext UnknownText_0x6a4c6 yesorno iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind - special ContestDropOffMons + special Special_ContestDropOffMons iftrue Route35NationalParkGate_FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6a537 diff --git a/maps/Route36.asm b/maps/Route36.asm index 4076725b4..26026370f 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -94,7 +94,7 @@ DidntCatchSudowoodo: applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Flee disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX special RefreshSprites end diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 88d7abb14..05bba8674 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -91,7 +91,7 @@ Route36NationalParkGate_MapScriptHeader: closetext spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 end @@ -156,7 +156,7 @@ Route36OfficerScriptContest: iffalse .DecidedNotToJoinContest checkcode VAR_PARTYCOUNT if_greater_than $1, .LeaveMonsWithOfficer - special ContestDropOffMons + special Special_ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER .ResumeStartingContest: setflag ENGINE_BUG_CONTEST_TIMER @@ -174,7 +174,7 @@ Route36OfficerScriptContest: special Special_GiveParkBalls spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx special Special_SelectRandomBugContestContestants warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 @@ -186,12 +186,12 @@ Route36OfficerScriptContest: checkcode VAR_BOXSPACE if_equal $0, .BoxFull .ContinueLeavingMons: - special CheckFirstMonIsEgg + special Special_CheckFirstMonIsEgg if_equal $1, .FirstMonIsEgg writetext UnknownText_0x6afb0 yesorno iffalse .RefusedToLeaveMons - special ContestDropOffMons + special Special_ContestDropOffMons iftrue .FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6b021 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index a7cfe5405..6234a9cf4 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -52,7 +52,7 @@ MooMoo: iftrue .HappyCow writetext Text_WeakMoo writebyte MILTANK - special PlaySlowCry + special Special_PlaySlowCry buttonsound writetext Text_ItsCryIsWeak checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 77531a70d..7677976fe 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -24,7 +24,7 @@ FarmerMScript_SellMilk: checkitem MOOMOO_MILK iftrue FarmerMScript_Milking writetext FarmerMText_BuyMilk - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight yesorno iffalse FarmerMScript_NoSale checkmoney $0, 500 @@ -32,7 +32,7 @@ FarmerMScript_SellMilk: giveitem MOOMOO_MILK iffalse FarmerMScript_NoRoom takemoney $0, 500 - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight waitsfx playsound SFX_TRANSACTION writetext FarmerMText_GotMilk diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index c4357abf1..4a63f1816 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -67,7 +67,7 @@ TrainerGruntM1: clearevent EVENT_AZALEA_TOWN_SLOWPOKES clearevent EVENT_KURTS_HOUSE_SLOWPOKE clearevent EVENT_KURTS_HOUSE_KURT_1 - special FadeOutPalettes + special Special_FadeOutPalettes special HealParty pause 15 warp KURTS_HOUSE, $3, $3 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 464215210..3f66d10a5 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -448,9 +448,9 @@ ExplodingTrap22: end VoltorbExplodingTrap: - special FadeOutPalettes + special Special_FadeOutPalettes cry VOLTORB - special FadeInPalettes + special Special_FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon VOLTORB, 23 @@ -458,9 +458,9 @@ VoltorbExplodingTrap: end GeodudeExplodingTrap: - special FadeOutPalettes + special Special_FadeOutPalettes cry GEODUDE - special FadeInPalettes + special Special_FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon GEODUDE, 21 @@ -468,9 +468,9 @@ GeodudeExplodingTrap: end KoffingExplodingTrap: - special FadeOutPalettes + special Special_FadeOutPalettes cry KOFFING - special FadeInPalettes + special Special_FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon KOFFING, 21 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 0ed2c67f0..ebfc223d9 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -166,11 +166,11 @@ LanceHealsCommon: writetext LanceHealsText1 waitbutton closetext - special FadeOutPalettes + special Special_FadeOutPalettes special TrainerRankings_Healings playsound SFX_FULL_HEAL special HealParty - special FadeInPalettes + special Special_FadeInPalettes opentext writetext LanceHealsText2 waitbutton diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index c4219a991..73f22a1e7 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -20,7 +20,7 @@ TrainerHouseReceptionistScript: iftrue .FoughtTooManyTimes writetext TrainerHouseB1FIntroText buttonsound - special SpecialTrainerHouse + special Special_TrainerHouse iffalse .GetCal3Name trainertotext CAL, CAL2, $0 jump .GotName @@ -42,7 +42,7 @@ TrainerHouseReceptionistScript: writetext TrainerHouseB1FCalBeforeText waitbutton closetext - special SpecialTrainerHouse + special Special_TrainerHouse iffalse .NoSpecialBattle winlosstext TrainerHouseB1FCalBeatenText, 0 setlasttalked TRAINERHOUSEB1F_CHRIS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 90baf28b0..8ae3aeafd 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -42,7 +42,7 @@ VermilionCitySuperNerdScript: VermilionSnorlax: opentext - special SpecialSnorlaxAwake + special Special_SnorlaxAwake iftrue UnknownScript_0x1aa9ab writetext UnknownText_0x1aab64 waitbutton diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 8d7af46a8..ca534987c 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -52,7 +52,7 @@ SailorScript_0x74dc4: waitsfx applymovement PLAYER, MovementData_0x74ef1 playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND -- cgit v1.2.3 From b4a49351c18dcef7f4493670058ad2833206f016 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 17:47:58 +0100 Subject: Finish consistent Special function names --- maps/BattleTower1F.asm | 56 +++++++++++++++++++------------------- maps/BattleTowerBattleRoom.asm | 24 ++++++++-------- maps/BattleTowerElevator.asm | 2 +- maps/CeladonMansion3F.asm | 4 +-- maps/CeladonPokecenter1F.asm | 4 +-- maps/CeruleanPokecenter1F.asm | 2 +- maps/DragonShrine.asm | 2 +- maps/EcruteakPokecenter1F.asm | 2 +- maps/ElmsLab.asm | 2 +- maps/FastShipCabins_SW_SSW_NW.asm | 4 +-- maps/GoldenrodPokecenter1F.asm | 4 +-- maps/IlexForest.asm | 2 +- maps/MobileBattleRoom.asm | 14 +++++----- maps/MobileTradeRoomMobile.asm | 4 +-- maps/MrPokemonsHouse.asm | 2 +- maps/PokeSeersHouse.asm | 2 +- maps/Pokecenter2F.asm | 20 +++++++------- maps/RadioTower2F.asm | 6 ++-- maps/Route26HealSpeechHouse.asm | 2 +- maps/Route36.asm | 2 +- maps/Route40.asm | 2 +- maps/RuinsOfAlphHoOhChamber.asm | 2 +- maps/RuinsOfAlphOmanyteChamber.asm | 2 +- maps/SaffronPokecenter1F.asm | 2 +- maps/TeamRocketBaseB2F.asm | 2 +- maps/TinTower1F.asm | 10 +++---- 26 files changed, 90 insertions(+), 90 deletions(-) (limited to 'maps') diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 0e44eab3a..861b8849d 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -16,10 +16,10 @@ BattleTower1F_MapScriptHeader: .Scene0: writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS - special BattleTowerAction + special Special_BattleTowerAction iffalse .SkipEverything writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState - special BattleTowerAction + special Special_BattleTowerAction if_equal $0, .SkipEverything if_equal $2, .priorityjump1 if_equal $3, .SkipEverything @@ -34,9 +34,9 @@ BattleTower1F_MapScriptHeader: .priorityjump1 priorityjump BattleTower_LeftWithoutSaving writebyte BATTLETOWERACTION_CHALLENGECANCELED - special BattleTowerAction + special Special_BattleTowerAction writebyte BATTLETOWERACTION_06 - special BattleTowerAction + special Special_BattleTowerAction .SkipEverything: setscene $1 .Scene1: @@ -55,13 +55,13 @@ UnknownScript_0x9e3e0: ReceptionistScript_0x9e3e2: writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState - special BattleTowerAction + special Special_BattleTowerAction if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm opentext writetext Text_BattleTowerWelcomesYou buttonsound writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags] - special BattleTowerAction + special Special_BattleTowerAction if_not_equal $0, Script_Menu_ChallengeExplanationCancel jump Script_BattleTowerIntroductionYesNo @@ -75,8 +75,8 @@ Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc Script_ChooseChallenge: ; 0x9e40f writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM - special BattleTowerAction - special SpecialCheckForBattleTowerRules + special Special_BattleTowerAction + special Special_CheckForBattleTowerRules if_not_equal $0, Script_WaitButton writetext Text_SaveBeforeEnteringBattleRoom yesorno @@ -86,23 +86,23 @@ Script_ChooseChallenge: ; 0x9e40f iffalse Script_Menu_ChallengeExplanationCancel setscene $1 writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags] - special BattleTowerAction - special BattleTowerRoomMenu + special Special_BattleTowerAction + special Special_BattleTowerRoomMenu if_equal $a, Script_Menu_ChallengeExplanationCancel if_not_equal $0, Script_MobileError writebyte BATTLETOWERACTION_11 - special BattleTowerAction + special Special_BattleTowerAction writetext Text_RightThisWayToYourBattleRoom waitbutton closetext writebyte BATTLETOWERACTION_CHOOSEREWARD - special BattleTowerAction + special Special_BattleTowerAction jump Script_WalkToBattleTowerElevator Script_ResumeBattleTowerChallenge: closetext writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group - special BattleTowerAction + special Special_BattleTowerAction Script_WalkToBattleTowerElevator: musicfadeout MUSIC_NONE, 8 setmapscene BATTLE_TOWER_BATTLE_ROOM, $0 @@ -111,7 +111,7 @@ Script_WalkToBattleTowerElevator: follow BATTLETOWER1F_RECEPTIONIST, PLAYER applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator writebyte BATTLETOWERACTION_0A - special BattleTowerAction + special Special_BattleTowerAction warpsound disappear BATTLETOWER1F_RECEPTIONIST stopfollow @@ -121,15 +121,15 @@ Script_WalkToBattleTowerElevator: Script_GivePlayerHisPrize: ; 0x9e47a writebyte BATTLETOWERACTION_1C - special BattleTowerAction + special Special_BattleTowerAction writebyte BATTLETOWERACTION_GIVEREWARD - special BattleTowerAction + special Special_BattleTowerAction if_equal POTION, Script_YourPackIsStuffedFull itemtotext $0, $1 giveitem ITEM_FROM_MEM, 5 writetext Text_PlayerGotFive writebyte BATTLETOWERACTION_1D - special BattleTowerAction + special Special_BattleTowerAction closetext end @@ -147,7 +147,7 @@ Script_BattleTowerExplanation: ; 0x9e4a5 writetext Text_BattleTowerIntroduction_2 Script_BattleTowerSkipExplanation: writebyte BATTLETOWERACTION_SET_EXPLANATION_READ - special BattleTowerAction + special Special_BattleTowerAction jump Script_Menu_ChallengeExplanationCancel Script_BattleTowerHopeToServeYouAgain: @@ -157,7 +157,7 @@ Script_BattleTowerHopeToServeYouAgain: end UnreferencedScript_0x9e4b6: - special BattleTowerMobileError + special Special_BattleTowerMobileError closetext end @@ -173,8 +173,8 @@ UnreferencedScript_0x9e4be: special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel writebyte BATTLETOWERACTION_SET_EXPLANATION_READ - special BattleTowerAction - special Function1700ba + special Special_BattleTowerAction + special Special_Function1700ba if_equal $a, Script_Menu_ChallengeExplanationCancel if_not_equal $0, Script_MobileError writetext Text_ReceivedAListOfLeadersOnTheHonorRoll @@ -187,15 +187,15 @@ UnreferencedScript_0x9e4be: UnreferencedScript_0x9e4ea: writebyte BATTLETOWERACTION_LEVEL_CHECK - special BattleTowerAction + special Special_BattleTowerAction if_not_equal $0, Script_APkmnLevelExceeds writebyte BATTLETOWERACTION_UBERS_CHECK - special BattleTowerAction + special Special_BattleTowerAction if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70 - special SpecialCheckForBattleTowerRules + special Special_CheckForBattleTowerRules if_not_equal $0, Script_WaitButton writebyte BATTLETOWERACTION_05 - special BattleTowerAction + special Special_BattleTowerAction if_equal $0, .zero writetext Text_CantBeRegistered_PreviousRecordDeleted jump continue @@ -213,9 +213,9 @@ continue: iffalse Script_Menu_ChallengeExplanationCancel setscene $1 writebyte BATTLETOWERACTION_06 - special BattleTowerAction + special Special_BattleTowerAction writebyte BATTLETOWERACTION_12 - special BattleTowerAction + special Special_BattleTowerAction writetext Text_RightThisWayToYourBattleRoom waitbutton jump Script_ResumeBattleTowerChallenge @@ -236,7 +236,7 @@ Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549 jump Script_Menu_ChallengeExplanationCancel Script_MobileError: - special BattleTowerMobileError + special Special_BattleTowerMobileError closetext end diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index f2e5f1116..150d71119 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -23,7 +23,7 @@ Script_BattleRoom: ; 0x9f421 ; beat all 7 opponents in a row Script_BattleRoomLoop: ; 0x9f425 writebyte BATTLETOWERBATTLEROOM_YOUNGSTER - special Function_LoadOpponentTrainerAndPokemonsWithOTSprite + special Special_LoadOpponentTrainerAndPokemonWithOTSprite appear BATTLETOWERBATTLEROOM_YOUNGSTER warpsound waitsfx @@ -32,7 +32,7 @@ Script_BattleRoomLoop: ; 0x9f425 battletowertext 1 buttonsound closetext - special BattleTowerBattle ; calls predef startbattle + special Special_BattleTowerBattle ; calls predef startbattle special Special_FadeOutPalettes reloadmap if_not_equal $0, Script_FailedBattleTowerChallenge @@ -49,7 +49,7 @@ Script_BattleRoomLoop: ; 0x9f425 closetext playmusic MUSIC_HEAL special Special_FadeOutPalettes - special LoadMapPalettes + special Special_LoadMapPalettes pause 60 special Special_FadeInPalettes special RestartMapMusic @@ -68,11 +68,11 @@ Script_DontBattleNextOpponent: ; 0x9f483 yesorno iffalse Script_DontSaveAndEndTheSession writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group - special BattleTowerAction + special Special_BattleTowerAction writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward - special BattleTowerAction + special Special_BattleTowerAction writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave - special BattleTowerAction + special Special_BattleTowerAction playsound SFX_SAVE waitsfx special Special_FadeOutPalettes @@ -82,9 +82,9 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3 yesorno iffalse Script_ContinueAndBattleNextOpponent writebyte BATTLETOWERACTION_CHALLENGECANCELED - special BattleTowerAction + special Special_BattleTowerAction writebyte BATTLETOWERACTION_06 - special BattleTowerAction + special Special_BattleTowerAction closetext special Special_FadeOutPalettes warpfacing UP, BATTLE_TOWER_1F, $7, $7 @@ -96,7 +96,7 @@ Script_FailedBattleTowerChallenge: special Special_BattleTowerFade warpfacing UP, BATTLE_TOWER_1F, $7, $7 writebyte BATTLETOWERACTION_CHALLENGECANCELED - special BattleTowerAction + special Special_BattleTowerAction opentext writetext Text_ThanksForVisiting waitbutton @@ -114,7 +114,7 @@ Script_BeatenAllTrainers2: UnreferencedScript_0x9f4eb: writebyte BATTLETOWERACTION_CHALLENGECANCELED - special BattleTowerAction + special Special_BattleTowerAction opentext writetext Text_TooMuchTimeElapsedNoRegister waitbutton @@ -123,9 +123,9 @@ UnreferencedScript_0x9f4eb: UnreferencedScript_0x9f4f7: writebyte BATTLETOWERACTION_CHALLENGECANCELED - special BattleTowerAction + special Special_BattleTowerAction writebyte BATTLETOWERACTION_06 - special BattleTowerAction + special Special_BattleTowerAction opentext writetext Text_ThanksForVisiting writetext Text_WeHopeToServeYouAgain diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 2327b31fa..fc976062e 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -22,7 +22,7 @@ BattleTowerElevator_MapScriptHeader: applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn writebyte BATTLETOWERACTION_0A - special BattleTowerAction + special Special_BattleTowerAction playsound SFX_ELEVATOR earthquake 60 waitsfx diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 5274b5b38..bd7565b05 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -28,7 +28,7 @@ UnknownScript_0x7167e: waitsfx writetext UnknownText_0x71760 buttonsound - special Diploma + special Special_Diploma writetext UnknownText_0x71763 waitbutton closetext @@ -49,7 +49,7 @@ UnknownScript_0x716a4: writetext UnknownText_0x717d8 yesorno iffalse UnknownScript_0x716b0 - special PrintDiploma + special Special_PrintDiploma closetext end diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 2c2a594e6..f8c412287 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -30,9 +30,9 @@ CeladonEusine: writetext CeladonEusineText1 buttonsound writebyte SUICUNE - special SpecialMonCheck + special Special_MonCheck iffalse .NoSuicune - special SpecialBeastsCheck + special Special_BeastsCheck iftrue .HoOh writetext NoBeastsText waitbutton diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 2e03275d4..74b5b2bbb 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -14,7 +14,7 @@ NurseScript_0x18820f: jumpstd pokecenternurse SuperNerdScript_0x188212: - special Mobile_DummyReturnFalse + special Special_Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x188221 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 1df424ca1..150562eb7 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -217,7 +217,7 @@ ElderScript_0x18d1a5: waitsfx givepoke DRATINI, 15 checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG - special SpecialDratini + special Special_Dratini setevent EVENT_GOT_DRATINI setevent EVENT_JUST_RECEIVED_DRATINI writetext UnknownText_0x18d6ca diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index da661209f..564e66360 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -61,7 +61,7 @@ EcruteakPokecenter1FNurseScript: jumpstd pokecenternurse EcruteakPokecenter1FPokefanMScript: - special Mobile_DummyReturnFalse + special Special_Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer EcruteakPokecenter1FPokefanMText diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 754222323..d3b0a7154 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -308,7 +308,7 @@ ElmsLabHealingMachine: end ElmsLabHealingMachine_HealParty: - special TrainerRankings_Healings + special Special_TrainerRankings_Healings special HealParty playmusic MUSIC_NONE writebyte 1 ; Machine is in Elm's Lab diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 8af9a2e3f..6dafb77d6 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -49,7 +49,7 @@ TrainerGuitaristClyde: .Script: end_if_just_battled - special Mobile_DummyReturnFalse + special Special_Mobile_DummyReturnFalse iftrue .mobile opentext writetext UnknownText_0x75d65 @@ -71,7 +71,7 @@ FastShipBed: closetext special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes - special TrainerRankings_Healings + special Special_TrainerRankings_Healings special HealParty playmusic MUSIC_HEAL pause 60 diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 617d54327..27fc2452e 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -17,7 +17,7 @@ NurseScript_0x60f91: GoldenrodPokecenter1F_GSBallSceneLeft: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT - special BattleTowerAction + special Special_BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end @@ -49,7 +49,7 @@ GoldenrodPokecenter1F_GSBallSceneLeft: GoldenrodPokecenter1F_GSBallSceneRight: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT - special BattleTowerAction + special Special_BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 7bbba6562..47669e569 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -472,7 +472,7 @@ MapIlexForestSignpost4Script: startbattle reloadmapafterbattle pause 20 - special CheckCaughtCelebi + special Special_CheckCaughtCelebi iffalse .DidntCatchCelebi appear ILEXFOREST_KURT applymovement ILEXFOREST_KURT, MovementData_0x6ef4e diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 2073a7eda..51ff1d200 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -21,9 +21,9 @@ MobileBattleRoom_MapScriptHeader: MapMobileBattleRoomSignpost0Script: refreshscreen $0 - special Function1037c2 + special Special_Function1037c2 if_equal $1, .one - special Function1037eb + special Special_Function1037eb iffalse .false if_equal $1, .one_ if_equal $2, .two_ @@ -35,22 +35,22 @@ MapMobileBattleRoomSignpost0Script: closetext special Special_FadeOutPalettes playmusic MUSIC_HEAL - special LoadMapPalettes + special Special_LoadMapPalettes pause 60 special Special_FadeInPalettes special RestartMapMusic refreshscreen $0 .two_ - special TrainerRankings_Healings + special Special_TrainerRankings_Healings special HealParty - special Function10383c + special Special_Function10383c iftrue .false .one - special Function10387b + special Special_Function10387b writetext MobileBattleRoom_EstablishingCommsText waitbutton reloadmappart - special Function101225 + special Special_Function101225 .false closetext end diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 1003d4ea5..ebc29f523 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -21,11 +21,11 @@ MobileTradeRoomMobile_MapScriptHeader: MapMobileTradeRoomMobileSignpost0Script: refreshscreen $0 - special Function1037c2 + special Special_Function1037c2 writetext MobileTradeRoomMobile_EstablishingCommsText waitbutton reloadmappart - special Function101231 + special Special_Function101231 closetext end diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index f808d44c8..27779aac6 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -113,7 +113,7 @@ MrPokemonsHouse_OakScript: special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes playmusic MUSIC_HEAL - special TrainerRankings_Healings + special Special_TrainerRankings_Healings special HealParty pause 60 special Special_FadeInQuickly diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 9b9052ee8..7f105c02e 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -11,7 +11,7 @@ PokeSeersHouse_MapScriptHeader: SeerScript: faceplayer opentext - special SpecialPokeSeer + special Special_PokeSeer waitbutton closetext end diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 79b526cda..bfc2a9c23 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -76,10 +76,10 @@ LinkReceptionistScript_Trade: writetext Text_TradeReceptionistIntro yesorno iffalse .Cancel - special Mobile_DummyReturnFalse ; always returns false + special Special_Mobile_DummyReturnFalse ; always returns false iffalse .NoMobile writetext Text_TradeReceptionistMobile - special AskMobileOrCable + special Special_AskMobileOrCable iffalse .Cancel if_equal $1, .Mobile .NoMobile: @@ -153,7 +153,7 @@ LinkReceptionistScript_Trade: iffalse .Mobile_DidNotSave special Special_TryQuickSave iffalse .Mobile_DidNotSave - special Function1011f1 + special Special_Function1011f1 writetext Text_PleaseComeIn2 waitbutton closetext @@ -178,10 +178,10 @@ LinkReceptionistScript_Battle: writetext Text_BattleReceptionistIntro yesorno iffalse .Cancel - special Mobile_DummyReturnFalse ; always returns false + special Special_Mobile_DummyReturnFalse ; always returns false iffalse .NoMobile writetext Text_BattleReceptionistMobile - special AskMobileOrCable + special Special_AskMobileOrCable iffalse .Cancel if_equal $1, .Mobile .NoMobile: @@ -255,9 +255,9 @@ LinkReceptionistScript_Battle: writetext Text_MustSaveGame yesorno iffalse .Mobile_DidNotSave - special Function103780 + special Special_Function103780 iffalse .Mobile_DidNotSave - special Function1011f1 + special Special_Function1011f1 writetext Text_PleaseComeIn2 waitbutton closetext @@ -271,7 +271,7 @@ LinkReceptionistScript_Battle: end .SelectThreeMons: - special Mobile_SelectThreeMons + special Special_Mobile_SelectThreeMons iffalse .Mobile_DidNotSelect if_equal $1, .Mobile_OK if_equal $2, .Mobile_OK @@ -381,7 +381,7 @@ Script_LeftCableTradeCenter: end Script_LeftMobileTradeRoom: - special Function101220 + special Special_Function101220 scall Script_WalkOutOfMobileTradeRoom setscene $0 setmapscene MOBILE_TRADE_ROOM_MOBILE, $0 @@ -401,7 +401,7 @@ Script_LeftCableColosseum: end Script_LeftMobileBattleRoom: - special Function101220 + special Special_Function101220 scall Script_WalkOutOfMobileBattleRoom setscene $0 setmapscene MOBILE_BATTLE_ROOM, $0 diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 7942063f9..adcdc2770 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -117,7 +117,7 @@ Buena: if_equal 30, UnknownScript_0x5d87f playmusic MUSIC_BUENAS_PASSWORD writetext UnknownText_0x5de35 - special AskRememberPassword + special Special_AskRememberPassword iffalse UnknownScript_0x5d81e writetext UnknownText_0x5de84 waitbutton @@ -134,7 +134,7 @@ UnknownScript_0x5d7be: closetext spriteface RADIOTOWER2F_BUENA, DOWN refreshscreen $0 - special SpecialBuenasPassword + special Special_BuenasPassword closetext iffalse UnknownScript_0x5d845 opentext @@ -316,7 +316,7 @@ ReceptionistScript_0x5d8ff: iffalse UnknownScript_0x5d90f writetext UnknownText_0x5e392 buttonsound - special SpecialBuenaPrize + special Special_BuenaPrize closetext end diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index 15f888fb6..111d6fd65 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -16,7 +16,7 @@ TeacherScript_0x7b125: closetext special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes - special TrainerRankings_Healings + special Special_TrainerRankings_Healings playmusic MUSIC_HEAL special HealParty pause 60 diff --git a/maps/Route36.asm b/maps/Route36.asm index 26026370f..58530fbee 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -95,7 +95,7 @@ DidntCatchSudowoodo: disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN special Special_MapCallbackSprites_LoadUsedSpritesGFX - special RefreshSprites + special Special_RefreshSprites end Route36FloriaScript: diff --git a/maps/Route40.asm b/maps/Route40.asm index 73f089bd2..92bd1fbfc 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -79,7 +79,7 @@ Route40Lass1Script: jumptextfaceplayer Route40Lass1Text PokefanMScript_0x1a61c7: - special Mobile_DummyReturnFalse + special Special_Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x1a646a diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 52915317d..ba682d30b 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -9,7 +9,7 @@ RuinsOfAlphHoOhChamber_MapScriptHeader: dbw MAPCALLBACK_TILES, .HiddenDoors .CheckWall: - special SpecialHoOhChamber + special Special_HoOhChamber checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue .OpenWall end diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 994f69edd..a8424ccea 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -9,7 +9,7 @@ RuinsOfAlphOmanyteChamber_MapScriptHeader: dbw MAPCALLBACK_TILES, .HiddenDoors .CheckWall: - special SpecialOmanyteChamber + special Special_OmanyteChamber checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue .OpenWall end diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index 39d6ad8bb..7e11928ae 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -15,7 +15,7 @@ NurseScript_0x18a47d: jumpstd pokecenternurse TeacherScript_0x18a480: - special Mobile_DummyReturnFalse + special Special_Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x18a4a3 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index ebfc223d9..0967e2f0f 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -167,7 +167,7 @@ LanceHealsCommon: waitbutton closetext special Special_FadeOutPalettes - special TrainerRankings_Healings + special Special_TrainerRankings_Healings playsound SFX_FULL_HEAL special HealParty special Special_FadeInPalettes diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index ab23a7b3e..b55cc384b 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -33,7 +33,7 @@ TinTower1F_MapScriptHeader: iftrue .GotRainbowWing checkevent EVENT_BEAT_ELITE_FOUR iffalse .FaceBeasts - special SpecialBeastsCheck + special Special_BeastsCheck iffalse .FaceBeasts clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 @@ -49,7 +49,7 @@ TinTower1F_MapScriptHeader: iftrue .FoughtSuicune appear TINTOWER1F_SUICUNE writebyte RAIKOU - special SpecialMonCheck + special Special_MonCheck iftrue .NoRaikou appear TINTOWER1F_RAIKOU jump .CheckEntei @@ -58,7 +58,7 @@ TinTower1F_MapScriptHeader: disappear TINTOWER1F_RAIKOU .CheckEntei: writebyte ENTEI - special SpecialMonCheck + special Special_MonCheck iftrue .NoEntei appear TINTOWER1F_ENTEI jump .BeastsDone @@ -87,7 +87,7 @@ TinTower1F_MapScriptHeader: applymovement PLAYER, TinTowerPlayerMovement1 pause 15 writebyte RAIKOU - special SpecialMonCheck + special Special_MonCheck iftrue .Next1 ; if player caught Raikou, he doesn't appear in Tin Tower applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1 spriteface PLAYER, LEFT @@ -100,7 +100,7 @@ TinTower1F_MapScriptHeader: waitsfx .Next1: writebyte ENTEI - special SpecialMonCheck + special Special_MonCheck iftrue .Next2 ; if player caught Entei, he doesn't appear in Tin Tower applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1 spriteface PLAYER, RIGHT -- cgit v1.2.3 From d7970f749ac23786728926109be430ab732f19e6 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 18:49:25 +0100 Subject: Consistent predef function names --- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 2 +- maps/FastShipCabins_SW_SSW_NW.asm | 2 +- maps/MrPokemonsHouse.asm | 2 +- maps/RadioTower5F.asm | 2 +- maps/Route24.asm | 2 +- maps/Route26HealSpeechHouse.asm | 2 +- maps/Route36NationalParkGate.asm | 2 +- maps/SilverCaveRoom3.asm | 2 +- maps/SlowpokeWellB1F.asm | 2 +- maps/SproutTower3F.asm | 2 +- maps/TeamRocketBaseB2F.asm | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'maps') diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index efccd7d92..1a95553d5 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -49,7 +49,7 @@ SSAquaGranddaughterBefore: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2 applymovement PLAYER, MovementData_0x76004 moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, $3, $13 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 6dafb77d6..b8468203b 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -70,7 +70,7 @@ FastShipBed: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes special Special_TrainerRankings_Healings special HealParty playmusic MUSIC_HEAL diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 27779aac6..baae65af2 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -111,7 +111,7 @@ MrPokemonsHouse_OakScript: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes playmusic MUSIC_HEAL special Special_TrainerRankings_Healings special HealParty diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index c73d53de2..c19a0d1ae 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -96,7 +96,7 @@ RadioTower5FRocketBossScene: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes disappear RADIOTOWER5F_ROCKET disappear RADIOTOWER5F_ROCKET_GIRL pause 15 diff --git a/maps/Route24.asm b/maps/Route24.asm index 07740a467..e598c01a1 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -29,7 +29,7 @@ RocketScript_0x1adbfa: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes disappear ROUTE24_ROCKET pause 25 special Special_FadeInQuickly diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index 111d6fd65..ea761a6fc 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -15,7 +15,7 @@ TeacherScript_0x7b125: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes special Special_TrainerRankings_Healings playmusic MUSIC_HEAL special HealParty diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 05bba8674..a3425a82b 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -76,7 +76,7 @@ Route36NationalParkGate_MapScriptHeader: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes scall .CopyContestants disappear ROUTE36NATIONALPARKGATE_OFFICER1 appear ROUTE36NATIONALPARKGATE_OFFICER2 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 7daab6ba8..92b7041bd 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -26,7 +26,7 @@ Red: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes disappear SILVERCAVEROOM3_RED pause 15 special Special_FadeInQuickly diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 4a63f1816..f9a15d4d7 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -39,7 +39,7 @@ TrainerGruntM1: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes disappear SLOWPOKEWELLB1F_ROCKET1 disappear SLOWPOKEWELLB1F_ROCKET2 disappear SLOWPOKEWELLB1F_ROCKET3 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 33dd4dcd8..0d038b06e 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -55,7 +55,7 @@ UnknownScript_0x184947: closetext playsound SFX_WARP_TO special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes disappear SPROUTTOWER3F_SILVER waitsfx special Special_FadeInQuickly diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 0967e2f0f..3d95ac9f8 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -110,7 +110,7 @@ UnknownScript_0x6cfac: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes disappear TEAMROCKETBASEB2F_ROCKET1 disappear TEAMROCKETBASEB2F_ROCKET_GIRL disappear TEAMROCKETBASEB2F_ROCKET2 -- cgit v1.2.3 From b4e087167f3263342bbe01b5256f42fcf2d726af Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 19:38:56 +0100 Subject: More unreferenced labels and unused text --- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 2 +- maps/GoldenrodDeptStore2F.asm | 8 ++++---- maps/OlivineLighthouse2F.asm | 4 ++-- maps/Route29.asm | 2 +- maps/Route32.asm | 4 ++-- maps/Route36NationalParkGate.asm | 1 - maps/RuinsOfAlphAerodactylChamber.asm | 4 ++-- maps/RuinsOfAlphHoOhChamber.asm | 4 ++-- maps/RuinsOfAlphKabutoChamber.asm | 8 ++++---- maps/RuinsOfAlphOmanyteChamber.asm | 4 ++-- maps/RuinsOfAlphResearchCenter.asm | 16 ++++++++-------- 11 files changed, 28 insertions(+), 29 deletions(-) (limited to 'maps') diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 1a95553d5..830a6c9ee 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -18,7 +18,7 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader: .MapCallbacks: db 0 -Unused_0x75ea6: +Unreferenced_0x75ea6: end SSAquaCaptain: diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index b22e89026..ae78a5fe9 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -41,8 +41,8 @@ GoldenrodDeptStore2FDirectory: GoldenrodDeptStore2FElevatorButton: jumpstd elevatorbutton -; possibly unused -UnknownText_0x55b7c: +; unused +UnusedText_0x55b7c: text "We intend to sell" line "items for #MON" cont "to hold." @@ -52,8 +52,8 @@ UnknownText_0x55b7c: cont "MON hold it." done -; possibly unused -UnknownText_0x55bd3: +; unused +UnusedText_0x55bd3: text "By giving #MON" line "items to hold, I" diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 0961a4427..d5c42544a 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -164,8 +164,8 @@ SailorHuey1BeatenText: line "I lose!" done -; possibly unused -UnknownText_0x5b0be: +; unused +UnusedText_0x5b0be: text "What power!" line "How would you like" diff --git a/maps/Route29.asm b/maps/Route29.asm index cd91a1f3e..f4040a72c 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -324,7 +324,7 @@ Route29FisherText: line "progress." done -; possibly unused +; unused Text_WaitingForDay: text "I'm waiting for" line "#MON that" diff --git a/maps/Route32.asm b/maps/Route32.asm index 659ea40db..6fab9bfde 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -59,7 +59,7 @@ Route32CooltrainerMContinueScene: closetext end -.Unused: +.Unreferenced: writetext Route32CooltrainerMText_UnusedSproutTower waitbutton closetext @@ -839,7 +839,7 @@ BirdKeeperPeterAfterText: cont "in VIOLET CITY." done -; possibly unused +; unused Route32UnusedText: text "The fishermen" line "yelled at me for" diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index a3425a82b..aa355a5d4 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -799,7 +799,6 @@ UnknownText_0x6b7af: ; This text is unused and unreferenced in the final game. ; The tree Pokémon is Sudowoodo. ; The Silph Scope 2 was later reworked into the Squirtbottle. - UnusedSudowoodoText: text "I hear there's a" line "#MON that looks" diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 355b5591c..222299282 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -114,8 +114,8 @@ UnknownText_0x58e4f: line "on the walls…" done -; possibly unused.. again? -UnknownText_0x58e70: +; unused +UnusedText_0x58e70: text "It's UNOWN text!" done diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index ba682d30b..5038a657d 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -115,8 +115,8 @@ UnknownText_0x58612: line "on the walls…" done -; possibly unused -UnknownText_0x58633: +; unused +UnusedText_0x58633: text "It's UNOWN text!" done diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index e4f3f16c5..ad5161ec8 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -202,8 +202,8 @@ UnknownText_0x589b8: cont "this wall here…" done -; possibly unused -UnknownText_0x58a03: +; unused +UnusedText_0x58a03: text "The patterns on" line "the wall appear to" cont "be words!" @@ -226,8 +226,8 @@ UnknownText_0x58aa7: line "on the walls…" done -; possibly unused -UnknownText_0x58ac8: +; unused +UnusedText_0x58ac8: text "It's UNOWN text!" done diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index a8424ccea..9141c27dd 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -115,8 +115,8 @@ UnknownText_0x58c8e: line "on the walls…" done -; possibly unused.. this again? -UnknownText_0x58caf: +; unused +UnusedText_0x58caf: text "It's UNOWN text!" done diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 223b2bd62..3c7f46525 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -169,8 +169,8 @@ UnknownScript_0x59260: closetext end -UnknownScript_0x59269: - jumptext UnknownText_0x59848 +UnreferencedScript_0x59269: + jumptext UnusedText_0x59848 MapRuinsOfAlphResearchCenterSignpost0Script: jumptext UnknownText_0x59886 @@ -308,8 +308,8 @@ UnknownText_0x595cb: cont "kinds of them…" done -; possibly unused -UnknownText_0x59669: +; unused +UnusedText_0x59669: text "We think something" line "caused the cryptic" @@ -320,8 +320,8 @@ UnknownText_0x59669: line "studies on that." done -; possibly unused -UnknownText_0x596d3: +; unused +UnusedText_0x596d3: text "According to my" line "research…" @@ -374,8 +374,8 @@ UnknownText_0x5982d: line "printed out." done -; possibly unused -UnknownText_0x59848: +; unused +UnusedText_0x59848: text "It's a photo of" line "the RESEARCH" -- cgit v1.2.3 From aa9a0a900ddeaa79a05f1b93458a8b19ae170d69 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 20:00:14 +0100 Subject: No more mobile EQUS ret (replace with Stubbed_ + ret) --- maps/ElmsLab.asm | 2 +- maps/FastShipCabins_SW_SSW_NW.asm | 2 +- maps/MobileBattleRoom.asm | 2 +- maps/MrPokemonsHouse.asm | 2 +- maps/Route26HealSpeechHouse.asm | 2 +- maps/TeamRocketBaseB2F.asm | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'maps') diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index d3b0a7154..af69c7de2 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -308,7 +308,7 @@ ElmsLabHealingMachine: end ElmsLabHealingMachine_HealParty: - special Special_TrainerRankings_Healings + special Special_StubbedTrainerRankings_Healings special HealParty playmusic MUSIC_NONE writebyte 1 ; Machine is in Elm's Lab diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index b8468203b..a7f5b69e8 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -71,7 +71,7 @@ FastShipBed: closetext special Special_FadeBlackQuickly special ReloadSpritesNoPalettes - special Special_TrainerRankings_Healings + special Special_StubbedTrainerRankings_Healings special HealParty playmusic MUSIC_HEAL pause 60 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 51ff1d200..37818b162 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -41,7 +41,7 @@ MapMobileBattleRoomSignpost0Script: special RestartMapMusic refreshscreen $0 .two_ - special Special_TrainerRankings_Healings + special Special_StubbedTrainerRankings_Healings special HealParty special Special_Function10383c iftrue .false diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index baae65af2..1f05676c9 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -113,7 +113,7 @@ MrPokemonsHouse_OakScript: special Special_FadeBlackQuickly special ReloadSpritesNoPalettes playmusic MUSIC_HEAL - special Special_TrainerRankings_Healings + special Special_StubbedTrainerRankings_Healings special HealParty pause 60 special Special_FadeInQuickly diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index ea761a6fc..e60b83ce4 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -16,7 +16,7 @@ TeacherScript_0x7b125: closetext special Special_FadeBlackQuickly special ReloadSpritesNoPalettes - special Special_TrainerRankings_Healings + special Special_StubbedTrainerRankings_Healings playmusic MUSIC_HEAL special HealParty pause 60 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 3d95ac9f8..7fd4b5592 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -167,7 +167,7 @@ LanceHealsCommon: waitbutton closetext special Special_FadeOutPalettes - special Special_TrainerRankings_Healings + special Special_StubbedTrainerRankings_Healings playsound SFX_FULL_HEAL special HealParty special Special_FadeInPalettes -- cgit v1.2.3 From 91f97f08f06923e3548797133275df53e240d894 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Wed, 3 Jan 2018 14:58:08 +0100 Subject: Special_MapCallbackSprites_LoadUsedSpritesGFX -> Special_LoadUsedSpritesGFX --- maps/CopycatsHouse2F.asm | 10 +++++----- maps/FuchsiaGym.asm | 10 +++++----- maps/FuchsiaPokecenter1F.asm | 4 ++-- maps/OlivineCity.asm | 4 ++-- maps/Route36.asm | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'maps') diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 8d378a820..0f12d3a97 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -46,7 +46,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Default_Merge_1: - special Special_MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX checkevent EVENT_RETURNED_MACHINE_PART iftrue .TalkAboutLostItem opentext @@ -70,7 +70,7 @@ Copycat: .Default_Merge_3a: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Special_MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX opentext writetext CopycatText_QuickMimicking waitbutton @@ -99,7 +99,7 @@ Copycat: .Default_Merge_3b: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Special_MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX opentext writetext CopycatText_Worried waitbutton @@ -142,7 +142,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .GotPass_Merge_1: - special Special_MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX opentext checkflag ENGINE_PLAYER_IS_FEMALE iftrue .GotPass_Female_2 @@ -164,7 +164,7 @@ Copycat: .GotPass_Merge_3: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Special_MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX opentext writetext CopycatText_ItsAScream waitbutton diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 505f5ca53..2ef7f2abd 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -35,7 +35,7 @@ FuchsiaGymJanineScript: variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER - special Special_MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX opentext writetext Text_ReceivedSoulBadge playsound SFX_GET_BADGE @@ -65,7 +65,7 @@ LassAliceScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_1, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS - special Special_MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX .AliceUnmasked: faceplayer opentext @@ -99,7 +99,7 @@ LassLindaScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_2, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS - special Special_MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX .LindaUnmasked: faceplayer opentext @@ -133,7 +133,7 @@ PicnickerCindyScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_3, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS - special Special_MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX .CindyUnmasked: faceplayer opentext @@ -167,7 +167,7 @@ CamperBarryScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_4, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER - special Special_MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX .BarryUnmasked: faceplayer opentext diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index f82fbb26e..1e7b32c9e 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -33,7 +33,7 @@ JanineImpersonatorScript_0x196462: applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE - special Special_MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX opentext writetext UnknownText_0x19654e waitbutton @@ -41,7 +41,7 @@ JanineImpersonatorScript_0x196462: applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS - special Special_MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX end MovementData_0x196486: diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index d90d2900e..f914fb493 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -45,7 +45,7 @@ UnknownScript_0x1a8833: disappear OLIVINECITY_OLIVINE_RIVAL special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY - special Special_MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX end UnknownScript_0x1a886b: @@ -69,7 +69,7 @@ UnknownScript_0x1a886b: setscene $1 special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY - special Special_MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX end OlivineCitySailor1Script: diff --git a/maps/Route36.asm b/maps/Route36.asm index 58530fbee..91a497c1f 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -94,7 +94,7 @@ DidntCatchSudowoodo: applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Flee disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN - special Special_MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX special Special_RefreshSprites end -- cgit v1.2.3 From 31edd7f803a9df47d76469559065af96d78f1c7d Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 00:23:48 -0500 Subject: Move text/ into data/ --- maps/GoldenrodNameRater.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'maps') diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index 259e0fbb7..73fb70d93 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -22,7 +22,7 @@ GoldenrodNameRaterBookshelf: GoldenrodNameRaterRadio: jumpstd radio2 -INCLUDE "text/unused_sweet_honey.asm" +INCLUDE "data/unused_text/sweet_honey.asm" GoldenrodNameRater_MapEventHeader: ; filler -- cgit v1.2.3 From 2f0973f3e0b54073a7fe542258ceb1314f4a0023 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 18:45:25 -0500 Subject: Clean up some hex values in map scripts --- maps/AzaleaGym.asm | 4 +- maps/AzaleaTown.asm | 6 +-- maps/BattleTower1F.asm | 16 +++---- maps/BattleTowerBattleRoom.asm | 8 ++-- maps/BattleTowerElevator.asm | 2 +- maps/BattleTowerHallway.asm | 2 +- maps/BlackthornGym1F.asm | 10 ++--- maps/BrunosRoom.asm | 12 +++--- maps/BurnedTower1F.asm | 12 +++--- maps/BurnedTowerB1F.asm | 12 +++--- maps/CeladonDeptStore6F.asm | 2 +- maps/CeladonGym.asm | 4 +- maps/CeladonPokecenter1F.asm | 2 +- maps/CeruleanGym.asm | 14 +++--- maps/CherrygroveCity.asm | 4 +- maps/CianwoodCity.asm | 12 +++--- maps/CianwoodGym.asm | 4 +- maps/Colosseum.asm | 6 +-- maps/DragonShrine.asm | 8 ++-- maps/DragonsDenB1F.asm | 2 +- maps/EcruteakGym.asm | 8 ++-- maps/EcruteakHouse.asm | 10 ++--- maps/EcruteakPokecenter1F.asm | 2 +- maps/ElmsLab.asm | 20 ++++----- maps/FastShip1F.asm | 16 +++---- maps/FastShipB1F.asm | 4 +- maps/FastShipCabins_NNW_NNE_NE.asm | 2 +- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 6 +-- maps/FuchsiaGym.asm | 4 +- maps/GoldenrodDeptStore6F.asm | 4 +- maps/GoldenrodDeptStoreB1F.asm | 8 ++-- maps/GoldenrodDeptStoreRoof.asm | 4 +- maps/GoldenrodGym.asm | 8 ++-- maps/GoldenrodMagnetTrainStation.asm | 2 +- maps/GoldenrodPokecenter1F.asm | 4 +- maps/GoldenrodUnderground.asm | 4 +- maps/HallOfFame.asm | 4 +- maps/IlexForest.asm | 64 ++++++++++++++-------------- maps/IndigoPlateauPokecenter1F.asm | 18 ++++---- maps/KarensRoom.asm | 12 +++--- maps/KogasRoom.asm | 12 +++--- maps/KrissHouse1F.asm | 2 +- maps/KrissHouse2F.asm | 2 +- maps/KurtsHouse.asm | 2 +- maps/LakeOfRage.asm | 4 +- maps/LancesRoom.asm | 12 +++--- maps/MahoganyGym.asm | 4 +- maps/MahoganyMart1F.asm | 6 +-- maps/MobileBattleRoom.asm | 4 +- maps/MobileTradeRoomMobile.asm | 4 +- maps/MountMoon.asm | 2 +- maps/MrPokemonsHouse.asm | 8 ++-- maps/OlivineCity.asm | 4 +- maps/OlivineGym.asm | 4 +- maps/OlivinePort.asm | 6 +-- maps/PewterGym.asm | 4 +- maps/Pokecenter2F.asm | 20 ++++----- maps/PowerPlant.asm | 6 +-- maps/RadioTower1F.asm | 4 +- maps/RadioTower3F.asm | 8 ++-- maps/RadioTower5F.asm | 8 ++-- maps/Route19.asm | 12 +++--- maps/Route25.asm | 4 +- maps/Route27.asm | 2 +- maps/Route29.asm | 8 ++-- maps/Route32.asm | 2 +- maps/Route35NationalParkGate.asm | 8 ++-- maps/Route36.asm | 4 +- maps/Route36NationalParkGate.asm | 8 ++-- maps/Route42.asm | 8 ++-- maps/Route43.asm | 4 +- maps/Route43Gate.asm | 10 ++--- maps/RuinsOfAlphAerodactylChamber.asm | 18 ++++---- maps/RuinsOfAlphHoOhChamber.asm | 18 ++++---- maps/RuinsOfAlphInnerChamber.asm | 2 +- maps/RuinsOfAlphKabutoChamber.asm | 18 ++++---- maps/RuinsOfAlphOmanyteChamber.asm | 18 ++++---- maps/RuinsOfAlphOutside.asm | 6 +-- maps/RuinsOfAlphResearchCenter.asm | 4 +- maps/SaffronGym.asm | 4 +- maps/SaffronTrainStation.asm | 2 +- maps/SeafoamGym.asm | 2 +- maps/SilverCaveRoom3.asm | 10 ++--- maps/SlowpokeWellB1F.asm | 6 +-- maps/SproutTower3F.asm | 2 +- maps/TeamRocketBaseB1F.asm | 32 +++++++------- maps/TeamRocketBaseB2F.asm | 26 +++++------ maps/TeamRocketBaseB3F.asm | 10 ++--- maps/TimeCapsule.asm | 4 +- maps/TinTower1F.asm | 26 +++++------ maps/TradeCenter.asm | 4 +- maps/VermilionGym.asm | 4 +- maps/VermilionPort.asm | 6 +-- maps/VictoryRoad.asm | 6 +-- maps/VictoryRoadGate.asm | 2 +- maps/VioletGym.asm | 6 +-- maps/VioletPokecenter1F.asm | 2 +- maps/ViridianGym.asm | 4 +- maps/WillsRoom.asm | 12 +++--- maps/WiseTriosRoom.asm | 2 +- 100 files changed, 399 insertions(+), 399 deletions(-) (limited to 'maps') diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 1e36df96f..b73a00a03 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -23,7 +23,7 @@ AzaleaGymBugsyScript: waitbutton closetext winlosstext BugsyText_ResearchIncomplete, 0 - loadtrainer BUGSY, 1 + loadtrainer BUGSY, BUGSY1 startbattle reloadmapafterbattle setevent EVENT_BEAT_BUGSY @@ -146,7 +146,7 @@ AzaleaGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext BUGSY, 1, $1 + trainertotext BUGSY, BUGSY1, $1 jumpstd gymstatue2 BugsyText_INeverLose: diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index ba1ee1a2c..a0c3ab79e 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -37,7 +37,7 @@ AzaleaTown_MapScriptHeader: return AzaleaTownRivalBattleScene1: - moveobject AZALEATOWN_SILVER, $b, $b + moveobject AZALEATOWN_SILVER, 11, 11 spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -102,7 +102,7 @@ AzaleaTownRivalBattleScript: applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement playsound SFX_EXIT_BUILDING disappear AZALEATOWN_SILVER - setscene $0 + setscene 0 waitsfx playmapmusic end @@ -170,7 +170,7 @@ AzaleaTownCelebiScene: setflag ENGINE_HAVE_EXAMINED_GS_BALL clearevent EVENT_ILEX_FOREST_LASS setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS - setscene $0 + setscene 0 closetext end diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 0e44eab3a..b769b0429 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -38,7 +38,7 @@ BattleTower1F_MapScriptHeader: writebyte BATTLETOWERACTION_06 special BattleTowerAction .SkipEverything: - setscene $1 + setscene 1 .Scene1: end @@ -81,10 +81,10 @@ Script_ChooseChallenge: ; 0x9e40f writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel - setscene $0 + setscene 0 special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel - setscene $1 + setscene 1 writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags] special BattleTowerAction special BattleTowerRoomMenu @@ -105,9 +105,9 @@ Script_ResumeBattleTowerChallenge: special BattleTowerAction Script_WalkToBattleTowerElevator: musicfadeout MUSIC_NONE, 8 - setmapscene BATTLE_TOWER_BATTLE_ROOM, $0 - setmapscene BATTLE_TOWER_ELEVATOR, $0 - setmapscene 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 @@ -208,10 +208,10 @@ continue: writetext Text_SaveBeforeReentry yesorno iffalse Script_Menu_ChallengeExplanationCancel - setscene $0 + setscene 0 special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel - setscene $1 + setscene 1 writebyte BATTLETOWERACTION_06 special BattleTowerAction writebyte BATTLETOWERACTION_12 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index acd8bfa66..3b2916f56 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -14,7 +14,7 @@ BattleTowerBattleRoom_MapScriptHeader: .EnterBattleRoom: ; 0x9f419 disappear BATTLETOWERBATTLEROOM_YOUNGSTER priorityjump Script_BattleRoom - setscene $1 + setscene 1 .DummyScene: end @@ -87,14 +87,14 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3 special BattleTowerAction closetext special FadeOutPalettes - warpfacing UP, BATTLE_TOWER_1F, $7, $7 + warpfacing UP, BATTLE_TOWER_1F, 7, 7 opentext jump Script_BattleTowerHopeToServeYouAgain Script_FailedBattleTowerChallenge: pause 60 special Special_BattleTowerFade - warpfacing UP, BATTLE_TOWER_1F, $7, $7 + warpfacing UP, BATTLE_TOWER_1F, 7, 7 writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction opentext @@ -106,7 +106,7 @@ Script_FailedBattleTowerChallenge: Script_BeatenAllTrainers: ; 0x9f4d9 pause 60 special Special_BattleTowerFade - warpfacing UP, BATTLE_TOWER_1F, $7, $7 + warpfacing UP, BATTLE_TOWER_1F, 7, 7 Script_BeatenAllTrainers2: opentext writetext Text_CongratulationsYouveBeatenAllTheTrainers diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 2327b31fa..d9974beea 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -12,7 +12,7 @@ BattleTowerElevator_MapScriptHeader: .Scene0: priorityjump .RideElevator - setscene $1 + setscene 1 .Scene1: end diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 41a3beb83..e461ce613 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -12,7 +12,7 @@ BattleTowerHallway_MapScriptHeader: .Scene0: priorityjump .ChooseBattleRoom - setscene $1 + setscene 1 .Scene1: end diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index c640c2c06..0d654d5c8 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -16,15 +16,15 @@ BlackthornGym1F_MapScriptHeader: .Boulders: checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_1 iffalse .skip1 - changeblock $8, $2, $3b + changeblock 8, 2, $3b .skip1 checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_2 iffalse .skip2 - changeblock $2, $4, $3a + changeblock 2, 4, $3a .skip2 checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_3 iffalse .skip3 - changeblock $8, $6, $3b + changeblock 8, 6, $3b .skip3 return @@ -39,7 +39,7 @@ BlackthornGymClairScript: waitbutton closetext winlosstext ClairWinText, 0 - loadtrainer CLAIR, 1 + loadtrainer CLAIR, CLAIR1 startbattle reloadmapafterbattle setevent EVENT_BEAT_CLAIR @@ -146,7 +146,7 @@ BlackthornGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext CLAIR, 1, $1 + trainertotext CLAIR, CLAIR1, $1 jumpstd gymstatue2 ClairIntroText: diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 784f06185..9e9ad1894 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -21,11 +21,11 @@ BrunosRoom_MapScriptHeader: .BrunosRoomDoors: checkevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED iffalse .KeepDoorClosed - changeblock $4, $e, $2a + changeblock 4, 14, $2a .KeepDoorClosed: checkevent EVENT_BRUNOS_ROOM_EXIT_OPEN iffalse .OpenDoor - changeblock $4, $2, $16 + changeblock 4, 2, $16 .OpenDoor: return @@ -34,10 +34,10 @@ BrunosRoom_MapScriptHeader: refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock $4, $e, $2a + changeblock 4, 14, $2a reloadmappart closetext - setscene $1 + setscene 1 setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -51,7 +51,7 @@ BrunoScript_Battle: waitbutton closetext winlosstext BrunoScript_BrunoBeatenText, 0 - loadtrainer BRUNO, 1 + loadtrainer BRUNO, BRUNO1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_BRUNO @@ -60,7 +60,7 @@ BrunoScript_Battle: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock $4, $2, $16 + changeblock 4, 2, $16 reloadmappart closetext setevent EVENT_BRUNOS_ROOM_EXIT_OPEN diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 69b71d9e3..fce0e73c8 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -29,11 +29,11 @@ BurnedTower1F_MapScriptHeader: .HoleAndLadder: checkevent EVENT_HOLE_IN_BURNED_TOWER iftrue .Next - changeblock $a, $8, $32 ; hole + changeblock 10, 8, $32 ; hole .Next: checkevent EVENT_RELEASED_THE_BEASTS iftrue .Done - changeblock $6, $e, $9 ; ladder + changeblock 6, 14, $9 ; ladder .Done: return @@ -45,8 +45,8 @@ BurnedTower1F_MapScriptHeader: writetext BurnedTower1FEusineIntroText waitbutton closetext - moveobject BURNEDTOWER1F_EUSINE, $9, $e - setscene $1 + moveobject BURNEDTOWER1F_EUSINE, 9, 14 + setscene 1 end BurnedTowerRivalBattleScript: @@ -98,7 +98,7 @@ BurnedTowerRivalBattleScript: writetext BurnedTowerSilver_AfterText1 waitbutton closetext - setscene $2 + setscene 2 setevent EVENT_RIVAL_BURNED_TOWER special Special_FadeOutMusic pause 15 @@ -106,7 +106,7 @@ BurnedTowerRivalBattleScript: showemote EMOTE_SHOCK, PLAYER, 15 playsound SFX_ENTER_DOOR waitsfx - changeblock $a, $8, $25 + changeblock 10, 8, $25 reloadmappart pause 15 applymovement PLAYER, BurnedTower1FMovement_PlayerStartsToFall diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 07f5c3d6e..935c14516 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -28,7 +28,7 @@ BurnedTowerB1F_MapScriptHeader: .LadderCallback: checkevent EVENT_RELEASED_THE_BEASTS iftrue .NoChange - changeblock $6, $e, $2 + changeblock 6, 14, $2 .NoChange: return @@ -81,11 +81,11 @@ ReleaseTheBeasts: disappear BURNEDTOWERB1F_SUICUNE1 waitsfx special RestartMapMusic - setscene $1 + setscene 1 setevent EVENT_RELEASED_THE_BEASTS special InitRoamMons - setmapscene ECRUTEAK_GYM, $1 - setmapscene 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 @@ -93,10 +93,10 @@ ReleaseTheBeasts: setevent EVENT_BURNED_TOWER_1F_EUSINE appear BURNEDTOWERB1F_EUSINE refreshscreen $0 - changeblock $6, $e, $1b + changeblock 6, 14, $1b reloadmappart closetext - setscene $1 + setscene 1 end BurnedTowerB1FEusine: diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index c94ef993e..ad34df21f 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -11,7 +11,7 @@ CeladonDeptStore6F_MapScriptHeader: dbw MAPCALLBACK_TILES, .Callback .Callback: - changeblock $c, $0, $3 + changeblock 12, 0, $3 return CeladonDeptStore6FSuperNerdScript: diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index cabb2d45c..0bbad4f98 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -22,7 +22,7 @@ ErikaScript_0x72a6a: waitbutton closetext winlosstext UnknownText_0x72c3e, 0 - loadtrainer ERIKA, 1 + loadtrainer ERIKA, ERIKA1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ERIKA @@ -109,7 +109,7 @@ CeladonGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext ERIKA, 1, $1 + trainertotext ERIKA, ERIKA1, $1 jumpstd gymstatue2 UnknownText_0x72b28: diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 2c2a594e6..e607d0e9d 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -133,7 +133,7 @@ NoBeastsText: para "#MON RAIKOU and" line "ENTEI?" - para $56, $56, $56 + para "<......><......><......>" para "Okay…" diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 59a1b72b9..3ed242b70 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -48,9 +48,9 @@ CeruleanGym_MapScriptHeader: setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM clearevent EVENT_ROUTE_24_ROCKET clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND - setscene $0 - setmapscene ROUTE_25, $1 - setmapscene POWER_PLANT, $0 + setscene 0 + setmapscene ROUTE_25, 1 + setmapscene POWER_PLANT, 0 waitsfx special RestartMapMusic pause 15 @@ -67,7 +67,7 @@ MistyScript_0x188432: waitbutton closetext winlosstext UnknownText_0x18870c, 0 - loadtrainer MISTY, 1 + loadtrainer MISTY, MISTY1 startbattle reloadmapafterbattle setevent EVENT_BEAT_MISTY @@ -161,7 +161,7 @@ CeruleanGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext MISTY, 1, $1 + trainertotext MISTY, MISTY1, $1 jumpstd gymstatue2 MovementData_0x1884e3: @@ -178,9 +178,9 @@ MovementData_0x1884e8: MovementData_0x1884eb: fix_facing - db $39 ; movement + set_sliding jump_step UP - db $38 ; movement + remove_sliding remove_fixed_facing step_sleep 8 step_sleep 8 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index d87d52165..94b66d104 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -101,7 +101,7 @@ CherrygroveCityGuideGent: end CherrygroveSilverSceneSouth: - moveobject CHERRYGROVECITY_SILVER, $27, $7 + moveobject CHERRYGROVECITY_SILVER, 39, 7 CherrygroveSilverSceneNorth: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 @@ -171,7 +171,7 @@ CherrygroveSilverSceneNorth: spriteface PLAYER, LEFT applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft disappear CHERRYGROVECITY_SILVER - setscene $0 + setscene 0 special HealParty playmapmusic end diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 75c34f6e1..078915791 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -49,9 +49,9 @@ CianwoodCitySuicuneAndEusine: applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0 disappear CIANWOODCITY_SUICUNE pause 10 - setscene $0 + setscene 0 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42 - setmapscene ROUTE_42, $1 + setmapscene ROUTE_42, 1 checkevent EVENT_FOUGHT_EUSINE iftrue .Done setevent EVENT_FOUGHT_EUSINE @@ -151,20 +151,20 @@ CianwoodCityHiddenMaxEther: dwb EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER MovementData_0x1a00da: - db $39 ; movement + set_sliding fast_jump_step DOWN fast_jump_step DOWN fast_jump_step RIGHT - db $38 ; movement + remove_sliding step_end MovementData_0x1a00e0: - db $39 ; movement + set_sliding fast_jump_step RIGHT fast_jump_step UP fast_jump_step RIGHT fast_jump_step RIGHT - db $38 ; movement + remove_sliding step_end MovementData_0x1a00e7: diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 0323fc0eb..49db07005 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -40,7 +40,7 @@ ChuckScript_0x9d60f: waitbutton closetext winlosstext ChuckLossText, 0 - loadtrainer CHUCK, 1 + loadtrainer CHUCK, CHUCK1 startbattle reloadmapafterbattle setevent EVENT_BEAT_CHUCK @@ -138,7 +138,7 @@ CianwoodGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext CHUCK, 1, $1 + trainertotext CHUCK, CHUCK1, $1 jumpstd gymstatue2 CianwoodGymMovement_ChuckChucksBoulder: diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 647e16541..be3742ef3 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -37,12 +37,12 @@ Colosseum_MapScriptHeader: return .PreparePokecenter2F: - setmapscene POKECENTER_2F, $2 + setmapscene POKECENTER_2F, 2 return .InitializeAndPreparePokecenter2F: - setscene $1 - setmapscene POKECENTER_2F, $2 + setscene 1 + setmapscene POKECENTER_2F, 2 end MapColosseumSignpost1Script: diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 1df424ca1..a27c0e6b0 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -165,8 +165,8 @@ DragonShrine_MapScriptHeader: waitsfx special RestartMapMusic specialphonecall SPECIALCALL_MASTERBALL - setscene $1 - setmapscene DRAGONS_DEN_B1F, $1 + setscene 1 + setmapscene DRAGONS_DEN_B1F, 1 writetext UnknownText_0x18d9f2 buttonsound writetext UnknownText_0x18da0b @@ -614,7 +614,7 @@ UnknownText_0x18d916: para "You did fail?" - para $56, $56, $56, $56, $56, $56 + para "<......><......><......><......><......><......>" para "…What? You passed?" done @@ -665,7 +665,7 @@ UnknownText_0x18da0b: done UnknownText_0x18dab4: - text $56, $56, $56, $56, $56, $56 + text "<......><......><......><......><......><......>" done DragonShrine_MapEventHeader: diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 8f87735db..b79857e36 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -80,7 +80,7 @@ DragonsDenB1F_ClairScene: pause 30 special RestartMapMusic disappear DRAGONSDENB1F_CLAIR - setscene $0 + setscene 0 end TrainerCooltrainermDarin: diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 491aaff7b..6948996e2 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -32,7 +32,7 @@ MortyScript_0x99d58: waitbutton closetext winlosstext UnknownText_0x9a00a, 0 - loadtrainer MORTY, 1 + loadtrainer MORTY, MORTY1 startbattle reloadmapafterbattle setevent EVENT_BEAT_MORTY @@ -43,7 +43,7 @@ MortyScript_0x99d58: setflag ENGINE_FOGBADGE checkcode VAR_BADGES scall EcruteakGymActivateRockets - setmapscene ECRUTEAK_HOUSE, $1 + setmapscene ECRUTEAK_HOUSE, 1 setevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_RANG_CLEAR_BELL_2 .FightDone: @@ -94,7 +94,7 @@ EcruteakGymClosed: special FadeOutPalettes playsound SFX_ENTER_DOOR waitsfx - warp ECRUTEAK_CITY, $6, $1b + warp ECRUTEAK_CITY, 6, 27 end TrainerSageJeffrey: @@ -162,7 +162,7 @@ EcruteakGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext MORTY, 1, $1 + trainertotext MORTY, MORTY1, $1 jumpstd gymstatue2 MovementData_0x99e5d: diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 274cc99e3..69dbfcbfa 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -35,7 +35,7 @@ EcruteakHouse_MapScriptHeader: setevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE checkitem CLEAR_BELL iftrue .NoClearBell - setscene $0 + setscene 0 .NoClearBell: return @@ -47,7 +47,7 @@ EcruteakHouse_CoordEvent1: checkevent EVENT_RANG_CLEAR_BELL_2 iftrue EcruteakHouse_CoordEvent_DontMove applymovement ECRUTEAKHOUSE_SAGE2, MovementData_0x980c7 - moveobject ECRUTEAKHOUSE_SAGE1, $4, $6 + moveobject ECRUTEAKHOUSE_SAGE1, 4, 6 appear ECRUTEAKHOUSE_SAGE1 pause 5 disappear ECRUTEAKHOUSE_SAGE2 @@ -57,7 +57,7 @@ EcruteakHouse_CoordEvent2: checkevent EVENT_RANG_CLEAR_BELL_1 iftrue EcruteakHouse_CoordEvent_DontMove applymovement ECRUTEAKHOUSE_SAGE1, MovementData_0x980cc - moveobject ECRUTEAKHOUSE_SAGE2, $5, $6 + moveobject ECRUTEAKHOUSE_SAGE2, 5, 6 appear ECRUTEAKHOUSE_SAGE2 pause 5 disappear ECRUTEAKHOUSE_SAGE1 @@ -100,7 +100,7 @@ SageScript_0x98062: writetext UnknownText_0x98250 waitbutton closetext - setscene $1 + setscene 1 setevent EVENT_RANG_CLEAR_BELL_2 clearevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_GAVE_KURT_APRICORNS @@ -202,7 +202,7 @@ UnknownText_0x98250: line "but I must ask you" cont "to leave." - para $56, $56, $56 + para "<......><......><......>" para "Ah!" diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index da661209f..dce2160de 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -53,7 +53,7 @@ EcruteakPokecenter1F_MapScriptHeader: disappear ECRUTEAKPOKECENTER1F_BILL clearevent EVENT_MET_BILL setflag ENGINE_TIME_CAPSULE - setscene $1 + setscene 1 waitsfx end diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 13c8b367e..c3e1a51f5 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -42,7 +42,7 @@ ElmsLab_MapScriptHeader: .MoveElmCallback: checkscene iftrue .Skip - moveobject ELMSLAB_ELM, $3, $4 + moveobject ELMSLAB_ELM, 3, 4 .Skip: return @@ -84,7 +84,7 @@ ElmsLab_MapScriptHeader: opentext writetext ElmText_ChooseAPokemon waitbutton - setscene $1 + setscene 1 closetext end @@ -274,8 +274,8 @@ ElmDirectionsScript: closetext setevent EVENT_GOT_A_POKEMON_FROM_ELM setevent EVENT_RIVAL_CHERRYGROVE_CITY - setscene $5 - setmapscene NEW_BARK_TOWN, $1 + setscene 5 + setmapscene NEW_BARK_TOWN, 1 end ElmDescribesMrPokemonScript: @@ -341,13 +341,13 @@ ElmAfterTheftScript: buttonsound setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM setflag ENGINE_BUG_CONTEST_ON - setmapscene ROUTE_29, $1 + setmapscene ROUTE_29, 1 clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY setevent EVENT_ROUTE_30_BATTLE writetext ElmAfterTheftText6 waitbutton closetext - setscene $6 + setscene 6 end ElmStudyingEggScript: @@ -479,7 +479,7 @@ AideScript_GivePotions: writetext AideText_AlwaysBusy waitbutton closetext - setscene $2 + setscene 2 end AideScript_WalkBalls1: @@ -507,7 +507,7 @@ AideScript_GiveYouBalls: buttonsound itemnotify closetext - setscene $2 + setscene 2 end AideScript_ReceiveTheBalls: @@ -562,7 +562,7 @@ CopScript: closetext applymovement ELMSLAB_OFFICER, OfficerLeavesMovement disappear ELMSLAB_OFFICER - setscene $2 + setscene 2 end ElmsLabWindow: @@ -794,7 +794,7 @@ ElmText_GotAnEmail: text "Oh, hey! I got an" line "e-mail!" - para $56, $56, $56 + para "<......><......><......>" line "Hm… Uh-huh…" para "Okay…" diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 869cb147c..d702ded51 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -35,11 +35,11 @@ FastShip1F_MapScriptHeader: clearevent EVENT_FAST_SHIP_HAS_ARRIVED checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue .SkipGrandpa - setscene $2 + setscene 2 end .SkipGrandpa: - setscene $0 + setscene 0 end SailorScript_0x75160: @@ -71,8 +71,8 @@ SailorScript_0x75160: special FadeOutPalettes waitsfx setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - setmapscene VERMILION_PORT, $1 - warp VERMILION_PORT, $7, $11 + setmapscene VERMILION_PORT, 1 + warp VERMILION_PORT, 7, 17 end ._Olivine: @@ -84,8 +84,8 @@ SailorScript_0x75160: special FadeOutPalettes waitsfx setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY - setmapscene OLIVINE_PORT, $1 - warp OLIVINE_PORT, $7, $17 + setmapscene OLIVINE_PORT, 1 + warp OLIVINE_PORT, 7, 23 end .LetThePlayerOut: @@ -120,7 +120,7 @@ FastShip1FSailorScript: jumptextfaceplayer FastShip1FSailorText WorriedGrandpaSceneRight: - moveobject FASTSHIP1F_GENTLEMAN, $14, $6 + moveobject FASTSHIP1F_GENTLEMAN, 20, 6 WorriedGrandpaSceneLeft: appear FASTSHIP1F_GENTLEMAN @@ -135,7 +135,7 @@ WorriedGrandpaSceneLeft: spriteface PLAYER, RIGHT applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222 disappear FASTSHIP1F_GENTLEMAN - setscene $0 + setscene 0 end MovementData_0x7520e: diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 498e65f70..988ab724e 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -31,7 +31,7 @@ UnknownScript_0x7673c: checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT iftrue UnknownScript_0x76766 applymovement FASTSHIPB1F_SAILOR2, MovementData_0x76876 - moveobject FASTSHIPB1F_SAILOR1, $1e, $6 + moveobject FASTSHIPB1F_SAILOR1, 30, 6 appear FASTSHIPB1F_SAILOR1 pause 5 disappear FASTSHIPB1F_SAILOR2 @@ -41,7 +41,7 @@ UnknownScript_0x76751: checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT iftrue UnknownScript_0x76766 applymovement FASTSHIPB1F_SAILOR1, MovementData_0x76871 - moveobject FASTSHIPB1F_SAILOR2, $1f, $6 + moveobject FASTSHIPB1F_SAILOR2, 31, 6 appear FASTSHIPB1F_SAILOR2 pause 5 disappear FASTSHIPB1F_SAILOR1 diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 1bd1c91f1..26618e8d3 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -98,7 +98,7 @@ SailorScript_0x755f1: waitbutton closetext setevent EVENT_FAST_SHIP_LAZY_SAILOR - setmapscene 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 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index efccd7d92..67e78a725 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -52,7 +52,7 @@ SSAquaGranddaughterBefore: special Special_ReloadSpritesNoPalettes disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2 applymovement PLAYER, MovementData_0x76004 - moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, $3, $13 + moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, 3, 19 appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 spriteface PLAYER, UP spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP @@ -81,7 +81,7 @@ SSAquaGranddaughterBefore: writetext SSAquaEntertainedGranddaughterText buttonsound setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - setmapscene FAST_SHIP_1F, $0 + setmapscene FAST_SHIP_1F, 0 jump SSAquaMetalCoatAndDocking SSAquaGrandpa: @@ -94,7 +94,7 @@ SSAquaGrandpa: writetext SSAquaCantFindGranddaughterText waitbutton closetext - setmapscene FAST_SHIP_1F, $0 + setmapscene FAST_SHIP_1F, 0 end SSAquaMetalCoatAndDocking: diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 8aaf6e364..64f580c5b 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -23,7 +23,7 @@ FuchsiaGymJanineScript: waitbutton closetext winlosstext JanineText_ToughOne, 0 - loadtrainer JANINE, 1 + loadtrainer JANINE, JANINE1 startbattle reloadmapafterbattle setevent EVENT_BEAT_JANINE @@ -216,7 +216,7 @@ FuchsiaGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext JANINE, 1, $1 + trainertotext JANINE, JANINE1, $1 jumpstd gymstatue2 Movement_NinjaSpin: diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 82d04ccc8..6cbb4441a 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -105,8 +105,8 @@ GoldenrodClangText: text "Clang! A can of" line "@" text_from_ram StringBuffer3 - text $55 - db "popped out!" + text "" + cont "popped out!" done GoldenrodVendingNoMoneyText: diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index da3dd0765..f2e88b6a1 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -23,7 +23,7 @@ UnknownScript_0x7d781: jump UnknownScript_0x7d791 UnknownScript_0x7d78a: - changeblock $10, $4, $d + changeblock 16, 4, $d jump UnknownScript_0x7d791 UnknownScript_0x7d791: @@ -31,15 +31,15 @@ UnknownScript_0x7d791: iftrue .Layout2 checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 iftrue .Layout3 - changeblock $a, $8, $d + changeblock 10, 8, $d return .Layout2: - changeblock $4, $a, $d + changeblock 4, 10, $d return .Layout3: - changeblock $a, $c, $d + changeblock 10, 12, $d return UnknownScript_0x7d7ac: diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index b384d43f1..baed07d79 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -23,8 +23,8 @@ GoldenrodDeptStoreRoof_MapScriptHeader: return .ChangeBlock: - changeblock $0, $2, $3f - changeblock $0, $4, $f + changeblock 0, 2, $3f + changeblock 0, 4, $f return .CheckSaleChangeClerk: diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 4446e653a..248864782 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -30,12 +30,12 @@ WhitneyScript_0x5400c: waitbutton closetext winlosstext UnknownText_0x541a5, 0 - loadtrainer WHITNEY, 1 + loadtrainer WHITNEY, WHITNEY1 startbattle reloadmapafterbattle setevent EVENT_BEAT_WHITNEY setevent EVENT_MADE_WHITNEY_CRY - setscene $1 + setscene 1 setevent EVENT_BEAT_BEAUTY_VICTORIA setevent EVENT_BEAT_BEAUTY_SAMANTHA setevent EVENT_BEAT_LASS_CARRIE @@ -112,7 +112,7 @@ WhitneyCriesScript: waitbutton closetext applymovement GOLDENRODGYM_LASS2, BridgetWalksAwayMovement - setscene $0 + setscene 0 clearevent EVENT_MADE_WHITNEY_CRY end @@ -171,7 +171,7 @@ GoldenrodGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext WHITNEY, 1, $1 + trainertotext WHITNEY, WHITNEY1, $1 jumpstd gymstatue2 BridgetWalksUpMovement: diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 8b114fd1c..73cc9701a 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -39,7 +39,7 @@ OfficerScript_0x550ec: warpcheck newloadmap MAPSETUP_TRAIN applymovement PLAYER, .MovementBoardTheTrain - wait $14 + wait 20 end .MovementBoardTheTrain: diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 617d54327..3cf35c3c0 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -25,7 +25,7 @@ GoldenrodPokecenter1F_GSBallSceneLeft: checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue .cancel playsound SFX_EXIT_BUILDING - moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, $0, $7 + moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, 0, 7 disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND @@ -57,7 +57,7 @@ GoldenrodPokecenter1F_GSBallSceneRight: checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue .cancel playsound SFX_EXIT_BUILDING - moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, $0, $7 + moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, 0, 7 disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index debf98bfa..1c5872548 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -45,7 +45,7 @@ GoldenrodUnderground_MapScriptHeader: return .LockBasementDoor: - changeblock $12, $6, $3d + changeblock 18, 6, $3d return .CheckDayOfWeek: @@ -384,7 +384,7 @@ BasementDoorScript:: writetext UnknownText_0x7c5d6 waitbutton closetext - changeblock $12, $6, $2e + changeblock 18, 6, $2e reloadmappart closetext setevent EVENT_USED_BASEMENT_KEY diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index c9bfdac9d..a10468875 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -28,7 +28,7 @@ HallOfFame_MapScriptHeader: closetext spriteface HALLOFFAME_LANCE, UP applymovement PLAYER, HallOfFame_SlowlyApproachMachine - setscene $1 + setscene 1 pause 15 writebyte 2 ; Machine is in the Hall of Fame special HealMachineAnim @@ -38,7 +38,7 @@ HallOfFame_MapScriptHeader: clearevent EVENT_RED_IN_MT_SILVER setevent EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME clearevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - setmapscene SPROUT_TOWER_3F, $1 + setmapscene SPROUT_TOWER_3F, 1 special HealParty checkevent EVENT_GOT_SS_TICKET_FROM_ELM iftrue .SkipPhoneCall diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 7bbba6562..094567692 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -37,52 +37,52 @@ IlexForest_MapScriptHeader: return .PositionOne: - moveobject ILEXFOREST_FARFETCHD, $e, $1f + moveobject ILEXFOREST_FARFETCHD, 14, 31 appear ILEXFOREST_FARFETCHD return .PositionTwo: - moveobject ILEXFOREST_FARFETCHD, $f, $19 + moveobject ILEXFOREST_FARFETCHD, 15, 25 appear ILEXFOREST_FARFETCHD return .PositionThree: - moveobject ILEXFOREST_FARFETCHD, $14, $18 + moveobject ILEXFOREST_FARFETCHD, 20, 24 appear ILEXFOREST_FARFETCHD return .PositionFour: - moveobject ILEXFOREST_FARFETCHD, $1d, $16 + moveobject ILEXFOREST_FARFETCHD, 29, 22 appear ILEXFOREST_FARFETCHD return .PositionFive: - moveobject ILEXFOREST_FARFETCHD, $1c, $1f + moveobject ILEXFOREST_FARFETCHD, 28, 31 appear ILEXFOREST_FARFETCHD return .PositionSix: - moveobject ILEXFOREST_FARFETCHD, $18, $23 + moveobject ILEXFOREST_FARFETCHD, 24, 35 appear ILEXFOREST_FARFETCHD return .PositionSeven: - moveobject ILEXFOREST_FARFETCHD, $16, $1f + moveobject ILEXFOREST_FARFETCHD, 22, 31 appear ILEXFOREST_FARFETCHD return .PositionEight: - moveobject ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, 15, 29 appear ILEXFOREST_FARFETCHD return .PositionNine: - moveobject ILEXFOREST_FARFETCHD, $a, $23 + moveobject ILEXFOREST_FARFETCHD, 10, 35 appear ILEXFOREST_FARFETCHD return .PositionTen: - moveobject ILEXFOREST_FARFETCHD, $6, $1c + moveobject ILEXFOREST_FARFETCHD, 6, 28 appear ILEXFOREST_FARFETCHD return @@ -125,7 +125,7 @@ IlexForestFarfetchdScript: waitbutton closetext applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos1_Pos2 - moveobject ILEXFOREST_FARFETCHD, $f, $19 + moveobject ILEXFOREST_FARFETCHD, 15, 25 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 2 @@ -135,7 +135,7 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal DOWN, .Position2_Down applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos2_Pos3 - moveobject ILEXFOREST_FARFETCHD, $14, $18 + moveobject ILEXFOREST_FARFETCHD, 20, 24 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 3 @@ -143,7 +143,7 @@ IlexForestFarfetchdScript: .Position2_Down: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos2_Pos8 - moveobject ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, 15, 29 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 @@ -153,7 +153,7 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal LEFT, .Position3_Left applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos3_Pos4 - moveobject ILEXFOREST_FARFETCHD, $1d, $16 + moveobject ILEXFOREST_FARFETCHD, 29, 22 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 4 @@ -161,7 +161,7 @@ IlexForestFarfetchdScript: .Position3_Left: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos3_Pos2 - moveobject ILEXFOREST_FARFETCHD, $f, $19 + moveobject ILEXFOREST_FARFETCHD, 15, 25 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 2 @@ -171,7 +171,7 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal UP, .Position4_Up applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos4_Pos5 - moveobject ILEXFOREST_FARFETCHD, $1c, $1f + moveobject ILEXFOREST_FARFETCHD, 28, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 5 @@ -179,7 +179,7 @@ IlexForestFarfetchdScript: .Position4_Up: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos4_Pos3 - moveobject ILEXFOREST_FARFETCHD, $14, $18 + moveobject ILEXFOREST_FARFETCHD, 20, 24 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 3 @@ -191,7 +191,7 @@ IlexForestFarfetchdScript: if_equal LEFT, .Position5_Left if_equal RIGHT, .Position5_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos5_Pos6 - moveobject ILEXFOREST_FARFETCHD, $18, $23 + moveobject ILEXFOREST_FARFETCHD, 24, 35 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 6 @@ -199,7 +199,7 @@ IlexForestFarfetchdScript: .Position5_Left: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos5_Pos7 - moveobject ILEXFOREST_FARFETCHD, $16, $1f + moveobject ILEXFOREST_FARFETCHD, 22, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 7 @@ -207,7 +207,7 @@ IlexForestFarfetchdScript: .Position5_Up: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos5_Pos4_Up - moveobject ILEXFOREST_FARFETCHD, $1d, $16 + moveobject ILEXFOREST_FARFETCHD, 29, 22 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 4 @@ -215,7 +215,7 @@ IlexForestFarfetchdScript: .Position5_Right: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos5_Pos4_Right - moveobject ILEXFOREST_FARFETCHD, $1d, $16 + moveobject ILEXFOREST_FARFETCHD, 29, 22 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 4 @@ -225,7 +225,7 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal RIGHT, .Position6_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos6_Pos7 - moveobject ILEXFOREST_FARFETCHD, $16, $1f + moveobject ILEXFOREST_FARFETCHD, 22, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 7 @@ -233,7 +233,7 @@ IlexForestFarfetchdScript: .Position6_Right: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos6_Pos5 - moveobject ILEXFOREST_FARFETCHD, $1c, $1f + moveobject ILEXFOREST_FARFETCHD, 28, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 5 @@ -244,7 +244,7 @@ IlexForestFarfetchdScript: if_equal DOWN, .Position7_Down if_equal LEFT, .Position7_Left applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos8 - moveobject ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, 15, 29 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 @@ -252,7 +252,7 @@ IlexForestFarfetchdScript: .Position7_Left: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos6 - moveobject ILEXFOREST_FARFETCHD, $18, $23 + moveobject ILEXFOREST_FARFETCHD, 24, 35 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 6 @@ -260,7 +260,7 @@ IlexForestFarfetchdScript: .Position7_Down: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos5 - moveobject ILEXFOREST_FARFETCHD, $1c, $1f + moveobject ILEXFOREST_FARFETCHD, 28, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 5 @@ -272,7 +272,7 @@ IlexForestFarfetchdScript: if_equal LEFT, .Position8_Left if_equal RIGHT, .Position8_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos9 - moveobject ILEXFOREST_FARFETCHD, $a, $23 + moveobject ILEXFOREST_FARFETCHD, 10, 35 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 9 @@ -280,7 +280,7 @@ IlexForestFarfetchdScript: .Position8_Right: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos7 - moveobject ILEXFOREST_FARFETCHD, $16, $1f + moveobject ILEXFOREST_FARFETCHD, 22, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 7 @@ -289,7 +289,7 @@ IlexForestFarfetchdScript: .Position8_Up: .Position8_Left: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos2 - moveobject ILEXFOREST_FARFETCHD, $f, $19 + moveobject ILEXFOREST_FARFETCHD, 15, 25 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 2 @@ -300,7 +300,7 @@ IlexForestFarfetchdScript: if_equal DOWN, .Position9_Down if_equal RIGHT, .Position9_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos10 - moveobject ILEXFOREST_FARFETCHD, $6, $1c + moveobject ILEXFOREST_FARFETCHD, 6, 28 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 10 @@ -311,7 +311,7 @@ IlexForestFarfetchdScript: .Position9_Right: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos8_Right - moveobject ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, 15, 29 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 @@ -319,7 +319,7 @@ IlexForestFarfetchdScript: .Position9_Down: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos8_Down - moveobject ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, 15, 29 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 879e1dd8b..f5f156565 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -19,12 +19,12 @@ IndigoPlateauPokecenter1F_MapScriptHeader: end .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 + 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 @@ -54,7 +54,7 @@ PlateauRivalBattle1: if_equal THURSDAY, PlateauRivalScriptDone if_equal FRIDAY, PlateauRivalScriptDone if_equal SATURDAY, PlateauRivalScriptDone - moveobject INDIGOPLATEAUPOKECENTER1F_SILVER, $11, $9 + moveobject INDIGOPLATEAUPOKECENTER1F_SILVER, 17, 9 appear INDIGOPLATEAUPOKECENTER1F_SILVER spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 @@ -130,7 +130,7 @@ PlateauRivalPostBattle: spriteface PLAYER, DOWN applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement disappear INDIGOPLATEAUPOKECENTER1F_SILVER - setscene $0 + setscene 0 playmapmusic setflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT PlateauRivalScriptDone: @@ -160,7 +160,7 @@ TeleportGuyScript: playsound SFX_WARP_TO special FadeOutPalettes waitsfx - warp NEW_BARK_TOWN, $d, $6 + warp NEW_BARK_TOWN, 13, 6 end .No: diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index cba4aed9a..cb1743d8a 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -21,11 +21,11 @@ KarensRoom_MapScriptHeader: .KarensRoomDoors: checkevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED iffalse .KeepDoorsClosed - changeblock $4, $e, $2a + changeblock 4, 14, $2a .KeepDoorsClosed: checkevent EVENT_KARENS_ROOM_EXIT_OPEN iffalse .OpenDoors - changeblock $4, $2, $16 + changeblock 4, 2, $16 .OpenDoors: return @@ -34,10 +34,10 @@ KarensRoom_MapScriptHeader: refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock $4, $e, $2a + changeblock 4, 14, $2a reloadmappart closetext - setscene $1 + setscene 1 setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -51,7 +51,7 @@ KarenScript_Battle: waitbutton closetext winlosstext KarenScript_KarenBeatenText, 0 - loadtrainer KAREN, 1 + loadtrainer KAREN, KAREN1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_KAREN @@ -60,7 +60,7 @@ KarenScript_Battle: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock $4, $2, $16 + changeblock 4, 2, $16 reloadmappart closetext setevent EVENT_KARENS_ROOM_EXIT_OPEN diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index d621ed342..2c6900d89 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -21,11 +21,11 @@ KogasRoom_MapScriptHeader: .KogasRoomDoors: checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED iffalse .KeepDoorsClosed - changeblock $4, $e, $2a + changeblock 4, 14, $2a .KeepDoorsClosed: checkevent EVENT_KOGAS_ROOM_EXIT_OPEN iffalse .OpenDoors - changeblock $4, $2, $16 + changeblock 4, 2, $16 .OpenDoors: return @@ -34,10 +34,10 @@ KogasRoom_MapScriptHeader: refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock $4, $e, $2a + changeblock 4, 14, $2a reloadmappart closetext - setscene $1 + setscene 1 setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -51,7 +51,7 @@ KogaScript_Battle: waitbutton closetext winlosstext KogaScript_KogaBeatenText, 0 - loadtrainer KOGA, 1 + loadtrainer KOGA, KOGA1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_KOGA @@ -60,7 +60,7 @@ KogaScript_Battle: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock $4, $2, $16 + changeblock 4, 2, $16 reloadmappart closetext setevent EVENT_KOGAS_ROOM_EXIT_OPEN diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 24092cc4f..addfeef13 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -43,7 +43,7 @@ UnknownScript_0x7a4f6: setflag ENGINE_POKEGEAR setflag ENGINE_PHONE_CARD addcellnum PHONE_MOM - setscene $1 + setscene 1 setevent EVENT_KRISS_HOUSE_MOM_1 clearevent EVENT_KRISS_HOUSE_MOM_2 writetext UnknownText_0x7a6bd diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 65d5fdaee..15e5d3641 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -93,7 +93,7 @@ KrissHousePC: closetext end .Warp: - warp NONE, $0, $0 + warp NONE, 0, 0 end KrisRadioText1: diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 6c1d6a9eb..2c1e7ba70 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -311,7 +311,7 @@ KurtScript_0x18e178: clearevent EVENT_AZALEA_TOWN_KURT waitsfx special RestartMapMusic - setmapscene AZALEA_TOWN, $2 + setmapscene AZALEA_TOWN, 2 end KurtScript_0x18e3bd: diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 50e7f05d0..6ff7060f9 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -62,7 +62,7 @@ UnknownScript_0x70035: disappear LAKEOFRAGE_LANCE clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_DECIDED_TO_HELP_LANCE - setmapscene MAHOGANY_MART_1F, $1 + setmapscene MAHOGANY_MART_1F, 1 end UnknownScript_0x7004e: @@ -101,7 +101,7 @@ UnknownScript_0x7007a: waitsfx itemnotify closetext - setscene $0 + setscene 0 appear LAKEOFRAGE_LANCE end diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index f185af0dc..6a1931d1b 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -23,11 +23,11 @@ LancesRoom_MapScriptHeader: .LancesRoomDoors: checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED iffalse .KeepDoorsClosed - changeblock $4, $16, $34 + changeblock 4, 22, $34 .KeepDoorsClosed: checkevent EVENT_LANCES_ROOM_EXIT_OPEN iffalse .OpenDoors - changeblock $4, $0, $b + changeblock 4, 0, $b .OpenDoors: return @@ -36,10 +36,10 @@ LancesRoom_MapScriptHeader: refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock $4, $16, $34 + changeblock 4, 22, $34 reloadmappart closetext - setscene $1 + setscene 1 setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED end @@ -69,7 +69,7 @@ LanceScript_0x180e7b: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock $4, $0, $b + changeblock 4, 0, $b reloadmappart closetext setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED @@ -127,7 +127,7 @@ LanceScript_0x180e7b: applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth special FadeOutPalettes pause 15 - warpfacing UP, HALL_OF_FAME, $4, $d + warpfacing UP, HALL_OF_FAME, 4, 13 end LancesRoom_PlayerWalksInMovementData: diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index a8de6e987..814e81776 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -23,7 +23,7 @@ PryceScript_0x199a9e: waitbutton closetext winlosstext PryceText_Impressed, 0 - loadtrainer PRYCE, 1 + loadtrainer PRYCE, PRYCE1 startbattle reloadmapafterbattle setevent EVENT_BEAT_PRYCE @@ -146,7 +146,7 @@ MahoganyGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext PRYCE, 1, $1 + trainertotext PRYCE, PRYCE1, $1 jumpstd gymstatue2 PryceText_Intro: diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index a25277fd9..2dbdf203d 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -28,7 +28,7 @@ MahoganyMart1F_MapScriptHeader: return .ShowStairs: - changeblock $6, $2, $1e + changeblock 6, 2, $1e return PharmacistScript_0x6c367: @@ -89,7 +89,7 @@ UnknownScript_0x6c38f: waitbutton showemote EMOTE_SHOCK, MAHOGANYMART1F_PHARMACIST, 10 playsound SFX_FAINT - changeblock $6, $2, $1e + changeblock 6, 2, $1e reloadmappart closetext setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART @@ -101,7 +101,7 @@ UnknownScript_0x6c38f: applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412 playsound SFX_EXIT_BUILDING disappear MAHOGANYMART1F_LANCE - setscene $0 + setscene 0 waitsfx end diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 870321f3d..9439eabf3 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -15,8 +15,8 @@ MobileBattleRoom_MapScriptHeader: end .InitializeAndPreparePokecenter2F: - setscene $1 - setmapscene POKECENTER_2F, $5 + setscene 1 + setmapscene POKECENTER_2F, 5 end MapMobileBattleRoomSignpost0Script: diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 1003d4ea5..bcc2c2d79 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -15,8 +15,8 @@ MobileTradeRoomMobile_MapScriptHeader: end .InitializeAndPreparePokecenter2F: - setscene $1 - setmapscene POKECENTER_2F, $4 + setscene 1 + setmapscene POKECENTER_2F, 4 end MapMobileTradeRoomMobileSignpost0Script: diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 73306f424..531c8a327 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -66,7 +66,7 @@ MountMoon_MapScriptHeader: closetext applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter disappear MOUNTMOON_SILVER - setscene $1 + setscene 1 setevent EVENT_BEAT_RIVAL_IN_MT_MOON playmapmusic end diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index f808d44c8..4b5d25ecb 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -125,9 +125,9 @@ MrPokemonsHouse_OakScript: setevent EVENT_RIVAL_NEW_BARK_TOWN setevent EVENT_KRISS_HOUSE_1F_NEIGHBOR clearevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR - setscene $1 - setmapscene CHERRYGROVE_CITY, $1 - setmapscene 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 @@ -169,7 +169,7 @@ MrPokemonsHouse_OakExits: step DOWN step LEFT turn_head DOWN - db $3f ; movement + step_sleep 2 step_end MrPokemonIntroText1: diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 2e5129bc5..26e673ded 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -41,7 +41,7 @@ UnknownScript_0x1a8833: applymovement PLAYER, MovementData_0x1a88f4 spriteface PLAYER, RIGHT applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db - setscene $1 + setscene 1 disappear OLIVINECITY_OLIVINE_RIVAL special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY @@ -66,7 +66,7 @@ UnknownScript_0x1a886b: spriteface PLAYER, RIGHT applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8 disappear OLIVINECITY_OLIVINE_RIVAL - setscene $1 + setscene 1 special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY special MapCallbackSprites_LoadUsedSpritesGFX diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index cb87bdd85..849f6eecf 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -18,7 +18,7 @@ JasmineScript_0x9c12f: waitbutton closetext winlosstext Jasmine_BetterTrainer, 0 - loadtrainer JASMINE, 1 + loadtrainer JASMINE, JASMINE1 startbattle reloadmapafterbattle setevent EVENT_BEAT_JASMINE @@ -91,7 +91,7 @@ OlivineGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext JASMINE, 1, $1 + trainertotext JASMINE, JASMINE1, $1 jumpstd gymstatue2 Jasmine_SteelTypeIntro: diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index f34281e43..4fd072c67 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -26,7 +26,7 @@ OlivinePort_MapScriptHeader: .LeaveFastShipScript: applymovement PLAYER, MovementData_0x74a32 appear OLIVINEPORT_SAILOR1 - setscene $0 + setscene 0 setevent EVENT_GAVE_KURT_APRICORNS blackoutmod OLIVINE_CITY end @@ -64,8 +64,8 @@ SailorScript_0x748c0: UnknownScript_0x7490a: clearevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear OLIVINEPORT_SAILOR1 - setmapscene FAST_SHIP_1F, $1 - warp FAST_SHIP_1F, $19, $1 + setmapscene FAST_SHIP_1F, 1 + warp FAST_SHIP_1F, 25, 1 end UnknownScript_0x74919: diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index ca94d9e9f..cfe63fe18 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -19,7 +19,7 @@ BrockScript_0x1a2864: waitbutton closetext winlosstext UnknownText_0x1a29bb, 0 - loadtrainer BROCK, 1 + loadtrainer BROCK, BROCK1 startbattle reloadmapafterbattle setevent EVENT_BEAT_BROCK @@ -72,7 +72,7 @@ PewterGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext BROCK, 1, $1 + trainertotext BROCK, BROCK1, $1 jumpstd gymstatue2 UnknownText_0x1a28d0: diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index ece34605d..cf626c500 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -376,15 +376,15 @@ LinkReceptionistScript_TimeCapsule: Script_LeftCableTradeCenter: special WaitForOtherPlayerToExit scall Script_WalkOutOfLinkTradeRoom - setscene $0 - setmapscene TRADE_CENTER, $0 + setscene 0 + setmapscene TRADE_CENTER, 0 end Script_LeftMobileTradeRoom: special Function101220 scall Script_WalkOutOfMobileTradeRoom - setscene $0 - setmapscene MOBILE_TRADE_ROOM_MOBILE, $0 + setscene 0 + setmapscene MOBILE_TRADE_ROOM_MOBILE, 0 end Script_WalkOutOfMobileTradeRoom: @@ -396,15 +396,15 @@ Script_WalkOutOfMobileTradeRoom: Script_LeftCableColosseum: special WaitForOtherPlayerToExit scall Script_WalkOutOfLinkBattleRoom - setscene $0 - setmapscene COLOSSEUM, $0 + setscene 0 + setmapscene COLOSSEUM, 0 end Script_LeftMobileBattleRoom: special Function101220 scall Script_WalkOutOfMobileBattleRoom - setscene $0 - setmapscene MOBILE_BATTLE_ROOM, $0 + setscene 0 + setmapscene MOBILE_BATTLE_ROOM, 0 end Script_WalkOutOfMobileBattleRoom: @@ -579,8 +579,8 @@ Script_LeftTimeCapsule: applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2 .Done: - setscene $0 - setmapscene TIME_CAPSULE, $0 + setscene 0 + setmapscene TIME_CAPSULE, 0 end MapPokecenter2FSignpost0Script: diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 371ef6c58..f3b02fe44 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -42,7 +42,7 @@ PowerPlantGuardPhoneScript: closetext spriteface PLAYER, DOWN applymovement POWERPLANT_OFFICER1, MovementData_0x188eda - setscene $0 + setscene 0 end OfficerScript_0x188df5: @@ -148,8 +148,8 @@ PowerPlantManager: setevent EVENT_MET_MANAGER_AT_POWER_PLANT clearevent EVENT_CERULEAN_GYM_ROCKET clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM - setmapscene CERULEAN_GYM, $1 - setscene $1 + setmapscene CERULEAN_GYM, 1 + setscene 1 end UnknownScript_0x188e8d: diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index febce1a36..d3ded02ea 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -249,8 +249,8 @@ UnknownText_0x5cf5a: done UnknownText_0x5cf79: - text $56 - line $56 + text "<......>" + line "<......>" done UnknownText_0x5cf7e: diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 5a0e360c5..3ac8c1388 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -21,8 +21,8 @@ RadioTower3F_MapScriptHeader: return .Change: - changeblock $e, $2, $2a - changeblock $e, $4, $1 + changeblock 14, 2, $2a + changeblock 14, 4, $1 return RadioTower3FSuperNerdScript: @@ -143,8 +143,8 @@ UnknownScript_0x5e605: waitbutton setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER playsound SFX_ENTER_DOOR - changeblock $e, $2, $2a - changeblock $e, $4, $1 + changeblock 14, 2, $2a + changeblock 14, 4, $1 reloadmappart closetext waitsfx diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index c73d53de2..1ef195be0 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -47,7 +47,7 @@ FakeDirectorScript: buttonsound verbosegiveitem BASEMENT_KEY closetext - setscene $1 + setscene 1 setevent EVENT_BEAT_ROCKET_EXECUTIVEM_3 end @@ -115,7 +115,7 @@ RadioTower5FRocketBossScene: clearevent EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM special PlayMapMusic disappear RADIOTOWER5F_DIRECTOR - moveobject RADIOTOWER5F_DIRECTOR, $c, $0 + moveobject RADIOTOWER5F_DIRECTOR, 12, 0 appear RADIOTOWER5F_DIRECTOR applymovement RADIOTOWER5F_DIRECTOR, RadioTower5FDirectorWalksIn spriteface PLAYER, RIGHT @@ -126,8 +126,8 @@ RadioTower5FRocketBossScene: writetext RadioTower5FDirectorDescribeClearBellText waitbutton closetext - setscene $2 - setmapscene ECRUTEAK_HOUSE, $0 + setscene 2 + setmapscene ECRUTEAK_HOUSE, 0 setevent EVENT_GOT_CLEAR_BELL setevent EVENT_TEAM_ROCKET_DISBANDED jump .UselessJump diff --git a/maps/Route19.asm b/maps/Route19.asm index 7681b39c2..eee48f089 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -17,12 +17,12 @@ Route19_MapScriptHeader: .ClearRocks: checkevent EVENT_CINNABAR_ROCKS_CLEARED iftrue .Done - changeblock $6, $6, $7a - changeblock $8, $6, $7a - changeblock $a, $6, $7a - changeblock $c, $8, $7a - changeblock $4, $8, $7a - changeblock $a, $a, $7a + changeblock 6, 6, $7a + changeblock 8, 6, $7a + changeblock 10, 6, $7a + changeblock 12, 8, $7a + changeblock 4, 8, $7a + changeblock 10, 10, $7a .Done: return diff --git a/maps/Route25.asm b/maps/Route25.asm index ce37fe894..0d2f7a054 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -48,7 +48,7 @@ UnknownScript_0x19eea0: applymovement ROUTE25_MISTY, MovementData_0x19f000 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM - setscene $0 + setscene 0 special RestartMapMusic end @@ -74,7 +74,7 @@ UnknownScript_0x19eee0: applymovement ROUTE25_MISTY, MovementData_0x19f000 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM - setscene $0 + setscene 0 special RestartMapMusic end diff --git a/maps/Route27.asm b/maps/Route27.asm index 3afac9155..4b02422f7 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -42,7 +42,7 @@ UnknownScript_0x1a088c: writetext Route27FisherText waitbutton closetext - setscene $1 + setscene 1 end Route27FisherScript: diff --git a/maps/Route29.asm b/maps/Route29.asm index 6d564f083..a990cdc18 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -59,7 +59,7 @@ Route29Tutorial1: writetext CatchingTutorialDebriefText waitbutton closetext - setscene $0 + setscene 0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end @@ -84,7 +84,7 @@ Route29Tutorial2: writetext CatchingTutorialDebriefText waitbutton closetext - setscene $0 + setscene 0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end @@ -93,7 +93,7 @@ Script_RefusedTutorial1: waitbutton closetext applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b - setscene $0 + setscene 0 end Script_RefusedTutorial2: @@ -101,7 +101,7 @@ Script_RefusedTutorial2: waitbutton closetext applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b - setscene $0 + setscene 0 end CatchingTutorialDudeScript: diff --git a/maps/Route32.asm b/maps/Route32.asm index 659ea40db..b9de0d4df 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -127,7 +127,7 @@ Route32WannaBuyASlowpokeTailScript: SlowpokeTailSalesmanScript: faceplayer _OfferToSellSlowpokeTail: - setscene $2 + setscene 2 opentext writetext Text_MillionDollarSlowpokeTail yesorno diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index cf68bbcc2..84bc40ccc 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -28,11 +28,11 @@ Route35NationalParkGate_MapScriptHeader: .CheckIfContestRunning: checkflag ENGINE_BUG_CONTEST_TIMER iftrue .BugContestIsRunning - setscene $0 + setscene 0 return .BugContestIsRunning: - setscene $2 + setscene 2 return .CheckIfContestAvailable: @@ -76,7 +76,7 @@ Route35NationalParkGate_MapScriptHeader: playsound SFX_ENTER_DOOR special FadeOutPalettes waitsfx - warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f + warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47 end OfficerScript_0x6a204: @@ -114,7 +114,7 @@ Route35NationalParkGate_OkayToProceed: special FadeOutPalettes waitsfx special Special_SelectRandomBugContestContestants - warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f + warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47 end Route35NationalParkGate_EnterContest: diff --git a/maps/Route36.asm b/maps/Route36.asm index 4076725b4..40a4ae446 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -44,9 +44,9 @@ Route36SuicuneScript: disappear ROUTE36_SUICUNE spriteface PLAYER, DOWN pause 10 - setscene $0 + setscene 0 clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY - setmapscene CIANWOOD_CITY, $1 + setmapscene CIANWOOD_CITY, 1 end SudowoodoScript: diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 88d7abb14..9c6bd8c45 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -37,11 +37,11 @@ Route36NationalParkGate_MapScriptHeader: .CheckIfContestRunning: checkflag ENGINE_BUG_CONTEST_TIMER iftrue .BugContestIsRunning - setscene $0 + setscene 0 return .BugContestIsRunning: - setscene $2 + setscene 2 return .CheckIfContestAvailable: @@ -93,7 +93,7 @@ Route36NationalParkGate_MapScriptHeader: playsound SFX_EXIT_BUILDING special FadeOutPalettes waitsfx - warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 + warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18 end .CopyContestants: @@ -177,7 +177,7 @@ Route36OfficerScriptContest: special FadeOutPalettes waitsfx special Special_SelectRandomBugContestContestants - warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 + warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18 end .LeaveMonsWithOfficer: diff --git a/maps/Route42.asm b/maps/Route42.asm index ccf174b17..9f18f09e8 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -31,9 +31,9 @@ Route42SuicuneScript: applymovement ROUTE42_SUICUNE, MovementData_0x1a9356 disappear ROUTE42_SUICUNE pause 10 - setscene $0 + setscene 0 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36 - setmapscene ROUTE_36, $1 + setmapscene ROUTE_36, 1 end TrainerFisherTully1: @@ -216,14 +216,14 @@ Route42HiddenMaxPotion: MovementData_0x1a9356: - db $39 ; movement + set_sliding fast_jump_step UP fast_jump_step UP fast_jump_step UP fast_jump_step RIGHT fast_jump_step RIGHT fast_jump_step RIGHT - db $38 ; movement + remove_sliding step_end FisherTully1SeenText: diff --git a/maps/Route43.asm b/maps/Route43.asm index b76ebaead..79e367af9 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -19,11 +19,11 @@ Route43_MapScriptHeader: .CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .NoRockets - setmapscene ROUTE_43_GATE, $0 + setmapscene ROUTE_43_GATE, 0 return .NoRockets: - setmapscene ROUTE_43_GATE, $1 + setmapscene ROUTE_43_GATE, 1 return TrainerCamperSpencer: diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 58bb163ef..e59c04390 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -25,11 +25,11 @@ Route43Gate_MapScriptHeader: .CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .NoRockets - setmapscene ROUTE_43, $0 + setmapscene ROUTE_43, 0 return .NoRockets: - setmapscene ROUTE_43, $1 + setmapscene ROUTE_43, 1 return .RocketTakeover: @@ -37,7 +37,7 @@ Route43Gate_MapScriptHeader: checkcode VAR_FACING if_equal DOWN, RocketScript_Southbound if_equal UP, RocketScript_Northbound - setscene $1 + setscene 1 end RocketScript_Southbound: @@ -69,7 +69,7 @@ RocketScript_ShakeDownSouth: closetext applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassSouth applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassSouth - setscene $1 + setscene 1 special RestartMapMusic end @@ -101,7 +101,7 @@ RocketScript_ShakeDownNorth: closetext applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassNorth applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassNorth - setscene $1 + setscene 1 special RestartMapMusic end diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 355b5591c..14ed627d1 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -23,15 +23,15 @@ RuinsOfAlphAerodactylChamber_MapScriptHeader: .HiddenDoors: checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER iftrue .WallOpen - changeblock $4, $0, $2e + changeblock 4, 0, $2e .WallOpen: checkevent EVENT_SOLVED_AERODACTYL_PUZZLE iffalse .FloorClosed return .FloorClosed: - changeblock $2, $2, $1 - changeblock $4, $2, $2 + changeblock 2, 2, $1 + changeblock 4, 2, $2 return .WallOpenScript: @@ -40,10 +40,10 @@ RuinsOfAlphAerodactylChamber_MapScriptHeader: showemote EMOTE_SHOCK, PLAYER, 20 pause 30 playsound SFX_STRENGTH - changeblock $4, $0, $30 + changeblock 4, 0, $30 reloadmappart earthquake 50 - setscene $1 + setscene 1 closetext end @@ -59,11 +59,11 @@ UnknownScript_0x58df7: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_AERODACTYL_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_3 - setmapscene RUINS_OF_ALPH_INNER_CHAMBER, $1 + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 - changeblock $2, $2, $18 - changeblock $4, $2, $19 + changeblock 2, 2, $18 + changeblock 4, 2, $19 reloadmappart playsound SFX_STRENGTH earthquake 80 @@ -106,7 +106,7 @@ UnknownScript_0x58e46: end MovementData_0x58e4d: - db $59 ; movement + skyfall_top step_end UnknownText_0x58e4f: diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 52915317d..586231a08 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -24,15 +24,15 @@ RuinsOfAlphHoOhChamber_MapScriptHeader: .HiddenDoors: checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue .WallOpen - changeblock $4, $0, $2e + changeblock 4, 0, $2e .WallOpen: checkevent EVENT_SOLVED_HO_OH_PUZZLE iffalse .FloorClosed return .FloorClosed: - changeblock $2, $2, $1 - changeblock $4, $2, $2 + changeblock 2, 2, $1 + changeblock 4, 2, $2 return .WallOpenScript: @@ -41,10 +41,10 @@ RuinsOfAlphHoOhChamber_MapScriptHeader: showemote EMOTE_SHOCK, PLAYER, 20 pause 30 playsound SFX_STRENGTH - changeblock $4, $0, $30 + changeblock 4, 0, $30 reloadmappart earthquake 50 - setscene $1 + setscene 1 closetext end @@ -60,11 +60,11 @@ UnknownScript_0x585ba: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_HO_OH_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_4 - setmapscene RUINS_OF_ALPH_INNER_CHAMBER, $1 + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 - changeblock $2, $2, $18 - changeblock $4, $2, $19 + changeblock 2, 2, $18 + changeblock 4, 2, $19 reloadmappart playsound SFX_STRENGTH earthquake 80 @@ -107,7 +107,7 @@ UnknownScript_0x58609: end MovementData_0x58610: - db $59 ; movement + skyfall_top step_end UnknownText_0x58612: diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index e0f9b4ad8..a7c329068 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -24,7 +24,7 @@ RuinsOfAlphInnerChamber_MapScriptHeader: writetext RuinsOfAlphStrangePresenceText waitbutton closetext - setscene $0 + setscene 0 setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER end diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index e4f3f16c5..e7ea3ee53 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -27,15 +27,15 @@ RuinsOfAlphKabutoChamber_MapScriptHeader: .HiddenDoors: checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue .WallOpen - changeblock $4, $0, $2e + changeblock 4, 0, $2e .WallOpen: checkevent EVENT_SOLVED_KABUTO_PUZZLE iffalse .FloorClosed return .FloorClosed: - changeblock $2, $2, $1 - changeblock $4, $2, $2 + changeblock 2, 2, $1 + changeblock 4, 2, $2 return .WallOpenScript: @@ -44,10 +44,10 @@ RuinsOfAlphKabutoChamber_MapScriptHeader: showemote EMOTE_SHOCK, PLAYER, 20 pause 30 playsound SFX_STRENGTH - changeblock $4, $0, $30 + changeblock 4, 0, $30 reloadmappart earthquake 50 - setscene $1 + setscene 1 closetext end @@ -67,11 +67,11 @@ UnknownScript_0x58778: setevent EVENT_SOLVED_KABUTO_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_1 setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST - setmapscene RUINS_OF_ALPH_INNER_CHAMBER, $1 + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 - changeblock $2, $2, $18 - changeblock $4, $2, $19 + changeblock 2, 2, $18 + changeblock 4, 2, $19 reloadmappart playsound SFX_STRENGTH earthquake 80 @@ -144,7 +144,7 @@ UnknownScript_0x587f7: end MovementData_0x587fe: - db $59 ; movement + skyfall_top step_end RuinsOfAlphKabutoChamberReceptionistText: diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 994f69edd..9943aeef8 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -24,15 +24,15 @@ RuinsOfAlphOmanyteChamber_MapScriptHeader: .HiddenDoors: checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue .WallOpen - changeblock $4, $0, $2e + changeblock 4, 0, $2e .WallOpen: checkevent EVENT_SOLVED_OMANYTE_PUZZLE iffalse .FloorClosed return .FloorClosed: - changeblock $2, $2, $1 - changeblock $4, $2, $2 + changeblock 2, 2, $1 + changeblock 4, 2, $2 return .WallOpenScript: @@ -41,10 +41,10 @@ RuinsOfAlphOmanyteChamber_MapScriptHeader: showemote EMOTE_SHOCK, PLAYER, 20 pause 30 playsound SFX_STRENGTH - changeblock $4, $0, $30 + changeblock 4, 0, $30 reloadmappart earthquake 50 - setscene $1 + setscene 1 closetext end @@ -60,11 +60,11 @@ UnknownScript_0x58c36: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_OMANYTE_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_2 - setmapscene RUINS_OF_ALPH_INNER_CHAMBER, $1 + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 - changeblock $2, $2, $18 - changeblock $4, $2, $19 + changeblock 2, 2, $18 + changeblock 4, 2, $19 reloadmappart playsound SFX_STRENGTH earthquake 80 @@ -107,7 +107,7 @@ UnknownScript_0x58c85: end MovementData_0x58c8c: - db $59 ; movement + skyfall_top step_end UnknownText_0x58c8e: diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 478a2b9d0..258a6f1c8 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -35,12 +35,12 @@ RuinsOfAlphOutside_MapScriptHeader: .YesScientist: appear RUINSOFALPHOUTSIDE_SCIENTIST - setscene $1 + setscene 1 return .NoScientist: disappear RUINSOFALPHOUTSIDE_SCIENTIST - setscene $0 + setscene 0 return RuinsOfAlphOutsideScientistScene1: @@ -66,7 +66,7 @@ UnknownScript_0x58044: disappear RUINSOFALPHOUTSIDE_SCIENTIST stopfollow applymovement PLAYER, MovementData_0x580c5 - setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, $1 + setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, 1 warpcheck end diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 223b2bd62..bd20284d0 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -26,7 +26,7 @@ RuinsOfAlphResearchCenter_MapScriptHeader: return .ShowScientist: - moveobject RUINSOFALPHRESEARCHCENTER_SCIENTIST3, $3, $7 + moveobject RUINSOFALPHRESEARCHCENTER_SCIENTIST3, 3, 7 appear RUINSOFALPHRESEARCHCENTER_SCIENTIST3 return @@ -55,7 +55,7 @@ RuinsOfAlphResearchCenter_MapScriptHeader: waitbutton closetext applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59276 - setscene $0 + setscene 0 special RestartMapMusic end diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 008356172..53f900cad 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -22,7 +22,7 @@ SabrinaScript_0x189c2e: waitbutton closetext winlosstext UnknownText_0x189df4, 0 - loadtrainer SABRINA, 1 + loadtrainer SABRINA, SABRINA1 startbattle reloadmapafterbattle setevent EVENT_BEAT_SABRINA @@ -111,7 +111,7 @@ SaffronGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext SABRINA, 1, $1 + trainertotext SABRINA, SABRINA1, $1 jumpstd gymstatue2 UnknownText_0x189cdf: diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 19c35a37c..19ea7a6ec 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -41,7 +41,7 @@ OfficerScript_0x18a81e: warpcheck newloadmap MAPSETUP_TRAIN applymovement PLAYER, .MovementBoardTheTrain - wait $14 + wait 20 end .MovementBoardTheTrain: diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index f08ba0b8f..225dab027 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -22,7 +22,7 @@ BlaineScript_0x1ab4fb: waitbutton closetext winlosstext UnknownText_0x1ab646, 0 - loadtrainer BLAINE, 1 + loadtrainer BLAINE, BLAINE1 startbattle iftrue .ReturnAfterBattle appear SEAFOAMGYM_GYM_GUY diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 7daab6ba8..fd546e67a 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -16,7 +16,7 @@ Red: waitbutton closetext winlosstext .Text2, .Text2 - loadtrainer RED, 1 + loadtrainer RED, RED1 startbattle dontrestartmapmusic reloadmapafterbattle @@ -37,8 +37,8 @@ Red: end .Text1: - text $56 - line $56 + text "<......>" + line "<......>" done .Text2: @@ -46,8 +46,8 @@ Red: done .Text3: - text $56 - line $56 + text "<......>" + line "<......>" done SilverCaveRoom3_MapEventHeader: diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index c4357abf1..5f549fc8f 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -47,7 +47,7 @@ TrainerGruntM1: pause 15 special Special_FadeInQuickly disappear SLOWPOKEWELLB1F_KURT - moveobject SLOWPOKEWELLB1F_KURT, $b, $6 + moveobject SLOWPOKEWELLB1F_KURT, 11, 6 appear SLOWPOKEWELLB1F_KURT applymovement SLOWPOKEWELLB1F_KURT, KurtSlowpokeWellVictoryMovementData spriteface PLAYER, RIGHT @@ -57,7 +57,7 @@ TrainerGruntM1: closetext setevent EVENT_CLEARED_SLOWPOKE_WELL variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER - setmapscene AZALEA_TOWN, $1 + setmapscene AZALEA_TOWN, 1 clearevent EVENT_ILEX_FOREST_APPRENTICE clearevent EVENT_ILEX_FOREST_FARFETCHD setevent EVENT_CHARCOAL_KILN_FARFETCH_D @@ -70,7 +70,7 @@ TrainerGruntM1: special FadeOutPalettes special HealParty pause 15 - warp KURTS_HOUSE, $3, $3 + warp KURTS_HOUSE, 3, 3 end TrainerGruntM2: diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 33dd4dcd8..643a590f5 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -59,7 +59,7 @@ UnknownScript_0x184947: disappear SPROUTTOWER3F_SILVER waitsfx special Special_FadeInQuickly - setscene $1 + setscene 1 special RestartMapMusic end diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 464215210..fce00700b 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -30,7 +30,7 @@ SecurityCamera1a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $2 + moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 2 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -39,7 +39,7 @@ SecurityCamera1a: scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $2 + moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 2 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt2 @@ -55,7 +55,7 @@ SecurityCamera1b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $3 + moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 3 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -64,7 +64,7 @@ SecurityCamera1b: scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $3 + moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 3 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt2 @@ -80,7 +80,7 @@ SecurityCamera2a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $4, $7 + moveobject TEAMROCKETBASEB1F_ROCKET1, 4, 7 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement2 @@ -90,7 +90,7 @@ SecurityCamera2a: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveobject TEAMROCKETBASEB1F_ROCKET1, $c, $5 + moveobject TEAMROCKETBASEB1F_ROCKET1, 12, 5 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement3 scall TrainerCameraGrunt2 @@ -106,7 +106,7 @@ SecurityCamera2b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $4, $8 + moveobject TEAMROCKETBASEB1F_ROCKET1, 4, 8 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement4 @@ -116,7 +116,7 @@ SecurityCamera2b: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveobject TEAMROCKETBASEB1F_ROCKET1, $c, $5 + moveobject TEAMROCKETBASEB1F_ROCKET1, 12, 5 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement5 scall TrainerCameraGrunt2 @@ -132,7 +132,7 @@ SecurityCamera3a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $6 + moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 6 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -142,7 +142,7 @@ SecurityCamera3a: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveobject TEAMROCKETBASEB1F_ROCKET1, $19, $b + moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 11 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement6 scall TrainerCameraGrunt2 @@ -158,7 +158,7 @@ SecurityCamera3b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $7 + moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 7 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -168,7 +168,7 @@ SecurityCamera3b: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveobject TEAMROCKETBASEB1F_ROCKET1, $19, $c + moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 12 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement7 scall TrainerCameraGrunt2 @@ -184,7 +184,7 @@ SecurityCamera4: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $11, $10 + moveobject TEAMROCKETBASEB1F_ROCKET1, 17, 16 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -194,7 +194,7 @@ SecurityCamera4: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveobject TEAMROCKETBASEB1F_ROCKET1, $19, $b + moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 11 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement8 scall TrainerCameraGrunt2 @@ -210,7 +210,7 @@ SecurityCamera5: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $3, $10 + moveobject TEAMROCKETBASEB1F_ROCKET1, 3, 16 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -220,7 +220,7 @@ SecurityCamera5: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveobject TEAMROCKETBASEB1F_ROCKET1, $e, $10 + moveobject TEAMROCKETBASEB1F_ROCKET1, 14, 16 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement9 scall TrainerCameraGrunt2 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 0ed2c67f0..76b22da03 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -44,18 +44,18 @@ TeamRocketBaseB2F_MapScriptHeader: return .Change: - changeblock $e, $c, $7 + changeblock 14, 12, $7 return UnknownScript_0x6cf95: - moveobject TEAMROCKETBASEB2F_LANCE, $9, $d + moveobject TEAMROCKETBASEB2F_LANCE, 9, 13 jump UnknownScript_0x6cfac UnknownScript_0x6cf9c: - moveobject TEAMROCKETBASEB2F_ROCKET_GIRL, $15, $10 - moveobject TEAMROCKETBASEB2F_ROCKET1, $15, $10 - moveobject TEAMROCKETBASEB2F_DRAGON, $a, $d - moveobject TEAMROCKETBASEB2F_LANCE, $a, $d + moveobject TEAMROCKETBASEB2F_ROCKET_GIRL, 21, 16 + moveobject TEAMROCKETBASEB2F_ROCKET1, 21, 16 + moveobject TEAMROCKETBASEB2F_DRAGON, 10, 13 + moveobject TEAMROCKETBASEB2F_LANCE, 10, 13 UnknownScript_0x6cfac: appear TEAMROCKETBASEB2F_ROCKET_GIRL appear TEAMROCKETBASEB2F_ROCKET1 @@ -118,7 +118,7 @@ UnknownScript_0x6cfac: disappear TEAMROCKETBASEB2F_ROCKET4 pause 15 special Special_FadeInQuickly - setscene $2 + setscene 2 clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE spriteface TEAMROCKETBASEB2F_LANCE, DOWN opentext @@ -175,7 +175,7 @@ LanceHealsCommon: writetext LanceHealsText2 waitbutton closetext - setscene $1 + setscene 1 setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE checkcode VAR_FACING if_equal RIGHT, UnknownScript_0x6d0be @@ -280,7 +280,7 @@ UnknownScript_0x6d182: end UnknownScript_0x6d184: - moveobject TEAMROCKETBASEB2F_LANCE, $12, $6 + moveobject TEAMROCKETBASEB2F_LANCE, 18, 6 appear TEAMROCKETBASEB2F_LANCE applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a spriteface PLAYER, RIGHT @@ -304,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 - setscene $3 + setscene 3 clearevent EVENT_LAKE_OF_RAGE_CIVILIANS setevent EVENT_TURNED_OFF_SECURITY_CAMERAS setevent EVENT_SECURITY_CAMERA_1 @@ -330,7 +330,7 @@ UnknownScript_0x6d1e8: writetext UnknownText_0x6dd6b waitbutton playsound SFX_ENTER_DOOR - changeblock $e, $c, $7 + changeblock 14, 12, $7 reloadmappart closetext setevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER @@ -414,9 +414,9 @@ MovementData_0x6d236: MovementData_0x6d23b: fix_facing - db $39 ; movement + set_sliding jump_step RIGHT - db $38 ; movement + remove_sliding remove_fixed_facing step_end diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 63729ce63..3801be542 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -45,7 +45,7 @@ TeamRocketBaseB3F_MapScriptHeader: return .OpenSesame: - changeblock $a, $8, $7 + changeblock 10, 8, $7 return LanceGetPasswordScript: @@ -60,7 +60,7 @@ LanceGetPasswordScript: closetext applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c disappear TEAMROCKETBASEB3F_LANCE - setscene $1 + setscene 1 end RocketBaseRival: @@ -79,7 +79,7 @@ RocketBaseRival: applymovement PLAYER, RocketBaseRivalShovesPlayerMovement applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalLeaveMovement disappear TEAMROCKETBASEB3F_SILVER - setscene $2 + setscene 2 special RestartMapMusic end @@ -116,7 +116,7 @@ UnknownScript_0x6e056: playsound SFX_TACKLE applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e147 disappear TEAMROCKETBASEB3F_ROCKET1 - setscene $3 + setscene 3 end RocketBaseMurkrow: @@ -194,7 +194,7 @@ TeamRocketBaseB3FLockedDoor: writetext UnknownText_0x6e9a3 waitbutton playsound SFX_ENTER_DOOR - changeblock $a, $8, $7 + changeblock 10, 8, $7 reloadmappart closetext setevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index c24c1606a..b199df655 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -32,8 +32,8 @@ TimeCapsule_MapScriptHeader: return .InitializeAndPreparePokecenter2F: - setscene $1 - setmapscene POKECENTER_2F, $3 + setscene 1 + setmapscene POKECENTER_2F, 3 end MapTimeCapsuleSignpost1Script: diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index ab23a7b3e..a322c6846 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -79,7 +79,7 @@ TinTower1F_MapScriptHeader: .StairsCallback: checkevent EVENT_GOT_RAINBOW_WING iftrue .DontHideStairs - changeblock $a, $2, $9 + changeblock 10, 2, $9 .DontHideStairs: return @@ -125,36 +125,36 @@ TinTower1F_MapScriptHeader: disappear TINTOWER1F_SUICUNE setevent EVENT_FOUGHT_SUICUNE setevent EVENT_SAW_SUICUNE_ON_ROUTE_42 - setmapscene ROUTE_42, $0 + setmapscene ROUTE_42, 0 setevent EVENT_SAW_SUICUNE_ON_ROUTE_36 - setmapscene ROUTE_36, $0 + setmapscene ROUTE_36, 0 setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY - setmapscene CIANWOOD_CITY, $0 - setscene $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 - moveobject TINTOWER1F_EUSINE, $a, $f + moveobject TINTOWER1F_EUSINE, 10, 15 appear TINTOWER1F_EUSINE applymovement TINTOWER1F_EUSINE, MovementData_0x1851ec playsound SFX_ENTER_DOOR - moveobject TINTOWER1F_SAGE1, $9, $f + moveobject TINTOWER1F_SAGE1, 9, 15 appear TINTOWER1F_SAGE1 applymovement TINTOWER1F_SAGE1, MovementData_0x1851f5 playsound SFX_ENTER_DOOR - moveobject TINTOWER1F_SAGE2, $9, $f + moveobject TINTOWER1F_SAGE2, 9, 15 appear TINTOWER1F_SAGE2 applymovement TINTOWER1F_SAGE2, MovementData_0x1851fb playsound SFX_ENTER_DOOR - moveobject TINTOWER1F_SAGE3, $9, $f + moveobject TINTOWER1F_SAGE3, 9, 15 appear TINTOWER1F_SAGE3 applymovement TINTOWER1F_SAGE3, MovementData_0x1851fe - moveobject TINTOWER1F_SAGE1, $7, $d - moveobject TINTOWER1F_SAGE2, $9, $d - moveobject TINTOWER1F_SAGE3, $b, $d + moveobject TINTOWER1F_SAGE1, 7, 13 + moveobject TINTOWER1F_SAGE2, 9, 13 + moveobject TINTOWER1F_SAGE3, 11, 13 spriteface PLAYER, RIGHT opentext writetext TinTowerEusineSuicuneText @@ -201,7 +201,7 @@ TinTower1FSage5Script: earthquake 72 waitsfx playsound SFX_STRENGTH - changeblock $a, $2, $20 + changeblock 10, 2, $20 reloadmappart setevent EVENT_GOT_RAINBOW_WING closetext diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index fe9e43ce4..2e1318363 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -32,8 +32,8 @@ TradeCenter_MapScriptHeader: return .InitializeAndPreparePokecenter2F: - setscene $1 - setmapscene POKECENTER_2F, $1 + setscene 1 + setmapscene POKECENTER_2F, 1 end MapTradeCenterSignpost1Script: diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 7c86eba76..a815a0e35 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -21,7 +21,7 @@ SurgeScript_0x1920a5: waitbutton closetext winlosstext UnknownText_0x192238, 0 - loadtrainer LT_SURGE, 1 + loadtrainer LT_SURGE, LT_SURGE1 startbattle reloadmapafterbattle setevent EVENT_BEAT_LTSURGE @@ -101,7 +101,7 @@ VermilionGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext LT_SURGE, 1, $1 + trainertotext LT_SURGE, LT_SURGE1, $1 jumpstd gymstatue2 UnknownText_0x192142: diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 8d7af46a8..557525898 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -27,7 +27,7 @@ VermilionPort_MapScriptHeader: .LeaveFastShipScript: applymovement PLAYER, MovementData_0x74ef3 appear VERMILIONPORT_SAILOR1 - setscene $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 @@ -68,8 +68,8 @@ SailorScript_0x74dc4: clearevent EVENT_BEAT_SCHOOLBOY_RICKY setevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear VERMILIONPORT_SAILOR1 - setmapscene FAST_SHIP_1F, $1 - warp FAST_SHIP_1F, $19, $1 + setmapscene FAST_SHIP_1F, 1 + warp FAST_SHIP_1F, 25, 1 end UnknownScript_0x74e1a: diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index ef8bd3ead..1ae22e121 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -22,7 +22,7 @@ VictoryRoad_MapScriptHeader: end UnknownScript_0x74492: - moveobject VICTORYROAD_SILVER, $12, $b + moveobject VICTORYROAD_SILVER, 18, 11 spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -32,7 +32,7 @@ UnknownScript_0x74492: scall UnknownScript_0x744d4 applymovement VICTORYROAD_SILVER, MovementData_0x7454c disappear VICTORYROAD_SILVER - setscene $1 + setscene 1 playmapmusic end @@ -46,7 +46,7 @@ UnknownScript_0x744b5: scall UnknownScript_0x744d4 applymovement VICTORYROAD_SILVER, MovementData_0x74555 disappear VICTORYROAD_SILVER - setscene $1 + setscene 1 playmapmusic end diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 95011fd5e..3d15be073 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -40,7 +40,7 @@ VictoryRoadGateBadgeCheckScript: writetext VictoryRoadGateEightBadgesText waitbutton closetext - setscene $1 + setscene 1 end VictoryRoadGateLeftBlackBeltScript: diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 84effea16..aa5934103 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -20,7 +20,7 @@ FalknerScript_0x683c2: waitbutton closetext winlosstext UnknownText_0x6854a, 0 - loadtrainer FALKNER, 1 + loadtrainer FALKNER, FALKNER1 startbattle reloadmapafterbattle setevent EVENT_BEAT_FALKNER @@ -36,7 +36,7 @@ FalknerScript_0x683c2: iftrue .SpeechAfterTM setevent EVENT_BEAT_BIRD_KEEPER_ROD setevent EVENT_BEAT_BIRD_KEEPER_ABE - setmapscene ELMS_LAB, $2 + setmapscene ELMS_LAB, 2 specialphonecall SPECIALCALL_ASSISTANT writetext UnknownText_0x685c8 buttonsound @@ -109,7 +109,7 @@ VioletGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext FALKNER, 1, $1 + trainertotext FALKNER, FALKNER1, $1 jumpstd gymstatue2 UnknownText_0x68473: diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index e4c6e8df6..f16ee8989 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -32,7 +32,7 @@ VioletPokecenter1F_ElmsAideScript: setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE clearevent EVENT_ELMS_AIDE_IN_LAB clearevent EVENT_TOGEPI_HATCHED - setmapscene ROUTE_32, $1 + setmapscene ROUTE_32, 1 writetext UnknownText_0x695c5 waitbutton closetext diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index bf6a99290..ce75a5503 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -18,7 +18,7 @@ ViridianGymBlueScript: waitbutton closetext winlosstext LeaderBlueWinText, 0 - loadtrainer BLUE, 1 + loadtrainer BLUE, BLUE1 startbattle reloadmapafterbattle setevent EVENT_BEAT_BLUE @@ -60,7 +60,7 @@ ViridianGymStatue: jumpstd gymstatue1 .Beaten: - trainertotext BLUE, 1, $1 + trainertotext BLUE, BLUE1, $1 jumpstd gymstatue2 LeaderBlueBeforeText: diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index d72451638..81ece5a06 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -21,11 +21,11 @@ WillsRoom_MapScriptHeader: .WillsRoomDoors: checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED iffalse .KeepDoorsClosed - changeblock $4, $e, $2a + changeblock 4, 14, $2a .KeepDoorsClosed: checkevent EVENT_WILLS_ROOM_EXIT_OPEN iffalse .OpenDoors - changeblock $4, $2, $16 + changeblock 4, 2, $16 .OpenDoors: return @@ -34,10 +34,10 @@ WillsRoom_MapScriptHeader: refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock $4, $e, $2a + changeblock 4, 14, $2a reloadmappart closetext - setscene $1 + setscene 1 setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -51,7 +51,7 @@ WillScript_Battle: waitbutton closetext winlosstext WillScript_WillBeatenText, 0 - loadtrainer WILL, 1 + loadtrainer WILL, WILL1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_WILL @@ -60,7 +60,7 @@ WillScript_Battle: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock $4, $2, $16 + changeblock 4, 2, $16 reloadmappart closetext setevent EVENT_WILLS_ROOM_EXIT_OPEN diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index ab072fb36..1a7b959ff 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -105,7 +105,7 @@ TrainerSageKoji: applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628 spriteface WISETRIOSROOM_SAGE6, UP setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - setscene $1 + setscene 1 end UnknownScript_0x9861b: -- cgit v1.2.3 From 0a3b251dcb710a8319d6633122d92a983bcefd1c Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 22:53:42 -0500 Subject: Arrays end with -1, not $ff --- maps/CeladonDeptStoreElevator.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'maps') diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index d199bb734..13317c02a 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -25,7 +25,7 @@ CeladonDeptStoreElevatorData: 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 + db -1 ; end CeladonDeptStoreElevator_MapEventHeader: ; filler -- cgit v1.2.3 From cc8dac5a22a4f9307dd2f94e4bf29ee5b132c0b7 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 00:25:14 -0500 Subject: Use constants and data for Unown chamber events --- maps/RuinsOfAlphAerodactylChamber.asm | 6 +++--- maps/RuinsOfAlphHoOhChamber.asm | 6 +++--- maps/RuinsOfAlphKabutoChamber.asm | 6 +++--- maps/RuinsOfAlphOmanyteChamber.asm | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'maps') diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 14ed627d1..cce84bafd 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -49,7 +49,7 @@ RuinsOfAlphAerodactylChamber_MapScriptHeader: MapRuinsOfAlphAerodactylChamberSignpost2Script: refreshscreen $0 - writebyte $2 + writebyte UNOWNPUZZLE_AERODACTYL special Special_UnownPuzzle closetext iftrue UnknownScript_0x58df7 @@ -83,7 +83,7 @@ MapRuinsOfAlphAerodactylChamberSignpost3Script: MapRuinsOfAlphAerodactylChamberSignpost4Script: opentext writetext UnknownText_0x58e4f - writebyte $1 + writebyte UNOWNWORDS_LIGHT special Special_DisplayUnownWords closetext end @@ -93,7 +93,7 @@ MapRuinsOfAlphAerodactylChamberSignpost5Script: iftrue UnknownScript_0x58e46 opentext writetext UnknownText_0x58e81 - writebyte $1 + writebyte UNOWNWORDS_LIGHT special Special_DisplayUnownWords closetext end diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 586231a08..02a306f72 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -50,7 +50,7 @@ RuinsOfAlphHoOhChamber_MapScriptHeader: MapRuinsOfAlphHoOhChamberSignpost2Script: refreshscreen $0 - writebyte $3 + writebyte UNOWNPUZZLE_HO_OH special Special_UnownPuzzle closetext iftrue UnknownScript_0x585ba @@ -84,7 +84,7 @@ MapRuinsOfAlphHoOhChamberSignpost3Script: MapRuinsOfAlphHoOhChamberSignpost4Script: opentext writetext UnknownText_0x58612 - writebyte $3 + writebyte UNOWNWORDS_HO_OH special Special_DisplayUnownWords closetext end @@ -94,7 +94,7 @@ MapRuinsOfAlphHoOhChamberSignpost5Script: iftrue UnknownScript_0x58609 opentext writetext UnknownText_0x58644 - writebyte $3 + writebyte UNOWNWORDS_HO_OH special Special_DisplayUnownWords closetext end diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index e7ea3ee53..efcf238c0 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -56,7 +56,7 @@ RuinsOfAlphKabutoChamberReceptionistScript: MapRuinsOfAlphKabutoChamberSignpost2Script: refreshscreen $0 - writebyte $0 + writebyte UNOWNPUZZLE_KABUTO special Special_UnownPuzzle closetext iftrue UnknownScript_0x58778 @@ -121,7 +121,7 @@ MapRuinsOfAlphKabutoChamberSignpost3Script: MapRuinsOfAlphKabutoChamberSignpost4Script: opentext writetext UnknownText_0x58aa7 - writebyte $0 + writebyte UNOWNWORDS_ESCAPE special Special_DisplayUnownWords closetext end @@ -131,7 +131,7 @@ MapRuinsOfAlphKabutoChamberSignpost5Script: iftrue UnknownScript_0x587f7 opentext writetext UnknownText_0x58ad9 - writebyte $0 + writebyte UNOWNWORDS_ESCAPE special Special_DisplayUnownWords closetext end diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 9943aeef8..862b629f7 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -50,7 +50,7 @@ RuinsOfAlphOmanyteChamber_MapScriptHeader: MapRuinsOfAlphOmanyteChamberSignpost2Script: refreshscreen $0 - writebyte $1 + writebyte UNOWNPUZZLE_OMANYTE special Special_UnownPuzzle closetext iftrue UnknownScript_0x58c36 @@ -84,7 +84,7 @@ MapRuinsOfAlphOmanyteChamberSignpost3Script: MapRuinsOfAlphOmanyteChamberSignpost4Script: opentext writetext UnknownText_0x58c8e - writebyte $2 + writebyte UNOWNWORDS_WATER special Special_DisplayUnownWords closetext end @@ -94,7 +94,7 @@ MapRuinsOfAlphOmanyteChamberSignpost5Script: iftrue UnknownScript_0x58c85 opentext writetext UnknownText_0x58cc0 - writebyte $2 + writebyte UNOWNWORDS_WATER special Special_DisplayUnownWords closetext end -- cgit v1.2.3 From d83aefb30af180eae03bbd65878e8de45166f3d0 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 12 Jan 2018 01:40:20 -0500 Subject: Use more constants in scripts --- maps/AzaleaGym.asm | 2 +- maps/BattleTower1F.asm | 2 +- maps/BattleTowerBattleRoom.asm | 2 +- maps/BlackthornGym1F.asm | 4 +-- maps/BluesHouse.asm | 4 +-- maps/BurnedTowerB1F.asm | 4 +-- maps/CeladonCafe.asm | 4 +-- maps/CeladonDeptStore6F.asm | 32 +++++++++++----------- maps/CeladonGameCorner.asm | 18 ++++++------- maps/CeladonGameCornerPrizeRoom.asm | 42 ++++++++++++++--------------- maps/CeladonGym.asm | 2 +- maps/CeladonMansion3F.asm | 2 +- maps/CeladonPokecenter1F.asm | 2 +- maps/CeruleanGym.asm | 2 +- maps/CherrygroveCity.asm | 2 +- maps/CianwoodGym.asm | 2 +- maps/DragonShrine.asm | 30 ++++++++++----------- maps/DragonsDenB1F.asm | 6 ++--- maps/EarlsPokemonAcademy.asm | 10 +++---- maps/EcruteakGym.asm | 2 +- maps/ElmsLab.asm | 16 +++++------ maps/FastShipCabins_NNW_NNE_NE.asm | 2 +- maps/FuchsiaGym.asm | 2 +- maps/GoldenrodBillsHouse.asm | 6 ++--- maps/GoldenrodCity.asm | 20 +++++++------- maps/GoldenrodDeptStore5F.asm | 6 ++--- maps/GoldenrodDeptStore6F.asm | 30 ++++++++++----------- maps/GoldenrodGameCorner.asm | 48 ++++++++++++++++----------------- maps/GoldenrodGym.asm | 2 +- maps/GoldenrodHappinessRater.asm | 10 +++---- maps/GoldenrodMagnetTrainStation.asm | 2 +- maps/GoldenrodPokeComCenter2FMobile.asm | 8 +++--- maps/GoldenrodUnderground.asm | 14 +++++----- maps/GoldenrodUndergroundWarehouse.asm | 2 +- maps/HallOfFame.asm | 2 +- maps/KrissHouse1F.asm | 2 +- maps/KrissHouse2F.asm | 12 ++++----- maps/KrissNeighborsHouse.asm | 2 +- maps/KurtsHouse.asm | 2 +- maps/LakeOfRageMagikarpHouse.asm | 7 ++--- maps/LancesRoom.asm | 2 +- maps/LavRadioTower1F.asm | 2 +- maps/MahoganyGym.asm | 2 +- maps/MahoganyTown.asm | 6 ++--- maps/ManiasHouse.asm | 9 ++++--- maps/MobileBattleRoom.asm | 4 +-- maps/MobileTradeRoomMobile.asm | 2 +- maps/MountMortarB1F.asm | 2 +- maps/NationalPark.asm | 12 ++++----- maps/OaksLab.asm | 4 +-- maps/OlivineCity.asm | 4 +-- maps/OlivineGym.asm | 2 +- maps/OlivineLighthouse2F.asm | 6 ++--- maps/PewterGym.asm | 2 +- maps/Pokecenter2F.asm | 14 +++++----- maps/RadioTower1F.asm | 2 +- maps/RadioTower2F.asm | 10 +++---- maps/Route16.asm | 4 +-- maps/Route26.asm | 8 +++--- maps/Route27.asm | 12 ++++----- maps/Route27SandstormHouse.asm | 2 +- maps/Route29.asm | 2 +- maps/Route30.asm | 6 ++--- maps/Route31.asm | 15 ++++++----- maps/Route32.asm | 12 ++++----- maps/Route33.asm | 6 ++--- maps/Route34.asm | 14 +++++----- maps/Route35.asm | 12 ++++----- maps/Route35NationalParkGate.asm | 10 +++---- maps/Route36.asm | 6 ++--- maps/Route36NationalParkGate.asm | 12 ++++----- maps/Route38.asm | 12 ++++----- maps/Route39.asm | 6 ++--- maps/Route39Farmhouse.asm | 6 ++--- maps/Route42.asm | 6 ++--- maps/Route43.asm | 12 ++++----- maps/Route43Gate.asm | 16 +++++------ maps/Route44.asm | 12 ++++----- maps/Route45.asm | 14 +++++----- maps/Route46.asm | 6 ++--- maps/RuinsOfAlphAerodactylChamber.asm | 2 +- maps/RuinsOfAlphHoOhChamber.asm | 2 +- maps/RuinsOfAlphKabutoChamber.asm | 4 +-- maps/RuinsOfAlphOmanyteChamber.asm | 2 +- maps/RuinsOfAlphOutside.asm | 2 +- maps/RuinsOfAlphResearchCenter.asm | 12 ++++----- maps/SaffronGym.asm | 2 +- maps/SaffronTrainStation.asm | 2 +- maps/SilverCaveRoom3.asm | 2 +- maps/TeamRocketBaseB1F.asm | 32 +++++++++++----------- maps/TinTower1F.asm | 2 +- maps/TrainerHouseB1F.asm | 4 +-- maps/VermilionCity.asm | 2 +- maps/VermilionGym.asm | 2 +- maps/VictoryRoadGate.asm | 2 +- maps/VioletGym.asm | 2 +- maps/VioletPokecenter1F.asm | 2 +- maps/ViridianGym.asm | 2 +- 98 files changed, 373 insertions(+), 372 deletions(-) (limited to 'maps') diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index b73a00a03..c10add3c4 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -146,7 +146,7 @@ AzaleaGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext BUGSY, BUGSY1, $1 + trainertotext BUGSY, BUGSY1, MEM_BUFFER_1 jumpstd gymstatue2 BugsyText_INeverLose: diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index b769b0429..aafa5698c 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -125,7 +125,7 @@ Script_GivePlayerHisPrize: ; 0x9e47a writebyte BATTLETOWERACTION_GIVEREWARD special BattleTowerAction if_equal POTION, Script_YourPackIsStuffedFull - itemtotext $0, $1 + itemtotext USE_SCRIPT_VAR, MEM_BUFFER_1 giveitem ITEM_FROM_MEM, 5 writetext Text_PlayerGotFive writebyte BATTLETOWERACTION_1D diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 3b2916f56..82e1ea21e 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -29,7 +29,7 @@ Script_BattleRoomLoop: ; 0x9f425 waitsfx applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksIn opentext - battletowertext 1 + battletowertext $1 buttonsound closetext special BattleTowerBattle ; calls predef startbattle diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 0d654d5c8..4ea64fd18 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -70,7 +70,7 @@ BlackthornGymClairScript: buttonsound giveitem TM_DRAGONBREATH iffalse .BagFull - itemtotext TM_DRAGONBREATH, $0 + itemtotext TM_DRAGONBREATH, MEM_BUFFER_0 writetext BlackthornGymText_ReceivedTM24 playsound SFX_ITEM waitsfx @@ -146,7 +146,7 @@ BlackthornGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext CLAIR, CLAIR1, $1 + trainertotext CLAIR, CLAIR1, MEM_BUFFER_1 jumpstd gymstatue2 ClairIntroText: diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 9a40a68f6..0203e7522 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -27,8 +27,8 @@ DaisyScript: writetext DaisyWhichMonText waitbutton special Special_DaisyMassage - if_equal 0, .Refused - if_equal 1, .CantGroomEgg + if_equal $0, .Refused + if_equal $1, .CantGroomEgg setflag ENGINE_TEA_IN_BLUES_HOUSE writetext DaisyAlrightText waitbutton diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 935c14516..0125d41a9 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -92,7 +92,7 @@ ReleaseTheBeasts: setevent EVENT_BURNED_TOWER_MORTY setevent EVENT_BURNED_TOWER_1F_EUSINE appear BURNEDTOWERB1F_EUSINE - refreshscreen $0 + refreshscreen changeblock 6, 14, $1b reloadmappart closetext @@ -106,7 +106,7 @@ BurnedTowerB1FEusine: waitbutton closetext checkcode VAR_FACING - if_equal $1, .Movement + if_equal UP, .Movement applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1 jump UnknownScript_0x18622a diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index de89b1953..9a1b58799 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -96,7 +96,7 @@ CeladonCafeTrashcan: giveitem LEFTOVERS iffalse .PackFull opentext - itemtotext LEFTOVERS, $0 + itemtotext LEFTOVERS, MEM_BUFFER_0 writetext FoundLeftoversText playsound SFX_ITEM waitsfx @@ -107,7 +107,7 @@ CeladonCafeTrashcan: .PackFull: opentext - itemtotext LEFTOVERS, $0 + itemtotext LEFTOVERS, MEM_BUFFER_0 writetext FoundLeftoversText buttonsound writetext NoRoomForLeftoversText diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index ad34df21f..95c0f6199 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -11,7 +11,7 @@ CeladonDeptStore6F_MapScriptHeader: dbw MAPCALLBACK_TILES, .Callback .Callback: - changeblock 12, 0, $3 + changeblock 12, 0, $03 return CeladonDeptStore6FSuperNerdScript: @@ -28,37 +28,37 @@ CeladonDeptStore6FVendingMachine: loadmenudata .MenuData verticalmenu closewindow - if_equal $1, .FreshWater - if_equal $2, .SodaPop - if_equal $3, .Lemonade + if_equal 1, .FreshWater + if_equal 2, .SodaPop + if_equal 3, .Lemonade closetext end .FreshWater: - checkmoney $0, 200 - if_equal $2, .NotEnoughMoney + checkmoney YOUR_MONEY, 200 + if_equal HAVE_LESS, .NotEnoughMoney giveitem FRESH_WATER iffalse .NotEnoughSpace - takemoney $0, 200 - itemtotext FRESH_WATER, $0 + takemoney YOUR_MONEY, 200 + itemtotext FRESH_WATER, MEM_BUFFER_0 jump .VendItem .SodaPop: - checkmoney $0, 300 - if_equal $2, .NotEnoughMoney + checkmoney YOUR_MONEY, 300 + if_equal HAVE_LESS, .NotEnoughMoney giveitem SODA_POP iffalse .NotEnoughSpace - takemoney $0, 300 - itemtotext SODA_POP, $0 + takemoney YOUR_MONEY, 300 + itemtotext SODA_POP, MEM_BUFFER_0 jump .VendItem .Lemonade: - checkmoney $0, 350 - if_equal $2, .NotEnoughMoney + checkmoney YOUR_MONEY, 350 + if_equal HAVE_LESS, .NotEnoughMoney giveitem LEMONADE iffalse .NotEnoughSpace - takemoney $0, 350 - itemtotext LEMONADE, $0 + takemoney YOUR_MONEY, 350 + itemtotext LEMONADE, MEM_BUFFER_0 jump .VendItem .VendItem: diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index d35b1a45b..42eea1775 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -59,8 +59,8 @@ CeladonGameCornerFisherScript: checkitem COIN_CASE iffalse .NoCoinCase checkcoins MAX_COINS - 1 - if_equal $0, .FullCoinCase - stringtotext .coinname, $1 + if_equal HAVE_MORE, .FullCoinCase + stringtotext .coinname, MEM_BUFFER_1 scall .GiveCoins givecoins 18 setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON @@ -111,23 +111,23 @@ CeladonGameCornerPoster2Script: jumptext CeladonGameCornerPoster2Text CeladonGameCornerLuckySlotMachineScript: - random $6 - if_equal $0, CeladonGameCornerSlotMachineScript - refreshscreen $0 - writebyte $0 + random 6 + if_equal 0, CeladonGameCornerSlotMachineScript + refreshscreen + writebyte FALSE special Special_SlotMachine closetext end CeladonGameCornerSlotMachineScript: - refreshscreen $0 - writebyte $1 + refreshscreen + writebyte TRUE special Special_SlotMachine closetext end CeladonGameCornerCardFlipScript: - refreshscreen $0 + refreshscreen special Special_CardFlip closetext end diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 7f74c684f..3918c86fa 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -28,15 +28,15 @@ CeladonPrizeRoom_tmcounterloop: loadmenudata CeladonPrizeRoom_TMMenuDataHeader verticalmenu closewindow - if_equal $1, .doubleteam - if_equal $2, .psychic - if_equal $3, .hyperbeam + if_equal 1, .doubleteam + if_equal 2, .psychic + if_equal 3, .hyperbeam jump CeladonPrizeRoom_cancel .doubleteam checkcoins 1500 - if_equal $2, CeladonPrizeRoom_notenoughcoins - itemtotext TM_DOUBLE_TEAM, $0 + if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins + itemtotext TM_DOUBLE_TEAM, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel giveitem TM_DOUBLE_TEAM @@ -46,8 +46,8 @@ CeladonPrizeRoom_tmcounterloop: .psychic checkcoins 3500 - if_equal $2, CeladonPrizeRoom_notenoughcoins - itemtotext TM_PSYCHIC_M, $0 + if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins + itemtotext TM_PSYCHIC_M, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel giveitem TM_PSYCHIC_M @@ -57,8 +57,8 @@ CeladonPrizeRoom_tmcounterloop: .hyperbeam checkcoins 7500 - if_equal $2, CeladonPrizeRoom_notenoughcoins - itemtotext TM_HYPER_BEAM, $0 + if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins + itemtotext TM_HYPER_BEAM, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel giveitem TM_HYPER_BEAM @@ -132,17 +132,17 @@ GoldenrodGameCornerPokemonVendor: loadmenudata .MenuDataHeader verticalmenu closewindow - if_equal $1, .pikachu - if_equal $2, .porygon - if_equal $3, .larvitar + if_equal 1, .pikachu + if_equal 2, .porygon + if_equal 3, .larvitar jump CeladonPrizeRoom_cancel .pikachu checkcoins 2222 - if_equal $2, CeladonPrizeRoom_notenoughcoins + if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins checkcode VAR_PARTYCOUNT - if_equal $6, CeladonPrizeRoom_notenoughroom - pokenamemem PIKACHU, $0 + if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom + pokenamemem PIKACHU, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel waitsfx @@ -157,10 +157,10 @@ GoldenrodGameCornerPokemonVendor: .porygon checkcoins 5555 - if_equal $2, CeladonPrizeRoom_notenoughcoins + if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins checkcode VAR_PARTYCOUNT - if_equal $6, CeladonPrizeRoom_notenoughroom - pokenamemem PORYGON, $0 + if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom + pokenamemem PORYGON, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel waitsfx @@ -175,10 +175,10 @@ GoldenrodGameCornerPokemonVendor: .larvitar checkcoins 8888 - if_equal $2, CeladonPrizeRoom_notenoughcoins + if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins checkcode VAR_PARTYCOUNT - if_equal $6, CeladonPrizeRoom_notenoughroom - pokenamemem LARVITAR, $0 + if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom + pokenamemem LARVITAR, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel waitsfx diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 0bbad4f98..2cd4d74ad 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -109,7 +109,7 @@ CeladonGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext ERIKA, ERIKA1, $1 + trainertotext ERIKA, ERIKA1, MEM_BUFFER_1 jumpstd gymstatue2 UnknownText_0x72b28: diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 5274b5b38..82b9919de 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -16,7 +16,7 @@ CooltrainerMScript_0x71670: opentext writetext UnknownText_0x716ce checkcode VAR_DEXCAUGHT - if_greater_than 248, UnknownScript_0x7167e + if_greater_than NUM_POKEMON - 2 - 1, UnknownScript_0x7167e ; ignore Mew and Celebi waitbutton closetext end diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index e607d0e9d..b08c75f23 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -45,7 +45,7 @@ CeladonEusine: waitbutton closetext checkcode VAR_FACING - if_equal $1, .Location1 + if_equal UP, .Location1 applymovement CELADONPOKECENTER1F_EUSINE, .Movement1 jump .Continue diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 3ed242b70..af9939f2d 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -161,7 +161,7 @@ CeruleanGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext MISTY, MISTY1, $1 + trainertotext MISTY, MISTY1, MEM_BUFFER_1 jumpstd gymstatue2 MovementData_0x1884e3: diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 94b66d104..40bc7d4ee 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -69,7 +69,7 @@ CherrygroveCityGuideGent: opentext writetext GuideGentGiftText buttonsound - stringtotext .mapcardname, $1 + stringtotext .mapcardname, MEM_BUFFER_1 scall .JumpstdReceiveItem setflag ENGINE_MAP_CARD writetext GotMapCardText diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 49db07005..95aa6aaf0 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -138,7 +138,7 @@ CianwoodGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext CHUCK, CHUCK1, $1 + trainertotext CHUCK, CHUCK1, MEM_BUFFER_1 jumpstd gymstatue2 CianwoodGymMovement_ChuckChucksBoulder: diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index a27c0e6b0..fd6cd48bf 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -33,9 +33,9 @@ DragonShrine_MapScriptHeader: loadmenudata MenuDataHeader_0x18d215 verticalmenu closewindow - if_equal $1, .RightAnswer - if_equal $2, .WrongAnswer - if_equal $3, .RightAnswer + if_equal 1, .RightAnswer + if_equal 2, .WrongAnswer + if_equal 3, .RightAnswer end .Question2: @@ -45,9 +45,9 @@ DragonShrine_MapScriptHeader: loadmenudata MenuDataHeader_0x18d234 verticalmenu closewindow - if_equal $1, .RightAnswer - if_equal $2, .RightAnswer - if_equal $3, .WrongAnswer + if_equal 1, .RightAnswer + if_equal 2, .RightAnswer + if_equal 3, .WrongAnswer .Question3: setevent EVENT_DRAGON_SHRINE_QUESTION_3 writetext UnknownText_0x18d3f3 @@ -55,9 +55,9 @@ DragonShrine_MapScriptHeader: loadmenudata MenuDataHeader_0x18d258 verticalmenu closewindow - if_equal $1, .WrongAnswer - if_equal $2, .RightAnswer - if_equal $3, .RightAnswer + if_equal 1, .WrongAnswer + if_equal 2, .RightAnswer + if_equal 3, .RightAnswer .Question4: setevent EVENT_DRAGON_SHRINE_QUESTION_4 writetext UnknownText_0x18d420 @@ -65,9 +65,9 @@ DragonShrine_MapScriptHeader: loadmenudata MenuDataHeader_0x18d283 verticalmenu closewindow - if_equal $1, .RightAnswer - if_equal $2, .WrongAnswer - if_equal $3, .RightAnswer + if_equal 1, .RightAnswer + if_equal 2, .WrongAnswer + if_equal 3, .RightAnswer .Question5: setevent EVENT_DRAGON_SHRINE_QUESTION_5 writetext UnknownText_0x18d44a @@ -75,9 +75,9 @@ DragonShrine_MapScriptHeader: loadmenudata MenuDataHeader_0x18d2a5 verticalmenu closewindow - if_equal $1, .WrongAnswer - if_equal $2, .RightAnswer - if_equal $3, .WrongAnswer + if_equal 1, .WrongAnswer + if_equal 2, .RightAnswer + if_equal 3, .WrongAnswer .RightAnswer: checkevent EVENT_DRAGON_SHRINE_QUESTION_5 iftrue .PassedTheTest diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index b79857e36..81dc33341 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -57,7 +57,7 @@ DragonsDenB1F_ClairScene: buttonsound giveitem TM_DRAGONBREATH iffalse .BagFull - itemtotext TM_DRAGONBREATH, $0 + itemtotext TM_DRAGONBREATH, MEM_BUFFER_0 writetext NotifyReceiveDragonbreath playsound SFX_ITEM waitsfx @@ -135,7 +135,7 @@ PokeBallScript_0x18c95a: iffalse .BagFull disappear DRAGONSDENB1F_POKE_BALL1 opentext - itemtotext DRAGON_FANG, $0 + itemtotext DRAGON_FANG, MEM_BUFFER_0 writetext Text_FoundDragonFang playsound SFX_ITEM waitsfx @@ -145,7 +145,7 @@ PokeBallScript_0x18c95a: .BagFull: opentext - itemtotext DRAGON_FANG, $0 + itemtotext DRAGON_FANG, MEM_BUFFER_0 writetext Text_FoundDragonFang buttonsound writetext Text_NoRoomForDragonFang diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 3ed66a713..62ef5b16b 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -69,11 +69,11 @@ AcademyBlackboard: loadmenudata .BlackboardMenuData _2dmenu closewindow - if_equal $1, .Poison - if_equal $2, .Paralysis - if_equal $3, .Sleep - if_equal $4, .Burn - if_equal $5, .Freeze + if_equal 1, .Poison + if_equal 2, .Paralysis + if_equal 3, .Sleep + if_equal 4, .Burn + if_equal 5, .Freeze closetext end diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 6948996e2..f88910855 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -162,7 +162,7 @@ EcruteakGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext MORTY, MORTY1, $1 + trainertotext MORTY, MORTY1, MEM_BUFFER_1 jumpstd gymstatue2 MovementData_0x99e5d: diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index c3e1a51f5..bd228e93b 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -161,7 +161,7 @@ CyndaquilPokeBallScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript spriteface ELMSLAB_ELM, DOWN - refreshscreen $0 + refreshscreen pokepic CYNDAQUIL cry CYNDAQUIL waitbutton @@ -175,7 +175,7 @@ CyndaquilPokeBallScript: writetext ChoseStarterText buttonsound waitsfx - pokenamemem CYNDAQUIL, $0 + pokenamemem CYNDAQUIL, MEM_BUFFER_0 writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx @@ -191,7 +191,7 @@ TotodilePokeBallScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript spriteface ELMSLAB_ELM, DOWN - refreshscreen $0 + refreshscreen pokepic TOTODILE cry TOTODILE waitbutton @@ -205,7 +205,7 @@ TotodilePokeBallScript: writetext ChoseStarterText buttonsound waitsfx - pokenamemem TOTODILE, $0 + pokenamemem TOTODILE, MEM_BUFFER_0 writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx @@ -219,7 +219,7 @@ ChikoritaPokeBallScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript spriteface ELMSLAB_ELM, DOWN - refreshscreen $0 + refreshscreen pokepic CHIKORITA cry CHIKORITA waitbutton @@ -233,7 +233,7 @@ ChikoritaPokeBallScript: writetext ChoseStarterText buttonsound waitsfx - pokenamemem CHIKORITA, $0 + pokenamemem CHIKORITA, MEM_BUFFER_0 writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx @@ -311,7 +311,7 @@ ElmsLabHealingMachine_HealParty: special TrainerRankings_Healings special HealParty playmusic MUSIC_NONE - writebyte 1 ; Machine is in Elm's Lab + writebyte HEALMACHINE_ELMS_LAB special HealMachineAnim pause 30 special RestartMapMusic @@ -500,7 +500,7 @@ AideScript_GiveYouBalls: opentext writetext AideText_GiveYouBalls buttonsound - itemtotext POKE_BALL, $1 + itemtotext POKE_BALL, MEM_BUFFER_1 scall AideScript_ReceiveTheBalls giveitem POKE_BALL, 5 writetext AideText_ExplainBalls diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 26618e8d3..f9145bcf7 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -100,7 +100,7 @@ SailorScript_0x755f1: setevent EVENT_FAST_SHIP_LAZY_SAILOR setmapscene FAST_SHIP_B1F, 1 checkcode VAR_FACING - if_equal $3, UnknownScript_0x75629 + if_equal RIGHT, UnknownScript_0x75629 applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637 playsound SFX_EXIT_BUILDING disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 64f580c5b..8a2a1fbd7 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -216,7 +216,7 @@ FuchsiaGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext JANINE, JANINE1, $1 + trainertotext JANINE, JANINE1, MEM_BUFFER_1 jumpstd gymstatue2 Movement_NinjaSpin: diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 2032c5b1e..e2b286848 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -22,7 +22,7 @@ BillsHouseBill: buttonsound waitsfx checkcode VAR_PARTYCOUNT - if_equal $6, UnknownScript_0x54c13 + if_equal PARTY_LENGTH, UnknownScript_0x54c13 writetext UnknownText_0x54dae playsound SFX_CAUGHT_MON waitsfx @@ -74,8 +74,8 @@ BillsSister: iftrue UnknownScript_0x54c58 writetext UnknownText_0x54f9e askforphonenumber PHONE_BILL - if_equal $1, UnknownScript_0x54c64 - if_equal $2, UnknownScript_0x54c5e + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x54c64 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x54c5e waitsfx addcellnum PHONE_BILL writetext UnknownText_0x54fd9 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 8e324a9bb..356a0e6ef 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -63,35 +63,35 @@ MoveTutor: yesorno iffalse .Refused2 checkcoins 4000 - if_equal $2, .NotEnoughMoney + if_equal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x1990ce loadmenudata .MoveMenuDataHeader verticalmenu closewindow - if_equal $1, .Flamethrower - if_equal $2, .Thunderbolt - if_equal $3, .IceBeam + if_equal MOVETUTOR_FLAMETHROWER, .Flamethrower + if_equal MOVETUTOR_THUNDERBOLT, .Thunderbolt + if_equal MOVETUTOR_ICE_BEAM, .IceBeam jump .Incompatible .Flamethrower: - writebyte $1 + writebyte MOVETUTOR_FLAMETHROWER writetext UnknownText_0x1991cf special Special_MoveTutor - if_equal $0, .TeachMove + if_equal FALSE, .TeachMove jump .Incompatible .Thunderbolt: - writebyte $2 + writebyte MOVETUTOR_THUNDERBOLT writetext UnknownText_0x1991cf special Special_MoveTutor - if_equal $0, .TeachMove + if_equal FALSE, .TeachMove jump .Incompatible .IceBeam: - writebyte $3 + writebyte MOVETUTOR_ICE_BEAM writetext UnknownText_0x1991cf special Special_MoveTutor - if_equal $0, .TeachMove + if_equal FALSE, .TeachMove jump .Incompatible diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 70e7ab046..9039975cd 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -68,8 +68,8 @@ ReceptionistScript_0x560ce: special GetFirstPokemonHappiness writetext UnknownText_0x56143 buttonsound - if_greater_than $95, .VeryHappy - if_greater_than $31, .SomewhatHappy + if_greater_than 150 - 1, .VeryHappy + if_greater_than 50 - 1, .SomewhatHappy jump .NotVeryHappy .VeryHappy: @@ -107,7 +107,7 @@ Carrie: faceplayer opentext special SpecialGameboyCheck - if_not_equal $2, .NotGBC ; This is a dummy check from Gold and Silver. In normal gameplay, this would not be checked. + if_not_equal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver writetext UnknownText_0x56241 waitbutton closetext diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 6cbb4441a..cfe7fde52 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -17,37 +17,37 @@ GoldenrodVendingMachine: loadmenudata .MenuData verticalmenu closewindow - if_equal $1, .FreshWater - if_equal $2, .SodaPop - if_equal $3, .Lemonade + if_equal 1, .FreshWater + if_equal 2, .SodaPop + if_equal 3, .Lemonade closetext end .FreshWater: - checkmoney $0, 200 - if_equal $2, .NotEnoughMoney + checkmoney YOUR_MONEY, 200 + if_equal HAVE_LESS, .NotEnoughMoney giveitem FRESH_WATER iffalse .NotEnoughSpace - takemoney $0, 200 - itemtotext FRESH_WATER, $0 + takemoney YOUR_MONEY, 200 + itemtotext FRESH_WATER, MEM_BUFFER_0 jump .VendItem .SodaPop: - checkmoney $0, 300 - if_equal $2, .NotEnoughMoney + checkmoney YOUR_MONEY, 300 + if_equal HAVE_LESS, .NotEnoughMoney giveitem SODA_POP iffalse .NotEnoughSpace - takemoney $0, 300 - itemtotext SODA_POP, $0 + takemoney YOUR_MONEY, 300 + itemtotext SODA_POP, MEM_BUFFER_0 jump .VendItem .Lemonade: - checkmoney $0, 350 - if_equal $2, .NotEnoughMoney + checkmoney YOUR_MONEY, 350 + if_equal HAVE_LESS, .NotEnoughMoney giveitem LEMONADE iffalse .NotEnoughSpace - takemoney $0, 350 - itemtotext LEMONADE, $0 + takemoney YOUR_MONEY, 350 + itemtotext LEMONADE, MEM_BUFFER_0 jump .VendItem .VendItem: diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index fc0216504..f6412f3b2 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -64,15 +64,15 @@ GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 loadmenudata GoldenrodGameCornerTMVendorMenuData verticalmenu closewindow - if_equal $1, .Thunder - if_equal $2, .Blizzard - if_equal $3, .FireBlast + if_equal 1, .Thunder + if_equal 2, .Blizzard + if_equal 3, .FireBlast jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript .Thunder: checkcoins 5500 - if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - itemtotext TM_THUNDER, $0 + if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + itemtotext TM_THUNDER, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_THUNDER @@ -82,8 +82,8 @@ GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 .Blizzard: checkcoins 5500 - if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - itemtotext TM_BLIZZARD, $0 + if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + itemtotext TM_BLIZZARD, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_BLIZZARD @@ -93,8 +93,8 @@ GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 .FireBlast: checkcoins 5500 - if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - itemtotext TM_FIRE_BLAST, $0 + if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + itemtotext TM_FIRE_BLAST, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_FIRE_BLAST @@ -168,17 +168,17 @@ GoldenrodGameCornerPrizeMonVendorScript: loadmenudata .MenuDataHeader verticalmenu closewindow - if_equal $1, .abra - if_equal $2, .cubone - if_equal $3, .wobbuffet + if_equal 1, .abra + if_equal 2, .cubone + if_equal 3, .wobbuffet jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript .abra checkcoins 100 - if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT - if_equal $6, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem ABRA, $0 + if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript + pokenamemem ABRA, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx @@ -193,10 +193,10 @@ GoldenrodGameCornerPrizeMonVendorScript: .cubone checkcoins 800 - if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT - if_equal $6, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem CUBONE, $0 + if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript + pokenamemem CUBONE, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx @@ -211,10 +211,10 @@ GoldenrodGameCornerPrizeMonVendorScript: .wobbuffet checkcoins 1500 - if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT - if_equal $6, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem WOBBUFFET, $0 + if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript + pokenamemem WOBBUFFET, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx @@ -301,21 +301,21 @@ GoldenrodGameCornerLeftTheirDrinkScript: GoldenrodGameCornerSlotsMachineScript: random 6 if_equal 0, GoldenrodGameCornerLuckySlotsMachineScript - refreshscreen $0 + refreshscreen writebyte FALSE special Special_SlotMachine closetext end GoldenrodGameCornerLuckySlotsMachineScript: - refreshscreen $0 + refreshscreen writebyte TRUE special Special_SlotMachine closetext end GoldenrodGameCornerCardFlipMachineScript: - refreshscreen $0 + refreshscreen special Special_CardFlip closetext end diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 248864782..598fa8673 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -171,7 +171,7 @@ GoldenrodGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext WHITNEY, WHITNEY1, $1 + trainertotext WHITNEY, WHITNEY1, MEM_BUFFER_1 jumpstd gymstatue2 BridgetWalksUpMovement: diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 667698662..c3e07b326 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -16,11 +16,11 @@ TeacherScript_0x54953: special GetFirstPokemonHappiness writetext UnknownText_0x549a3 buttonsound - if_greater_than $f9, UnknownScript_0x54973 - if_greater_than $c7, UnknownScript_0x54979 - if_greater_than $95, UnknownScript_0x5497f - if_greater_than $63, UnknownScript_0x54985 - if_greater_than $31, UnknownScript_0x5498b + if_greater_than 250 - 1, UnknownScript_0x54973 + if_greater_than 200 - 1, UnknownScript_0x54979 + if_greater_than 150 - 1, UnknownScript_0x5497f + if_greater_than 100 - 1, UnknownScript_0x54985 + if_greater_than 50 - 1, UnknownScript_0x5498b jump UnknownScript_0x54991 UnknownScript_0x54973: diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 73cc9701a..e05525a18 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -34,7 +34,7 @@ OfficerScript_0x550ec: closetext applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 applymovement PLAYER, MovementData_0x5514f - writebyte $0 + writebyte FALSE special Special_MagnetTrain warpcheck newloadmap MAPSETUP_TRAIN diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index a3e639409..304bb2234 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -28,8 +28,8 @@ UnknownScript_0x625df: loadmenudata MenuDataHeader_0x62602 verticalmenu closewindow - if_equal $1, UnknownScript_0x625f0 - if_equal $2, UnknownScript_0x625f8 + if_equal 1, UnknownScript_0x625f0 + if_equal 2, UnknownScript_0x625f8 jump UnknownScript_0x62600 UnknownScript_0x625f0: @@ -73,8 +73,8 @@ UnknownScript_0x62629: loadmenudata MenuDataHeader_0x6264c verticalmenu closewindow - if_equal $1, UnknownScript_0x6263a - if_equal $2, UnknownScript_0x62642 + if_equal 1, UnknownScript_0x6263a + if_equal 2, UnknownScript_0x62642 jump UnknownScript_0x6264a UnknownScript_0x6263a: diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index 1c5872548..3a07046fd 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -35,7 +35,7 @@ GoldenrodUnderground_MapScriptHeader: clearevent EVENT_SWITCH_12 clearevent EVENT_SWITCH_13 clearevent EVENT_SWITCH_14 - writebyte $0 + writebyte 0 copyvartobyte UndergroundSwitchPositions return @@ -196,8 +196,8 @@ OlderHaircutBrotherScript: writetext UnknownText_0x7c5f9 yesorno iffalse .Refused - checkmoney $0, 500 - if_equal $2, .NotEnoughMoney + checkmoney YOUR_MONEY, 500 + if_equal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x7c69a buttonsound special Special_YoungerHaircutBrother @@ -227,7 +227,7 @@ OlderHaircutBrotherScript: jump .then .then - takemoney $0, 500 + takemoney YOUR_MONEY, 500 special PlaceMoneyTopRight writetext UnknownText_0x7c6b8 waitbutton @@ -279,8 +279,8 @@ YoungerHaircutBrotherScript: writetext UnknownText_0x7c75c yesorno iffalse .Refused - checkmoney $0, 300 - if_equal $2, .NotEnoughMoney + checkmoney YOUR_MONEY, 300 + if_equal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x7c7f1 buttonsound special Special_OlderHaircutBrother @@ -310,7 +310,7 @@ YoungerHaircutBrotherScript: jump .then .then - takemoney $0, 300 + takemoney YOUR_MONEY, 300 special PlaceMoneyTopRight writetext UnknownText_0x7c80e waitbutton diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 03841736b..49ae5e39f 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -31,7 +31,7 @@ GoldenrodUndergroundWarehouse_MapScriptHeader: clearevent EVENT_SWITCH_12 clearevent EVENT_SWITCH_13 clearevent EVENT_SWITCH_14 - writebyte $0 + writebyte 0 copyvartobyte UndergroundSwitchPositions return diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index a10468875..a5b92d3b1 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -30,7 +30,7 @@ HallOfFame_MapScriptHeader: applymovement PLAYER, HallOfFame_SlowlyApproachMachine setscene 1 pause 15 - writebyte 2 ; Machine is in the Hall of Fame + writebyte HEALMACHINE_HALL_OF_FAME special HealMachineAnim setevent EVENT_BEAT_ELITE_FOUR setevent EVENT_TELEPORT_GUY diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index addfeef13..e6bc721aa 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -38,7 +38,7 @@ UnknownScript_0x7a4f6: opentext writetext UnknownText_0x7a604 buttonsound - stringtotext GearName, $1 + stringtotext GearName, MEM_BUFFER_1 scall UnknownScript_0x7a57e setflag ENGINE_POKEGEAR setflag ENGINE_PHONE_CARD diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 15e5d3641..c941bcdb3 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -31,27 +31,25 @@ KrissHouse2F_MapScriptHeader: special ToggleMaptileDecorations return - db 0, 0, 0 ; filler - Doll1: - describedecoration 1 + describedecoration DECODESC_LEFT_DOLL Doll2: - describedecoration 2 + describedecoration DECODESC_RIGHT_DOLL BigDoll: - describedecoration 3 + describedecoration DECODESC_BIG_DOLL GameConsole: - describedecoration 4 + describedecoration DECODESC_CONSOLE KrissHousePoster: dw EVENT_KRISS_ROOM_POSTER, .Script .Script: - describedecoration 0 + describedecoration DECODESC_POSTER KrissHouseRadio: checkevent EVENT_GOT_A_POKEMON_FROM_ELM diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 0cd9f77dc..4c3b2a2b6 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -31,7 +31,7 @@ KrissNeighborsHouseRadio: pause 45 writetext KrisNeighborRadioText3 pause 45 - musicfadeout MUSIC_NEW_BARK_TOWN, $10 + musicfadeout MUSIC_NEW_BARK_TOWN, 16 writetext KrisNeighborRadioText4 pause 45 closetext diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 2c1e7ba70..c9d9589e9 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -132,7 +132,7 @@ KurtScript_0x18e178: buttonsound setevent EVENT_DRAGON_SHRINE_QUESTION_2 special Special_SelectApricornForKurt - if_equal $0, .Cancel + if_equal FALSE, .Cancel if_equal BLU_APRICORN, .Blu if_equal YLW_APRICORN, .Ylw if_equal GRN_APRICORN, .Grn diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index cc494c8c5..8e164b6f9 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -45,9 +45,10 @@ UnknownScript_0x19a6e0: writetext UnknownText_0x19a93e waitbutton special Special_CheckMagikarpLength - if_equal $0, UnknownScript_0x19a71c - if_equal $1, UnknownScript_0x19a722 - if_equal $2, UnknownScript_0x19a716 + if_equal MAGIKARPLENGTH_NOT_MAGIKARP, UnknownScript_0x19a71c + if_equal MAGIKARPLENGTH_REFUSED, UnknownScript_0x19a722 + if_equal MAGIKARPLENGTH_TOO_SHORT, UnknownScript_0x19a716 + ; MAGIKARPLENGTH_BEAT_RECORD jump UnknownScript_0x19a6fe UnknownScript_0x19a6fe: diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 6a1931d1b..9b73671d6 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -73,7 +73,7 @@ LanceScript_0x180e7b: reloadmappart closetext setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED - musicfadeout MUSIC_BEAUTY_ENCOUNTER, $10 + musicfadeout MUSIC_BEAUTY_ENCOUNTER, 16 pause 30 showemote EMOTE_SHOCK, LANCESROOM_LANCE, 15 spriteface LANCESROOM_LANCE, DOWN diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 424a802c9..4ab8c6f48 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -36,7 +36,7 @@ GentlemanScript_0x7ee6c: .UnknownScript_0x7ee80: writetext UnknownText_0x7f0a1 buttonsound - stringtotext .expncardname, $1 + stringtotext .expncardname, MEM_BUFFER_1 scall .UnknownScript_0x7ee94 setflag ENGINE_EXPN_CARD .UnknownScript_0x7ee8e: diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 814e81776..3c403a735 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -146,7 +146,7 @@ MahoganyGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext PRYCE, PRYCE1, $1 + trainertotext PRYCE, PRYCE1, MEM_BUFFER_1 jumpstd gymstatue2 PryceText_Intro: diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index ba907383d..5ed0450c2 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -56,13 +56,13 @@ UnknownScript_0x190040: special PlaceMoneyTopRight yesorno iffalse UnknownScript_0x190072 - checkmoney $0, 300 - if_equal $2, UnknownScript_0x19006c + checkmoney YOUR_MONEY, 300 + if_equal HAVE_LESS, UnknownScript_0x19006c giveitem RAGECANDYBAR iffalse UnknownScript_0x190078 waitsfx playsound SFX_TRANSACTION - takemoney $0, 300 + takemoney YOUR_MONEY, 300 special PlaceMoneyTopRight writetext UnknownText_0x19014a waitbutton diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index d60d1081d..a1de377a0 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -55,10 +55,11 @@ ManiaScript: yesorno iffalse .refused special SpecialReturnShuckle - if_equal $0, .wrong - if_equal $1, .refused - if_equal $3, .superhappy - if_equal $4, .default_postevent + if_equal SHUCKIE_WRONG_MON, .wrong + if_equal SHUCKIE_REFUSED, .refused + if_equal SHUCKIE_HAPPY, .superhappy + if_equal SHUCKIE_FAINTED, .default_postevent + ; SHUCKIE_RETURNED writetext ManiaText_ThankYou waitbutton closetext diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 9439eabf3..4c8c068e9 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -20,7 +20,7 @@ MobileBattleRoom_MapScriptHeader: end MapMobileBattleRoomSignpost0Script: - refreshscreen $0 + refreshscreen special Function1037c2 if_equal $1, .one special Function1037eb @@ -39,7 +39,7 @@ MapMobileBattleRoomSignpost0Script: pause 60 special FadeInPalettes special RestartMapMusic - refreshscreen $0 + refreshscreen .two_ special TrainerRankings_Healings special HealParty diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index bcc2c2d79..f286a5452 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -20,7 +20,7 @@ MobileTradeRoomMobile_MapScriptHeader: end MapMobileTradeRoomMobileSignpost0Script: - refreshscreen $0 + refreshscreen special Function1037c2 writetext MobileTradeRoomMobile_EstablishingCommsText waitbutton diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index ad00662f8..f3db52690 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -35,7 +35,7 @@ UnknownScript_0x7e217: buttonsound waitsfx checkcode VAR_PARTYCOUNT - if_equal $6, UnknownScript_0x7e237 + if_equal PARTY_LENGTH, UnknownScript_0x7e237 writetext UnknownText_0x7e355 playsound SFX_CAUGHT_MON waitsfx diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index fe1547ea5..4f5077724 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -94,9 +94,9 @@ UnknownScript_0x5c071: scall UnknownScript_0x5c100 UnknownScript_0x5c074: askforphonenumber PHONE_SCHOOLBOY_JACK - if_equal $1, UnknownScript_0x5c110 - if_equal $2, UnknownScript_0x5c10c - trainertotext SCHOOLBOY, JACK1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5c110 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5c10c + trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0 scall UnknownScript_0x5c104 jump UnknownScript_0x5c108 @@ -224,9 +224,9 @@ UnknownScript_0x5c160: scall UnknownScript_0x5c193 UnknownScript_0x5c163: askforphonenumber PHONE_POKEFAN_BEVERLY - if_equal $1, UnknownScript_0x5c1a3 - if_equal $2, UnknownScript_0x5c19f - trainertotext POKEFANF, BEVERLY1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5c1a3 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5c19f + trainertotext POKEFANF, BEVERLY1, MEM_BUFFER_0 scall UnknownScript_0x5c197 jump UnknownScript_0x5c19b diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 17da0485d..877211b56 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -26,8 +26,8 @@ Oak: setevent EVENT_TALKED_TO_OAK_IN_KANTO .CheckBadges: checkcode VAR_BADGES - if_equal 16, .OpenMtSilver - if_equal 8, .Complain + if_equal NUM_BADGES, .OpenMtSilver + if_equal NUM_JOHTO_BADGES, .Complain jump .AhGood .CheckPokedex: diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 26e673ded..0f01ab008 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -78,8 +78,8 @@ OlivineCitySailor1Script: StandingYoungsterScript_0x1a88a6: faceplayer opentext - random $2 - if_equal $0, UnknownScript_0x1a88b4 + random 2 + if_equal 0, UnknownScript_0x1a88b4 writetext UnknownText_0x1a8b04 waitbutton closetext diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 849f6eecf..514b8e89a 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -91,7 +91,7 @@ OlivineGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext JASMINE, JASMINE1, $1 + trainertotext JASMINE, JASMINE1, MEM_BUFFER_1 jumpstd gymstatue2 Jasmine_SteelTypeIntro: diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 0961a4427..6f7ea422e 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -41,9 +41,9 @@ UnknownScript_0x5afb0: scall UnknownScript_0x5b057 UnknownScript_0x5afb3: askforphonenumber PHONE_SAILOR_HUEY - if_equal $1, UnknownScript_0x5b067 - if_equal $2, UnknownScript_0x5b063 - trainertotext SAILOR, HUEY1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5b067 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5b063 + trainertotext SAILOR, HUEY1, MEM_BUFFER_0 scall UnknownScript_0x5b05b jump UnknownScript_0x5b05f diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index cfe63fe18..305baf7fa 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -72,7 +72,7 @@ PewterGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext BROCK, BROCK1, $1 + trainertotext BROCK, BROCK1, MEM_BUFFER_1 jumpstd gymstatue2 UnknownText_0x1a28d0: diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index cf626c500..dffd92de9 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -157,13 +157,13 @@ LinkReceptionistScript_Trade: writetext Text_PleaseComeIn2 waitbutton closetext - writebyte $0 + writebyte FALSE end .Mobile_DidNotSave: writetext Text_PleaseComeAgain closetext - writebyte $1 + writebyte TRUE end BattleTradeMobile_WalkIn: @@ -261,13 +261,13 @@ LinkReceptionistScript_Battle: writetext Text_PleaseComeIn2 waitbutton closetext - writebyte $0 + writebyte FALSE end .Mobile_DidNotSave: writetext Text_PleaseComeAgain closetext - writebyte $1 + writebyte TRUE end .SelectThreeMons: @@ -283,11 +283,11 @@ LinkReceptionistScript_Battle: waitbutton .Mobile_DidNotSelect: closetext - writebyte $0 + writebyte FALSE end .Mobile_OK: - writebyte $1 + writebyte TRUE end Script_TimeCapsuleClosed: @@ -584,7 +584,7 @@ Script_LeftTimeCapsule: end MapPokecenter2FSignpost0Script: - refreshscreen $0 + refreshscreen special Special_DisplayLinkRecord closetext end diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index d3ded02ea..05a2a8cb8 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -148,7 +148,7 @@ CooltrainerFScript_0x5cdd5: waitsfx writetext UnknownText_0x5d37b buttonsound - stringtotext RadioCardText, $1 + stringtotext RadioCardText, MEM_BUFFER_1 scall UnknownScript_0x5ce3e writetext UnknownText_0x5d3c0 buttonsound diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 7942063f9..4ddd1c1af 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -133,7 +133,7 @@ UnknownScript_0x5d7be: waitbutton closetext spriteface RADIOTOWER2F_BUENA, DOWN - refreshscreen $0 + refreshscreen special SpecialBuenasPassword closetext iffalse UnknownScript_0x5d845 @@ -142,7 +142,7 @@ UnknownScript_0x5d7be: waitbutton closetext checkcode VAR_BLUECARDBALANCE - addvar $1 + addvar 1 writevarcode VAR_BLUECARDBALANCE waitsfx playsound SFX_TRANSACTION @@ -157,7 +157,7 @@ UnknownScript_0x5d7be: pause 20 special RestartMapMusic checkcode VAR_BLUECARDBALANCE - if_equal $1e, UnknownScript_0x5d8a4 + if_equal 30, UnknownScript_0x5d8a4 end UnknownScript_0x5d800: @@ -281,8 +281,8 @@ UnknownScript_0x5d8cc: writetext UnknownText_0x5e2bf UnknownScript_0x5d8d0: askforphonenumber PHONE_BUENA - if_equal $1, UnknownScript_0x5d8f6 - if_equal $2, UnknownScript_0x5d8ed + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5d8f6 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5d8ed writetext UnknownText_0x5e2f3 playsound SFX_REGISTER_PHONE_NUMBER waitsfx diff --git a/maps/Route16.asm b/maps/Route16.asm index e08bf0a25..14e8cbebc 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -8,9 +8,9 @@ Route16_MapScriptHeader: .AlwaysOnBike: checkcode VAR_YCOORD - if_less_than $5, .CanWalk + if_less_than 5, .CanWalk checkcode VAR_XCOORD - if_greater_than $d, .CanWalk + if_greater_than 13, .CanWalk setflag ENGINE_ALWAYS_ON_BIKE return diff --git a/maps/Route26.asm b/maps/Route26.asm index 4af45fe1f..bb6774f27 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -49,9 +49,9 @@ UnknownScript_0x1a4d62: scall UnknownScript_0x1a4dc3 UnknownScript_0x1a4d65: askforphonenumber PHONE_COOLTRAINERM_GAVEN - if_equal $1, UnknownScript_0x1a4dd3 - if_equal $2, UnknownScript_0x1a4dcf - trainertotext COOLTRAINERM, GAVEN3, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a4dd3 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a4dcf + trainertotext COOLTRAINERM, GAVEN3, MEM_BUFFER_0 scall UnknownScript_0x1a4dc7 jump UnknownScript_0x1a4dcb @@ -155,7 +155,7 @@ UnknownScript_0x1a4e21: askforphonenumber PHONE_COOLTRAINERF_BETH if_equal $1, UnknownScript_0x1a4e8f if_equal $2, UnknownScript_0x1a4e8b - trainertotext COOLTRAINERF, BETH1, $0 + trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0 scall UnknownScript_0x1a4e83 jump UnknownScript_0x1a4e87 diff --git a/maps/Route27.asm b/maps/Route27.asm index 4b02422f7..a21606768 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -84,9 +84,9 @@ UnknownScript_0x1a08e8: scall UnknownScript_0x1a095b UnknownScript_0x1a08eb: askforphonenumber PHONE_BIRDKEEPER_JOSE - if_equal $1, UnknownScript_0x1a096b - if_equal $2, UnknownScript_0x1a0967 - trainertotext BIRD_KEEPER, JOSE2, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a096b + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a0967 + trainertotext BIRD_KEEPER, JOSE2, MEM_BUFFER_0 scall UnknownScript_0x1a095f jump UnknownScript_0x1a0963 @@ -217,9 +217,9 @@ UnknownScript_0x1a09d2: scall UnknownScript_0x1a0a33 UnknownScript_0x1a09d5: askforphonenumber PHONE_COOLTRAINERF_REENA - if_equal $1, UnknownScript_0x1a0a43 - if_equal $2, UnknownScript_0x1a0a3f - trainertotext COOLTRAINERF, REENA1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a0a43 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a0a3f + trainertotext COOLTRAINERF, REENA1, MEM_BUFFER_0 scall UnknownScript_0x1a0a37 jump UnknownScript_0x1a0a3b diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index e66f41f4e..bb1690efe 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -16,7 +16,7 @@ SandstormHouseWoman: special GetFirstPokemonHappiness writetext SandstormHouseWomanText1 buttonsound - if_greater_than $95, .Loyal + if_greater_than 150 - 1, .Loyal jump .Disloyal .Loyal: diff --git a/maps/Route29.asm b/maps/Route29.asm index a990cdc18..9be77fafe 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -108,7 +108,7 @@ CatchingTutorialDudeScript: faceplayer opentext checkcode VAR_BOXSPACE - if_equal $0, .BoxFull + if_equal 0, .BoxFull checkevent EVENT_LEARNED_TO_CATCH_POKEMON iftrue .BoxFull checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM diff --git a/maps/Route30.asm b/maps/Route30.asm index 74db65a31..9830f4019 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -61,9 +61,9 @@ TrainerYoungsterJoey: scall .AskNumber2 .RequestNumber: askforphonenumber PHONE_YOUNGSTER_JOEY - if_equal $1, .PhoneFull - if_equal $2, .NumberDeclined - trainertotext YOUNGSTER, JOEY1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/Route31.asm b/maps/Route31.asm index e5498917f..4ef8ae314 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -49,9 +49,9 @@ TrainerBugCatcherWade1: scall .AskAgainSTD .Continue: askforphonenumber PHONE_BUG_CATCHER_WADE - if_equal $1, .PhoneFullSTD - if_equal $2, .DeclinedNumberSTD - trainertotext BUG_CATCHER, WADE1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFullSTD + if_equal PHONE_CONTACT_REFUSED, .DeclinedNumberSTD + trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0 scall .RegisterNumberSTD jump .AcceptedNumberSTD @@ -198,10 +198,11 @@ Route31MailRecipientScript: writetext Text_Route31SleepyManGotMail buttonsound checkpokeitem ReceivedSpearowMailText - if_equal $0, .WrongMail - if_equal $2, .Refused - if_equal $3, .NoMail - if_equal $4, .LastMon + if_equal POKEMAIL_WRONG_MAIL, .WrongMail + if_equal POKEMAIL_REFUSED, .Refused + if_equal POKEMAIL_NO_MAIL, .NoMail + if_equal POKEMAIL_LAST_MON, .LastMon + ; POKEMAIL_CORRECT writetext Text_Route31HandOverMailMon buttonsound writetext Text_Route31ReadingMail diff --git a/maps/Route32.asm b/maps/Route32.asm index b9de0d4df..d9149ad7f 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -190,9 +190,9 @@ TrainerFisherRalph1: scall .AskNumber2 .AskForNumber: askforphonenumber PHONE_FISHER_RALPH - if_equal $1, .PhoneFull - if_equal $2, .NumberDeclined - trainertotext FISHER, RALPH1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + trainertotext FISHER, RALPH1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -324,9 +324,9 @@ TrainerPicnickerLiz1: scall .AskNumber2 .AskForNumber: askforphonenumber PHONE_PICNICKER_LIZ - if_equal $1, .PhoneFull - if_equal $2, .NumberDeclined - trainertotext PICNICKER, LIZ1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + trainertotext PICNICKER, LIZ1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/Route33.asm b/maps/Route33.asm index fbc7b3190..5ab8610d7 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -38,9 +38,9 @@ TrainerHikerAnthony: scall .AskNumber2 .AskForPhoneNumber: askforphonenumber PHONE_HIKER_ANTHONY - if_equal $1, .PhoneFull - if_equal $2, .NumberDeclined - trainertotext HIKER, ANTHONY2, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + trainertotext HIKER, ANTHONY2, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/Route34.asm b/maps/Route34.asm index 144973036..29d3232d8 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -59,7 +59,7 @@ DayCareManScript_Outside: special Special_DayCareManOutside waitbutton closetext - if_equal $1, .end_fail + if_equal TRUE, .end_fail clearflag ENGINE_DAY_CARE_MAN_HAS_EGG checkcode VAR_FACING if_equal RIGHT, .walk_around_player @@ -112,9 +112,9 @@ TrainerCamperTodd1: scall .AskNumber2 .FinishAsk: askforphonenumber PHONE_CAMPER_TODD - if_equal $1, .PhoneFull - if_equal $2, .NumberDeclined - trainertotext CAMPER, TODD1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + trainertotext CAMPER, TODD1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -237,9 +237,9 @@ TrainerPicnickerGina1: scall .AskNumber2 .FinishAsk: askforphonenumber PHONE_PICNICKER_GINA - if_equal $1, .PhoneFull - if_equal $2, .NumberDeclined - trainertotext PICNICKER, GINA1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + trainertotext PICNICKER, GINA1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/Route35.asm b/maps/Route35.asm index becb45ad0..a8a8bfe46 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -50,9 +50,9 @@ UnknownScript_0x19c8ec: scall UnknownScript_0x19c907 UnknownScript_0x19c8ef: askforphonenumber PHONE_JUGGLER_IRWIN - if_equal $1, UnknownScript_0x19c917 - if_equal $2, UnknownScript_0x19c913 - trainertotext JUGGLER, IRWIN1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19c917 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19c913 + trainertotext JUGGLER, IRWIN1, MEM_BUFFER_0 scall UnknownScript_0x19c90b jump UnknownScript_0x19c90f @@ -153,9 +153,9 @@ UnknownScript_0x19c9a4: scall UnknownScript_0x19c907 UnknownScript_0x19c9a7: askforphonenumber PHONE_BUG_CATCHER_ARNIE - if_equal $1, UnknownScript_0x19c917 - if_equal $2, UnknownScript_0x19c913 - trainertotext BUG_CATCHER, ARNIE1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19c917 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19c913 + trainertotext BUG_CATCHER, ARNIE1, MEM_BUFFER_0 scall UnknownScript_0x19c90b jump UnknownScript_0x19c90f diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 84bc40ccc..80bf1531c 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -58,8 +58,8 @@ Route35NationalParkGate_MapScriptHeader: spriteface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT opentext checkcode VAR_CONTESTMINUTES - addvar $1 - RAM2MEM $0 + addvar 1 + vartomem MEM_BUFFER_0 writetext UnknownText_0x6a79a yesorno iffalse .GoBackToContest @@ -94,7 +94,7 @@ OfficerScript_0x6a204: yesorno 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: @@ -129,13 +129,13 @@ Route35NationalParkGate_FacingLeft: Route35NationalParkGate_LeaveTheRestBehind: checkcode VAR_PARTYCOUNT - if_less_than 6, Route35NationalParkGate_LessThanFullParty + if_less_than PARTY_LENGTH, Route35NationalParkGate_LessThanFullParty checkcode VAR_BOXSPACE if_equal 0, Route35NationalParkGate_NoRoomInBox Route35NationalParkGate_LessThanFullParty: ; 6a27d special CheckFirstMonIsEgg - if_equal $1, Route35NationalParkGate_FirstMonIsEgg + if_equal TRUE, Route35NationalParkGate_FirstMonIsEgg writetext UnknownText_0x6a4c6 yesorno iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind diff --git a/maps/Route36.asm b/maps/Route36.asm index 40a4ae446..cdc2360e9 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -191,9 +191,9 @@ TrainerSchoolboyAlan1: scall .AskNumber2 .ContinueAskForPhoneNumber: askforphonenumber PHONE_SCHOOLBOY_ALAN - if_equal $1, .PhoneFull - if_equal $2, .NumberDeclined - trainertotext SCHOOLBOY, ALAN1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 9c6bd8c45..cc74c5dfb 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -67,8 +67,8 @@ Route36NationalParkGate_MapScriptHeader: spriteface PLAYER, UP opentext checkcode VAR_CONTESTMINUTES - addvar $1 - RAM2MEM $0 + addvar 1 + vartomem MEM_BUFFER_0 writetext UnknownText_0x6b284 yesorno iffalse .GoBackToContest @@ -155,7 +155,7 @@ Route36OfficerScriptContest: yesorno iffalse .DecidedNotToJoinContest checkcode VAR_PARTYCOUNT - if_greater_than $1, .LeaveMonsWithOfficer + if_greater_than 1, .LeaveMonsWithOfficer special ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER .ResumeStartingContest: @@ -182,12 +182,12 @@ Route36OfficerScriptContest: .LeaveMonsWithOfficer: checkcode VAR_PARTYCOUNT - if_less_than $6, .ContinueLeavingMons + if_less_than PARTY_LENGTH, .ContinueLeavingMons checkcode VAR_BOXSPACE - if_equal $0, .BoxFull + if_equal 0, .BoxFull .ContinueLeavingMons: special CheckFirstMonIsEgg - if_equal $1, .FirstMonIsEgg + if_equal TRUE, .FirstMonIsEgg writetext UnknownText_0x6afb0 yesorno iffalse .RefusedToLeaveMons diff --git a/maps/Route38.asm b/maps/Route38.asm index 526bf3e36..c91ad06c1 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -61,9 +61,9 @@ TrainerLassDana1: scall .AskNumber2F .AskForPhoneNumber: askforphonenumber PHONE_LASS_DANA - if_equal $1, .PhoneFull - if_equal $2, .DeclinedPhoneNumber - trainertotext LASS, DANA1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .DeclinedPhoneNumber + trainertotext LASS, DANA1, MEM_BUFFER_0 scall .RegisteredPhoneNumber jump .NumberAccepted @@ -197,9 +197,9 @@ TrainerSchoolboyChad1: scall .AskPhoneNumber2 .AskToRegisterNumber: askforphonenumber PHONE_SCHOOLBOY_CHAD - if_equal $1, .PhoneFull - if_equal $2, .SaidNo - trainertotext SCHOOLBOY, CHAD1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .SaidNo + trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0 scall .RegisteredChad jump .HaveChadsNumber diff --git a/maps/Route39.asm b/maps/Route39.asm index 6545dd77d..db7b37410 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -50,9 +50,9 @@ PokefanMDerekWantsYourNumber: scall PokefanMDerekAsksNumber2 PokefanMDerekAsksForPhoneNumber: askforphonenumber PHONE_POKEFANM_DEREK - if_equal $1, PokefanMDerekPhoneFull - if_equal $2, PokefanMDerekDeclined - trainertotext POKEFANM, DEREK1, $0 + if_equal PHONE_CONTACTS_FULL, PokefanMDerekPhoneFull + if_equal PHONE_CONTACT_REFUSED, PokefanMDerekDeclined + trainertotext POKEFANM, DEREK1, MEM_BUFFER_0 scall PokefanMDerekRegistered jump PokefanMDerekAccepted diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 77531a70d..aa6b15078 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -27,11 +27,11 @@ FarmerMScript_SellMilk: special PlaceMoneyTopRight yesorno iffalse FarmerMScript_NoSale - checkmoney $0, 500 - if_equal $2, FarmerMScript_NoMoney + checkmoney YOUR_MONEY, 500 + if_equal HAVE_LESS, FarmerMScript_NoMoney giveitem MOOMOO_MILK iffalse FarmerMScript_NoRoom - takemoney $0, 500 + takemoney YOUR_MONEY, 500 special PlaceMoneyTopRight waitsfx playsound SFX_TRANSACTION diff --git a/maps/Route42.asm b/maps/Route42.asm index 9f18f09e8..2a7b0e775 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -61,9 +61,9 @@ UnknownScript_0x1a9268: scall UnknownScript_0x1a92f5 UnknownScript_0x1a926b: askforphonenumber PHONE_FISHER_TULLY - if_equal $1, UnknownScript_0x1a9305 - if_equal $2, UnknownScript_0x1a9301 - trainertotext FISHER, TULLY1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a9305 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a9301 + trainertotext FISHER, TULLY1, MEM_BUFFER_0 scall UnknownScript_0x1a92f9 jump UnknownScript_0x1a92fd diff --git a/maps/Route43.asm b/maps/Route43.asm index 79e367af9..8b0c7b307 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -71,9 +71,9 @@ UnknownScript_0x19d0b8: scall UnknownScript_0x19d130 UnknownScript_0x19d0bb: askforphonenumber PHONE_POKEMANIAC_BRENT - if_equal $1, UnknownScript_0x19d140 - if_equal $2, UnknownScript_0x19d13c - trainertotext POKEMANIAC, BRENT1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d140 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d13c + trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0 scall UnknownScript_0x19d134 jump UnknownScript_0x19d138 @@ -202,9 +202,9 @@ UnknownScript_0x19d1aa: scall UnknownScript_0x19d23d UnknownScript_0x19d1ad: askforphonenumber PHONE_PICNICKER_TIFFANY - if_equal $1, UnknownScript_0x19d24d - if_equal $2, UnknownScript_0x19d249 - trainertotext PICNICKER, TIFFANY3, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d24d + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d249 + trainertotext PICNICKER, TIFFANY3, MEM_BUFFER_0 scall UnknownScript_0x19d241 jump UnknownScript_0x19d245 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index e59c04390..9a59957db 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -50,17 +50,17 @@ RocketScript_Southbound: opentext writetext RocketText_TollFee buttonsound - checkmoney $0, ROUTE43GATE_TOLL - 1 - if_equal $0, RocketScript_TollSouth + checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1 + if_equal HAVE_MORE, RocketScript_TollSouth jump RocketScript_YoureBrokeSouth RocketScript_TollSouth: - takemoney $0, ROUTE43GATE_TOLL + takemoney YOUR_MONEY, ROUTE43GATE_TOLL writetext RocketText_ThankYou jump RocketScript_ShakeDownSouth RocketScript_YoureBrokeSouth: - takemoney $0, ROUTE43GATE_TOLL + takemoney YOUR_MONEY, ROUTE43GATE_TOLL writetext RocketText_AllYouGot jump RocketScript_ShakeDownSouth @@ -82,17 +82,17 @@ RocketScript_Northbound: opentext writetext RocketText_TollFee buttonsound - checkmoney $0, ROUTE43GATE_TOLL - 1 - if_equal $0, RocketScript_TollNorth + checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1 + if_equal HAVE_MORE, RocketScript_TollNorth jump RocketScript_YoureBrokeNorth RocketScript_TollNorth: - takemoney $0, ROUTE43GATE_TOLL + takemoney YOUR_MONEY, ROUTE43GATE_TOLL writetext RocketText_ThankYou jump RocketScript_ShakeDownNorth RocketScript_YoureBrokeNorth: - takemoney $0, ROUTE43GATE_TOLL + takemoney YOUR_MONEY, ROUTE43GATE_TOLL writetext RocketText_AllYouGot jump RocketScript_ShakeDownNorth diff --git a/maps/Route44.asm b/maps/Route44.asm index 4f9261a59..5693e9e15 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -41,9 +41,9 @@ UnknownScript_0x19d853: scall UnknownScript_0x19d8e3 UnknownScript_0x19d856: askforphonenumber PHONE_BIRDKEEPER_VANCE - if_equal $1, UnknownScript_0x19d8f3 - if_equal $2, UnknownScript_0x19d8ef - trainertotext BIRD_KEEPER, VANCE1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d8f3 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d8ef + trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0 scall UnknownScript_0x19d8e7 jump UnknownScript_0x19d8eb @@ -185,9 +185,9 @@ UnknownScript_0x19d957: scall UnknownScript_0x19d8e3 UnknownScript_0x19d95a: askforphonenumber PHONE_FISHER_WILTON - if_equal $1, UnknownScript_0x19d8f3 - if_equal $2, UnknownScript_0x19d8ef - trainertotext FISHER, WILTON1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d8f3 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d8ef + trainertotext FISHER, WILTON1, MEM_BUFFER_0 scall UnknownScript_0x19d8e7 jump UnknownScript_0x19d8eb diff --git a/maps/Route45.asm b/maps/Route45.asm index 38b7f77f2..f024eb7d7 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -42,15 +42,15 @@ UnknownScript_0x19e0cd: scall UnknownScript_0x19e11f UnknownScript_0x19e0d0: askforphonenumber PHONE_BLACKBELT_KENJI - if_equal $1, UnknownScript_0x19e12f - if_equal $2, UnknownScript_0x19e12b - trainertotext BLACKBELT_T, KENJI3, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19e12f + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19e12b + trainertotext BLACKBELT_T, KENJI3, MEM_BUFFER_0 scall UnknownScript_0x19e123 jump UnknownScript_0x19e127 UnknownScript_0x19e0e4: checkcode VAR_KENJI_BREAK - if_not_equal $1, UnknownScript_0x19e127 + if_not_equal 1, UnknownScript_0x19e127 checkmorn iftrue UnknownScript_0x19e10c checknite @@ -169,9 +169,9 @@ UnknownScript_0x19e1a1: scall UnknownScript_0x19e11f UnknownScript_0x19e1a4: askforphonenumber PHONE_HIKER_PARRY - if_equal $1, UnknownScript_0x19e12f - if_equal $2, UnknownScript_0x19e12b - trainertotext HIKER, PARRY1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19e12f + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19e12b + trainertotext HIKER, PARRY1, MEM_BUFFER_0 scall UnknownScript_0x19e123 jump UnknownScript_0x19e127 diff --git a/maps/Route46.asm b/maps/Route46.asm index 3ecab00f1..6edd26404 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -47,9 +47,9 @@ UnknownScript_0x1a96c3: scall UnknownScript_0x1a9753 UnknownScript_0x1a96c6: askforphonenumber PHONE_PICNICKER_ERIN - if_equal $1, UnknownScript_0x1a9763 - if_equal $2, UnknownScript_0x1a975f - trainertotext PICNICKER, ERIN1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a9763 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a975f + trainertotext PICNICKER, ERIN1, MEM_BUFFER_0 scall UnknownScript_0x1a9757 jump UnknownScript_0x1a975b diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index cce84bafd..a575828f6 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -48,7 +48,7 @@ RuinsOfAlphAerodactylChamber_MapScriptHeader: end MapRuinsOfAlphAerodactylChamberSignpost2Script: - refreshscreen $0 + refreshscreen writebyte UNOWNPUZZLE_AERODACTYL special Special_UnownPuzzle closetext diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 02a306f72..ec90edc03 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -49,7 +49,7 @@ RuinsOfAlphHoOhChamber_MapScriptHeader: end MapRuinsOfAlphHoOhChamberSignpost2Script: - refreshscreen $0 + refreshscreen writebyte UNOWNPUZZLE_HO_OH special Special_UnownPuzzle closetext diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index efcf238c0..bbaaa4ad3 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -55,7 +55,7 @@ RuinsOfAlphKabutoChamberReceptionistScript: jumptextfaceplayer RuinsOfAlphKabutoChamberReceptionistText MapRuinsOfAlphKabutoChamberSignpost2Script: - refreshscreen $0 + refreshscreen writebyte UNOWNPUZZLE_KABUTO special Special_UnownPuzzle closetext @@ -86,7 +86,7 @@ ScientistScript_0x587a8: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal 26, UnknownScript_0x587cf + if_equal NUM_UNOWN, UnknownScript_0x587cf checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x587c9 checkevent EVENT_SOLVED_KABUTO_PUZZLE diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 862b629f7..21583e485 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -49,7 +49,7 @@ RuinsOfAlphOmanyteChamber_MapScriptHeader: end MapRuinsOfAlphOmanyteChamberSignpost2Script: - refreshscreen $0 + refreshscreen writebyte UNOWNPUZZLE_OMANYTE special Special_UnownPuzzle closetext diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 258a6f1c8..d313644bb 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -30,7 +30,7 @@ RuinsOfAlphOutside_MapScriptHeader: .MaybeScientist: checkcode VAR_UNOWNCOUNT - if_greater_than $2, .YesScientist + if_greater_than 2, .YesScientist jump .NoScientist .YesScientist: diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index bd20284d0..e9606cd42 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -22,7 +22,7 @@ RuinsOfAlphResearchCenter_MapScriptHeader: .ScientistCallback: checkscene - if_equal $1, .ShowScientist + if_equal 1, .ShowScientist return .ShowScientist: @@ -63,7 +63,7 @@ ScientistScript_0x591d1: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal 26, UnknownScript_0x591df + if_equal NUM_UNOWN, UnknownScript_0x591df writetext UnknownText_0x59311 waitbutton closetext @@ -79,7 +79,7 @@ ScientistScript_0x591e5: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal 26, UnknownScript_0x5920b + if_equal NUM_UNOWN, UnknownScript_0x5920b checkflag ENGINE_UNOWN_DEX iftrue UnknownScript_0x59205 checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS @@ -112,7 +112,7 @@ ScientistScript_0x59214: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal 26, UnknownScript_0x5922e + if_equal NUM_UNOWN, UnknownScript_0x5922e checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x59228 writetext UnknownText_0x5954f @@ -137,7 +137,7 @@ MapRuinsOfAlphResearchCenterSignpost1Script: checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x59241 checkcode VAR_UNOWNCOUNT - if_equal 26, UnknownScript_0x59247 + if_equal NUM_UNOWN, UnknownScript_0x59247 UnknownScript_0x59241: writetext UnknownText_0x597b6 waitbutton @@ -155,7 +155,7 @@ MapRuinsOfAlphResearchCenterSignpost2Script: checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x5925a checkcode VAR_UNOWNCOUNT - if_equal 26, UnknownScript_0x59260 + if_equal NUM_UNOWN, UnknownScript_0x59260 UnknownScript_0x5925a: writetext UnknownText_0x5980e waitbutton diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 53f900cad..909c2754a 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -111,7 +111,7 @@ SaffronGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext SABRINA, SABRINA1, $1 + trainertotext SABRINA, SABRINA1, MEM_BUFFER_1 jumpstd gymstatue2 UnknownText_0x189cdf: diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 19ea7a6ec..105a938a7 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -36,7 +36,7 @@ OfficerScript_0x18a81e: closetext applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a88f applymovement PLAYER, MovementData_0x18a898 - writebyte $1 + writebyte TRUE special Special_MagnetTrain warpcheck newloadmap MAPSETUP_TRAIN diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index fd546e67a..e15469876 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -32,7 +32,7 @@ Red: special Special_FadeInQuickly pause 30 special HealParty - refreshscreen $0 + refreshscreen credits end diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index fce00700b..76b3cdc9f 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -35,7 +35,7 @@ SecurityCamera1a: spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -43,7 +43,7 @@ SecurityCamera1a: appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt2 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_1 end @@ -60,7 +60,7 @@ SecurityCamera1b: spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -68,7 +68,7 @@ SecurityCamera1b: appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt2 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_1 end @@ -85,7 +85,7 @@ SecurityCamera2a: spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement2 scall TrainerCameraGrunt1 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -94,7 +94,7 @@ SecurityCamera2a: appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement3 scall TrainerCameraGrunt2 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_2 end @@ -111,7 +111,7 @@ SecurityCamera2b: spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement4 scall TrainerCameraGrunt1 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -120,7 +120,7 @@ SecurityCamera2b: appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement5 scall TrainerCameraGrunt2 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_2 end @@ -137,7 +137,7 @@ SecurityCamera3a: spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -146,7 +146,7 @@ SecurityCamera3a: appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement6 scall TrainerCameraGrunt2 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_3 end @@ -163,7 +163,7 @@ SecurityCamera3b: spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -172,7 +172,7 @@ SecurityCamera3b: appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement7 scall TrainerCameraGrunt2 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_3 end @@ -189,7 +189,7 @@ SecurityCamera4: spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -198,7 +198,7 @@ SecurityCamera4: appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement8 scall TrainerCameraGrunt2 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_4 end @@ -215,7 +215,7 @@ SecurityCamera5: spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -224,7 +224,7 @@ SecurityCamera5: appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement9 scall TrainerCameraGrunt2 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_5 end diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index a322c6846..cfbb966f5 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -197,7 +197,7 @@ TinTower1FSage5Script: buttonsound verbosegiveitem RAINBOW_WING closetext - refreshscreen $0 + refreshscreen earthquake 72 waitsfx playsound SFX_STRENGTH diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index c4219a991..d2c689d5c 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -22,11 +22,11 @@ TrainerHouseReceptionistScript: buttonsound special SpecialTrainerHouse iffalse .GetCal3Name - trainertotext CAL, CAL2, $0 + trainertotext CAL, CAL2, MEM_BUFFER_0 jump .GotName .GetCal3Name: - trainertotext CAL, CAL3, $0 + trainertotext CAL, CAL3, MEM_BUFFER_0 .GotName: writetext TrainerHouseB1FYourOpponentIsText buttonsound diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 90baf28b0..3dee2616b 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -68,7 +68,7 @@ VermilionGymBadgeGuy: checkevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY iftrue .AlreadyGotItem checkcode VAR_BADGES - if_equal 16, .AllBadges + if_equal NUM_BADGES, .AllBadges if_greater_than 13, .MostBadges if_greater_than 9, .SomeBadges writetext UnknownText_0x1aabc8 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index a815a0e35..ac70f5c95 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -101,7 +101,7 @@ VermilionGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext LT_SURGE, LT_SURGE1, $1 + trainertotext LT_SURGE, LT_SURGE1, MEM_BUFFER_1 jumpstd gymstatue2 UnknownText_0x192142: diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 3d15be073..f1ae34fab 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -29,7 +29,7 @@ VictoryRoadGateBadgeCheckScript: writetext VictoryRoadGateOfficerText buttonsound checkcode VAR_BADGES - if_greater_than 7, .AllEightBadges + if_greater_than NUM_JOHTO_BADGES - 1, .AllEightBadges writetext VictoryRoadGateNotEnoughBadgesText waitbutton closetext diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index aa5934103..fc7cb0169 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -109,7 +109,7 @@ VioletGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext FALKNER, FALKNER1, $1 + trainertotext FALKNER, FALKNER1, MEM_BUFFER_1 jumpstd gymstatue2 UnknownText_0x68473: diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index f16ee8989..757ab1f44 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -27,7 +27,7 @@ VioletPokecenter1F_ElmsAideScript: checkcode VAR_PARTYCOUNT if_equal PARTY_LENGTH, .PartyFull giveegg TOGEPI, 5 - stringtotext .eggname, $1 + stringtotext .eggname, MEM_BUFFER_1 scall .AideGivesEgg setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE clearevent EVENT_ELMS_AIDE_IN_LAB diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index ce75a5503..19f8654d9 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -60,7 +60,7 @@ ViridianGymStatue: jumpstd gymstatue1 .Beaten: - trainertotext BLUE, BLUE1, $1 + trainertotext BLUE, BLUE1, MEM_BUFFER_1 jumpstd gymstatue2 LeaderBlueBeforeText: -- cgit v1.2.3 From 2b4a4ccaab3d04fe593bcea9739f56c0673dad24 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 12 Jan 2018 02:33:06 -0500 Subject: SaffronMagnetTrainStation --- maps/GoldenrodMagnetTrainStation.asm | 4 +- maps/SaffronCity.asm | 2 +- maps/SaffronMagnetTrainStation.asm | 241 +++++++++++++++++++++++++++++++++++ maps/SaffronMagnetTrainStation.blk | 6 + maps/SaffronTrainStation.asm | 241 ----------------------------------- maps/SaffronTrainStation.blk | 6 - maps/blockdata.asm | 4 +- maps/map_headers.asm | 2 +- maps/second_map_headers.asm | 2 +- 9 files changed, 254 insertions(+), 254 deletions(-) create mode 100644 maps/SaffronMagnetTrainStation.asm create mode 100644 maps/SaffronMagnetTrainStation.blk delete mode 100644 maps/SaffronTrainStation.asm delete mode 100644 maps/SaffronTrainStation.blk (limited to 'maps') diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index e05525a18..f92d2e3da 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -172,8 +172,8 @@ GoldenrodMagnetTrainStation_MapEventHeader: db 4 warp_def 8, 17, 5, GOLDENROD_CITY warp_def 9, 17, 5, GOLDENROD_CITY - warp_def 6, 5, 4, SAFFRON_TRAIN_STATION - warp_def 11, 5, 3, SAFFRON_TRAIN_STATION + warp_def 6, 5, 4, SAFFRON_MAGNET_TRAIN_STATION + warp_def 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION .CoordEvents: db 1 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 06eaf59a5..38d3eed48 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -276,7 +276,7 @@ SaffronCity_MapEventHeader: warp_def 25, 11, 2, SAFFRON_MART warp_def 9, 29, 1, SAFFRON_POKECENTER_1F warp_def 27, 29, 1, MR_PSYCHICS_HOUSE - warp_def 8, 3, 2, SAFFRON_TRAIN_STATION + warp_def 8, 3, 2, SAFFRON_MAGNET_TRAIN_STATION warp_def 18, 21, 1, SILPH_CO_1F warp_def 9, 11, 1, COPYCATS_HOUSE_1F warp_def 18, 3, 3, ROUTE_5_SAFFRON_GATE diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm new file mode 100644 index 000000000..471462840 --- /dev/null +++ b/maps/SaffronMagnetTrainStation.asm @@ -0,0 +1,241 @@ +const_value set 2 + const SAFFRONMAGNETTRAINSTATION_OFFICER + const SAFFRONMAGNETTRAINSTATION_GYM_GUY + const SAFFRONMAGNETTRAINSTATION_TEACHER + const SAFFRONMAGNETTRAINSTATION_LASS + +SaffronMagnetTrainStation_MapScriptHeader: +.SceneScripts: + db 1 + scene_script .DummyScene + +.MapCallbacks: + db 0 + +.DummyScene: + end + +OfficerScript_0x18a81e: + faceplayer + opentext + checkevent EVENT_RESTORED_POWER_TO_KANTO + iftrue .MagnetTrainToGoldenrod + writetext UnknownText_0x18a8a9 + waitbutton + closetext + end + +.MagnetTrainToGoldenrod: + writetext UnknownText_0x18a8dd + yesorno + iffalse .DecidedNotToRide + checkitem PASS + iffalse .PassNotInBag + writetext UnknownText_0x18a917 + waitbutton + closetext + applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f + applymovement PLAYER, MovementData_0x18a898 + writebyte TRUE + special Special_MagnetTrain + warpcheck + newloadmap MAPSETUP_TRAIN + applymovement PLAYER, .MovementBoardTheTrain + wait 20 + end + +.MovementBoardTheTrain: + turn_head DOWN + step_end + +.PassNotInBag: + writetext UnknownText_0x18a956 + waitbutton + closetext + end + +.DecidedNotToRide: + writetext UnknownText_0x18a978 + waitbutton + closetext + end + +Script_ArriveFromGoldenrod: + applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f + applymovement PLAYER, MovementData_0x18a8a1 + applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a894 + opentext + writetext UnknownText_0x18a993 + waitbutton + closetext + end + +GymGuyScript_0x18a875: + faceplayer + opentext + checkevent EVENT_RETURNED_MACHINE_PART + iftrue UnknownScript_0x18a883 + writetext UnknownText_0x18a9ca + waitbutton + closetext + end + +UnknownScript_0x18a883: + writetext UnknownText_0x18aa61 + waitbutton + closetext + end + +SaffronMagnetTrainStationTeacherScript: + jumptextfaceplayer SaffronMagnetTrainStationTeacherText + +SaffronMagnetTrainStationLassScript: + jumptextfaceplayer SaffronMagnetTrainStationLassText + +MovementData_0x18a88f: + step UP + step UP + step RIGHT + turn_head LEFT + step_end + +MovementData_0x18a894: + step LEFT + step DOWN + step DOWN + step_end + +MovementData_0x18a898: + step UP + step UP + step UP + step LEFT + step LEFT + step LEFT + step UP + step UP + step_end + +MovementData_0x18a8a1: + step LEFT + step LEFT + step DOWN + step DOWN + step DOWN + step DOWN + turn_head UP + step_end + +UnknownText_0x18a8a9: + text "I'm sorry, but the" + line "MAGNET TRAIN isn't" + cont "operating now." + done + +UnknownText_0x18a8dd: + text "We'll soon depart" + line "for GOLDENROD." + + para "Are you coming on" + line "board?" + done + +UnknownText_0x18a917: + text "May I see your" + line "rail PASS, please?" + + para "OK. Right this" + line "way, please." + done + +UnknownText_0x18a956: + text "Sorry, but you" + line "don't have a PASS." + done + +UnknownText_0x18a978: + text "We hope to see you" + line "again." + done + +UnknownText_0x18a993: + text "We have arrived in" + line "SAFFRON." + + para "We hope to see you" + line "again." + done + +UnknownText_0x18a9ca: + text "The MAGNET TRAIN" + line "is a super-modern" + + para "rail liner that" + line "uses electricity" + + para "and magnets to" + line "attain incredible" + cont "speed." + + para "However, if there" + line "isn't any elec-" + cont "tricity…" + done + +UnknownText_0x18aa61: + text "Whew…" + + para "How many times" + line "have I gone back" + + para "and forth between" + line "KANTO and JOHTO?" + done + +SaffronMagnetTrainStationTeacherText: + text "Before the MAGNET" + line "TRAIN STATION was" + + para "built, there was a" + line "house there." + + para "A little girl" + line "named COPYCAT used" + cont "to live there." + done + +SaffronMagnetTrainStationLassText: + text "Hi. Do you have a" + line "rail PASS? I have" + + para "one. All the peo-" + line "ple in SAFFRON who" + + para "ride the MAGNET" + line "TRAIN have PASSES." + done + +SaffronMagnetTrainStation_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 4 + warp_def 8, 17, 6, SAFFRON_CITY + warp_def 9, 17, 6, SAFFRON_CITY + warp_def 6, 5, 4, GOLDENROD_MAGNET_TRAIN_STATION + warp_def 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION + +.CoordEvents: + db 1 + coord_event 11, 6, 0, Script_ArriveFromGoldenrod + +.BGEvents: + db 0 + +.ObjectEvents: + db 4 + object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1 + object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1 + object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION + object_event 6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION diff --git a/maps/SaffronMagnetTrainStation.blk b/maps/SaffronMagnetTrainStation.blk new file mode 100644 index 000000000..bdca20f29 --- /dev/null +++ b/maps/SaffronMagnetTrainStation.blk @@ -0,0 +1,6 @@ + + + + + + /  3  \ No newline at end of file diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm deleted file mode 100644 index 105a938a7..000000000 --- a/maps/SaffronTrainStation.asm +++ /dev/null @@ -1,241 +0,0 @@ -const_value set 2 - const SAFFRONTRAINSTATION_OFFICER - const SAFFRONTRAINSTATION_GYM_GUY - const SAFFRONTRAINSTATION_TEACHER - const SAFFRONTRAINSTATION_LASS - -SaffronTrainStation_MapScriptHeader: -.SceneScripts: - db 1 - scene_script .DummyScene - -.MapCallbacks: - db 0 - -.DummyScene: - end - -OfficerScript_0x18a81e: - faceplayer - opentext - checkevent EVENT_RESTORED_POWER_TO_KANTO - iftrue .MagnetTrainToGoldenrod - writetext UnknownText_0x18a8a9 - waitbutton - closetext - end - -.MagnetTrainToGoldenrod: - writetext UnknownText_0x18a8dd - yesorno - iffalse .DecidedNotToRide - checkitem PASS - iffalse .PassNotInBag - writetext UnknownText_0x18a917 - waitbutton - closetext - applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a88f - applymovement PLAYER, MovementData_0x18a898 - writebyte TRUE - special Special_MagnetTrain - warpcheck - newloadmap MAPSETUP_TRAIN - applymovement PLAYER, .MovementBoardTheTrain - wait 20 - end - -.MovementBoardTheTrain: - turn_head DOWN - step_end - -.PassNotInBag: - writetext UnknownText_0x18a956 - waitbutton - closetext - end - -.DecidedNotToRide: - writetext UnknownText_0x18a978 - waitbutton - closetext - end - -Script_ArriveFromGoldenrod: - applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a88f - applymovement PLAYER, MovementData_0x18a8a1 - applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a894 - opentext - writetext UnknownText_0x18a993 - waitbutton - closetext - end - -GymGuyScript_0x18a875: - faceplayer - opentext - checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x18a883 - writetext UnknownText_0x18a9ca - waitbutton - closetext - end - -UnknownScript_0x18a883: - writetext UnknownText_0x18aa61 - waitbutton - closetext - end - -SaffronTrainStationTeacherScript: - jumptextfaceplayer SaffronTrainStationTeacherText - -SaffronTrainStationLassScript: - jumptextfaceplayer SaffronTrainStationLassText - -MovementData_0x18a88f: - step UP - step UP - step RIGHT - turn_head LEFT - step_end - -MovementData_0x18a894: - step LEFT - step DOWN - step DOWN - step_end - -MovementData_0x18a898: - step UP - step UP - step UP - step LEFT - step LEFT - step LEFT - step UP - step UP - step_end - -MovementData_0x18a8a1: - step LEFT - step LEFT - step DOWN - step DOWN - step DOWN - step DOWN - turn_head UP - step_end - -UnknownText_0x18a8a9: - text "I'm sorry, but the" - line "MAGNET TRAIN isn't" - cont "operating now." - done - -UnknownText_0x18a8dd: - text "We'll soon depart" - line "for GOLDENROD." - - para "Are you coming on" - line "board?" - done - -UnknownText_0x18a917: - text "May I see your" - line "rail PASS, please?" - - para "OK. Right this" - line "way, please." - done - -UnknownText_0x18a956: - text "Sorry, but you" - line "don't have a PASS." - done - -UnknownText_0x18a978: - text "We hope to see you" - line "again." - done - -UnknownText_0x18a993: - text "We have arrived in" - line "SAFFRON." - - para "We hope to see you" - line "again." - done - -UnknownText_0x18a9ca: - text "The MAGNET TRAIN" - line "is a super-modern" - - para "rail liner that" - line "uses electricity" - - para "and magnets to" - line "attain incredible" - cont "speed." - - para "However, if there" - line "isn't any elec-" - cont "tricity…" - done - -UnknownText_0x18aa61: - text "Whew…" - - para "How many times" - line "have I gone back" - - para "and forth between" - line "KANTO and JOHTO?" - done - -SaffronTrainStationTeacherText: - text "Before the MAGNET" - line "TRAIN STATION was" - - para "built, there was a" - line "house there." - - para "A little girl" - line "named COPYCAT used" - cont "to live there." - done - -SaffronTrainStationLassText: - text "Hi. Do you have a" - line "rail PASS? I have" - - para "one. All the peo-" - line "ple in SAFFRON who" - - para "ride the MAGNET" - line "TRAIN have PASSES." - done - -SaffronTrainStation_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 8, 17, 6, SAFFRON_CITY - warp_def 9, 17, 6, SAFFRON_CITY - warp_def 6, 5, 4, GOLDENROD_MAGNET_TRAIN_STATION - warp_def 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION - -.CoordEvents: - db 1 - coord_event 11, 6, 0, Script_ArriveFromGoldenrod - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1 - object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1 - object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION - object_event 6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION diff --git a/maps/SaffronTrainStation.blk b/maps/SaffronTrainStation.blk deleted file mode 100644 index bdca20f29..000000000 --- a/maps/SaffronTrainStation.blk +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - /  3  \ No newline at end of file diff --git a/maps/blockdata.asm b/maps/blockdata.asm index 3214b7971..4f0fe925e 100644 --- a/maps/blockdata.asm +++ b/maps/blockdata.asm @@ -849,8 +849,8 @@ SafariZoneMainOffice_BlockData: KrissHouse2F_BlockData: INCBIN "maps/KrissHouse2F.blk" -SaffronTrainStation_BlockData: - INCBIN "maps/SaffronTrainStation.blk" +SaffronMagnetTrainStation_BlockData: + INCBIN "maps/SaffronMagnetTrainStation.blk" CeruleanGym_BlockData: INCBIN "maps/CeruleanGym.blk" diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 563eaf4ac..8ad8d7333 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -487,7 +487,7 @@ MapGroup_Saffron: 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 SaffronMagnetTrainStation, 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_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 diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 8b6bbdfc5..378b3d05a 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -668,7 +668,7 @@ ENDM 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 SaffronMagnetTrainStation, SAFFRON_MAGNET_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 -- cgit v1.2.3 From 59c95abf836e139931a41d20cf95af2472763fab Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 12 Jan 2018 17:09:32 -0500 Subject: Trim whitespace --- maps/BattleTowerBattleRoom.asm | 2 -- maps/BattleTowerHallway.asm | 2 -- maps/BlackthornGym2F.asm | 1 - maps/BurnedTower1F.asm | 2 -- maps/CeladonDeptStore6F.asm | 1 - maps/CeladonGameCornerPrizeRoom.asm | 12 ++++-------- maps/CeruleanGym.asm | 1 - maps/DarkCaveVioletEntrance.asm | 1 - maps/DiglettsCave.asm | 1 - maps/DragonShrine.asm | 6 ------ maps/GoldenrodCity.asm | 2 -- maps/GoldenrodDeptStore6F.asm | 1 - maps/GoldenrodDeptStoreElevator.asm | 2 -- maps/GoldenrodGameCorner.asm | 4 ---- maps/GoldenrodPokeComCenter2FMobile.asm | 4 ---- maps/IcePathB1F.asm | 3 --- maps/IcePathB2FBlackthornSide.asm | 1 - maps/IcePathB2FMahoganySide.asm | 1 - maps/IlexForest.asm | 2 -- maps/LakeOfRage.asm | 3 --- maps/MountMoonSquare.asm | 1 - maps/MountMortar1FInside.asm | 1 - maps/MountMortar1FOutside.asm | 1 - maps/MountMortar2FInside.asm | 1 - maps/MountMortarB1F.asm | 1 - maps/NationalPark.asm | 1 - maps/NationalParkBugContest.asm | 1 - maps/OlivineLighthouse5F.asm | 1 - maps/OlivinePort.asm | 1 - maps/RockTunnel1F.asm | 2 -- maps/RockTunnelB1F.asm | 1 - maps/Route11.asm | 1 - maps/Route12.asm | 1 - maps/Route13.asm | 1 - maps/Route17.asm | 2 -- maps/Route25.asm | 1 - maps/Route28.asm | 1 - maps/Route30.asm | 1 - maps/Route32.asm | 2 -- maps/Route34.asm | 2 -- maps/Route37.asm | 1 - maps/Route39.asm | 1 - maps/Route4.asm | 1 - maps/Route42.asm | 1 - maps/Route44.asm | 1 - maps/Route45.asm | 1 - maps/Route9.asm | 1 - maps/RuinsOfAlphOutside.asm | 2 -- maps/SilverCaveRoom1.asm | 2 -- maps/SilverCaveRoom2.asm | 1 - maps/TeamRocketBaseB1F.asm | 1 - maps/TeamRocketBaseB2F.asm | 1 - maps/TinTower4F.asm | 1 - maps/TinTower5F.asm | 2 -- maps/UndergroundPath.asm | 2 -- maps/VermilionPort.asm | 1 - maps/VictoryRoad.asm | 2 -- maps/WhirlIslandB1F.asm | 3 --- 58 files changed, 4 insertions(+), 97 deletions(-) (limited to 'maps') diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 82e1ea21e..e74b9634c 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -133,13 +133,11 @@ UnreferencedScript_0x9f4f7: closetext end - Text_ReturnedAfterSave_Mobile: text "You'll be returned" line "after you SAVE." done - BattleTowerBattleRoom_MapEventHeader: ; filler db 0, 0 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index e461ce613..c12091582 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -21,7 +21,6 @@ BattleTowerHallway_MapScriptHeader: callasm .asm_load_battle_room jump .WalkToChosenBattleRoom - .asm_load_battle_room ld a, [rSVBK] push af @@ -35,7 +34,6 @@ BattleTowerHallway_MapScriptHeader: ld [rSVBK], a ret - ; enter different rooms for different levels to battle against ; at least it should look like that ; because all warps lead to the same room diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 6aa55a0e5..270ec0481 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -56,7 +56,6 @@ BlackthornGym2F_MapScriptHeader: earthquake 80 end - BlackthornGymBoulder: jumpstd strengthboulder diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index fce0e73c8..246946e76 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -133,11 +133,9 @@ BurnedTower1FRock: BurnedTower1FHiddenEther: dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER - BurnedTower1FHiddenUltraBall: dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL - BurnedTower1FHPUp: itemball HP_UP diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 95c0f6199..15b9a752b 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -94,7 +94,6 @@ CeladonDeptStore6FVendingMachine: db "LEMONADE ¥350@" db "CANCEL@" - CeladonDeptStore6FDirectory: jumptext CeladonDeptStore6FDirectoryText diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 3918c86fa..3e66a0e6b 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -15,7 +15,7 @@ CeladonGameCornerPrizeRoomGentlemanScript: CeladonGameCornerPrizeRoomPharmacistScript: jumptextfaceplayer CeladonGameCornerPrizeRoomPharmacistText -GoldenrodGameCornerTMVendor: +CeladonGameCornerPrizeRoomTMVendor: faceplayer opentext writetext CeladonPrizeRoom_PrizeVendorIntroText @@ -102,7 +102,6 @@ CeladonPrizeRoom_NoCoinCase: closetext end - CeladonPrizeRoom_TMMenuDataHeader: db $40 ; flags db 02, 00 ; start coords @@ -118,8 +117,7 @@ CeladonPrizeRoom_TMMenuDataHeader: db "TM15 7500@" db "CANCEL@" - -GoldenrodGameCornerPokemonVendor: +CeladonGameCornerPrizeRoomPokemonVendor: faceplayer opentext writetext CeladonPrizeRoom_PrizeVendorIntroText @@ -191,7 +189,6 @@ GoldenrodGameCornerPokemonVendor: takecoins 8888 jump .loop - .MenuDataHeader: db $40 ; flags db 02, 00 ; start coords @@ -207,7 +204,6 @@ GoldenrodGameCornerPokemonVendor: db "LARVITAR 8888@" db "CANCEL@" - CeladonGameCornerPrizeRoomGentlemanText: text "I wanted PORYGON," line "but I was short by" @@ -283,8 +279,8 @@ CeladonGameCornerPrizeRoom_MapEventHeader: .BGEvents: db 2 - bg_event 2, 1, BGEVENT_READ, GoldenrodGameCornerTMVendor - bg_event 4, 1, BGEVENT_READ, GoldenrodGameCornerPokemonVendor + bg_event 2, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomTMVendor + bg_event 4, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomPokemonVendor .ObjectEvents: db 2 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index af9939f2d..844286fa8 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -137,7 +137,6 @@ CeruleanGymGuyScript: CeruleanGymHiddenMachinePart: dwb EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART - CeruleanGymStatue1: checkevent EVENT_TRAINERS_IN_CERULEAN_GYM iffalse CeruleanGymStatue diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index b1e629a54..42510fd44 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -33,7 +33,6 @@ DarkCaveVioletEntranceRock: DarkCaveVioletEntranceHiddenElixer: dwb EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER - DarkCaveVioletEntrance_MapEventHeader: ; filler db 0, 0 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 04277b792..d2bdb03bf 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -14,7 +14,6 @@ DiglettsCavePokefanMScript: DiglettsCaveHiddenMaxRevive: dwb EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE - DiglettsCavePokefanMText: text "A bunch of DIGLETT" line "popped out of the" diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index fd6cd48bf..2b1e9267c 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -265,7 +265,6 @@ ElderScript_0x18d20d: closetext end - MenuDataHeader_0x18d215: db $40 ; flags db 04, 08 ; start coords @@ -280,7 +279,6 @@ MenuDataHeader_0x18d215: db "Underling@" db "Friend@" - MenuDataHeader_0x18d234: db $40 ; flags db 04, 09 ; start coords @@ -295,7 +293,6 @@ MenuDataHeader_0x18d234: db "Raising@" db "Cheating@" - MenuDataHeader_0x18d258: db $40 ; flags db 04, 05 ; start coords @@ -310,7 +307,6 @@ MenuDataHeader_0x18d258: db "Tough person@" db "Anybody@" - MenuDataHeader_0x18d283: db $40 ; flags db 04, 08 ; start coords @@ -325,7 +321,6 @@ MenuDataHeader_0x18d283: db "Violence@" db "Knowledge@" - MenuDataHeader_0x18d2a5: db $40 ; flags db 04, 12 ; start coords @@ -340,7 +335,6 @@ MenuDataHeader_0x18d2a5: db "Both@" db "Weak@" - MovementData_0x18d2bf: slow_step UP slow_step UP diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 356a0e6ef..6f612692c 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -94,7 +94,6 @@ MoveTutor: if_equal FALSE, .TeachMove jump .Incompatible - .MoveMenuDataHeader: db $40 ; flags db 02, 00 ; start coords @@ -110,7 +109,6 @@ MoveTutor: db "ICE BEAM@" db "CANCEL@" - .Refused: writetext UnknownText_0x1990b4 waitbutton diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index cfe7fde52..a20b74133 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -83,7 +83,6 @@ GoldenrodVendingMachine: db "LEMONADE ¥350@" db "CANCEL@" - GoldenrodDeptStore6FLassScript: jumptextfaceplayer GoldenrodDeptStore6FLassText diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 9b6a2158b..7d921dd57 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -43,7 +43,6 @@ MapGoldenrodDeptStoreElevatorSignpost0Script: .Done: end - Elevator_0x566e0: db 7 ; floors elevfloor FLOOR_B1F, 2, GOLDENROD_DEPT_STORE_B1F @@ -55,7 +54,6 @@ Elevator_0x566e0: elevfloor FLOOR_6F, 2, GOLDENROD_DEPT_STORE_6F db -1 ; end - GoldenrodDeptStoreElevator_MapEventHeader: ; filler db 0, 0 diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index f6412f3b2..628cb852e 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -138,7 +138,6 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript: closetext end - GoldenrodGameCornerTMVendorMenuData: db $40 ; flags db 02, 00 ; start coords @@ -154,7 +153,6 @@ GoldenrodGameCornerTMVendorMenuData: db "TM38 5500@" db "CANCEL@" - GoldenrodGameCornerPrizeMonVendorScript: faceplayer opentext @@ -227,7 +225,6 @@ GoldenrodGameCornerPrizeMonVendorScript: takecoins 1500 jump .loop - .MenuDataHeader: db $40 ; flags db 02, 00 ; start coords @@ -243,7 +240,6 @@ GoldenrodGameCornerPrizeMonVendorScript: db "WOBBUFFET 1500@" db "CANCEL@" - GoldenrodGameCornerPharmacistScript: faceplayer opentext diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 304bb2234..1696a014f 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -48,7 +48,6 @@ UnknownScript_0x62600: closetext end - MenuDataHeader_0x62602: db $40 ; flags db 00, 00 ; start coords @@ -63,7 +62,6 @@ MenuDataHeader_0x62602: db "モバイルセンター@" ; MOBILE CENTER db "やめる@" ; QUIT - MapGoldenrodPokeComCenter2FMobileSignpost1Script: opentext writetext UnknownText_0x62989 @@ -93,7 +91,6 @@ UnknownScript_0x6264a: closetext end - MenuDataHeader_0x6264c: db $40 ; flags db 00, 00 ; start coords @@ -108,7 +105,6 @@ MenuDataHeader_0x6264c: db "でんわ", $4a,"つながらないとき@" ; Don't use phone db "やめる@" ; QUIT - MapGoldenrodPokeComCenter2FMobileSignpost2Script: jumptext UnknownText_0x62b26 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 78c5dc659..58c75e63d 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -62,7 +62,6 @@ IcePathB1F_MapScriptHeader: earthquake 80 end - IcePathB1FBoulder: jumpstd strengthboulder @@ -72,13 +71,11 @@ IcePathB1FIron: IcePathB1FHiddenMaxPotion: dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION - IcePathBoulderFellThroughText: text "The boulder fell" line "through." done - IcePathB1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index c171147cd..2e20d36ae 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -14,7 +14,6 @@ IcePathB2FBlackthornSideTMRest: IcePathB2FBlackthornSideHiddenIceHeal: dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL - IcePathB2FBlackthornSide_MapEventHeader: ; filler db 0, 0 diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 80ae7f938..1b837eb11 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -25,7 +25,6 @@ IcePathB2FMahoganySideMaxPotion: IcePathB2FMahoganySideHiddenCarbos: dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS - UnknownText_0x7e5ad: text "It's immovably" line "imbedded in ice." diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 094567692..880839d97 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -416,11 +416,9 @@ IlexForestEther: IlexForestHiddenEther: dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER - IlexForestHiddenSuperPotion: dwb EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION - IlexForestHiddenFullHeal: dwb EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 6ff7060f9..92de41cc8 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -234,15 +234,12 @@ LakeOfRageTMDetect: LakeOfRageHiddenFullRestore: dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE - LakeOfRageHiddenRareCandy: dwb EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY - LakeOfRageHiddenMaxPotion: dwb EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION - MovementData_0x70155: teleport_from step_end diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 3e13b58ea..ea372868a 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -77,7 +77,6 @@ ClefairyDance: MountMoonSquareHiddenMoonStone: dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE - DontLitterSign: jumptext DontLitterSignText diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 659d7a54d..050abdc74 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -66,7 +66,6 @@ MountMortar1FInsideUltraBall: MountMortar1FInsideHiddenMaxRepel: dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL - PokemaniacMillerSeenText: text "I'm not losing" line "this time!" diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index faa9930d2..b06d8786a 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -18,7 +18,6 @@ MountMortar1FOutsideRevive: MountMortar1FOutsideHiddenHyperPotion: dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION - MountMortar1FOutside_MapEventHeader: ; filler db 0, 0 diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 106e51f5a..f44b33db3 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -46,7 +46,6 @@ MountMortar2FInsideEscapeRope: MountMortar2FInsideHiddenFullRestore: dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE - SupernerdHughSeenText: text "Yo! MARKUS!" done diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index f3db52690..968c8fe2e 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -74,7 +74,6 @@ MountMortarB1FPPUp: MountMortarB1FHiddenMaxRevive: dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE - UnknownText_0x7e24d: text "Hey!" diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 4f5077724..cb841b187 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -307,7 +307,6 @@ NationalParkTMDig: NationalParkHiddenFullHeal: dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL - NationalParkLassText: text "Look! Check out my" line "bag!" diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 5d7831529..3f9225eaf 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -117,7 +117,6 @@ NationalParkBugContestTMDig: NationalParkBugContestHiddenFullHeal: dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL - UnknownText_0x5c94c: text "DON: I'm going to" line "win! Don't bother" diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index e7c4a7884..07f6d95e1 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -46,7 +46,6 @@ OlivineLighthouse5FTMSwagger: OlivineLighthouse5FHiddenHyperPotion: dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION - SailorErnestSeenText: text "I wanted to battle" line "JASMINE, but she's" diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 4fd072c67..0aeaad328 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -236,7 +236,6 @@ CooltrainerFScript_0x74a22: OlivinePortHiddenProtein: dwb EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN - MovementData_0x74a30: step DOWN step_end diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 3f2f57f20..cdc3f04a7 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -18,11 +18,9 @@ RockTunnel1FTMSteelWing: RockTunnel1FHiddenXAccuracy: dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY - RockTunnel1FHiddenXDefend: dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND - RockTunnel1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 6d20a92f2..549f1c868 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -22,7 +22,6 @@ RockTunnelB1FRevive: RockTunnelB1FHiddenMaxPotion: dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION - RockTunnelB1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/Route11.asm b/maps/Route11.asm index 903cf1009..6034dcd37 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -65,7 +65,6 @@ FruitTreeScript_0x68055: Route11HiddenRevive: dwb EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE - YoungsterOwenSeenText: text "There's no cheat-" line "ing in #MON." diff --git a/maps/Route12.asm b/maps/Route12.asm index 240ff0bb5..778177c81 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -72,7 +72,6 @@ Route12Nugget: Route12HiddenElixer: dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER - FisherMartinSeenText: text "Patience is the" line "key to both fish-" diff --git a/maps/Route13.asm b/maps/Route13.asm index 59107f67f..64274d758 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -79,7 +79,6 @@ Route13DirectionsSign: Route13HiddenCalcium: dwb EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM - PokefanmAlexSeenText: text "Bow down before my" line "regal #MON!" diff --git a/maps/Route17.asm b/maps/Route17.asm index 0f8d17b3a..c906db984 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -64,11 +64,9 @@ TrainerBikerGlenn: Route17HiddenMaxEther: dwb EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER - Route17HiddenMaxElixer: dwb EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER - BikerRileySeenText: text "Hey, you! You're" line "from JOHTO, huh?" diff --git a/maps/Route25.asm b/maps/Route25.asm index 0d2f7a054..00f52d1e9 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -193,7 +193,6 @@ Route25Protein: Route25HiddenPotion: dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION - MovementData_0x19efe8: big_step DOWN step_end diff --git a/maps/Route28.asm b/maps/Route28.asm index 8b76bc407..fa93fdc31 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -11,7 +11,6 @@ Route28Sign: Route28HiddenRareCandy: dwb EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY - Route28SignText: text "ROUTE 28" done diff --git a/maps/Route30.asm b/maps/Route30.asm index 9830f4019..ed6fa98ef 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -250,7 +250,6 @@ Route30FruitTree2: Route30HiddenPotion: dwb EVENT_ROUTE_30_HIDDEN_POTION, POTION - Route30_JoeysRattataAttacksMovement: fix_facing big_step UP diff --git a/maps/Route32.asm b/maps/Route32.asm index d9149ad7f..07b4db57d 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -508,11 +508,9 @@ Route32PokecenterSign: Route32HiddenGreatBall: dwb EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL - Route32HiddenSuperPotion: dwb EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION - Movement_Route32CooltrainerMPushesYouBackToViolet: step UP step UP diff --git a/maps/Route34.asm b/maps/Route34.asm index 29d3232d8..a82cb350b 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -490,11 +490,9 @@ Route34Nugget: Route34HiddenRareCandy: dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY - Route34HiddenSuperPotion: dwb EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION - Route34MovementData_DayCareManWalksBackInside: slow_step LEFT slow_step LEFT diff --git a/maps/Route37.asm b/maps/Route37.asm index 190656869..8821f951e 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -116,7 +116,6 @@ FruitTreeScript_0x1a8e0d: Route37HiddenEther: dwb EVENT_ROUTE_37_HIDDEN_ETHER, ETHER - TwinsAnnandanne1SeenText: text "ANN: ANNE and I" line "are in this to-" diff --git a/maps/Route39.asm b/maps/Route39.asm index db7b37410..b1044d293 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -182,7 +182,6 @@ FruitTreeScript_0x1a5bf4: Route39HiddenNugget: dwb EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET - Route39MiltankText: text "MILTANK: Mooo!" done diff --git a/maps/Route4.asm b/maps/Route4.asm index bd6ea62e5..8a36de84a 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -53,7 +53,6 @@ Route4HPUp: Route4HiddenUltraBall: dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL - BirdKeeperHankSeenText: text "I'm raising my" line "#MON. Want to" diff --git a/maps/Route42.asm b/maps/Route42.asm index 2a7b0e775..ad820796b 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -214,7 +214,6 @@ FruitTreeScript_0x1a9351: Route42HiddenMaxPotion: dwb EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION - MovementData_0x1a9356: set_sliding fast_jump_step UP diff --git a/maps/Route44.asm b/maps/Route44.asm index 5693e9e15..9e6504097 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -320,7 +320,6 @@ Route44MaxRepel: Route44HiddenElixer: dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER - FisherWilton1SeenText: text "Aack! You made me" line "lose a POLIWAG!" diff --git a/maps/Route45.asm b/maps/Route45.asm index f024eb7d7..786a5db7c 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -314,7 +314,6 @@ Route45MaxPotion: Route45HiddenPpUp: dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP - HikerErikSeenText: text "Be prepared for" line "anything!" diff --git a/maps/Route9.asm b/maps/Route9.asm index 1b377ceeb..b8ad4eeb0 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -85,7 +85,6 @@ Route9Sign: Route9HiddenEther: dwb EVENT_ROUTE_9_HIDDEN_ETHER, ETHER - CamperDeanSeenText: text "I came to explore" line "ROCK TUNNEL." diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index d313644bb..8dc42daee 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -112,7 +112,6 @@ TrainerPsychicNathan: closetext end - TrainerSuperNerdStan: trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script @@ -124,7 +123,6 @@ TrainerSuperNerdStan: closetext end - RuinsOfAlphOutsideSignpost0Script: jumptext UnknownText_0x58325 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 7879184ee..335c4a834 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -26,11 +26,9 @@ SilverCaveRoom1UltraBall: SilverCaveRoom1HiddenDireHit: dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT - SilverCaveRoom1HiddenUltraBall: dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL - SilverCaveRoom1_MapEventHeader: ; filler db 0, 0 diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index ec33e2be8..6bb381e3a 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -22,7 +22,6 @@ SilverCaveRoom2PPUp: SilverCaveRoom2HiddenMaxPotion: dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION - SilverCaveRoom2_MapEventHeader: ; filler db 0, 0 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 76b3cdc9f..503477338 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -542,7 +542,6 @@ TeamRocketBaseB1FGuardSpec: TeamRocketBaseB1FHiddenRevive: dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE - SecurityCameraMovement1: big_step RIGHT big_step RIGHT diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 76b22da03..9c4b2f66f 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -358,7 +358,6 @@ TeamRocketBaseB2FTMThief: TeamRocketBaseB2FHiddenFullHeal: dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL - MovementData_0x6d212: step RIGHT step RIGHT diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 34d1be488..7a19c395b 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -22,7 +22,6 @@ TinTower4FEscapeRope: TinTower4FHiddenMaxPotion: dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION - TinTower4F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index d8991932c..968cf61fc 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -14,11 +14,9 @@ TinTower5FRareCandy: TinTower5FHiddenFullRestore: dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE - TinTower5FHiddenCarbos: dwb EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS - TinTower5F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm index 557a478be..45807676a 100644 --- a/maps/UndergroundPath.asm +++ b/maps/UndergroundPath.asm @@ -8,11 +8,9 @@ UndergroundPath_MapScriptHeader: 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 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 557525898..9698eae6c 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -197,7 +197,6 @@ SuperNerdScript_0x74ee6: VermilionPortHiddenIron: dwb EVENT_VERMILION_PORT_HIDDEN_IRON, IRON - MovementData_0x74ef1: step DOWN step_end diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 1ae22e121..c4b85dfbb 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -114,11 +114,9 @@ VictoryRoadHPUp: VictoryRoadHiddenMaxPotion: dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION - VictoryRoadHiddenFullHeal: dwb EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL - MovementData_0x74539: step LEFT step LEFT diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 011b0ac8f..92bb755b7 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -34,15 +34,12 @@ WhirlIslandB1FBoulder: WhirlIslandB1FHiddenRareCandy: dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY - WhirlIslandB1FHiddenUltraBall: dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL - WhirlIslandB1FHiddenFullRestore: dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE - WhirlIslandB1F_MapEventHeader: ; filler db 0, 0 -- cgit v1.2.3 From 5a3822fe863a7365735c1f5d1c007d98d7736f1b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 13 Jan 2018 00:47:38 -0500 Subject: Introduce callback, hiddenitem, conditional_event, and cmdqueue macros for map scripts --- maps/AzaleaTown.asm | 4 ++-- maps/BattleTowerOutside.asm | 4 ++-- maps/BlackthornCity.asm | 4 ++-- maps/BlackthornGym1F.asm | 2 +- maps/BlackthornGym2F.asm | 5 ++--- maps/BrunosRoom.asm | 2 +- maps/BurnedTower1F.asm | 6 +++--- maps/BurnedTowerB1F.asm | 2 +- maps/CeladonCity.asm | 4 ++-- maps/CeladonDeptStore6F.asm | 2 +- maps/CeruleanCity.asm | 4 ++-- maps/CeruleanGym.asm | 2 +- maps/CherrygroveCity.asm | 2 +- maps/CianwoodCity.asm | 6 +++--- maps/CinnabarIsland.asm | 4 ++-- maps/Colosseum.asm | 4 ++-- maps/CopycatsHouse2F.asm | 2 +- maps/DarkCaveVioletEntrance.asm | 2 +- maps/DayCare.asm | 2 +- maps/DiglettsCave.asm | 2 +- maps/DragonsDenB1F.asm | 8 ++++---- maps/EcruteakCity.asm | 4 ++-- maps/EcruteakHouse.asm | 2 +- maps/ElmsLab.asm | 2 +- maps/FuchsiaCity.asm | 2 +- maps/GoldenrodCity.asm | 4 ++-- maps/GoldenrodDeptStore5F.asm | 2 +- maps/GoldenrodDeptStoreB1F.asm | 4 ++-- maps/GoldenrodDeptStoreRoof.asm | 4 ++-- maps/GoldenrodGameCorner.asm | 2 +- maps/GoldenrodUnderground.asm | 12 ++++++------ maps/GoldenrodUndergroundSwitchRoomEntrances.asm | 6 +++--- maps/GoldenrodUndergroundWarehouse.asm | 2 +- maps/IcePathB1F.asm | 7 +++---- maps/IcePathB2FBlackthornSide.asm | 2 +- maps/IcePathB2FMahoganySide.asm | 2 +- maps/IlexForest.asm | 8 ++++---- maps/IndigoPlateauPokecenter1F.asm | 2 +- maps/KarensRoom.asm | 2 +- maps/KogasRoom.asm | 2 +- maps/KrissHouse2F.asm | 11 ++++++----- maps/KurtsHouse.asm | 2 +- maps/LakeOfRage.asm | 10 +++++----- maps/LancesRoom.asm | 2 +- maps/LavenderTown.asm | 2 +- maps/MahoganyMart1F.asm | 2 +- maps/MahoganyTown.asm | 2 +- maps/MountMoonSquare.asm | 6 +++--- maps/MountMortar1FInside.asm | 2 +- maps/MountMortar1FOutside.asm | 2 +- maps/MountMortar2FInside.asm | 2 +- maps/MountMortarB1F.asm | 2 +- maps/NationalPark.asm | 2 +- maps/NationalParkBugContest.asm | 2 +- maps/NewBarkTown.asm | 2 +- maps/OlivineCity.asm | 2 +- maps/OlivineLighthouse5F.asm | 2 +- maps/OlivinePort.asm | 2 +- maps/PalletTown.asm | 2 +- maps/PewterCity.asm | 2 +- maps/RadioTower3F.asm | 2 +- maps/RockTunnel1F.asm | 4 ++-- maps/RockTunnelB1F.asm | 2 +- maps/Route11.asm | 2 +- maps/Route12.asm | 2 +- maps/Route13.asm | 2 +- maps/Route16.asm | 2 +- maps/Route17.asm | 6 +++--- maps/Route19.asm | 2 +- maps/Route2.asm | 8 ++++---- maps/Route20.asm | 2 +- maps/Route23.asm | 2 +- maps/Route25.asm | 2 +- maps/Route28.asm | 2 +- maps/Route29.asm | 2 +- maps/Route30.asm | 2 +- maps/Route31.asm | 2 +- maps/Route32.asm | 6 +++--- maps/Route34.asm | 6 +++--- maps/Route34IlexForestGate.asm | 2 +- maps/Route35NationalParkGate.asm | 4 ++-- maps/Route36.asm | 2 +- maps/Route36NationalParkGate.asm | 4 ++-- maps/Route37.asm | 4 ++-- maps/Route39.asm | 2 +- maps/Route4.asm | 2 +- maps/Route40.asm | 4 ++-- maps/Route40BattleTowerGate.asm | 2 +- maps/Route41.asm | 2 +- maps/Route42.asm | 2 +- maps/Route43.asm | 2 +- maps/Route43Gate.asm | 2 +- maps/Route44.asm | 2 +- maps/Route45.asm | 2 +- maps/Route9.asm | 2 +- maps/RuinsOfAlphAerodactylChamber.asm | 2 +- maps/RuinsOfAlphHoOhChamber.asm | 2 +- maps/RuinsOfAlphKabutoChamber.asm | 2 +- maps/RuinsOfAlphOmanyteChamber.asm | 2 +- maps/RuinsOfAlphOutside.asm | 2 +- maps/RuinsOfAlphResearchCenter.asm | 2 +- maps/SaffronCity.asm | 2 +- maps/SilverCaveOutside.asm | 4 ++-- maps/SilverCaveRoom1.asm | 4 ++-- maps/SilverCaveRoom2.asm | 2 +- maps/TeamRocketBaseB1F.asm | 4 ++-- maps/TeamRocketBaseB2F.asm | 6 +++--- maps/TeamRocketBaseB3F.asm | 4 ++-- maps/TimeCapsule.asm | 2 +- maps/TinTower1F.asm | 4 ++-- maps/TinTower4F.asm | 2 +- maps/TinTower5F.asm | 4 ++-- maps/TinTowerRoof.asm | 2 +- maps/TradeCenter.asm | 2 +- maps/UndergroundPath.asm | 4 ++-- maps/UnionCaveB2F.asm | 2 +- maps/VermilionCity.asm | 4 ++-- maps/VermilionPort.asm | 4 ++-- maps/VictoryRoad.asm | 4 ++-- maps/VioletCity.asm | 4 ++-- maps/ViridianCity.asm | 2 +- maps/WhirlIslandB1F.asm | 6 +++--- maps/WhirlIslandLugiaChamber.asm | 2 +- maps/WillsRoom.asm | 2 +- maps/WiseTriosRoom.asm | 2 +- 125 files changed, 196 insertions(+), 197 deletions(-) (limited to 'maps') diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index a0c3ab79e..a345898f0 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -21,7 +21,7 @@ AzaleaTown_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .Flypoint + callback MAPCALLBACK_NEWMAP, .Flypoint .DummyScene0: end @@ -211,7 +211,7 @@ WhiteApricornTree: fruittree FRUITTREE_AZALEA_TOWN AzaleaTownHiddenFullHeal: - dwb EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL AzaleaTownRivalBattleApproachMovement1: step LEFT diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 6ed01da6f..adb0c5f21 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -10,8 +10,8 @@ BattleTowerOutside_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_TILES, .Callback1 - dbw MAPCALLBACK_OBJECTS, .Callback2 + callback MAPCALLBACK_TILES, .Callback1 + callback MAPCALLBACK_OBJECTS, .Callback2 .Callback1: return diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index c5cd10235..178e986bd 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -15,8 +15,8 @@ BlackthornCity_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .FlyPoint - dbw MAPCALLBACK_OBJECTS, .Santos + callback MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_OBJECTS, .Santos .FlyPoint: setflag ENGINE_FLYPOINT_BLACKTHORN diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 4ea64fd18..8e997132a 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -11,7 +11,7 @@ BlackthornGym1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .Boulders + callback MAPCALLBACK_TILES, .Boulders .Boulders: checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_1 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 270ec0481..77f338e7b 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -14,15 +14,14 @@ BlackthornGym2F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_CMDQUEUE, .Boulders + callback MAPCALLBACK_CMDQUEUE, .Boulders .Boulders: writecmdqueue .BoulderCmdQueue return .BoulderCmdQueue: - dbw CMDQUEUE_STONETABLE, .BoulderTable ; check if any stones are sitting on a warp - dw 0 ; filler + cmdqueue CMDQUEUE_STONETABLE, .BoulderTable ; check if any stones are sitting on a warp .BoulderTable: stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Disappear4 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 9e9ad1894..568ca0476 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -9,7 +9,7 @@ BrunosRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .BrunosRoomDoors + callback MAPCALLBACK_TILES, .BrunosRoomDoors .LockDoor: priorityjump .BrunosDoorLocksBehindYou diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 246946e76..89fd33e5d 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -14,7 +14,7 @@ BurnedTower1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .HoleAndLadder + callback MAPCALLBACK_TILES, .HoleAndLadder .EusineScene: priorityjump .MeetEusine @@ -131,10 +131,10 @@ BurnedTower1FRock: jumpstd smashrock BurnedTower1FHiddenEther: - dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER + hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER BurnedTower1FHiddenUltraBall: - dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL BurnedTower1FHPUp: itemball HP_UP diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 0125d41a9..1a3aac3d3 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -17,7 +17,7 @@ BurnedTowerB1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .LadderCallback + callback MAPCALLBACK_TILES, .LadderCallback .DummyScene0: end diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index bfc5265ea..bcd254a2f 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -15,7 +15,7 @@ CeladonCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_CELADON @@ -75,7 +75,7 @@ CeladonCityPokecenterSign: jumpstd pokecentersign CeladonCityHiddenPpUp: - dwb EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP + hiddenitem EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP CeladonCityFisherText: text "This POLIWRATH is" diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 15b9a752b..8789ebc6b 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -8,7 +8,7 @@ CeladonDeptStore6F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .Callback + callback MAPCALLBACK_TILES, .Callback .Callback: changeblock 12, 0, $03 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 47a991d21..23dd9444a 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -12,7 +12,7 @@ CeruleanCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_CERULEAN @@ -147,7 +147,7 @@ CeruleanCityMartSign: jumpstd martsign CeruleanCityHiddenBerserkGene: - dwb EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE + hiddenitem EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE CeruleanCityCooltrainerMText1: text "KANTO's POWER" diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 844286fa8..144b690b1 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -135,7 +135,7 @@ CeruleanGymGuyScript: end CeruleanGymHiddenMachinePart: - dwb EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART + hiddenitem EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART CeruleanGymStatue1: checkevent EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 40bc7d4ee..37464afd5 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -13,7 +13,7 @@ CherrygroveCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: end diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 078915791..44d61317a 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -20,7 +20,7 @@ CianwoodCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPointAndSuicune + callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune .DummyScene0: end @@ -145,10 +145,10 @@ CianwoodCityRock: jumpstd smashrock CianwoodCityHiddenRevive: - dwb EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE + hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE CianwoodCityHiddenMaxEther: - dwb EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER MovementData_0x1a00da: set_sliding diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 50b26a8f5..36d25a127 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -7,7 +7,7 @@ CinnabarIsland_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_CINNABAR @@ -35,7 +35,7 @@ CinnabarIslandPokecenterSign: jumpstd pokecentersign CinnabarIslandHiddenRareCandy: - dwb EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY CinnabarIslandBlueTeleport: teleport_from diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index be3742ef3..eba9d42fc 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -11,8 +11,8 @@ Colosseum_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_OBJECTS, .SetWhichChris - dbw MAPCALLBACK_NEWMAP, .PreparePokecenter2F + callback MAPCALLBACK_OBJECTS, .SetWhichChris + callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F .InitializeColosseum: priorityjump .InitializeAndPreparePokecenter2F diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 5456973dc..d7925313f 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -12,7 +12,7 @@ CopycatsHouse2F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Callback + callback MAPCALLBACK_OBJECTS, .Callback .Callback: checkflag ENGINE_PLAYER_IS_FEMALE diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 42510fd44..b7806dcef 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -31,7 +31,7 @@ DarkCaveVioletEntranceRock: jumpstd smashrock DarkCaveVioletEntranceHiddenElixer: - dwb EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER + hiddenitem EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER DarkCaveVioletEntrance_MapEventHeader: ; filler diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 0d06cea93..447f52971 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -8,7 +8,7 @@ DayCare_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .EggCheckCallback + callback MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: checkflag ENGINE_DAY_CARE_MAN_HAS_EGG diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index d2bdb03bf..92e39d7b4 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -12,7 +12,7 @@ DiglettsCavePokefanMScript: jumptextfaceplayer DiglettsCavePokefanMText DiglettsCaveHiddenMaxRevive: - dwb EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE + hiddenitem EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE DiglettsCavePokefanMText: text "A bunch of DIGLETT" diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 81dc33341..678678c07 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -17,7 +17,7 @@ DragonsDenB1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .CheckSilver + callback MAPCALLBACK_NEWMAP, .CheckSilver .DummyScene0: end @@ -183,13 +183,13 @@ DragonsDenB1FMaxElixer: itemball MAX_ELIXER DragonsDenB1FHiddenRevive: - dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE + hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE DragonsDenB1FHiddenMaxPotion: - dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION DragonsDenB1FHiddenMaxElixer: - dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER + hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER MovementDragonsDen_ClairWalksToYou: slow_step RIGHT diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 322b403f6..a81a466e2 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -13,7 +13,7 @@ EcruteakCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_ECRUTEAK @@ -88,7 +88,7 @@ EcruteakCityMartSign: jumpstd martsign EcruteakCityHiddenHyperPotion: - dwb EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION UnusedMissingDaughterText: ; This text is neither used nor referenced in the final game. diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 69dbfcbfa..57c040d43 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -12,7 +12,7 @@ EcruteakHouse_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .InitializeSages + callback MAPCALLBACK_OBJECTS, .InitializeSages .DummyScene0: end diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index bd228e93b..47451a677 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -18,7 +18,7 @@ ElmsLab_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .MoveElmCallback + callback MAPCALLBACK_OBJECTS, .MoveElmCallback .MeetElm: priorityjump .WalkUpToElm diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 79824c76d..8010d3beb 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -10,7 +10,7 @@ FuchsiaCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_FUCHSIA diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 6f612692c..5ce8b92cc 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -21,8 +21,8 @@ GoldenrodCity_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .FlyPointAndFloria - dbw MAPCALLBACK_OBJECTS, .MoveTutor + callback MAPCALLBACK_NEWMAP, .FlyPointAndFloria + callback MAPCALLBACK_OBJECTS, .MoveTutor .FlyPointAndFloria: setflag ENGINE_FLYPOINT_GOLDENROD diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 9039975cd..ab4b197aa 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -12,7 +12,7 @@ GoldenrodDeptStore5F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .CheckIfSunday + callback MAPCALLBACK_OBJECTS, .CheckIfSunday .CheckIfSunday: checkcode VAR_WEEKDAY diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index f2e88b6a1..035bc1107 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -14,8 +14,8 @@ GoldenrodDeptStoreB1F_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_TILES, UnknownScript_0x7d781 - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac + callback MAPCALLBACK_TILES, UnknownScript_0x7d781 + callback MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac UnknownScript_0x7d781: checkevent EVENT_RECEIVED_CARD_KEY diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index baed07d79..24fc33ded 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -14,8 +14,8 @@ GoldenrodDeptStoreRoof_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_TILES, .CheckSaleChangeBlock - dbw MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk + callback MAPCALLBACK_TILES, .CheckSaleChangeBlock + callback MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk .CheckSaleChangeBlock: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 628cb852e..dd3203ac7 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -18,7 +18,7 @@ GoldenrodGameCorner_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Callback + callback MAPCALLBACK_OBJECTS, .Callback .Callback: checkevent EVENT_BEAT_ELITE_FOUR diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index 3a07046fd..cd3d7ec15 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -15,9 +15,9 @@ GoldenrodUnderground_MapScriptHeader: .MapCallbacks: db 3 - dbw MAPCALLBACK_NEWMAP, .ResetSwitches - dbw MAPCALLBACK_TILES, .CheckBasementKey - dbw MAPCALLBACK_OBJECTS, .CheckDayOfWeek + callback MAPCALLBACK_NEWMAP, .ResetSwitches + callback MAPCALLBACK_TILES, .CheckBasementKey + callback MAPCALLBACK_OBJECTS, .CheckDayOfWeek .ResetSwitches: clearevent EVENT_SWITCH_1 @@ -409,13 +409,13 @@ MapGoldenrodUndergroundSignpost1Script: jumptext UnknownText_0x7c91a GoldenrodUndergroundHiddenParlyzHeal: - dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL + hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL GoldenrodUndergroundHiddenSuperPotion: - dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION, SUPER_POTION GoldenrodUndergroundHiddenAntidote: - dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE, ANTIDOTE + hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE, ANTIDOTE SupernerdEricSeenText: text "I got booted out" diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index f3b7f4946..85eb1bc1b 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -51,7 +51,7 @@ GoldenrodUndergroundSwitchRoomEntrances_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .UpdateDoorPositions + callback MAPCALLBACK_TILES, .UpdateDoorPositions .DummyScene0: end @@ -630,10 +630,10 @@ GoldenrodUndergroundSwitchRoomEntrancesFullHeal: itemball FULL_HEAL GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion: - dwb EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive: - dwb EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE + hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE UndergroundSilverApproachMovement1: step DOWN diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 49ae5e39f..e87f3ab1b 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -13,7 +13,7 @@ GoldenrodUndergroundWarehouse_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .ResetSwitches + callback MAPCALLBACK_NEWMAP, .ResetSwitches .ResetSwitches: clearevent EVENT_SWITCH_1 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 58c75e63d..7bb6d0406 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -11,15 +11,14 @@ IcePathB1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_CMDQUEUE, .SetUpStoneTable + callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable .SetUpStoneTable: writecmdqueue .CommandQueue return .CommandQueue: - dbw CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp - dw 0 ; filler + cmdqueue CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp .StoneTable: stonetable 3, ICEPATHB1F_BOULDER1, .Boulder1 @@ -69,7 +68,7 @@ IcePathB1FIron: itemball IRON IcePathB1FHiddenMaxPotion: - dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION IcePathBoulderFellThroughText: text "The boulder fell" diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 2e20d36ae..544d7d600 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -12,7 +12,7 @@ IcePathB2FBlackthornSideTMRest: itemball TM_REST IcePathB2FBlackthornSideHiddenIceHeal: - dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL + hiddenitem EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL IcePathB2FBlackthornSide_MapEventHeader: ; filler diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 1b837eb11..c01252f98 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -23,7 +23,7 @@ IcePathB2FMahoganySideMaxPotion: itemball MAX_POTION IcePathB2FMahoganySideHiddenCarbos: - dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS + hiddenitem EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS UnknownText_0x7e5ad: text "It's immovably" diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 880839d97..ad4e473f8 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -17,7 +17,7 @@ IlexForest_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .FarfetchdCallback + callback MAPCALLBACK_OBJECTS, .FarfetchdCallback .FarfetchdCallback: checkevent EVENT_GOT_HM01_CUT @@ -414,13 +414,13 @@ IlexForestEther: itemball ETHER IlexForestHiddenEther: - dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER + hiddenitem EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER IlexForestHiddenSuperPotion: - dwb EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION IlexForestHiddenFullHeal: - dwb EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL IlexForestBoulder: ; unused diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index f5f156565..223d92a0c 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -13,7 +13,7 @@ IndigoPlateauPokecenter1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .PrepareElite4 + callback MAPCALLBACK_NEWMAP, .PrepareElite4 .DummyScene: end diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index cb1743d8a..6eccbad60 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -9,7 +9,7 @@ KarensRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .KarensRoomDoors + callback MAPCALLBACK_TILES, .KarensRoomDoors .LockDoor: priorityjump .KarensDoorLocksBehindYou diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 2c6900d89..04580cdbb 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -9,7 +9,7 @@ KogasRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .KogasRoomDoors + callback MAPCALLBACK_TILES, .KogasRoomDoors .LockDoor: priorityjump .KogasDoorLocksBehindYou diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index c941bcdb3..aa28b6076 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -10,9 +10,10 @@ KrissHouse2F_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .InitializeRoom - dbw MAPCALLBACK_TILES, .SetSpawn + callback MAPCALLBACK_NEWMAP, .InitializeRoom + callback MAPCALLBACK_TILES, .SetSpawn +; unused .Null: end @@ -20,11 +21,11 @@ KrissHouse2F_MapScriptHeader: special ToggleDecorationsVisibility setevent EVENT_IN_YOUR_ROOM checkevent EVENT_INITIALIZED_EVENTS - iftrue .SkipInizialization + iftrue .SkipInitialization jumpstd initializeevents return -.SkipInizialization: +.SkipInitialization: return .SetSpawn: @@ -46,7 +47,7 @@ GameConsole: describedecoration DECODESC_CONSOLE KrissHousePoster: - dw EVENT_KRISS_ROOM_POSTER, .Script + conditional_event EVENT_KRISS_ROOM_POSTER, .Script .Script: describedecoration DECODESC_POSTER diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index c9d9589e9..478e94e5c 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -11,7 +11,7 @@ KurtsHouse_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .KurtCallback + callback MAPCALLBACK_OBJECTS, .KurtCallback .KurtCallback: checkevent EVENT_CLEARED_SLOWPOKE_WELL diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 92de41cc8..882e42b22 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -20,8 +20,8 @@ LakeOfRage_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .FlyPoint - dbw MAPCALLBACK_OBJECTS, .Wesley + callback MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_OBJECTS, .Wesley .DummyScene0: end @@ -232,13 +232,13 @@ LakeOfRageTMDetect: itemball TM_DETECT LakeOfRageHiddenFullRestore: - dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE LakeOfRageHiddenRareCandy: - dwb EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY LakeOfRageHiddenMaxPotion: - dwb EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION MovementData_0x70155: teleport_from diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 9b73671d6..330943b8c 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -11,7 +11,7 @@ LancesRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .LancesRoomDoors + callback MAPCALLBACK_TILES, .LancesRoomDoors .LockDoor: priorityjump .LancesDoorLocksBehindYou diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 35bfdb12a..57806ef41 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -10,7 +10,7 @@ LavenderTown_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_LAVENDER diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 2dbdf203d..e0c610f71 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -13,7 +13,7 @@ MahoganyMart1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .MahoganyMart1FStaircase + callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase .DummyScene0: end diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 5ed0450c2..a5327330b 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -12,7 +12,7 @@ MahoganyTown_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: end diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index ea372868a..c914e669f 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -10,8 +10,8 @@ MountMoonSquare_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .DisappearMoonStone - dbw MAPCALLBACK_OBJECTS, .DisappearRock + callback MAPCALLBACK_NEWMAP, .DisappearMoonStone + callback MAPCALLBACK_OBJECTS, .DisappearRock .DummyScene: end @@ -75,7 +75,7 @@ ClefairyDance: end MountMoonSquareHiddenMoonStone: - dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE + hiddenitem EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE DontLitterSign: jumptext DontLitterSignText diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 050abdc74..983fd9839 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -64,7 +64,7 @@ MountMortar1FInsideUltraBall: itemball ULTRA_BALL MountMortar1FInsideHiddenMaxRepel: - dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL + hiddenitem EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL PokemaniacMillerSeenText: text "I'm not losing" diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index b06d8786a..4e8dcf331 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -16,7 +16,7 @@ MountMortar1FOutsideRevive: itemball REVIVE MountMortar1FOutsideHiddenHyperPotion: - dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION MountMortar1FOutside_MapEventHeader: ; filler diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index f44b33db3..4d401da9c 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -44,7 +44,7 @@ MountMortar2FInsideEscapeRope: itemball ESCAPE_ROPE MountMortar2FInsideHiddenFullRestore: - dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE SupernerdHughSeenText: text "Yo! MARKUS!" diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 968c8fe2e..2bfea9fec 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -72,7 +72,7 @@ MountMortarB1FPPUp: itemball PP_UP MountMortarB1FHiddenMaxRevive: - dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE + hiddenitem EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE UnknownText_0x7e24d: text "Hey!" diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index cb841b187..56f861384 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -305,7 +305,7 @@ NationalParkTMDig: itemball TM_DIG NationalParkHiddenFullHeal: - dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL NationalParkLassText: text "Look! Check out my" diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 3f9225eaf..07e6455ac 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -115,7 +115,7 @@ NationalParkBugContestTMDig: itemball TM_DIG NationalParkBugContestHiddenFullHeal: - dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL UnknownText_0x5c94c: text "DON: I'm going to" diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 56b5f14db..dee94a7c9 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -11,7 +11,7 @@ NewBarkTown_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: end diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 0f01ab008..112d96035 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -12,7 +12,7 @@ OlivineCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: end diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 07f6d95e1..fdd32455c 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -44,7 +44,7 @@ OlivineLighthouse5FTMSwagger: itemball TM_SWAGGER OlivineLighthouse5FHiddenHyperPotion: - dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION SailorErnestSeenText: text "I wanted to battle" diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 0aeaad328..ca51d41de 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -234,7 +234,7 @@ CooltrainerFScript_0x74a22: end OlivinePortHiddenProtein: - dwb EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN + hiddenitem EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN MovementData_0x74a30: step DOWN diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index f11cf6d65..e1e6006c9 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -8,7 +8,7 @@ PalletTown_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_PALLET diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 44ea440a7..876bacfb0 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -11,7 +11,7 @@ PewterCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_PEWTER diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 3ac8c1388..3b62ec884 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -13,7 +13,7 @@ RadioTower3F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .CardKeyShutterCallback + callback MAPCALLBACK_TILES, .CardKeyShutterCallback .CardKeyShutterCallback: checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index cdc3f04a7..6288f23f3 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -16,10 +16,10 @@ RockTunnel1FTMSteelWing: itemball TM_STEEL_WING RockTunnel1FHiddenXAccuracy: - dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY + hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY RockTunnel1FHiddenXDefend: - dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND + hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND RockTunnel1F_MapEventHeader: ; filler diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 549f1c868..26b465c11 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -20,7 +20,7 @@ RockTunnelB1FRevive: itemball REVIVE RockTunnelB1FHiddenMaxPotion: - dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION RockTunnelB1F_MapEventHeader: ; filler diff --git a/maps/Route11.asm b/maps/Route11.asm index 6034dcd37..ecb1003a7 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -63,7 +63,7 @@ FruitTreeScript_0x68055: fruittree FRUITTREE_ROUTE_11 Route11HiddenRevive: - dwb EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE + hiddenitem EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE YoungsterOwenSeenText: text "There's no cheat-" diff --git a/maps/Route12.asm b/maps/Route12.asm index 778177c81..ac585f51b 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -70,7 +70,7 @@ Route12Nugget: itemball NUGGET Route12HiddenElixer: - dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER + hiddenitem EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER FisherMartinSeenText: text "Patience is the" diff --git a/maps/Route13.asm b/maps/Route13.asm index 64274d758..014bd4c70 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -77,7 +77,7 @@ Route13DirectionsSign: jumptext Route13DirectionsSignText Route13HiddenCalcium: - dwb EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM + hiddenitem EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM PokefanmAlexSeenText: text "Bow down before my" diff --git a/maps/Route16.asm b/maps/Route16.asm index 14e8cbebc..8d7141f57 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -4,7 +4,7 @@ Route16_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike + callback MAPCALLBACK_NEWMAP, .AlwaysOnBike .AlwaysOnBike: checkcode VAR_YCOORD diff --git a/maps/Route17.asm b/maps/Route17.asm index c906db984..9ed64340e 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -10,7 +10,7 @@ Route17_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike + callback MAPCALLBACK_NEWMAP, .AlwaysOnBike .AlwaysOnBike: setflag ENGINE_ALWAYS_ON_BIKE @@ -62,10 +62,10 @@ TrainerBikerGlenn: end Route17HiddenMaxEther: - dwb EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER Route17HiddenMaxElixer: - dwb EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER + hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER BikerRileySeenText: text "Hey, you! You're" diff --git a/maps/Route19.asm b/maps/Route19.asm index eee48f089..5309598b6 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -12,7 +12,7 @@ Route19_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .ClearRocks + callback MAPCALLBACK_TILES, .ClearRocks .ClearRocks: checkevent EVENT_CINNABAR_ROCKS_CLEARED diff --git a/maps/Route2.asm b/maps/Route2.asm index 47abdc9f5..508758448 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -70,16 +70,16 @@ FruitTreeScript_0x1ac306: fruittree FRUITTREE_ROUTE_2 Route2HiddenMaxEther: - dwb EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER Route2HiddenFullHeal: - dwb EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL Route2HiddenFullRestore: - dwb EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE Route2HiddenRevive: - dwb EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE + hiddenitem EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE BugCatcherRobSeenText: text "My bug #MON are" diff --git a/maps/Route20.asm b/maps/Route20.asm index 7137999fe..67118d5cb 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -9,7 +9,7 @@ Route20_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .ClearRocks + callback MAPCALLBACK_NEWMAP, .ClearRocks .ClearRocks: setevent EVENT_CINNABAR_ROCKS_CLEARED diff --git a/maps/Route23.asm b/maps/Route23.asm index 87ba72d9c..c82ae6462 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -4,7 +4,7 @@ Route23_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_INDIGO_PLATEAU diff --git a/maps/Route25.asm b/maps/Route25.asm index 00f52d1e9..15a2ded4e 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -191,7 +191,7 @@ Route25Protein: itemball PROTEIN Route25HiddenPotion: - dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION + hiddenitem EVENT_ROUTE_25_HIDDEN_POTION, POTION MovementData_0x19efe8: big_step DOWN diff --git a/maps/Route28.asm b/maps/Route28.asm index fa93fdc31..225039518 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -9,7 +9,7 @@ Route28Sign: jumptext Route28SignText Route28HiddenRareCandy: - dwb EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY Route28SignText: text "ROUTE 28" diff --git a/maps/Route29.asm b/maps/Route29.asm index 9be77fafe..fca71310d 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -16,7 +16,7 @@ Route29_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Tuscany + callback MAPCALLBACK_OBJECTS, .Tuscany .DummyScene0: end diff --git a/maps/Route30.asm b/maps/Route30.asm index ed6fa98ef..4884beeee 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -248,7 +248,7 @@ Route30FruitTree2: fruittree FRUITTREE_ROUTE_30_2 Route30HiddenPotion: - dwb EVENT_ROUTE_30_HIDDEN_POTION, POTION + hiddenitem EVENT_ROUTE_30_HIDDEN_POTION, POTION Route30_JoeysRattataAttacksMovement: fix_facing diff --git a/maps/Route31.asm b/maps/Route31.asm index 4ef8ae314..15a76a3cf 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -13,7 +13,7 @@ Route31_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .CheckMomCall + callback MAPCALLBACK_NEWMAP, .CheckMomCall .CheckMomCall: checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST diff --git a/maps/Route32.asm b/maps/Route32.asm index 07b4db57d..bad2f617b 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -23,7 +23,7 @@ Route32_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Frieda + callback MAPCALLBACK_OBJECTS, .Frieda .DummyScene0: end @@ -506,10 +506,10 @@ Route32PokecenterSign: jumpstd pokecentersign Route32HiddenGreatBall: - dwb EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL + hiddenitem EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL Route32HiddenSuperPotion: - dwb EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION Movement_Route32CooltrainerMPushesYouBackToViolet: step UP diff --git a/maps/Route34.asm b/maps/Route34.asm index a82cb350b..04ea74ab7 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -19,7 +19,7 @@ Route34_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .EggCheckCallback + callback MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: checkflag ENGINE_DAY_CARE_MAN_HAS_EGG @@ -488,10 +488,10 @@ Route34Nugget: itemball NUGGET Route34HiddenRareCandy: - dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY Route34HiddenSuperPotion: - dwb EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION Route34MovementData_DayCareManWalksBackInside: slow_step LEFT diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 18b010bff..db9f31f39 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -10,7 +10,7 @@ Route34IlexForestGate_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .IsForestRestless + callback MAPCALLBACK_OBJECTS, .IsForestRestless .IsForestRestless: checkevent EVENT_FOREST_IS_RESTLESS diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 80bf1531c..3d4a6647b 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -12,8 +12,8 @@ Route35NationalParkGate_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning - dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable + callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning + callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable .DummyScene0: end diff --git a/maps/Route36.asm b/maps/Route36.asm index cdc2360e9..db1f8419e 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -17,7 +17,7 @@ Route36_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .ArthurCallback + callback MAPCALLBACK_OBJECTS, .ArthurCallback .DummyScene0: end diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index cc74c5dfb..90fe2555c 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -21,8 +21,8 @@ Route36NationalParkGate_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning - dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable + callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning + callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable .DummyScene0: end diff --git a/maps/Route37.asm b/maps/Route37.asm index 8821f951e..233a299b9 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -13,7 +13,7 @@ Route37_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Sunny + callback MAPCALLBACK_OBJECTS, .Sunny .Sunny: checkcode VAR_WEEKDAY @@ -114,7 +114,7 @@ FruitTreeScript_0x1a8e0d: fruittree FRUITTREE_ROUTE_37_3 Route37HiddenEther: - dwb EVENT_ROUTE_37_HIDDEN_ETHER, ETHER + hiddenitem EVENT_ROUTE_37_HIDDEN_ETHER, ETHER TwinsAnnandanne1SeenText: text "ANN: ANNE and I" diff --git a/maps/Route39.asm b/maps/Route39.asm index b1044d293..6038df139 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -180,7 +180,7 @@ FruitTreeScript_0x1a5bf4: fruittree FRUITTREE_ROUTE_39 Route39HiddenNugget: - dwb EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET + hiddenitem EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET Route39MiltankText: text "MILTANK: Mooo!" diff --git a/maps/Route4.asm b/maps/Route4.asm index 8a36de84a..c28394c0f 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -51,7 +51,7 @@ Route4HPUp: itemball HP_UP Route4HiddenUltraBall: - dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL BirdKeeperHankSeenText: text "I'm raising my" diff --git a/maps/Route40.asm b/maps/Route40.asm index 73f089bd2..7cbefca10 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -18,7 +18,7 @@ Route40_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .MonicaCallback + callback MAPCALLBACK_OBJECTS, .MonicaCallback .MonicaCallback: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR @@ -135,7 +135,7 @@ Route40Rock: jumpstd smashrock Route40HiddenHyperPotion: - dwb EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION MovementData_0x1a621c: step RIGHT diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index f37b78669..9562c3ae4 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -8,7 +8,7 @@ Route40BattleTowerGate_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .ShowSailor + callback MAPCALLBACK_OBJECTS, .ShowSailor .ShowSailor: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR diff --git a/maps/Route41.asm b/maps/Route41.asm index 95618e692..29eb35e04 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -132,7 +132,7 @@ Route41Rock: jumpstd smashrock Route41HiddenMaxEther: - dwb EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER SwimmermCharlieSeenText: text "The water's warm" diff --git a/maps/Route42.asm b/maps/Route42.asm index ad820796b..46606e647 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -212,7 +212,7 @@ FruitTreeScript_0x1a9351: fruittree FRUITTREE_ROUTE_42_3 Route42HiddenMaxPotion: - dwb EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION MovementData_0x1a9356: set_sliding diff --git a/maps/Route43.asm b/maps/Route43.asm index 8b0c7b307..afad4a606 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -14,7 +14,7 @@ Route43_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .CheckIfRockets + callback MAPCALLBACK_NEWMAP, .CheckIfRockets .CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 9a59957db..7548394a5 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -13,7 +13,7 @@ Route43Gate_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .CheckIfRockets + callback MAPCALLBACK_NEWMAP, .CheckIfRockets .RocketShakedown: priorityjump .RocketTakeover diff --git a/maps/Route44.asm b/maps/Route44.asm index 9e6504097..31fe9223f 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -318,7 +318,7 @@ Route44MaxRepel: itemball MAX_REPEL Route44HiddenElixer: - dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER + hiddenitem EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER FisherWilton1SeenText: text "Aack! You made me" diff --git a/maps/Route45.asm b/maps/Route45.asm index 786a5db7c..63db10a95 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -312,7 +312,7 @@ Route45MaxPotion: itemball MAX_POTION Route45HiddenPpUp: - dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP + hiddenitem EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP HikerErikSeenText: text "Be prepared for" diff --git a/maps/Route9.asm b/maps/Route9.asm index b8ad4eeb0..f98b45310 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -83,7 +83,7 @@ Route9Sign: jumptext Route9SignText Route9HiddenEther: - dwb EVENT_ROUTE_9_HIDDEN_ETHER, ETHER + hiddenitem EVENT_ROUTE_9_HIDDEN_ETHER, ETHER CamperDeanSeenText: text "I came to explore" diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index a575828f6..216c079e7 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -6,7 +6,7 @@ RuinsOfAlphAerodactylChamber_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .HiddenDoors + callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index ec90edc03..16a978cbf 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -6,7 +6,7 @@ RuinsOfAlphHoOhChamber_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .HiddenDoors + callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: special SpecialHoOhChamber diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index bbaaa4ad3..14e096b58 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -10,7 +10,7 @@ RuinsOfAlphKabutoChamber_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .HiddenDoors + callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 21583e485..1bfa3b076 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -6,7 +6,7 @@ RuinsOfAlphOmanyteChamber_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .HiddenDoors + callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: special SpecialOmanyteChamber diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 8dc42daee..39c85fa05 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -13,7 +13,7 @@ RuinsOfAlphOutside_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .ScientistCallback + callback MAPCALLBACK_OBJECTS, .ScientistCallback .DummyScene0: end diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index e9606cd42..7c73e1e2d 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -11,7 +11,7 @@ RuinsOfAlphResearchCenter_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .ScientistCallback + callback MAPCALLBACK_OBJECTS, .ScientistCallback .DummyScene0: end diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 38d3eed48..d016d61c7 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -14,7 +14,7 @@ SaffronCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_SAFFRON diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 52f1c1b16..0672b7dab 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -4,7 +4,7 @@ SilverCaveOutside_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_SILVER_CAVE @@ -17,7 +17,7 @@ MtSilverSign: jumptext MtSilverSignText SilverCaveOutsideHiddenFullRestore: - dwb EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE MtSilverSignText: text "MT.SILVER" diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 335c4a834..f75946854 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -24,10 +24,10 @@ SilverCaveRoom1UltraBall: itemball ULTRA_BALL SilverCaveRoom1HiddenDireHit: - dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT + hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT SilverCaveRoom1HiddenUltraBall: - dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL SilverCaveRoom1_MapEventHeader: ; filler diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 6bb381e3a..57072f858 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -20,7 +20,7 @@ SilverCaveRoom2PPUp: itemball PP_UP SilverCaveRoom2HiddenMaxPotion: - dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION SilverCaveRoom2_MapEventHeader: ; filler diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 503477338..48f980f9a 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -13,7 +13,7 @@ TeamRocketBaseB1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .HideSecurityGrunt + callback MAPCALLBACK_OBJECTS, .HideSecurityGrunt .DummyScene: end @@ -540,7 +540,7 @@ TeamRocketBaseB1FGuardSpec: itemball GUARD_SPEC TeamRocketBaseB1FHiddenRevive: - dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE + hiddenitem EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE SecurityCameraMovement1: big_step RIGHT diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 9c4b2f66f..0225d1e4d 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -24,7 +24,7 @@ TeamRocketBaseB2F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .TransmitterDoorCallback + callback MAPCALLBACK_TILES, .TransmitterDoorCallback .DummyScene0: end @@ -315,7 +315,7 @@ UnknownScript_0x6d184: end TeamRocketBaseB2FLockedDoor: - dw EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER, .Script + conditional_event EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER, .Script .Script: opentext @@ -356,7 +356,7 @@ TeamRocketBaseB2FTMThief: itemball TM_THIEF TeamRocketBaseB2FHiddenFullHeal: - dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL MovementData_0x6d212: step RIGHT diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 3801be542..4a110c4e3 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -24,7 +24,7 @@ TeamRocketBaseB3F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .CheckGiovanniDoor + callback MAPCALLBACK_TILES, .CheckGiovanniDoor .LanceGetsPassword: priorityjump LanceGetPasswordScript @@ -174,7 +174,7 @@ TrainerScientistMitch: end TeamRocketBaseB3FLockedDoor: - dw EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE, .Script + conditional_event EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE, .Script .Script: opentext diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index b199df655..3ea686c32 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -10,7 +10,7 @@ TimeCapsule_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .SetWhichChris + callback MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTimeCapsule: priorityjump .InitializeAndPreparePokecenter2F diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index cfbb966f5..7c6f1aee8 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -18,8 +18,8 @@ TinTower1F_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_OBJECTS, .NPCsCallback - dbw MAPCALLBACK_TILES, .StairsCallback + callback MAPCALLBACK_OBJECTS, .NPCsCallback + callback MAPCALLBACK_TILES, .StairsCallback .FaceSuicune: priorityjump .SuicuneBattle diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 7a19c395b..4faf141cd 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -20,7 +20,7 @@ TinTower4FEscapeRope: itemball ESCAPE_ROPE TinTower4FHiddenMaxPotion: - dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION TinTower4F_MapEventHeader: ; filler diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 968cf61fc..4bb02de9d 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -12,10 +12,10 @@ TinTower5FRareCandy: itemball RARE_CANDY TinTower5FHiddenFullRestore: - dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE TinTower5FHiddenCarbos: - dwb EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS + hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS TinTower5F_MapEventHeader: ; filler diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 8d5eed029..b04c47800 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -7,7 +7,7 @@ TinTowerRoof_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .HoOh + callback MAPCALLBACK_OBJECTS, .HoOh .HoOh: checkevent EVENT_FOUGHT_HO_OH diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 2e1318363..deffd661b 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -10,7 +10,7 @@ TradeCenter_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .SetWhichChris + callback MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTradeCenter: priorityjump .InitializeAndPreparePokecenter2F diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm index 45807676a..0f47d7cb8 100644 --- a/maps/UndergroundPath.asm +++ b/maps/UndergroundPath.asm @@ -6,10 +6,10 @@ UndergroundPath_MapScriptHeader: db 0 UndergroundPathHiddenFullRestore: - dwb EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE, FULL_RESTORE UndergroundPathHiddenXSpecial: - dwb EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL + hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL UndergroundPath_MapEventHeader: ; filler diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 8aa4ddd5e..ec6c30385 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -12,7 +12,7 @@ UnionCaveB2F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Lapras + callback MAPCALLBACK_OBJECTS, .Lapras .Lapras: checkflag ENGINE_UNION_CAVE_LAPRAS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 3dee2616b..d84aaa4cb 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -12,7 +12,7 @@ VermilionCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_VERMILION @@ -123,7 +123,7 @@ VermilionCityMartSign: jumpstd martsign VermilionCityHiddenFullHeal: - dwb EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL VermilionCityTeacherText: text "VERMILION PORT is" diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 9698eae6c..d318b98de 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -11,7 +11,7 @@ VermilionPort_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: end @@ -195,7 +195,7 @@ SuperNerdScript_0x74ee6: end VermilionPortHiddenIron: - dwb EVENT_VERMILION_PORT_HIDDEN_IRON, IRON + hiddenitem EVENT_VERMILION_PORT_HIDDEN_IRON, IRON MovementData_0x74ef1: step DOWN diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index c4b85dfbb..d8fc51043 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -112,10 +112,10 @@ VictoryRoadHPUp: itemball HP_UP VictoryRoadHiddenMaxPotion: - dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION VictoryRoadHiddenFullHeal: - dwb EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL MovementData_0x74539: step LEFT diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 34939ff3e..63dd3b92c 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -14,7 +14,7 @@ VioletCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_VIOLET @@ -98,7 +98,7 @@ VioletCityFruitTreeScript: fruittree FRUITTREE_VIOLET_CITY VioletCityHiddenHyperPotion: - dwb EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION VioletCityFollowEarl_MovementData: big_step DOWN diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 5b5e077cb..c29422c52 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -10,7 +10,7 @@ ViridianCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_VIRIDIAN diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 92bb755b7..c84725509 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -32,13 +32,13 @@ WhirlIslandB1FBoulder: jumpstd strengthboulder WhirlIslandB1FHiddenRareCandy: - dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY WhirlIslandB1FHiddenUltraBall: - dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL WhirlIslandB1FHiddenFullRestore: - dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE WhirlIslandB1F_MapEventHeader: ; filler diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 39285cc15..7ee64bf74 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -7,7 +7,7 @@ WhirlIslandLugiaChamber_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Lugia + callback MAPCALLBACK_OBJECTS, .Lugia .Lugia: checkevent EVENT_FOUGHT_LUGIA diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 81ece5a06..9ea754d1a 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -9,7 +9,7 @@ WillsRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .WillsRoomDoors + callback MAPCALLBACK_TILES, .WillsRoomDoors .LockDoor: priorityjump .WillsDoorLocksBehindYou diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 1a7b959ff..c3440c889 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -14,7 +14,7 @@ WiseTriosRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .WiseTrioCallback + callback MAPCALLBACK_OBJECTS, .WiseTrioCallback .DummyScene0: end -- cgit v1.2.3 From b28e71271d936f5d817012a2bc492df1426b5ed4 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 13 Jan 2018 01:03:42 -0500 Subject: Consistent stonetable cmdqueues --- maps/BlackthornGym2F.asm | 24 ++++++++++++------------ maps/IcePathB1F.asm | 2 +- maps/IcePathB2FMahoganySide.asm | 14 +++++++------- maps/TeamRocketBaseB2F.asm | 4 ++-- maps/TeamRocketBaseB3F.asm | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) (limited to 'maps') diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 77f338e7b..2f23f7c9e 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -14,30 +14,30 @@ BlackthornGym2F_MapScriptHeader: .MapCallbacks: db 1 - callback MAPCALLBACK_CMDQUEUE, .Boulders + callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable -.Boulders: - writecmdqueue .BoulderCmdQueue +.SetUpStoneTable: + writecmdqueue .CommandQueue return -.BoulderCmdQueue: - cmdqueue CMDQUEUE_STONETABLE, .BoulderTable ; check if any stones are sitting on a warp +.CommandQueue: + cmdqueue CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp -.BoulderTable: - stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Disappear4 - stonetable 3, BLACKTHORNGYM2F_BOULDER2, .Disappear5 - stonetable 4, BLACKTHORNGYM2F_BOULDER3, .Disappear6 +.StoneTable: + stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Boulder1 + stonetable 3, BLACKTHORNGYM2F_BOULDER2, .Boulder2 + stonetable 4, BLACKTHORNGYM2F_BOULDER3, .Boulder3 db -1 ; end -.Disappear4: +.Boulder1: disappear BLACKTHORNGYM2F_BOULDER1 jump .Fall -.Disappear5: +.Boulder2: disappear BLACKTHORNGYM2F_BOULDER2 jump .Fall -.Disappear6: +.Boulder3: disappear BLACKTHORNGYM2F_BOULDER3 jump .Fall diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 7bb6d0406..2d1bd1aad 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -25,7 +25,7 @@ IcePathB1F_MapScriptHeader: stonetable 4, ICEPATHB1F_BOULDER2, .Boulder2 stonetable 5, ICEPATHB1F_BOULDER3, .Boulder3 stonetable 6, ICEPATHB1F_BOULDER4, .Boulder4 - db -1 + db -1 ; end .Boulder1: disappear ICEPATHB1F_BOULDER1 diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index c01252f98..915794dec 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -13,8 +13,8 @@ IcePathB2FMahoganySide_MapScriptHeader: .MapCallbacks: db 0 -BoulderScript_0x7e5a3: - jumptext UnknownText_0x7e5ad +IcePathB2FMahoganySideBoulder: + jumptext IcePathB2FMahoganySideBoulderText IcePathB2FMahoganySideFullHeal: itemball FULL_HEAL @@ -25,7 +25,7 @@ IcePathB2FMahoganySideMaxPotion: IcePathB2FMahoganySideHiddenCarbos: hiddenitem EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS -UnknownText_0x7e5ad: +IcePathB2FMahoganySideBoulderText: text "It's immovably" line "imbedded in ice." done @@ -52,9 +52,9 @@ IcePathB2FMahoganySide_MapEventHeader: .ObjectEvents: db 6 - object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A - object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A - object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A - object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A + object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A + object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A + object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A + object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_4A object_event 8, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL object_event 0, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 0225d1e4d..555b7ef1b 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -44,7 +44,7 @@ TeamRocketBaseB2F_MapScriptHeader: return .Change: - changeblock 14, 12, $7 + changeblock 14, 12, $07 return UnknownScript_0x6cf95: @@ -330,7 +330,7 @@ UnknownScript_0x6d1e8: writetext UnknownText_0x6dd6b waitbutton playsound SFX_ENTER_DOOR - changeblock 14, 12, $7 + changeblock 14, 12, $07 reloadmappart closetext setevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 4a110c4e3..38734063a 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -45,7 +45,7 @@ TeamRocketBaseB3F_MapScriptHeader: return .OpenSesame: - changeblock 10, 8, $7 + changeblock 10, 8, $07 return LanceGetPasswordScript: @@ -194,7 +194,7 @@ TeamRocketBaseB3FLockedDoor: writetext UnknownText_0x6e9a3 waitbutton playsound SFX_ENTER_DOOR - changeblock 10, 8, $7 + changeblock 10, 8, $07 reloadmappart closetext setevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE -- cgit v1.2.3 From 3db107b72159e991a08248be7e32d74cfb723289 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 13 Jan 2018 10:25:02 -0500 Subject: Label Dragon Shrine --- maps/DragonShrine.asm | 174 +++++++++++++++++++++++++------------------------- 1 file changed, 87 insertions(+), 87 deletions(-) (limited to 'maps') diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 2b1e9267c..d9089313d 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -21,16 +21,16 @@ DragonShrine_MapScriptHeader: end .DragonShrineTestScript: - applymovement PLAYER, MovementData_0x18d2bf - applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c7 + applymovement PLAYER, DragonShrinePlayerWalkInMovement + applymovement DRAGONSHRINE_ELDER1, DragonShrineElderStepDownMovement opentext - writetext UnknownText_0x18d2ea + writetext DragonShrineElderGreetingText buttonsound .Question1: setevent EVENT_RECEIVED_BALLS_FROM_KURT - writetext UnknownText_0x18d3bc + writetext DragonShrineQuestion1Text buttonsound - loadmenudata MenuDataHeader_0x18d215 + loadmenudata DragonShrineQuestion1_MenuDataHeader verticalmenu closewindow if_equal 1, .RightAnswer @@ -40,9 +40,9 @@ DragonShrine_MapScriptHeader: .Question2: setevent EVENT_DRAGON_SHRINE_QUESTION_2 - writetext UnknownText_0x18d3d3 + writetext DragonShrineQuestion2Text buttonsound - loadmenudata MenuDataHeader_0x18d234 + loadmenudata DragonShrineQuestion2_MenuDataHeader verticalmenu closewindow if_equal 1, .RightAnswer @@ -50,9 +50,9 @@ DragonShrine_MapScriptHeader: if_equal 3, .WrongAnswer .Question3: setevent EVENT_DRAGON_SHRINE_QUESTION_3 - writetext UnknownText_0x18d3f3 + writetext DragonShrineQuestion3Text buttonsound - loadmenudata MenuDataHeader_0x18d258 + loadmenudata DragonShrineQuestion3_MenuDataHeader verticalmenu closewindow if_equal 1, .WrongAnswer @@ -60,9 +60,9 @@ DragonShrine_MapScriptHeader: if_equal 3, .RightAnswer .Question4: setevent EVENT_DRAGON_SHRINE_QUESTION_4 - writetext UnknownText_0x18d420 + writetext DragonShrineQuestion4Text buttonsound - loadmenudata MenuDataHeader_0x18d283 + loadmenudata DragonShrineQuestion4_MenuDataHeader verticalmenu closewindow if_equal 1, .RightAnswer @@ -70,9 +70,9 @@ DragonShrine_MapScriptHeader: if_equal 3, .RightAnswer .Question5: setevent EVENT_DRAGON_SHRINE_QUESTION_5 - writetext UnknownText_0x18d44a + writetext DragonShrineQuestion5Text buttonsound - loadmenudata MenuDataHeader_0x18d2a5 + loadmenudata DragonShrineQuestion5_MenuDataHeader verticalmenu closewindow if_equal 1, .WrongAnswer @@ -81,7 +81,7 @@ DragonShrine_MapScriptHeader: .RightAnswer: checkevent EVENT_DRAGON_SHRINE_QUESTION_5 iftrue .PassedTheTest - writetext UnknownText_0x18d82d + writetext DragonShrineRightAnswerText buttonsound checkevent EVENT_DRAGON_SHRINE_QUESTION_4 iftrue .Question5 @@ -95,12 +95,12 @@ DragonShrine_MapScriptHeader: closetext spriteface DRAGONSHRINE_ELDER1, LEFT opentext - writetext UnknownText_0x18d7f6 + writetext DragonShrineWrongAnswerText1 waitbutton closetext spriteface DRAGONSHRINE_ELDER1, DOWN opentext - writetext UnknownText_0x18d816 + writetext DragonShrineWrongAnswerText2 waitbutton closetext setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG @@ -116,7 +116,7 @@ DragonShrine_MapScriptHeader: checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue .Question1 .PassedTheTest: - writetext UnknownText_0x18d47c + writetext DragonShrinePassedTestText waitbutton closetext playsound SFX_ENTER_DOOR @@ -126,39 +126,39 @@ DragonShrine_MapScriptHeader: waitsfx spriteface PLAYER, DOWN pause 30 - applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2d4 + applymovement DRAGONSHRINE_CLAIR, DragonShrineClairWalkInMovement spriteface DRAGONSHRINE_CLAIR, RIGHT spriteface PLAYER, LEFT spriteface DRAGONSHRINE_ELDER1, LEFT opentext - writetext UnknownText_0x18d916 + writetext DragonShrineClairYouPassedText waitbutton closetext special Special_FadeOutMusic - applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2da + applymovement DRAGONSHRINE_CLAIR, DragonShrineClairBigStepLeftMovement opentext - writetext UnknownText_0x18d974 + writetext DragonShrineClairThatCantBeText waitbutton closetext - applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2dd + applymovement DRAGONSHRINE_CLAIR, DragonShrineClairSlowStepLeftMovement opentext - writetext UnknownText_0x18d983 + writetext DragonShrineClairYoureLyingText waitbutton closetext - applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c9 + applymovement DRAGONSHRINE_ELDER1, DragonShrineElderWalkToClairMovement spriteface DRAGONSHRINE_CLAIR, UP opentext - writetext UnknownText_0x18d520 + writetext DragonShrineMustIInformLanceText waitbutton closetext showemote EMOTE_SHOCK, DRAGONSHRINE_CLAIR, 15 opentext - writetext UnknownText_0x18d9ae + writetext DragonShrineIUnderstandText waitbutton closetext applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e0 opentext - writetext UnknownText_0x18d9bf + writetext DragonShrineHereRisingBadgeText waitbutton setflag ENGINE_RISINGBADGE playsound SFX_GET_BADGE @@ -167,9 +167,9 @@ DragonShrine_MapScriptHeader: specialphonecall SPECIALCALL_MASTERBALL setscene 1 setmapscene DRAGONS_DEN_B1F, 1 - writetext UnknownText_0x18d9f2 + writetext DragonShrinePlayerReceivedRisingBadgeText buttonsound - writetext UnknownText_0x18da0b + writetext DragonShrineRisingBadgeExplanationText waitbutton closetext applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2ce @@ -177,11 +177,11 @@ DragonShrine_MapScriptHeader: applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2d1 spriteface PLAYER, UP opentext - writetext UnknownText_0x18d5a3 + writetext DragonShrineElderScoldsClairText waitbutton closetext opentext - writetext UnknownText_0x18dab4 + writetext DragonShrineSpeechlessText waitbutton closetext applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e3 @@ -191,7 +191,7 @@ DragonShrine_MapScriptHeader: setevent EVENT_GAVE_KURT_APRICORNS end -ElderScript_0x18d1a5: +DragonShrineElder1Script: faceplayer opentext checkevent EVENT_GAVE_KURT_APRICORNS @@ -202,17 +202,17 @@ ElderScript_0x18d1a5: iffalse .GiveDratini checkevent EVENT_BEAT_RIVAL_IN_MT_MOON iftrue .BeatRivalInMtMoon - writetext UnknownText_0x18d724 + writetext DragonShrineClairsGrandfatherText waitbutton closetext end .GiveDratini: - writetext UnknownText_0x18d604 + writetext DragonShrineTakeThisDratiniText waitbutton checkcode VAR_PARTYCOUNT if_equal 6, .PartyFull - writetext UnknownText_0x18d697 + writetext DragonShrinePlayerReceivedDratiniText playsound SFX_CAUGHT_MON waitsfx givepoke DRATINI, 15 @@ -220,52 +220,52 @@ ElderScript_0x18d1a5: special SpecialDratini setevent EVENT_GOT_DRATINI setevent EVENT_JUST_RECEIVED_DRATINI - writetext UnknownText_0x18d6ca + writetext DragonShrineSymbolicDragonText waitbutton closetext end .PartyFull: - writetext UnknownText_0x18d6ac + writetext DragonShrinePartyFullText waitbutton closetext end .BeatRivalInMtMoon: - writetext UnknownText_0x18d782 + writetext DragonShrineSilverIsInTrainingText waitbutton closetext end .DontGiveDratiniYet: - writetext UnknownText_0x18d5e5 + writetext DragonShrineComeAgainText waitbutton closetext end .ReceivedDratini: - writetext UnknownText_0x18d6ca + writetext DragonShrineSymbolicDragonText waitbutton closetext end -ElderScript_0x18d205: +DragonShrineElder2Script: faceplayer opentext - writetext UnknownText_0x18d840 + writetext DragonShrineElder2Text waitbutton closetext end -ElderScript_0x18d20d: +DragonShrineElder3Script: faceplayer opentext - writetext UnknownText_0x18d8b1 + writetext DragonShrineElder3Text waitbutton closetext end -MenuDataHeader_0x18d215: +DragonShrineQuestion1_MenuDataHeader: db $40 ; flags db 04, 08 ; start coords db 11, 19 ; end coords @@ -279,7 +279,7 @@ MenuDataHeader_0x18d215: db "Underling@" db "Friend@" -MenuDataHeader_0x18d234: +DragonShrineQuestion2_MenuDataHeader: db $40 ; flags db 04, 09 ; start coords db 11, 19 ; end coords @@ -293,7 +293,7 @@ MenuDataHeader_0x18d234: db "Raising@" db "Cheating@" -MenuDataHeader_0x18d258: +DragonShrineQuestion3_MenuDataHeader: db $40 ; flags db 04, 05 ; start coords db 11, 19 ; end coords @@ -307,7 +307,7 @@ MenuDataHeader_0x18d258: db "Tough person@" db "Anybody@" -MenuDataHeader_0x18d283: +DragonShrineQuestion4_MenuDataHeader: db $40 ; flags db 04, 08 ; start coords db 11, 19 ; end coords @@ -321,7 +321,7 @@ MenuDataHeader_0x18d283: db "Violence@" db "Knowledge@" -MenuDataHeader_0x18d2a5: +DragonShrineQuestion5_MenuDataHeader: db $40 ; flags db 04, 12 ; start coords db 11, 19 ; end coords @@ -335,7 +335,7 @@ MenuDataHeader_0x18d2a5: db "Both@" db "Weak@" -MovementData_0x18d2bf: +DragonShrinePlayerWalkInMovement: slow_step UP slow_step UP slow_step UP @@ -345,11 +345,11 @@ MovementData_0x18d2bf: slow_step UP step_end -MovementData_0x18d2c7: +DragonShrineElderStepDownMovement: slow_step DOWN step_end -MovementData_0x18d2c9: +DragonShrineElderWalkToClairMovement: slow_step LEFT slow_step LEFT slow_step LEFT @@ -366,7 +366,7 @@ MovementData_0x18d2d1: turn_head DOWN step_end -MovementData_0x18d2d4: +DragonShrineClairWalkInMovement: slow_step UP slow_step UP slow_step UP @@ -374,12 +374,12 @@ MovementData_0x18d2d4: slow_step UP step_end -MovementData_0x18d2da: +DragonShrineClairBigStepLeftMovement: fix_facing big_step LEFT step_end -MovementData_0x18d2dd: +DragonShrineClairSlowStepLeftMovement: slow_step LEFT remove_fixed_facing step_end @@ -398,7 +398,7 @@ MovementData_0x18d2e3: step DOWN step_end -UnknownText_0x18d2ea: +DragonShrineElderGreetingText: text "Hm… Good to see" line "you here." @@ -421,29 +421,29 @@ UnknownText_0x18d2ea: para "Ready?" done -UnknownText_0x18d3bc: +DragonShrineQuestion1Text: text "What are #MON" line "to you?" done -UnknownText_0x18d3d3: +DragonShrineQuestion2Text: text "What helps you to" line "win battles?" done -UnknownText_0x18d3f3: +DragonShrineQuestion3Text: text "What kind of" line "trainer do you" cont "wish to battle?" done -UnknownText_0x18d420: +DragonShrineQuestion4Text: text "What is most" line "important for" cont "raising #MON?" done -UnknownText_0x18d44a: +DragonShrineQuestion5Text: text "Strong #MON." line "Weak #MON." @@ -451,7 +451,7 @@ UnknownText_0x18d44a: line "important?" done -UnknownText_0x18d47c: +DragonShrinePassedTestText: text "Hm… I see…" para "You care deeply" @@ -470,7 +470,7 @@ UnknownText_0x18d47c: cont "#MON LEAGUE." done -UnknownText_0x18d520: +DragonShrineMustIInformLanceText: text "CLAIR!" para "This child is" @@ -485,7 +485,7 @@ UnknownText_0x18d520: line "LANCE of this?" done -UnknownText_0x18d5a3: +DragonShrineElderScoldsClairText: text "CLAIR…" para "Reflect upon what" @@ -495,12 +495,12 @@ UnknownText_0x18d5a3: line "child has." done -UnknownText_0x18d5e5: +DragonShrineComeAgainText: text "Come again, if you" line "so desire." done -UnknownText_0x18d604: +DragonShrineTakeThisDratiniText: text "Hm… Good to see" line "you here." @@ -517,17 +517,17 @@ UnknownText_0x18d604: line "your worth." done -UnknownText_0x18d697: +DragonShrinePlayerReceivedDratiniText: text " received" line "DRATINI!" done -UnknownText_0x18d6ac: +DragonShrinePartyFullText: text "Hm? Your #MON" line "party is full." done -UnknownText_0x18d6ca: +DragonShrineSymbolicDragonText: text "Dragon #MON are" line "symbolic of our" cont "clan." @@ -539,7 +539,7 @@ UnknownText_0x18d6ca: line "one." done -UnknownText_0x18d724: +DragonShrineClairsGrandfatherText: text "CLAIR appears to" line "have learned an" @@ -550,7 +550,7 @@ UnknownText_0x18d724: line "grandfather." done -UnknownText_0x18d782: +DragonShrineSilverIsInTrainingText: text "A boy close to" line "your age is in" cont "training here." @@ -562,21 +562,21 @@ UnknownText_0x18d782: line "little worrisome…" done -UnknownText_0x18d7f6: +DragonShrineWrongAnswerText1: text "Hah? I didn't" line "quite catch that…" done -UnknownText_0x18d816: +DragonShrineWrongAnswerText2: text "What was it you" line "said?" done -UnknownText_0x18d82d: +DragonShrineRightAnswerText: text "Oh, I understand…" done -UnknownText_0x18d840: +DragonShrineElder2Text: text "It's been quite" line "some time since a" @@ -588,7 +588,7 @@ UnknownText_0x18d840: line "Master LANCE." done -UnknownText_0x18d8b1: +DragonShrineElder3Text: text "You know young" line "Master LANCE?" @@ -600,7 +600,7 @@ UnknownText_0x18d8b1: line "blood." done -UnknownText_0x18d916: +DragonShrineClairYouPassedText: text "So how did it go?" para "I guess there's no" @@ -613,34 +613,34 @@ UnknownText_0x18d916: para "…What? You passed?" done -UnknownText_0x18d974: +DragonShrineClairThatCantBeText: text "That can't be!" done -UnknownText_0x18d983: +DragonShrineClairYoureLyingText: text "You're lying!" para "Even I haven't" line "been approved!" done -UnknownText_0x18d9ae: +DragonShrineIUnderstandText: text "I-I understand…" done -UnknownText_0x18d9bf: +DragonShrineHereRisingBadgeText: text "Here, this is the" line "RISINGBADGE…" para "Hurry up! Take it!" done -UnknownText_0x18d9f2: +DragonShrinePlayerReceivedRisingBadgeText: text " received" line "RISINGBADGE." done -UnknownText_0x18da0b: +DragonShrineRisingBadgeExplanationText: text "RISINGBADGE will" line "enable your" @@ -658,7 +658,7 @@ UnknownText_0x18da0b: line "question." done -UnknownText_0x18dab4: +DragonShrineSpeechlessText: text "<......><......><......><......><......><......>" done @@ -679,7 +679,7 @@ DragonShrine_MapEventHeader: .ObjectEvents: db 4 - object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS - object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS - object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS + object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_GAVE_KURT_APRICORNS + object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_GAVE_KURT_APRICORNS + object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_GAVE_KURT_APRICORNS object_event 4, 8, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR -- cgit v1.2.3 From 2ab60fa8a49dfe9e20ebb620471ba4c2ca64a4aa Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 13 Jan 2018 16:38:14 -0500 Subject: menu_coords macro for (x1, y1, x2, y2) order (see issue #440) --- maps/CeladonDeptStore6F.asm | 3 +-- maps/CeladonGameCornerPrizeRoom.asm | 6 ++---- maps/DragonShrine.asm | 15 +++++---------- maps/EarlsPokemonAcademy.asm | 3 +-- maps/GoldenrodCity.asm | 3 +-- maps/GoldenrodDeptStore6F.asm | 3 +-- maps/GoldenrodGameCorner.asm | 6 ++---- maps/GoldenrodPokeComCenter2FMobile.asm | 6 ++---- 8 files changed, 15 insertions(+), 30 deletions(-) (limited to 'maps') diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 8789ebc6b..8f67c1dae 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -81,8 +81,7 @@ CeladonDeptStore6FVendingMachine: .MenuData: db $40 ; flags - db 02, 00 ; start coords - db 11, 19 ; end coords + menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 3e66a0e6b..07728ca97 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -104,8 +104,7 @@ CeladonPrizeRoom_NoCoinCase: CeladonPrizeRoom_TMMenuDataHeader: db $40 ; flags - db 02, 00 ; start coords - db 11, 15 ; end coords + menu_coords 0, 2, 15, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -191,8 +190,7 @@ CeladonGameCornerPrizeRoomPokemonVendor: .MenuDataHeader: db $40 ; flags - db 02, 00 ; start coords - db 11, 17 ; end coords + menu_coords 0, 2, 17, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index d9089313d..19c1011d5 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -267,8 +267,7 @@ DragonShrineElder3Script: DragonShrineQuestion1_MenuDataHeader: db $40 ; flags - db 04, 08 ; start coords - db 11, 19 ; end coords + menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -281,8 +280,7 @@ DragonShrineQuestion1_MenuDataHeader: DragonShrineQuestion2_MenuDataHeader: db $40 ; flags - db 04, 09 ; start coords - db 11, 19 ; end coords + menu_coords 9, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -295,8 +293,7 @@ DragonShrineQuestion2_MenuDataHeader: DragonShrineQuestion3_MenuDataHeader: db $40 ; flags - db 04, 05 ; start coords - db 11, 19 ; end coords + menu_coords 5, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -309,8 +306,7 @@ DragonShrineQuestion3_MenuDataHeader: DragonShrineQuestion4_MenuDataHeader: db $40 ; flags - db 04, 08 ; start coords - db 11, 19 ; end coords + menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -323,8 +319,7 @@ DragonShrineQuestion4_MenuDataHeader: DragonShrineQuestion5_MenuDataHeader: db $40 ; flags - db 04, 12 ; start coords - db 11, 19 ; end coords + menu_coords 12, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 62ef5b16b..cad836b6d 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -104,8 +104,7 @@ AcademyBlackboard: .BlackboardMenuData: db $40 ; flags - db 00, 00 ; start coords - db 08, 11 ; end coords + menu_coords 0, 0, 11, 8 dw .MenuData2 db 1 ; default option diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 5ce8b92cc..8d3a91f2d 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -96,8 +96,7 @@ MoveTutor: .MoveMenuDataHeader: db $40 ; flags - db 02, 00 ; start coords - db 11, 15 ; end coords + menu_coords 0, 2, 15, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index a20b74133..89c628684 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -70,8 +70,7 @@ GoldenrodVendingMachine: .MenuData: db $40 ; flags - db 02, 00 ; start coords - db 11, 19 ; end coords + menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index dd3203ac7..b1a911a85 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -140,8 +140,7 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript: GoldenrodGameCornerTMVendorMenuData: db $40 ; flags - db 02, 00 ; start coords - db 11, 15 ; end coords + menu_coords 0, 2, 15, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -227,8 +226,7 @@ GoldenrodGameCornerPrizeMonVendorScript: .MenuDataHeader: db $40 ; flags - db 02, 00 ; start coords - db 11, 17 ; end coords + menu_coords 0, 2, 17, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 1696a014f..1042bf28e 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -50,8 +50,7 @@ UnknownScript_0x62600: MenuDataHeader_0x62602: db $40 ; flags - db 00, 00 ; start coords - db 08, 15 ; end coords + menu_coords 0, 0, 15, 8 dw .MenuData2 db 1 ; default option @@ -93,8 +92,7 @@ UnknownScript_0x6264a: MenuDataHeader_0x6264c: db $40 ; flags - db 00, 00 ; start coords - db 08, 15 ; end coords + menu_coords 0, 0, 15, 8 dw .MenuData2 db 1 ; default option -- cgit v1.2.3 From 11d67567d2c0182864a755a7bebcff0f29e877d6 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sun, 14 Jan 2018 11:59:56 +0100 Subject: Use constants for menu flags Added a bunch of constants for the bitflags of each kind of menu. Some are slightly vague or too long, but I'm not sure how to else name them. --- maps/CeladonDeptStore6F.asm | 4 ++-- maps/CeladonGameCornerPrizeRoom.asm | 8 ++++---- maps/DragonShrine.asm | 20 ++++++++++---------- maps/EarlsPokemonAcademy.asm | 4 ++-- maps/GoldenrodCity.asm | 4 ++-- maps/GoldenrodDeptStore6F.asm | 4 ++-- maps/GoldenrodGameCorner.asm | 8 ++++---- maps/GoldenrodPokeComCenter2FMobile.asm | 8 ++++---- 8 files changed, 30 insertions(+), 30 deletions(-) (limited to 'maps') diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index c94ef993e..01dfa6642 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -80,14 +80,14 @@ CeladonDeptStore6FVendingMachine: jump .Start .MenuData: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "FRESH WATER ¥200@" db "SODA POP ¥300@" diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 7f74c684f..681d144b4 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -104,14 +104,14 @@ CeladonPrizeRoom_NoCoinCase: CeladonPrizeRoom_TMMenuDataHeader: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 15 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "TM32 1500@" db "TM29 3500@" @@ -193,14 +193,14 @@ GoldenrodGameCornerPokemonVendor: .MenuDataHeader: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 17 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "PIKACHU 2222@" db "PORYGON 5555@" diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 1df424ca1..98b57b4de 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -267,14 +267,14 @@ ElderScript_0x18d20d: MenuDataHeader_0x18d215: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 08 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Pal@" db "Underling@" @@ -282,14 +282,14 @@ MenuDataHeader_0x18d215: MenuDataHeader_0x18d234: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 09 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Strategy@" db "Raising@" @@ -297,14 +297,14 @@ MenuDataHeader_0x18d234: MenuDataHeader_0x18d258: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 05 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Weak person@" db "Tough person@" @@ -312,14 +312,14 @@ MenuDataHeader_0x18d258: MenuDataHeader_0x18d283: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 08 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Love@" db "Violence@" @@ -327,14 +327,14 @@ MenuDataHeader_0x18d283: MenuDataHeader_0x18d2a5: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 12 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Tough@" db "Both@" diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 3ed66a713..fcaab3039 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -103,14 +103,14 @@ AcademyBlackboard: jump .Loop .BlackboardMenuData: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 00 ; start coords db 08, 11 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags dn 3, 2 ; rows, columns db 5 ; spacing dba .Text diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 8e324a9bb..a2b3f676b 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -96,14 +96,14 @@ MoveTutor: .MoveMenuDataHeader: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 15 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "FLAMETHROWER@" db "THUNDERBOLT@" diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 82d04ccc8..b9ccc3663 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -69,14 +69,14 @@ GoldenrodVendingMachine: jump .Start .MenuData: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "FRESH WATER ¥200@" db "SODA POP ¥300@" diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index fc0216504..9314207fa 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -140,14 +140,14 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript: GoldenrodGameCornerTMVendorMenuData: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 15 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "TM25 5500@" db "TM14 5500@" @@ -229,14 +229,14 @@ GoldenrodGameCornerPrizeMonVendorScript: .MenuDataHeader: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 17 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "ABRA 100@" db "CUBONE 800@" diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index a3e639409..1cf7e6f6d 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -50,14 +50,14 @@ UnknownScript_0x62600: MenuDataHeader_0x62602: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 00 ; start coords db 08, 15 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 3 ; items db "# つうしん クラブ@" ; # COM CLUB db "モバイルセンター@" ; MOBILE CENTER @@ -95,14 +95,14 @@ UnknownScript_0x6264a: MenuDataHeader_0x6264c: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 00 ; start coords db 08, 15 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 3 ; items db "でんわ", $1f,"つかうとき@" ; Use phone db "でんわ", $4a,"つながらないとき@" ; Don't use phone -- cgit v1.2.3 From eb3102200f66e3aa1688e4e52429fcac4b0272fa Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 14 Jan 2018 19:26:55 -0500 Subject: More Battle Tower map script constants, fewer raw hex values --- maps/BattleTower1F.asm | 10 +++++----- maps/BattleTowerBattleRoom.asm | 2 +- maps/BurnedTower1F.asm | 2 +- maps/BurnedTowerB1F.asm | 2 +- maps/GoldenrodDeptStoreB1F.asm | 8 ++++---- maps/GoldenrodDeptStoreRoof.asm | 2 +- maps/LancesRoom.asm | 4 ++-- maps/RadioTower3F.asm | 4 ++-- maps/Route26.asm | 4 ++-- maps/RuinsOfAlphAerodactylChamber.asm | 4 ++-- maps/RuinsOfAlphHoOhChamber.asm | 4 ++-- maps/RuinsOfAlphKabutoChamber.asm | 4 ++-- maps/RuinsOfAlphOmanyteChamber.asm | 4 ++-- maps/TinTower1F.asm | 2 +- 14 files changed, 28 insertions(+), 28 deletions(-) (limited to 'maps') diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index aafa5698c..ddf0e3c8e 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -67,17 +67,17 @@ ReceptionistScript_0x9e3e2: Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc writetext Text_WantToGoIntoABattleRoom - writebyte $1 + writebyte TRUE special Special_Menu_ChallengeExplanationCancel - if_equal $1, Script_ChooseChallenge - if_equal $2, Script_BattleTowerExplanation + if_equal 1, Script_ChooseChallenge + if_equal 2, Script_BattleTowerExplanation jump Script_BattleTowerHopeToServeYouAgain Script_ChooseChallenge: ; 0x9e40f writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM special BattleTowerAction special SpecialCheckForBattleTowerRules - if_not_equal $0, Script_WaitButton + if_not_equal FALSE, Script_WaitButton writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel @@ -193,7 +193,7 @@ UnreferencedScript_0x9e4ea: special BattleTowerAction if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70 special SpecialCheckForBattleTowerRules - if_not_equal $0, Script_WaitButton + if_not_equal FALSE, Script_WaitButton writebyte BATTLETOWERACTION_05 special BattleTowerAction if_equal $0, .zero diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index e74b9634c..6a23dbcc1 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -29,7 +29,7 @@ Script_BattleRoomLoop: ; 0x9f425 waitsfx applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksIn opentext - battletowertext $1 + battletowertext BATTLETOWERTEXT_INTRO buttonsound closetext special BattleTowerBattle ; calls predef startbattle diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 89fd33e5d..d35fd0a00 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -33,7 +33,7 @@ BurnedTower1F_MapScriptHeader: .Next: checkevent EVENT_RELEASED_THE_BEASTS iftrue .Done - changeblock 6, 14, $9 ; ladder + changeblock 6, 14, $09 ; ladder .Done: return diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 1a3aac3d3..0f0846d2a 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -28,7 +28,7 @@ BurnedTowerB1F_MapScriptHeader: .LadderCallback: checkevent EVENT_RELEASED_THE_BEASTS iftrue .NoChange - changeblock 6, 14, $2 + changeblock 6, 14, $02 .NoChange: return diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 035bc1107..7922e4185 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -23,7 +23,7 @@ UnknownScript_0x7d781: jump UnknownScript_0x7d791 UnknownScript_0x7d78a: - changeblock 16, 4, $d + changeblock 16, 4, $0d jump UnknownScript_0x7d791 UnknownScript_0x7d791: @@ -31,15 +31,15 @@ UnknownScript_0x7d791: iftrue .Layout2 checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 iftrue .Layout3 - changeblock 10, 8, $d + changeblock 10, 8, $0d return .Layout2: - changeblock 4, 10, $d + changeblock 4, 10, $0d return .Layout3: - changeblock 10, 12, $d + changeblock 10, 12, $0d return UnknownScript_0x7d7ac: diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 24fc33ded..8fcadbb3f 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -24,7 +24,7 @@ GoldenrodDeptStoreRoof_MapScriptHeader: .ChangeBlock: changeblock 0, 2, $3f - changeblock 0, 4, $f + changeblock 0, 4, $0f return .CheckSaleChangeClerk: diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 330943b8c..b181e419e 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -27,7 +27,7 @@ LancesRoom_MapScriptHeader: .KeepDoorsClosed: checkevent EVENT_LANCES_ROOM_EXIT_OPEN iffalse .OpenDoors - changeblock 4, 0, $b + changeblock 4, 0, $0b .OpenDoors: return @@ -69,7 +69,7 @@ LanceScript_0x180e7b: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock 4, 0, $b + changeblock 4, 0, $0b reloadmappart closetext setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 3b62ec884..7c2862e80 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -22,7 +22,7 @@ RadioTower3F_MapScriptHeader: .Change: changeblock 14, 2, $2a - changeblock 14, 4, $1 + changeblock 14, 4, $01 return RadioTower3FSuperNerdScript: @@ -144,7 +144,7 @@ UnknownScript_0x5e605: setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER playsound SFX_ENTER_DOOR changeblock 14, 2, $2a - changeblock 14, 4, $1 + changeblock 14, 4, $01 reloadmappart closetext waitsfx diff --git a/maps/Route26.asm b/maps/Route26.asm index bb6774f27..148d5e96c 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -153,8 +153,8 @@ UnknownScript_0x1a4e1e: scall UnknownScript_0x1a4e7f UnknownScript_0x1a4e21: askforphonenumber PHONE_COOLTRAINERF_BETH - if_equal $1, UnknownScript_0x1a4e8f - if_equal $2, UnknownScript_0x1a4e8b + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a4e8f + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a4e8b trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0 scall UnknownScript_0x1a4e83 jump UnknownScript_0x1a4e87 diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 216c079e7..8ed3c6a65 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -30,8 +30,8 @@ RuinsOfAlphAerodactylChamber_MapScriptHeader: return .FloorClosed: - changeblock 2, 2, $1 - changeblock 4, 2, $2 + changeblock 2, 2, $01 + changeblock 4, 2, $02 return .WallOpenScript: diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 16a978cbf..0aeee9f56 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -31,8 +31,8 @@ RuinsOfAlphHoOhChamber_MapScriptHeader: return .FloorClosed: - changeblock 2, 2, $1 - changeblock 4, 2, $2 + changeblock 2, 2, $01 + changeblock 4, 2, $02 return .WallOpenScript: diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index 14e096b58..1b82d9e40 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -34,8 +34,8 @@ RuinsOfAlphKabutoChamber_MapScriptHeader: return .FloorClosed: - changeblock 2, 2, $1 - changeblock 4, 2, $2 + changeblock 2, 2, $01 + changeblock 4, 2, $02 return .WallOpenScript: diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 1bfa3b076..902f4a1e1 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -31,8 +31,8 @@ RuinsOfAlphOmanyteChamber_MapScriptHeader: return .FloorClosed: - changeblock 2, 2, $1 - changeblock 4, 2, $2 + changeblock 2, 2, $01 + changeblock 4, 2, $02 return .WallOpenScript: diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 7c6f1aee8..7e19d0ef2 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -79,7 +79,7 @@ TinTower1F_MapScriptHeader: .StairsCallback: checkevent EVENT_GOT_RAINBOW_WING iftrue .DontHideStairs - changeblock 10, 2, $9 + changeblock 10, 2, $09 .DontHideStairs: return -- cgit v1.2.3 From fe3ef73a8c2d22da6067bdeab1686a24d527a65e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 15 Jan 2018 00:44:40 -0500 Subject: Group unused data --- maps/GoldenrodNameRater.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'maps') diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index 65873f94c..a9effc92d 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -22,7 +22,7 @@ GoldenrodNameRaterBookshelf: GoldenrodNameRaterRadio: jumpstd radio2 -INCLUDE "data/unused_text/sweet_honey.asm" +INCLUDE "data/unused/sweet_honey_text.asm" GoldenrodNameRater_MapEventHeader: ; filler -- cgit v1.2.3 From 94bbfe2f0c97f653db21db3bb68fcc3263340e4e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 16 Jan 2018 19:56:21 -0500 Subject: Move map-related "metadata" files into data/maps/ --- maps/BetaAzaleaTown.blk | 10 - maps/BetaBlackthornCity.blk | 1 - maps/BetaBlank.blk | 1 - maps/BetaCave.blk | 8 - maps/BetaCave2.blk | 5 - maps/BetaCaveTestMap.blk | 18 - maps/BetaCeladonMansion.blk | 1 - maps/BetaCherrygroveCity.blk | 9 - maps/BetaCianwoodCity.blk | 1 - maps/BetaCinnabarPokemonLabHallway.blk | 2 - maps/BetaCinnabarPokemonLabRoom1.blk | 2 - maps/BetaCinnabarPokemonLabRoom2.blk | 1 - maps/BetaCinnabarPokemonLabRoom3.blk | 1 - maps/BetaEcruteakCity.blk | 1 - maps/BetaElevator.blk | 1 - maps/BetaEmptyHouse.blk | 15 - maps/BetaFastShipInsideCutOut.blk | 1 - maps/BetaGoldenrodCity.blk | 10 - maps/BetaHerosHouse.blk | 1 - maps/BetaHouse.blk | 1 - maps/BetaHouse2.blk | 1 - maps/BetaIlexForest.blk | 1 - maps/BetaLakeOfRage.blk | 1 - maps/BetaMahoganyTown.blk | 1 - maps/BetaNewBarkTown.blk | 1 - maps/BetaOlivineCity.blk | 4 - maps/BetaPewterMuseumOfScience1F.blk | 2 - maps/BetaPewterMuseumOfScience2F.blk | 1 - maps/BetaPokecenterMainHouse.blk | 1 - maps/BetaPokecenterTradeStation.blk | 1 - maps/BetaRocketHideout1.blk | 5 - maps/BetaRocketHideout2.blk | 4 - maps/BetaRocketHideout3.blk | 5 - maps/BetaRoute23EarlyVersion.blk | 7 - maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk | 1 - maps/BetaSproutTower1.blk | 3 - maps/BetaSproutTower2.blk | 9 - maps/BetaSproutTower3.blk | 7 - maps/BetaSproutTower5.blk | 9 - maps/BetaSproutTower6.blk | 4 - maps/BetaSproutTower7.blk | 8 - maps/BetaSproutTower8.blk | 5 - maps/BetaSproutTower9.blk | 1 - maps/BetaSproutTowerCutOut1.blk | 1 - maps/BetaSproutTowerCutOut2.blk | 1 - maps/BetaSproutTowerCutOut3.blk | 1 - maps/BetaUnknown.blk | 1 - maps/BetaVioletCity.blk | 7 - maps/blockdata.asm | 1047 --------------------- maps/map_headers.asm | 510 ---------- maps/second_map_headers.asm | 685 -------------- maps/unused/BetaAzaleaTown.blk | 10 + maps/unused/BetaBlackthornCity.blk | 1 + maps/unused/BetaBlank.blk | 1 + maps/unused/BetaCave.blk | 8 + maps/unused/BetaCave2.blk | 5 + maps/unused/BetaCaveTestMap.blk | 18 + maps/unused/BetaCeladonMansion.blk | 1 + maps/unused/BetaCherrygroveCity.blk | 9 + maps/unused/BetaCianwoodCity.blk | 1 + maps/unused/BetaCinnabarPokemonLabHallway.blk | 2 + maps/unused/BetaCinnabarPokemonLabRoom1.blk | 2 + maps/unused/BetaCinnabarPokemonLabRoom2.blk | 1 + maps/unused/BetaCinnabarPokemonLabRoom3.blk | 1 + maps/unused/BetaEcruteakCity.blk | 1 + maps/unused/BetaElevator.blk | 1 + maps/unused/BetaEmptyHouse.blk | 15 + maps/unused/BetaFastShipInsideCutOut.blk | 1 + maps/unused/BetaGoldenrodCity.blk | 10 + maps/unused/BetaHerosHouse.blk | 1 + maps/unused/BetaHouse.blk | 1 + maps/unused/BetaHouse2.blk | 1 + maps/unused/BetaIlexForest.blk | 1 + maps/unused/BetaLakeOfRage.blk | 1 + maps/unused/BetaMahoganyTown.blk | 1 + maps/unused/BetaNewBarkTown.blk | 1 + maps/unused/BetaOlivineCity.blk | 4 + maps/unused/BetaPewterMuseumOfScience1F.blk | 2 + maps/unused/BetaPewterMuseumOfScience2F.blk | 1 + maps/unused/BetaPokecenterMainHouse.blk | 1 + maps/unused/BetaPokecenterTradeStation.blk | 1 + maps/unused/BetaRocketHideout1.blk | 5 + maps/unused/BetaRocketHideout2.blk | 4 + maps/unused/BetaRocketHideout3.blk | 5 + maps/unused/BetaRoute23EarlyVersion.blk | 7 + maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk | 1 + maps/unused/BetaSproutTower1.blk | 3 + maps/unused/BetaSproutTower2.blk | 9 + maps/unused/BetaSproutTower3.blk | 7 + maps/unused/BetaSproutTower5.blk | 9 + maps/unused/BetaSproutTower6.blk | 4 + maps/unused/BetaSproutTower7.blk | 8 + maps/unused/BetaSproutTower8.blk | 5 + maps/unused/BetaSproutTower9.blk | 1 + maps/unused/BetaSproutTowerCutOut1.blk | 1 + maps/unused/BetaSproutTowerCutOut2.blk | 1 + maps/unused/BetaSproutTowerCutOut3.blk | 1 + maps/unused/BetaUnknown.blk | 1 + maps/unused/BetaVioletCity.blk | 7 + 99 files changed, 183 insertions(+), 2425 deletions(-) delete mode 100644 maps/BetaAzaleaTown.blk delete mode 100644 maps/BetaBlackthornCity.blk delete mode 100644 maps/BetaBlank.blk delete mode 100644 maps/BetaCave.blk delete mode 100644 maps/BetaCave2.blk delete mode 100644 maps/BetaCaveTestMap.blk delete mode 100644 maps/BetaCeladonMansion.blk delete mode 100644 maps/BetaCherrygroveCity.blk delete mode 100644 maps/BetaCianwoodCity.blk delete mode 100644 maps/BetaCinnabarPokemonLabHallway.blk delete mode 100644 maps/BetaCinnabarPokemonLabRoom1.blk delete mode 100644 maps/BetaCinnabarPokemonLabRoom2.blk delete mode 100644 maps/BetaCinnabarPokemonLabRoom3.blk delete mode 100644 maps/BetaEcruteakCity.blk delete mode 100644 maps/BetaElevator.blk delete mode 100644 maps/BetaEmptyHouse.blk delete mode 100644 maps/BetaFastShipInsideCutOut.blk delete mode 100644 maps/BetaGoldenrodCity.blk delete mode 100644 maps/BetaHerosHouse.blk delete mode 100644 maps/BetaHouse.blk delete mode 100644 maps/BetaHouse2.blk delete mode 100644 maps/BetaIlexForest.blk delete mode 100644 maps/BetaLakeOfRage.blk delete mode 100644 maps/BetaMahoganyTown.blk delete mode 100644 maps/BetaNewBarkTown.blk delete mode 100644 maps/BetaOlivineCity.blk delete mode 100644 maps/BetaPewterMuseumOfScience1F.blk delete mode 100644 maps/BetaPewterMuseumOfScience2F.blk delete mode 100644 maps/BetaPokecenterMainHouse.blk delete mode 100644 maps/BetaPokecenterTradeStation.blk delete mode 100644 maps/BetaRocketHideout1.blk delete mode 100644 maps/BetaRocketHideout2.blk delete mode 100644 maps/BetaRocketHideout3.blk delete mode 100644 maps/BetaRoute23EarlyVersion.blk delete mode 100644 maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk delete mode 100644 maps/BetaSproutTower1.blk delete mode 100644 maps/BetaSproutTower2.blk delete mode 100644 maps/BetaSproutTower3.blk delete mode 100644 maps/BetaSproutTower5.blk delete mode 100644 maps/BetaSproutTower6.blk delete mode 100644 maps/BetaSproutTower7.blk delete mode 100644 maps/BetaSproutTower8.blk delete mode 100644 maps/BetaSproutTower9.blk delete mode 100644 maps/BetaSproutTowerCutOut1.blk delete mode 100644 maps/BetaSproutTowerCutOut2.blk delete mode 100644 maps/BetaSproutTowerCutOut3.blk delete mode 100644 maps/BetaUnknown.blk delete mode 100644 maps/BetaVioletCity.blk delete mode 100644 maps/blockdata.asm delete mode 100644 maps/map_headers.asm delete mode 100644 maps/second_map_headers.asm create mode 100644 maps/unused/BetaAzaleaTown.blk create mode 100644 maps/unused/BetaBlackthornCity.blk create mode 100644 maps/unused/BetaBlank.blk create mode 100644 maps/unused/BetaCave.blk create mode 100644 maps/unused/BetaCave2.blk create mode 100644 maps/unused/BetaCaveTestMap.blk create mode 100644 maps/unused/BetaCeladonMansion.blk create mode 100644 maps/unused/BetaCherrygroveCity.blk create mode 100644 maps/unused/BetaCianwoodCity.blk create mode 100644 maps/unused/BetaCinnabarPokemonLabHallway.blk create mode 100644 maps/unused/BetaCinnabarPokemonLabRoom1.blk create mode 100644 maps/unused/BetaCinnabarPokemonLabRoom2.blk create mode 100644 maps/unused/BetaCinnabarPokemonLabRoom3.blk create mode 100644 maps/unused/BetaEcruteakCity.blk create mode 100644 maps/unused/BetaElevator.blk create mode 100644 maps/unused/BetaEmptyHouse.blk create mode 100644 maps/unused/BetaFastShipInsideCutOut.blk create mode 100644 maps/unused/BetaGoldenrodCity.blk create mode 100644 maps/unused/BetaHerosHouse.blk create mode 100644 maps/unused/BetaHouse.blk create mode 100644 maps/unused/BetaHouse2.blk create mode 100644 maps/unused/BetaIlexForest.blk create mode 100644 maps/unused/BetaLakeOfRage.blk create mode 100644 maps/unused/BetaMahoganyTown.blk create mode 100644 maps/unused/BetaNewBarkTown.blk create mode 100644 maps/unused/BetaOlivineCity.blk create mode 100644 maps/unused/BetaPewterMuseumOfScience1F.blk create mode 100644 maps/unused/BetaPewterMuseumOfScience2F.blk create mode 100644 maps/unused/BetaPokecenterMainHouse.blk create mode 100644 maps/unused/BetaPokecenterTradeStation.blk create mode 100644 maps/unused/BetaRocketHideout1.blk create mode 100644 maps/unused/BetaRocketHideout2.blk create mode 100644 maps/unused/BetaRocketHideout3.blk create mode 100644 maps/unused/BetaRoute23EarlyVersion.blk create mode 100644 maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk create mode 100644 maps/unused/BetaSproutTower1.blk create mode 100644 maps/unused/BetaSproutTower2.blk create mode 100644 maps/unused/BetaSproutTower3.blk create mode 100644 maps/unused/BetaSproutTower5.blk create mode 100644 maps/unused/BetaSproutTower6.blk create mode 100644 maps/unused/BetaSproutTower7.blk create mode 100644 maps/unused/BetaSproutTower8.blk create mode 100644 maps/unused/BetaSproutTower9.blk create mode 100644 maps/unused/BetaSproutTowerCutOut1.blk create mode 100644 maps/unused/BetaSproutTowerCutOut2.blk create mode 100644 maps/unused/BetaSproutTowerCutOut3.blk create mode 100644 maps/unused/BetaUnknown.blk create mode 100644 maps/unused/BetaVioletCity.blk (limited to 'maps') diff --git a/maps/BetaAzaleaTown.blk b/maps/BetaAzaleaTown.blk deleted file mode 100644 index 8faa18369..000000000 --- a/maps/BetaAzaleaTown.blk +++ /dev/null @@ -1,10 +0,0 @@ -aaaaaaaaFDaaaaaaaaaaaaaaaaaFDaaaaaaaaaaaaaaaaaFHIIaaaaaaBaaaFaaaaaaFaFaaaHJGFee>aacaaaFaaaadeefaaaaFGbaaaaaaaaFDaaaaaaaFaaDaU -aaaaaaaHIY -aaaaaaa~zU -aaaaaaa5Y -aaaaa@AAAA5z -vvvUaaaaaaaaaaa552955zvvvvvvvvvv -aa55551111111111111 - -a555555555555555552 -a \ No newline at end of file diff --git a/maps/BetaBlackthornCity.blk b/maps/BetaBlackthornCity.blk deleted file mode 100644 index c6fc4f210..000000000 --- a/maps/BetaBlackthornCity.blk +++ /dev/null @@ -1 +0,0 @@ -hqqqqqqqqqqqqqqqqqqqhqorrrrrrrrrnqqqqqqqhqiaKeWaKeWahqqqqqqqhqieKaWWWaeWhqorrnqqhqiaWWKWeaWehqi !hqqhqiKWWeeaWWahqi$%hqqhqieKeaWWeeehqi$%hqqhqiaKaWeeWaahqi$%hqqlrmKeWWaWeWahqi()hqqKaWKaWaeWlrmtuhqqWWWWWWKaWWWWWWhqqhqqlrrG \ No newline at end of file diff --git a/maps/BetaBlank.blk b/maps/BetaBlank.blk deleted file mode 100644 index e53405655..000000000 --- a/maps/BetaBlank.blk +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/maps/BetaCave.blk b/maps/BetaCave.blk deleted file mode 100644 index b103c2532..000000000 --- a/maps/BetaCave.blk +++ /dev/null @@ -1,8 +0,0 @@ -  - - - - - - -  \ No newline at end of file diff --git a/maps/BetaCave2.blk b/maps/BetaCave2.blk deleted file mode 100644 index a2722d010..000000000 --- a/maps/BetaCave2.blk +++ /dev/null @@ -1,5 +0,0 @@ -  -(+ -)* - -   \ No newline at end of file diff --git a/maps/BetaCaveTestMap.blk b/maps/BetaCaveTestMap.blk deleted file mode 100644 index eba6c84c8..000000000 --- a/maps/BetaCaveTestMap.blk +++ /dev/null @@ -1,18 +0,0 @@ -   -;<  ; 6< - - 589: - - - - -  5  - -    - - 5   - -    -  - 5 6 -    \ No newline at end of file diff --git a/maps/BetaCeladonMansion.blk b/maps/BetaCeladonMansion.blk deleted file mode 100644 index 8d3e219df..000000000 --- a/maps/BetaCeladonMansion.blk +++ /dev/null @@ -1 +0,0 @@ -? +,/ \ No newline at end of file diff --git a/maps/BetaCherrygroveCity.blk b/maps/BetaCherrygroveCity.blk deleted file mode 100644 index 440952f6f..000000000 --- a/maps/BetaCherrygroveCity.blk +++ /dev/null @@ -1,9 +0,0 @@ - -aaaaaaaa - -a6 -a6YEa6Y,-6YG./a52vUa551 - -aaaaa5555 - -aaaa \ No newline at end of file diff --git a/maps/BetaCianwoodCity.blk b/maps/BetaCianwoodCity.blk deleted file mode 100644 index d946e1de7..000000000 --- a/maps/BetaCianwoodCity.blk +++ /dev/null @@ -1 +0,0 @@ -aaaaXaaTyaaX5ETy5Tv455aTvvyfaXYaaXYEaaeaaa \ No newline at end of file diff --git a/maps/BetaCinnabarPokemonLabHallway.blk b/maps/BetaCinnabarPokemonLabHallway.blk deleted file mode 100644 index 7a6502a26..000000000 --- a/maps/BetaCinnabarPokemonLabHallway.blk +++ /dev/null @@ -1,2 +0,0 @@ -  -  \ No newline at end of file diff --git a/maps/BetaCinnabarPokemonLabRoom1.blk b/maps/BetaCinnabarPokemonLabRoom1.blk deleted file mode 100644 index ef77b6561..000000000 --- a/maps/BetaCinnabarPokemonLabRoom1.blk +++ /dev/null @@ -1,2 +0,0 @@ -  -  \ No newline at end of file diff --git a/maps/BetaCinnabarPokemonLabRoom2.blk b/maps/BetaCinnabarPokemonLabRoom2.blk deleted file mode 100644 index 822db175b..000000000 --- a/maps/BetaCinnabarPokemonLabRoom2.blk +++ /dev/null @@ -1 +0,0 @@ -  \ No newline at end of file diff --git a/maps/BetaCinnabarPokemonLabRoom3.blk b/maps/BetaCinnabarPokemonLabRoom3.blk deleted file mode 100644 index d9a64a5da..000000000 --- a/maps/BetaCinnabarPokemonLabRoom3.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/BetaEcruteakCity.blk b/maps/BetaEcruteakCity.blk deleted file mode 100644 index ce448c2ef..000000000 --- a/maps/BetaEcruteakCity.blk +++ /dev/null @@ -1 +0,0 @@ -?eeeeeeeeeeeb !bb$%b>$%`&;',-&'`$%`*"+#/*+aE$%dg,-b()#/tuWZWVWVWVWZ@AABGTU !FXY$%&'XYa$%*+VVZVVVVVVZaa()EatuIIJ~{@AAAAA HII \ No newline at end of file diff --git a/maps/BetaElevator.blk b/maps/BetaElevator.blk deleted file mode 100644 index 32fb22697..000000000 --- a/maps/BetaElevator.blk +++ /dev/null @@ -1 +0,0 @@ -&$$$%$$$$$$$$$$$$$$$$$$ \ No newline at end of file diff --git a/maps/BetaEmptyHouse.blk b/maps/BetaEmptyHouse.blk deleted file mode 100644 index dcec62794..000000000 --- a/maps/BetaEmptyHouse.blk +++ /dev/null @@ -1,15 +0,0 @@ -  -   -  - - - -   -  -   -   -   - - % - -   \ No newline at end of file diff --git a/maps/BetaFastShipInsideCutOut.blk b/maps/BetaFastShipInsideCutOut.blk deleted file mode 100644 index b385b0198..000000000 --- a/maps/BetaFastShipInsideCutOut.blk +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/maps/BetaGoldenrodCity.blk b/maps/BetaGoldenrodCity.blk deleted file mode 100644 index 1a156122d..000000000 --- a/maps/BetaGoldenrodCity.blk +++ /dev/null @@ -1,10 +0,0 @@ - - - -FD - -JHU !Y$#Y"HEzv%&IIIIIIIIJII55)* @-.EAAAAAAAAAA FIHIJEEvvU55YY@AEYDFYHFzU5 - -B @55 - -F~D \ No newline at end of file diff --git a/maps/BetaHerosHouse.blk b/maps/BetaHerosHouse.blk deleted file mode 100644 index b5b53b4bd..000000000 --- a/maps/BetaHerosHouse.blk +++ /dev/null @@ -1 +0,0 @@ - ! " \ No newline at end of file diff --git a/maps/BetaHouse.blk b/maps/BetaHouse.blk deleted file mode 100644 index 187a3cd32..000000000 --- a/maps/BetaHouse.blk +++ /dev/null @@ -1 +0,0 @@ -*+,*-.12/0/ \ No newline at end of file diff --git a/maps/BetaHouse2.blk b/maps/BetaHouse2.blk deleted file mode 100644 index 993ea3a8d..000000000 --- a/maps/BetaHouse2.blk +++ /dev/null @@ -1 +0,0 @@ -?',9..',9 \ No newline at end of file diff --git a/maps/BetaIlexForest.blk b/maps/BetaIlexForest.blk deleted file mode 100644 index 3cde14007..000000000 --- a/maps/BetaIlexForest.blk +++ /dev/null @@ -1 +0,0 @@ -hqqqqqihqqqqqilrrsm \ No newline at end of file diff --git a/maps/BetaLakeOfRage.blk b/maps/BetaLakeOfRage.blk deleted file mode 100644 index d1d63a0d4..000000000 --- a/maps/BetaLakeOfRage.blk +++ /dev/null @@ -1 +0,0 @@ -\^af\a\^afG^f\\f>^fTU^abfd?fdTvyY>dG\fd\X55Ya^d?f^Tvy55Y<d`f\\Ty555Y`f]\?\aX555Y\\^?Tvvy555Y^<fTvy555555Y^bd\bf^X5555555Ydf\ffTy5555555Y\b\af\fX55555Ya^d<d\daX555Yfd\\G`f^^\>e\adfa \ No newline at end of file diff --git a/maps/BetaMahoganyTown.blk b/maps/BetaMahoganyTown.blk deleted file mode 100644 index 6b4c62e10..000000000 --- a/maps/BetaMahoganyTown.blk +++ /dev/null @@ -1 +0,0 @@ -`N=`RZW,-G./WEZWWG? \ No newline at end of file diff --git a/maps/BetaNewBarkTown.blk b/maps/BetaNewBarkTown.blk deleted file mode 100644 index 395c91f1b..000000000 --- a/maps/BetaNewBarkTown.blk +++ /dev/null @@ -1 +0,0 @@ -^]?II~IDGaaHTvEX5@~~{XDGGXHIIIIIIIaXvvvvvvvvv1 \ No newline at end of file diff --git a/maps/BetaOlivineCity.blk b/maps/BetaOlivineCity.blk deleted file mode 100644 index 749f05a5c..000000000 --- a/maps/BetaOlivineCity.blk +++ /dev/null @@ -1,4 +0,0 @@ -FDIJHIIIFDFZFDFDFFZFFZFFDFFZFAABFZFFDF|}FTvvvvvvvvvUDF|}FXYX55YDF|}FXYX55YHIIIJ|}FXYX556vvv - -JXYX5545552 -Xzvvvvy55255552vvvy555 555550555552995555~5555:5555 \ No newline at end of file diff --git a/maps/BetaPewterMuseumOfScience1F.blk b/maps/BetaPewterMuseumOfScience1F.blk deleted file mode 100644 index 1eec02a37..000000000 --- a/maps/BetaPewterMuseumOfScience1F.blk +++ /dev/null @@ -1,2 +0,0 @@ - -  ! &! & \ No newline at end of file diff --git a/maps/BetaPewterMuseumOfScience2F.blk b/maps/BetaPewterMuseumOfScience2F.blk deleted file mode 100644 index ac5622246..000000000 --- a/maps/BetaPewterMuseumOfScience2F.blk +++ /dev/null @@ -1 +0,0 @@ -012! \ No newline at end of file diff --git a/maps/BetaPokecenterMainHouse.blk b/maps/BetaPokecenterMainHouse.blk deleted file mode 100644 index 261350738..000000000 --- a/maps/BetaPokecenterMainHouse.blk +++ /dev/null @@ -1 +0,0 @@ -  ' \ No newline at end of file diff --git a/maps/BetaPokecenterTradeStation.blk b/maps/BetaPokecenterTradeStation.blk deleted file mode 100644 index 555abfa07..000000000 --- a/maps/BetaPokecenterTradeStation.blk +++ /dev/null @@ -1 +0,0 @@ -' \ No newline at end of file diff --git a/maps/BetaRocketHideout1.blk b/maps/BetaRocketHideout1.blk deleted file mode 100644 index 988208073..000000000 --- a/maps/BetaRocketHideout1.blk +++ /dev/null @@ -1,5 +0,0 @@ - - :?  > "! 89  *> *   89 :?:? )  ;?;? )  ? :)   ><) >>    )89      >>   8: ::?   ?< <>:) 5//////>89<)  -,/////- >>>> 1 8899///= - 5///->:?  1 = - >? ? ,/////-,////- \ No newline at end of file diff --git a/maps/BetaRoute23EarlyVersion.blk b/maps/BetaRoute23EarlyVersion.blk deleted file mode 100644 index a62533dd4..000000000 --- a/maps/BetaRoute23EarlyVersion.blk +++ /dev/null @@ -1,7 +0,0 @@ - - ! - -ohi -omhi!nm7:~nm'nm'nm'nm'nm'nm'nm'nm -^ -noo !hihi \ No newline at end of file diff --git a/maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk b/maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk deleted file mode 100644 index a3aa06bd6..000000000 --- a/maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk +++ /dev/null @@ -1 +0,0 @@ - ,+ \ No newline at end of file diff --git a/maps/BetaSproutTower1.blk b/maps/BetaSproutTower1.blk deleted file mode 100644 index 6c0b2ea41..000000000 --- a/maps/BetaSproutTower1.blk +++ /dev/null @@ -1,3 +0,0 @@ -      -   -    \ No newline at end of file diff --git a/maps/BetaSproutTower2.blk b/maps/BetaSproutTower2.blk deleted file mode 100644 index a13cec16b..000000000 --- a/maps/BetaSproutTower2.blk +++ /dev/null @@ -1,9 +0,0 @@ -  -  -   -  -   -   -   -  - \ No newline at end of file diff --git a/maps/BetaSproutTower3.blk b/maps/BetaSproutTower3.blk deleted file mode 100644 index 846bb9016..000000000 --- a/maps/BetaSproutTower3.blk +++ /dev/null @@ -1,7 +0,0 @@ -  -    -  -    -  -   - \ No newline at end of file diff --git a/maps/BetaSproutTower5.blk b/maps/BetaSproutTower5.blk deleted file mode 100644 index baaeaa926..000000000 --- a/maps/BetaSproutTower5.blk +++ /dev/null @@ -1,9 +0,0 @@ -  -  -  -  -  -     -  - -         \ No newline at end of file diff --git a/maps/BetaSproutTower6.blk b/maps/BetaSproutTower6.blk deleted file mode 100644 index ea9395657..000000000 --- a/maps/BetaSproutTower6.blk +++ /dev/null @@ -1,4 +0,0 @@ -  -              -   -   \ No newline at end of file diff --git a/maps/BetaSproutTower7.blk b/maps/BetaSproutTower7.blk deleted file mode 100644 index bfa5da286..000000000 --- a/maps/BetaSproutTower7.blk +++ /dev/null @@ -1,8 +0,0 @@ -  - -   -  -      -    -   -  \ No newline at end of file diff --git a/maps/BetaSproutTower8.blk b/maps/BetaSproutTower8.blk deleted file mode 100644 index 254c0c565..000000000 --- a/maps/BetaSproutTower8.blk +++ /dev/null @@ -1,5 +0,0 @@ -   -     -   -     -     \ No newline at end of file diff --git a/maps/BetaSproutTower9.blk b/maps/BetaSproutTower9.blk deleted file mode 100644 index f5737b226..000000000 --- a/maps/BetaSproutTower9.blk +++ /dev/null @@ -1 +0,0 @@ -     \ No newline at end of file diff --git a/maps/BetaSproutTowerCutOut1.blk b/maps/BetaSproutTowerCutOut1.blk deleted file mode 100644 index 21808bb71..000000000 --- a/maps/BetaSproutTowerCutOut1.blk +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/maps/BetaSproutTowerCutOut2.blk b/maps/BetaSproutTowerCutOut2.blk deleted file mode 100644 index 21808bb71..000000000 --- a/maps/BetaSproutTowerCutOut2.blk +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/maps/BetaSproutTowerCutOut3.blk b/maps/BetaSproutTowerCutOut3.blk deleted file mode 100644 index 21808bb71..000000000 --- a/maps/BetaSproutTowerCutOut3.blk +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/maps/BetaUnknown.blk b/maps/BetaUnknown.blk deleted file mode 100644 index c3063adc7..000000000 --- a/maps/BetaUnknown.blk +++ /dev/null @@ -1 +0,0 @@ -( \ No newline at end of file diff --git a/maps/BetaVioletCity.blk b/maps/BetaVioletCity.blk deleted file mode 100644 index 963dbb2ed..000000000 --- a/maps/BetaVioletCity.blk +++ /dev/null @@ -1,7 +0,0 @@ -??&;'TU&;'b?*"+XY*"+?=G^bXYTU]]]]]]]]]]]]]XYXYXYb`b !`GbD$%F` -&;' -bD()F`G*"+ -eeebDtuF` - -AEA -bpk`bsm`=]E`G`G?e`b`?eeeeeeeeeef`b \ No newline at end of file diff --git a/maps/blockdata.asm b/maps/blockdata.asm deleted file mode 100644 index 4f0fe925e..000000000 --- a/maps/blockdata.asm +++ /dev/null @@ -1,1047 +0,0 @@ -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: -LavenderSpeechHouse_BlockData: -LavenderNameRater_BlockData: -Route12SuperRodHouse_BlockData: -Route28FamousSpeechHouse_BlockData: -CeladonMansionRoofHouse_BlockData: -Route16FuchsiaSpeechHouse_BlockData: -ManiasHouse_BlockData: -CianwoodPharmacy_BlockData: -CianwoodPhotoStudio_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: -Route29Route46Gate_BlockData: -Route5SaffronGate_BlockData: - INCBIN "maps/NorthSouthGate.blk" - -BetaEcruteakCity_BlockData: - INCBIN "maps/BetaEcruteakCity.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: -Route17Route18Gate_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" - -BetaCinnabarPokemonLabHallway_BlockData: - INCBIN "maps/BetaCinnabarPokemonLabHallway.blk" - -BetaCinnabarPokemonLabRoom1_BlockData: - INCBIN "maps/BetaCinnabarPokemonLabRoom1.blk" - -BetaCinnabarPokemonLabRoom2_BlockData: - INCBIN "maps/BetaCinnabarPokemonLabRoom2.blk" - -BetaCinnabarPokemonLabRoom3_BlockData: - INCBIN "maps/BetaCinnabarPokemonLabRoom3.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" - -BetaFastShipInsideCutOut_BlockData: - INCBIN "maps/BetaFastShipInsideCutOut.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" - -SaffronMagnetTrainStation_BlockData: - INCBIN "maps/SaffronMagnetTrainStation.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/map_headers.asm b/maps/map_headers.asm deleted file mode 100644 index 8ad8d7333..000000000 --- a/maps/map_headers.asm +++ /dev/null @@ -1,510 +0,0 @@ -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 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 - map_header OlivinePunishmentSpeechHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header OlivineGoodRodHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - 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_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 - - -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 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 - - -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 - map_header TinTower1F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTower2F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTower3F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTower4F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTower5F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTower6F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTower7F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTower8F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTower9F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header BurnedTower1F, TILESET_SPROUT_TOWER, DUNGEON, BURNED_TOWER, MUSIC_BURNED_TOWER, 1, PALETTE_NITE, FISHGROUP_SHORE - 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, 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 - map_header SlowpokeWellB1F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE - map_header SlowpokeWellB2F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE - map_header OlivineLighthouse1F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header OlivineLighthouse2F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header OlivineLighthouse3F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE - 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_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 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 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 - map_header MountMortarB1F, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE - map_header IcePath1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, 1, PALETTE_NITE, FISHGROUP_DRATINI - map_header IcePathB1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, 1, PALETTE_NITE, FISHGROUP_DRATINI - map_header IcePathB2FMahoganySide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, 1, PALETTE_NITE, FISHGROUP_DRATINI - map_header IcePathB2FBlackthornSide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, 1, PALETTE_NITE, FISHGROUP_DRATINI - map_header IcePathB3F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, 1, PALETTE_NITE, FISHGROUP_DRATINI - map_header WhirlIslandNW, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, 1, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_header WhirlIslandNE, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, 1, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_header WhirlIslandSW, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, 1, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_header WhirlIslandCave, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, 1, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_header WhirlIslandSE, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, 1, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_header WhirlIslandB1F, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, 1, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_header WhirlIslandB2F, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, 1, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_header WhirlIslandLugiaChamber, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, 1, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_header SilverCaveRoom1, TILESET_WHIRL_ISLANDS, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, 1, PALETTE_DARK, FISHGROUP_LAKE - map_header SilverCaveRoom2, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, 1, PALETTE_NITE, FISHGROUP_LAKE - map_header SilverCaveRoom3, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, 1, PALETTE_DAY, FISHGROUP_LAKE - map_header SilverCaveItemRooms, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, 1, PALETTE_NITE, FISHGROUP_LAKE - map_header DarkCaveVioletEntrance, TILESET_WHIRL_ISLANDS, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, 1, PALETTE_DARK, FISHGROUP_LAKE - map_header DarkCaveBlackthornEntrance, TILESET_WHIRL_ISLANDS, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, 1, PALETTE_DARK, FISHGROUP_LAKE - map_header DragonsDen1F, TILESET_CAVE, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, 1, PALETTE_NITE, FISHGROUP_DRATINI - map_header DragonsDenB1F, TILESET_JOHTO_1, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, 1, PALETTE_NITE, FISHGROUP_DRATINI - map_header DragonShrine, TILESET_LAB, INDOOR, DRAGONS_DEN, MUSIC_DRAGONS_DEN, 1, PALETTE_NITE, FISHGROUP_SHORE - 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 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 - map_header SafariZoneBeta, TILESET_PARK, CAVE, FUCHSIA_CITY, MUSIC_EVOLUTION, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, 1, PALETTE_NITE, FISHGROUP_SHORE - - -MapGroup_Ecruteak: - map_header EcruteakHouse, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 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_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 - - -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 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 - - -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 - map_header Route20, TILESET_KANTO, ROUTE, ROUTE_20, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_OCEAN - map_header Route21, TILESET_KANTO, ROUTE, ROUTE_21, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_OCEAN - map_header CinnabarIsland, TILESET_KANTO, TOWN, CINNABAR_ISLAND, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, FISHGROUP_OCEAN - - -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 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 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 - map_header Route9, TILESET_KANTO, ROUTE, ROUTE_9, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_LAKE - map_header Route10North, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_LAKE - map_header Route24, TILESET_KANTO, ROUTE, ROUTE_24, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_LAKE - map_header Route25, TILESET_KANTO, ROUTE, ROUTE_25, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_LAKE - map_header CeruleanCity, TILESET_KANTO, TOWN, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, FISHGROUP_NONE - - -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_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 - - -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 - - -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 - map_header Route37, TILESET_JOHTO_1, ROUTE, ROUTE_37, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header VioletCity, TILESET_JOHTO_1, TOWN, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_AUTO, FISHGROUP_POND - 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_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 - map_header GoldenrodBikeShop, TILESET_OLIVINE_GYM, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodHappinessRater, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodBillsHouse, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodFlowerShop, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodPPSpeechHouse, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodNameRater, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodDeptStore1F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodDeptStore2F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodDeptStore3F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodDeptStore4F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodDeptStore5F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodDeptStore6F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - 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 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 - - -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 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 Route6UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE - - -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_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 - - -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 PewterSnoozeSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - - -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 - map_header FastShipCabins_NNW_NNE_NE, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header FastShipCabins_SW_SSW_NW, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header FastShipCabins_SE_SSE_CaptainsCabin, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header FastShipB1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, 0, PALETTE_DAY, FISHGROUP_SHORE - 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_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 - - -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 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 - map_header KarensRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header LancesRoom, TILESET_OLIVINE_GYM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header HallOfFame, TILESET_ICE_PATH, INDOOR, INDIGO_PLATEAU, MUSIC_NEW_BARK_TOWN, 1, PALETTE_DAY, FISHGROUP_SHORE - - -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 - map_header Route18, TILESET_KANTO, ROUTE, ROUTE_18, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header FuchsiaCity, TILESET_KANTO, TOWN, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_AUTO, FISHGROUP_GYARADOS - map_header FuchsiaMart, TILESET_MART, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - 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 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 - - -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 MrFujisHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header LavenderSpeechHouse, 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 - map_header LavenderMart, TILESET_MART, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header SoulHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header LavRadioTower1F, TILESET_RADIO_TOWER, INDOOR, LAV_RADIO_TOWER, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route8SaffronGate, TILESET_GATE, GATE, ROUTE_8, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route12SuperRodHouse, TILESET_HOUSE_1, INDOOR, ROUTE_12, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - - -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 Route28FamousSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, 0, 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 - map_header MobileTradeRoomMobile, TILESET_CELADON_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header MobileBattleRoom, TILESET_CELADON_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - - -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 - map_header CeladonCity, TILESET_KANTO, TOWN, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_AUTO, FISHGROUP_NONE - map_header CeladonDeptStore1F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonDeptStore2F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonDeptStore3F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonDeptStore4F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonDeptStore5F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonDeptStore6F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonDeptStoreElevator, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonMansion1F, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonMansion2F, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - 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 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 - map_header CeladonCafe, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route16FuchsiaSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_16, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route16Gate, TILESET_GATE, GATE, ROUTE_16, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route7SaffronGate, TILESET_GATE, GATE, ROUTE_7, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route17Route18Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE - - -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 CianwoodPharmacy, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CianwoodPhotoStudio, 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 - map_header PokeSeersHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, 0, PALETTE_AUTO, FISHGROUP_SHORE - - -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 - map_header ViridianGym, TILESET_TRAIN_STATION, INDOOR, VIRIDIAN_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header ViridianNicknameSpeechHouse, TILESET_HOUSE_1, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - 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 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 - - -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_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_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 Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, 0, PALETTE_DAY, FISHGROUP_SHORE - - -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 MrPsychicsHouse, TILESET_HOUSE_1, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header SaffronMagnetTrainStation, 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_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 Route5SaffronGate, 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 - - -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 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 - map_header Route30BerrySpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header MrPokemonsHouse, TILESET_POWER_PLANT, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route31VioletGate, TILESET_GATE, GATE, ROUTE_31, MUSIC_ROUTE_30, 0, PALETTE_DAY, FISHGROUP_SHORE diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm deleted file mode 100644 index 378b3d05a..000000000 --- a/maps/second_map_headers.asm +++ /dev/null @@ -1,685 +0,0 @@ -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 - - map_header_2 CherrygroveCity, CHERRYGROVE_CITY, $35, NORTH | EAST - connection north, ROUTE_30, Route30, 5, 0, 10, CHERRYGROVE_CITY - connection east, ROUTE_29, Route29, 0, 0, 9, CHERRYGROVE_CITY - - map_header_2 VioletCity, VIOLET_CITY, $5, SOUTH | WEST | EAST - connection south, ROUTE_32, Route32, 0, 0, 10, VIOLET_CITY - connection west, ROUTE_36, Route36, 0, 0, 9, VIOLET_CITY - connection east, ROUTE_31, Route31, 9, 0, 9, VIOLET_CITY - - map_header_2 AzaleaTown, AZALEA_TOWN, $5, WEST | EAST - connection west, ROUTE_34, Route34, -3, 15, 12, AZALEA_TOWN - connection east, ROUTE_33, Route33, 0, 0, 9, AZALEA_TOWN - - map_header_2 CianwoodCity, CIANWOOD_CITY, $35, EAST - connection east, ROUTE_41, Route41, 0, 0, 27, CIANWOOD_CITY - - map_header_2 GoldenrodCity, GOLDENROD_CITY, $35, NORTH | SOUTH - connection north, ROUTE_35, Route35, 5, 0, 10, GOLDENROD_CITY - connection south, ROUTE_34, Route34, 5, 0, 10, GOLDENROD_CITY - - map_header_2 OlivineCity, OLIVINE_CITY, $35, NORTH | WEST - connection north, ROUTE_39, Route39, 5, 0, 10, OLIVINE_CITY - connection west, ROUTE_40, Route40, 9, 0, 12, OLIVINE_CITY - - map_header_2 EcruteakCity, ECRUTEAK_CITY, $5, SOUTH | WEST | EAST - connection south, ROUTE_37, Route37, 5, 0, 10, ECRUTEAK_CITY - connection west, ROUTE_38, Route38, 5, 0, 9, ECRUTEAK_CITY - connection east, ROUTE_42, Route42, 9, 0, 9, ECRUTEAK_CITY - - map_header_2 MahoganyTown, MAHOGANY_TOWN, $71, NORTH | WEST | EAST - connection north, ROUTE_43, Route43, 0, 0, 10, MAHOGANY_TOWN - 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 - connection south, ROUTE_43, Route43, 5, 0, 10, LAKE_OF_RAGE - - map_header_2 BlackthornCity, BLACKTHORN_CITY, $71, SOUTH | WEST - connection south, ROUTE_45, Route45, 0, 0, 10, BLACKTHORN_CITY - connection west, ROUTE_44, Route44, 9, 0, 9, BLACKTHORN_CITY - - map_header_2 SilverCaveOutside, SILVER_CAVE_OUTSIDE, $2c, EAST - connection east, ROUTE_28, Route28, 9, 0, 9, SILVER_CAVE_OUTSIDE - - map_header_2 Route26, ROUTE_26, $5, WEST - connection west, ROUTE_27, Route27, 45, 0, 9, ROUTE_26 - - map_header_2 Route27, ROUTE_27, $35, WEST | EAST - connection west, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_27 - connection east, ROUTE_26, Route26, -3, 42, 12, ROUTE_27 - - map_header_2 Route28, ROUTE_28, $2c, WEST - connection west, SILVER_CAVE_OUTSIDE, SilverCaveOutside, -3, 6, 12, ROUTE_28 - - map_header_2 Route29, ROUTE_29, $5, NORTH | WEST | EAST - connection north, ROUTE_46, Route46, 10, 0, 10, ROUTE_29 - connection west, CHERRYGROVE_CITY, CherrygroveCity, 0, 0, 9, ROUTE_29 - connection east, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_29 - - map_header_2 Route30, ROUTE_30, $5, NORTH | SOUTH - connection north, ROUTE_31, Route31, -3, 7, 13, ROUTE_30 - connection south, CHERRYGROVE_CITY, CherrygroveCity, -3, 2, 16, ROUTE_30 - - map_header_2 Route31, ROUTE_31, $5, SOUTH | WEST - connection south, ROUTE_30, Route30, 10, 0, 10, ROUTE_31 - connection west, VIOLET_CITY, VioletCity, -3, 6, 12, ROUTE_31 - - map_header_2 Route32, ROUTE_32, $5, NORTH | SOUTH - connection north, VIOLET_CITY, VioletCity, 0, 0, 13, ROUTE_32 - connection south, ROUTE_33, Route33, 0, 0, 10, ROUTE_32 - - map_header_2 Route33, ROUTE_33, $5, NORTH | WEST - connection north, ROUTE_32, Route32, 0, 0, 10, ROUTE_33 - connection west, AZALEA_TOWN, AzaleaTown, 0, 0, 9, ROUTE_33 - - map_header_2 Route34, ROUTE_34, $5, NORTH | EAST - connection north, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_34 - connection east, AZALEA_TOWN, AzaleaTown, 18, 0, 9, ROUTE_34 - - map_header_2 Route35, ROUTE_35, $5, NORTH | SOUTH - connection north, ROUTE_36, Route36, 0, 0, 13, ROUTE_35 - connection south, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_35 - - map_header_2 Route36, ROUTE_36, $5, NORTH | SOUTH | EAST - connection north, ROUTE_37, Route37, 10, 0, 10, ROUTE_36 - connection south, ROUTE_35, Route35, 0, 0, 10, ROUTE_36 - connection east, VIOLET_CITY, VioletCity, 0, 0, 12, ROUTE_36 - - map_header_2 Route37, ROUTE_37, $5, NORTH | SOUTH - connection north, ECRUTEAK_CITY, EcruteakCity, -3, 2, 16, ROUTE_37 - connection south, ROUTE_36, Route36, -3, 7, 16, ROUTE_37 - - map_header_2 Route38, ROUTE_38, $5, WEST | EAST - connection west, ROUTE_39, Route39, 0, 0, 12, ROUTE_38 - connection east, ECRUTEAK_CITY, EcruteakCity, -3, 2, 15, ROUTE_38 - - map_header_2 Route39, ROUTE_39, $5, SOUTH | EAST - connection south, OLIVINE_CITY, OlivineCity, -3, 2, 16, ROUTE_39 - connection east, ROUTE_38, Route38, 0, 0, 9, ROUTE_39 - - map_header_2 Route40, ROUTE_40, $35, SOUTH | EAST - connection south, ROUTE_41, Route41, -3, 12, 13, ROUTE_40 - connection east, OLIVINE_CITY, OlivineCity, -3, 6, 12, ROUTE_40 - - map_header_2 Route41, ROUTE_41, $35, NORTH | WEST - connection north, ROUTE_40, Route40, 15, 0, 10, ROUTE_41 - connection west, CIANWOOD_CITY, CianwoodCity, 0, 0, 27, ROUTE_41 - - map_header_2 Route42, ROUTE_42, $5, WEST | EAST - connection west, ECRUTEAK_CITY, EcruteakCity, -3, 6, 12, ROUTE_42 - 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 south, MAHOGANY_TOWN, MahoganyTown, 0, 0, 10, ROUTE_43 - - map_header_2 Route44, ROUTE_44, $71, WEST | EAST - connection west, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_44 - connection east, BLACKTHORN_CITY, BlackthornCity, -3, 6, 12, ROUTE_44 - - map_header_2 Route45, ROUTE_45, $71, NORTH | WEST - connection north, BLACKTHORN_CITY, BlackthornCity, 0, 0, 13, ROUTE_45 - connection west, ROUTE_46, Route46, 36, 0, 12, ROUTE_45 - - map_header_2 Route46, ROUTE_46, $5, SOUTH | EAST - connection south, ROUTE_29, Route29, -3, 7, 16, ROUTE_46 - connection east, ROUTE_45, Route45, -3, 33, 12, ROUTE_46 - - map_header_2 PewterCity, PEWTER_CITY, $f, SOUTH | EAST - connection south, ROUTE_2, Route2, 5, 0, 10, PEWTER_CITY - connection east, ROUTE_3, Route3, 5, 0, 9, PEWTER_CITY - - map_header_2 Route2, ROUTE_2, $f, NORTH | SOUTH - connection north, PEWTER_CITY, PewterCity, -3, 2, 16, ROUTE_2 - connection south, VIRIDIAN_CITY, ViridianCity, -3, 2, 16, ROUTE_2 - - map_header_2 ViridianCity, VIRIDIAN_CITY, $f, NORTH | SOUTH | WEST - connection north, ROUTE_2, Route2, 5, 0, 10, VIRIDIAN_CITY - connection south, ROUTE_1, Route1, 10, 0, 10, VIRIDIAN_CITY - connection west, ROUTE_22, Route22, 4, 0, 9, VIRIDIAN_CITY - - map_header_2 Route22, ROUTE_22, $2c, EAST - connection east, VIRIDIAN_CITY, ViridianCity, -3, 1, 15, ROUTE_22 - - map_header_2 Route1, ROUTE_1, $f, NORTH | SOUTH - connection north, VIRIDIAN_CITY, ViridianCity, -3, 7, 13, ROUTE_1 - connection south, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_1 - - map_header_2 PalletTown, PALLET_TOWN, $f, NORTH | SOUTH - connection north, ROUTE_1, Route1, 0, 0, 10, PALLET_TOWN - connection south, ROUTE_21, Route21, 0, 0, 10, PALLET_TOWN - - map_header_2 Route21, ROUTE_21, $43, NORTH | SOUTH - connection north, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_21 - connection south, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 10, ROUTE_21 - - map_header_2 CinnabarIsland, CINNABAR_ISLAND, $43, NORTH | EAST - connection north, ROUTE_21, Route21, 0, 0, 10, CINNABAR_ISLAND - connection east, ROUTE_20, Route20, 0, 0, 9, CINNABAR_ISLAND - - map_header_2 Route20, ROUTE_20, $43, WEST | EAST - connection west, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 9, ROUTE_20 - connection east, ROUTE_19, Route19, -3, 6, 12, ROUTE_20 - - map_header_2 Route19, ROUTE_19, $43, NORTH | WEST - connection north, FUCHSIA_CITY, FuchsiaCity, 0, 0, 13, ROUTE_19 - connection west, ROUTE_20, Route20, 9, 0, 9, ROUTE_19 - - map_header_2 FuchsiaCity, FUCHSIA_CITY, $f, SOUTH | WEST | EAST - connection south, ROUTE_19, Route19, 0, 0, 10, FUCHSIA_CITY - connection west, ROUTE_18, Route18, 7, 0, 9, FUCHSIA_CITY - connection east, ROUTE_15, Route15, 9, 0, 9, FUCHSIA_CITY - - map_header_2 Route18, ROUTE_18, $43, WEST | EAST - connection west, ROUTE_17, Route17, -3, 35, 10, ROUTE_18 - connection east, FUCHSIA_CITY, FuchsiaCity, -3, 4, 14, ROUTE_18 - - map_header_2 Route17, ROUTE_17, $43, NORTH | EAST - connection north, ROUTE_16, Route16, 0, 0, 10, ROUTE_17 - connection east, ROUTE_18, Route18, 38, 0, 9, ROUTE_17 - - map_header_2 Route16, ROUTE_16, $f, SOUTH | EAST - connection south, ROUTE_17, Route17, 0, 0, 10, ROUTE_16 - connection east, CELADON_CITY, CeladonCity, -3, 6, 12, ROUTE_16 - - map_header_2 CeladonCity, CELADON_CITY, $f, WEST | EAST - connection west, ROUTE_16, Route16, 9, 0, 9, CELADON_CITY - connection east, ROUTE_7, Route7, 5, 0, 9, CELADON_CITY - - map_header_2 Route7, ROUTE_7, $f, WEST | EAST - connection west, CELADON_CITY, CeladonCity, -3, 2, 15, ROUTE_7 - connection east, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_7 - - map_header_2 Route15, ROUTE_15, $f, WEST | EAST - connection west, FUCHSIA_CITY, FuchsiaCity, -3, 6, 12, ROUTE_15 - connection east, ROUTE_14, Route14, -3, 6, 12, ROUTE_15 - - map_header_2 Route14, ROUTE_14, $43, NORTH | WEST - connection north, ROUTE_13, Route13, 0, 0, 13, ROUTE_14 - connection west, ROUTE_15, Route15, 9, 0, 9, ROUTE_14 - - map_header_2 Route13, ROUTE_13, $43, NORTH | SOUTH - connection north, ROUTE_12, Route12, 20, 0, 10, ROUTE_13 - connection south, ROUTE_14, Route14, 0, 0, 10, ROUTE_13 - - map_header_2 Route12, ROUTE_12, $43, NORTH | SOUTH | WEST - connection north, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_12 - connection south, ROUTE_13, Route13, -3, 17, 13, ROUTE_12 - connection west, ROUTE_11, Route11, 9, 0, 9, ROUTE_12 - - map_header_2 Route11, ROUTE_11, $f, WEST | EAST - connection west, VERMILION_CITY, VermilionCity, 0, 0, 12, ROUTE_11 - connection east, ROUTE_12, Route12, -3, 6, 15, ROUTE_11 - - map_header_2 LavenderTown, LAVENDER_TOWN, $2c, NORTH | SOUTH | WEST - connection north, ROUTE_10_SOUTH, Route10South, 0, 0, 10, LAVENDER_TOWN - connection south, ROUTE_12, Route12, 0, 0, 10, LAVENDER_TOWN - connection west, ROUTE_8, Route8, 0, 0, 9, LAVENDER_TOWN - - map_header_2 VermilionCity, VERMILION_CITY, $43, NORTH | EAST - connection north, ROUTE_6, Route6, 5, 0, 10, VERMILION_CITY - connection east, ROUTE_11, Route11, 0, 0, 9, VERMILION_CITY - - map_header_2 Route6, ROUTE_6, $f, NORTH | SOUTH - connection north, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_6 - connection south, VERMILION_CITY, VermilionCity, -3, 2, 16, ROUTE_6 - - map_header_2 SaffronCity, SAFFRON_CITY, $f, NORTH | SOUTH | WEST | EAST - connection north, ROUTE_5, Route5, 5, 0, 10, SAFFRON_CITY - connection south, ROUTE_6, Route6, 5, 0, 10, SAFFRON_CITY - connection west, ROUTE_7, Route7, 9, 0, 9, SAFFRON_CITY - connection east, ROUTE_8, Route8, 9, 0, 9, SAFFRON_CITY - - map_header_2 Route5, ROUTE_5, $f, NORTH | SOUTH - connection north, CERULEAN_CITY, CeruleanCity, -3, 2, 16, ROUTE_5 - connection south, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_5 - - map_header_2 CeruleanCity, CERULEAN_CITY, $f, NORTH | SOUTH | WEST | EAST - connection north, ROUTE_24, Route24, 6, 0, 10, CERULEAN_CITY - connection south, ROUTE_5, Route5, 5, 0, 10, CERULEAN_CITY - connection west, ROUTE_4, Route4, 5, 0, 9, CERULEAN_CITY - connection east, ROUTE_9, Route9, 9, 0, 9, CERULEAN_CITY - - map_header_2 Route9, ROUTE_9, $2c, SOUTH | WEST - connection south, ROUTE_10_NORTH, Route10North, 20, 0, 10, ROUTE_9 - connection west, CERULEAN_CITY, CeruleanCity, -3, 6, 12, ROUTE_9 - - map_header_2 Route24, ROUTE_24, $2c, NORTH | SOUTH - connection north, ROUTE_25, Route25, 0, 0, 13, ROUTE_24 - connection south, CERULEAN_CITY, CeruleanCity, -3, 3, 16, ROUTE_24 - - map_header_2 Route25, ROUTE_25, $2c, SOUTH - connection south, ROUTE_24, Route24, 0, 0, 10, ROUTE_25 - - map_header_2 Route3, ROUTE_3, $2c, WEST | EAST - connection west, PEWTER_CITY, PewterCity, -3, 2, 15, ROUTE_3 - connection east, ROUTE_4, Route4, 0, 0, 9, ROUTE_3 - - map_header_2 Route4, ROUTE_4, $2c, WEST | EAST - connection west, ROUTE_3, Route3, 0, 0, 9, ROUTE_4 - connection east, CERULEAN_CITY, CeruleanCity, -3, 2, 15, ROUTE_4 - - map_header_2 Route8, ROUTE_8, $2c, WEST | EAST - connection west, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_8 - connection east, LAVENDER_TOWN, LavenderTown, 0, 0, 9, ROUTE_8 - - map_header_2 Route10North, ROUTE_10_NORTH, $2c, NORTH | SOUTH - connection north, ROUTE_9, Route9, -3, 17, 13, ROUTE_10_NORTH - connection south, ROUTE_10_SOUTH, Route10South, 0, 0, 10, ROUTE_10_NORTH - - map_header_2 Route10South, ROUTE_10_SOUTH, $2c, NORTH | SOUTH - connection north, ROUTE_10_NORTH, Route10North, 0, 0, 10, ROUTE_10_SOUTH - connection south, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_10_SOUTH - - map_header_2 Route23, ROUTE_23, $f, 0 - map_header_2 SproutTower1F, SPROUT_TOWER_1F, $0, 0 - map_header_2 SproutTower2F, SPROUT_TOWER_2F, $0, 0 - map_header_2 SproutTower3F, SPROUT_TOWER_3F, $0, 0 - map_header_2 TinTower1F, TIN_TOWER_1F, $0, 0 - map_header_2 TinTower2F, TIN_TOWER_2F, $0, 0 - map_header_2 TinTower3F, TIN_TOWER_3F, $0, 0 - map_header_2 TinTower4F, TIN_TOWER_4F, $0, 0 - map_header_2 TinTower5F, TIN_TOWER_5F, $0, 0 - map_header_2 TinTower6F, TIN_TOWER_6F, $0, 0 - map_header_2 TinTower7F, TIN_TOWER_7F, $0, 0 - map_header_2 TinTower8F, TIN_TOWER_8F, $0, 0 - map_header_2 TinTower9F, TIN_TOWER_9F, $0, 0 - map_header_2 BurnedTower1F, BURNED_TOWER_1F, $0, 0 - map_header_2 BurnedTowerB1F, BURNED_TOWER_B1F, $9, 0 - map_header_2 NationalPark, NATIONAL_PARK, $0, 0 - map_header_2 NationalParkBugContest, NATIONAL_PARK_BUG_CONTEST, $0, 0 - map_header_2 RadioTower1F, RADIO_TOWER_1F, $0, 0 - map_header_2 RadioTower2F, RADIO_TOWER_2F, $0, 0 - 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 UnionCave1F, UNION_CAVE_1F, $9, 0 - map_header_2 UnionCaveB1F, UNION_CAVE_B1F, $9, 0 - map_header_2 UnionCaveB2F, UNION_CAVE_B2F, $9, 0 - map_header_2 SlowpokeWellB1F, SLOWPOKE_WELL_B1F, $9, 0 - map_header_2 SlowpokeWellB2F, SLOWPOKE_WELL_B2F, $9, 0 - map_header_2 OlivineLighthouse1F, OLIVINE_LIGHTHOUSE_1F, $0, 0 - map_header_2 OlivineLighthouse2F, OLIVINE_LIGHTHOUSE_2F, $0, 0 - map_header_2 OlivineLighthouse3F, OLIVINE_LIGHTHOUSE_3F, $0, 0 - map_header_2 OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $0, 0 - map_header_2 OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $0, 0 - map_header_2 OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $0, 0 - map_header_2 MahoganyMart1F, MAHOGANY_MART_1F, $0, 0 - map_header_2 TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $0, 0 - 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 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 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 - map_header_2 MountMortarB1F, MOUNT_MORTAR_B1F, $9, 0 - map_header_2 IcePath1F, ICE_PATH_1F, $9, 0 - map_header_2 IcePathB1F, ICE_PATH_B1F, $19, 0 - map_header_2 IcePathB2FMahoganySide, ICE_PATH_B2F_MAHOGANY_SIDE, $19, 0 - map_header_2 IcePathB2FBlackthornSide, ICE_PATH_B2F_BLACKTHORN_SIDE, $19, 0 - map_header_2 IcePathB3F, ICE_PATH_B3F, $19, 0 - map_header_2 WhirlIslandNW, WHIRL_ISLAND_NW, $9, 0 - map_header_2 WhirlIslandNE, WHIRL_ISLAND_NE, $9, 0 - map_header_2 WhirlIslandSW, WHIRL_ISLAND_SW, $9, 0 - map_header_2 WhirlIslandCave, WHIRL_ISLAND_CAVE, $9, 0 - map_header_2 WhirlIslandSE, WHIRL_ISLAND_SE, $f, 0 - map_header_2 WhirlIslandB1F, WHIRL_ISLAND_B1F, $9, 0 - map_header_2 WhirlIslandB2F, WHIRL_ISLAND_B2F, $2e, 0 - map_header_2 WhirlIslandLugiaChamber, WHIRL_ISLAND_LUGIA_CHAMBER, $f, 0 - map_header_2 SilverCaveRoom1, SILVER_CAVE_ROOM_1, $9, 0 - map_header_2 SilverCaveRoom2, SILVER_CAVE_ROOM_2, $9, 0 - map_header_2 SilverCaveRoom3, SILVER_CAVE_ROOM_3, $9, 0 - map_header_2 SilverCaveItemRooms, SILVER_CAVE_ITEM_ROOMS, $9, 0 - map_header_2 DarkCaveVioletEntrance, DARK_CAVE_VIOLET_ENTRANCE, $9, 0 - map_header_2 DarkCaveBlackthornEntrance, DARK_CAVE_BLACKTHORN_ENTRANCE, $9, 0 - map_header_2 DragonsDen1F, DRAGONS_DEN_1F, $9, 0 - 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 OlivineGym, OLIVINE_GYM, $0, 0 - map_header_2 OlivineTimsHouse, OLIVINE_TIMS_HOUSE, $0, 0 - map_header_2 OlivineHouseBeta, OLIVINE_HOUSE_BETA, $0, 0 - map_header_2 OlivinePunishmentSpeechHouse, OLIVINE_PUNISHMENT_SPEECH_HOUSE, $0, 0 - map_header_2 OlivineGoodRodHouse, OLIVINE_GOOD_ROD_HOUSE, $0, 0 - map_header_2 OlivineCafe, OLIVINE_CAFE, $0, 0 - map_header_2 OlivineMart, OLIVINE_MART, $0, 0 - map_header_2 Route38EcruteakGate, ROUTE_38_ECRUTEAK_GATE, $0, 0 - map_header_2 Route39Barn, ROUTE_39_BARN, $0, 0 - 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 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 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 - map_header_2 SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0 - 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 EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $0, 0 - map_header_2 DanceTheatre, DANCE_THEATRE, $0, 0 - map_header_2 EcruteakMart, ECRUTEAK_MART, $0, 0 - map_header_2 EcruteakGym, ECRUTEAK_GYM, $0, 0 - map_header_2 EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $0, 0 - map_header_2 BlackthornGym1F, BLACKTHORN_GYM_1F, $0, 0 - map_header_2 BlackthornGym2F, BLACKTHORN_GYM_2F, $0, 0 - 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 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 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 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 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 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 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 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 - map_header_2 GoldenrodBillsHouse, GOLDENROD_BILLS_HOUSE, $0, 0 - map_header_2 GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $0, 0 - map_header_2 GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $0, 0 - map_header_2 GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $0, 0 - map_header_2 GoldenrodNameRater, GOLDENROD_NAME_RATER, $0, 0 - map_header_2 GoldenrodDeptStore1F, GOLDENROD_DEPT_STORE_1F, $0, 0 - map_header_2 GoldenrodDeptStore2F, GOLDENROD_DEPT_STORE_2F, $0, 0 - map_header_2 GoldenrodDeptStore3F, GOLDENROD_DEPT_STORE_3F, $0, 0 - map_header_2 GoldenrodDeptStore4F, GOLDENROD_DEPT_STORE_4F, $0, 0 - map_header_2 GoldenrodDeptStore5F, GOLDENROD_DEPT_STORE_5F, $0, 0 - map_header_2 GoldenrodDeptStore6F, GOLDENROD_DEPT_STORE_6F, $0, 0 - 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 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, 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 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 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 - map_header_2 OaksLab, OAKS_LAB, $0, 0 - 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 PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $0, 0 - map_header_2 OlivinePort, OLIVINE_PORT, $a, 0 - map_header_2 VermilionPort, VERMILION_PORT, $a, 0 - map_header_2 FastShip1F, FAST_SHIP_1F, $0, 0 - map_header_2 FastShipCabins_NNW_NNE_NE, FAST_SHIP_CABINS_NNW_NNE_NE, $0, 0 - map_header_2 FastShipCabins_SW_SSW_NW, FAST_SHIP_CABINS_SW_SSW_NW, $0, 0 - map_header_2 FastShipCabins_SE_SSE_CaptainsCabin, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, $0, 0 - map_header_2 FastShipB1F, FAST_SHIP_B1F, $0, 0 - map_header_2 OlivinePortPassage, OLIVINE_PORT_PASSAGE, $0, 0 - map_header_2 VermilionPortPassage, VERMILION_PORT_PASSAGE, $0, 0 - 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 WillsRoom, WILLS_ROOM, $0, 0 - map_header_2 KogasRoom, KOGAS_ROOM, $0, 0 - map_header_2 BrunosRoom, BRUNOS_ROOM, $0, 0 - map_header_2 KarensRoom, KARENS_ROOM, $0, 0 - map_header_2 LancesRoom, LANCES_ROOM, $0, 0 - map_header_2 HallOfFame, HALL_OF_FAME, $0, 0 - map_header_2 FuchsiaMart, FUCHSIA_MART, $0, 0 - 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 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 MrFujisHouse, MR_FUJIS_HOUSE, $0, 0 - map_header_2 LavenderSpeechHouse, LAVENDER_SPEECH_HOUSE, $0, 0 - map_header_2 LavenderNameRater, LAVENDER_NAME_RATER, $0, 0 - map_header_2 LavenderMart, LAVENDER_MART, $0, 0 - map_header_2 SoulHouse, SOUL_HOUSE, $0, 0 - 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 Route28FamousSpeechHouse, ROUTE_28_FAMOUS_SPEECH_HOUSE, $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 - map_header_2 MobileTradeRoomMobile, MOBILE_TRADE_ROOM_MOBILE, $0, 0 - map_header_2 MobileBattleRoom, MOBILE_BATTLE_ROOM, $0, 0 - map_header_2 CeladonDeptStore1F, CELADON_DEPT_STORE_1F, $0, 0 - map_header_2 CeladonDeptStore2F, CELADON_DEPT_STORE_2F, $0, 0 - map_header_2 CeladonDeptStore3F, CELADON_DEPT_STORE_3F, $0, 0 - map_header_2 CeladonDeptStore4F, CELADON_DEPT_STORE_4F, $0, 0 - map_header_2 CeladonDeptStore5F, CELADON_DEPT_STORE_5F, $0, 0 - map_header_2 CeladonDeptStore6F, CELADON_DEPT_STORE_6F, $0, 0 - map_header_2 CeladonDeptStoreElevator, CELADON_DEPT_STORE_ELEVATOR, $0, 0 - map_header_2 CeladonMansion1F, CELADON_MANSION_1F, $0, 0 - map_header_2 CeladonMansion2F, CELADON_MANSION_2F, $0, 0 - 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 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 - map_header_2 CeladonCafe, CELADON_CAFE, $0, 0 - map_header_2 Route16FuchsiaSpeechHouse, ROUTE_16_FUCHSIA_SPEECH_HOUSE, $0, 0 - map_header_2 Route16Gate, ROUTE_16_GATE, $0, 0 - map_header_2 Route7SaffronGate, ROUTE_7_SAFFRON_GATE, $0, 0 - map_header_2 Route17Route18Gate, ROUTE_17_ROUTE_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 CianwoodPharmacy, CIANWOOD_PHARMACY, $0, 0 - map_header_2 CianwoodPhotoStudio, CIANWOOD_PHOTO_STUDIO, $0, 0 - map_header_2 CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $0, 0 - map_header_2 PokeSeersHouse, POKE_SEERS_HOUSE, $0, 0 - map_header_2 BattleTower1F, BATTLE_TOWER_1F, $0, 0 - map_header_2 BattleTowerBattleRoom, BATTLE_TOWER_BATTLE_ROOM, $0, 0 - map_header_2 BattleTowerElevator, BATTLE_TOWER_ELEVATOR, $0, 0 - map_header_2 BattleTowerHallway, BATTLE_TOWER_HALLWAY, $0, 0 - map_header_2 Route40BattleTowerGate, ROUTE_40_BATTLE_TOWER_GATE, $0, 0 - map_header_2 BattleTowerOutside, BATTLE_TOWER_OUTSIDE, $5, 0 - map_header_2 ViridianGym, VIRIDIAN_GYM, $0, 0 - map_header_2 ViridianNicknameSpeechHouse, VIRIDIAN_NICKNAME_SPEECH_HOUSE, $0, 0 - 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 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 - map_header_2 ElmsLab, ELMS_LAB, $0, 0 - map_header_2 KrissHouse1F, KRISS_HOUSE_1F, $0, 0 - map_header_2 KrissHouse2F, KRISS_HOUSE_2F, $0, 0 - map_header_2 KrissNeighborsHouse, KRISS_NEIGHBORS_HOUSE, $0, 0 - map_header_2 ElmsHouse, ELMS_HOUSE, $0, 0 - map_header_2 Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $0, 0 - map_header_2 Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $0, 0 - map_header_2 Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $0, 0 - map_header_2 Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $0, 0 - 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 MrPsychicsHouse, MR_PSYCHICS_HOUSE, $0, 0 - map_header_2 SaffronMagnetTrainStation, SAFFRON_MAGNET_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 Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $0, 0 - map_header_2 Route5SaffronGate, ROUTE_5_SAFFRON_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 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 - map_header_2 Route30BerrySpeechHouse, ROUTE_30_BERRY_SPEECH_HOUSE, $0, 0 - map_header_2 MrPokemonsHouse, MR_POKEMONS_HOUSE, $0, 0 - map_header_2 Route31VioletGate, ROUTE_31_VIOLET_GATE, $0, 0 diff --git a/maps/unused/BetaAzaleaTown.blk b/maps/unused/BetaAzaleaTown.blk new file mode 100644 index 000000000..8faa18369 --- /dev/null +++ b/maps/unused/BetaAzaleaTown.blk @@ -0,0 +1,10 @@ +aaaaaaaaFDaaaaaaaaaaaaaaaaaFDaaaaaaaaaaaaaaaaaFHIIaaaaaaBaaaFaaaaaaFaFaaaHJGFee>aacaaaFaaaadeefaaaaFGbaaaaaaaaFDaaaaaaaFaaDaU +aaaaaaaHIY +aaaaaaa~zU +aaaaaaa5Y +aaaaa@AAAA5z +vvvUaaaaaaaaaaa552955zvvvvvvvvvv +aa55551111111111111 + +a555555555555555552 +a \ No newline at end of file diff --git a/maps/unused/BetaBlackthornCity.blk b/maps/unused/BetaBlackthornCity.blk new file mode 100644 index 000000000..c6fc4f210 --- /dev/null +++ b/maps/unused/BetaBlackthornCity.blk @@ -0,0 +1 @@ +hqqqqqqqqqqqqqqqqqqqhqorrrrrrrrrnqqqqqqqhqiaKeWaKeWahqqqqqqqhqieKaWWWaeWhqorrnqqhqiaWWKWeaWehqi !hqqhqiKWWeeaWWahqi$%hqqhqieKeaWWeeehqi$%hqqhqiaKaWeeWaahqi$%hqqlrmKeWWaWeWahqi()hqqKaWKaWaeWlrmtuhqqWWWWWWKaWWWWWWhqqhqqlrrG \ No newline at end of file diff --git a/maps/unused/BetaBlank.blk b/maps/unused/BetaBlank.blk new file mode 100644 index 000000000..e53405655 --- /dev/null +++ b/maps/unused/BetaBlank.blk @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/maps/unused/BetaCave.blk b/maps/unused/BetaCave.blk new file mode 100644 index 000000000..b103c2532 --- /dev/null +++ b/maps/unused/BetaCave.blk @@ -0,0 +1,8 @@ +  + + + + + + +  \ No newline at end of file diff --git a/maps/unused/BetaCave2.blk b/maps/unused/BetaCave2.blk new file mode 100644 index 000000000..a2722d010 --- /dev/null +++ b/maps/unused/BetaCave2.blk @@ -0,0 +1,5 @@ +  +(+ +)* + +   \ No newline at end of file diff --git a/maps/unused/BetaCaveTestMap.blk b/maps/unused/BetaCaveTestMap.blk new file mode 100644 index 000000000..eba6c84c8 --- /dev/null +++ b/maps/unused/BetaCaveTestMap.blk @@ -0,0 +1,18 @@ +   +;<  ; 6< + + 589: + + + + +  5  + +    + + 5   + +    +  + 5 6 +    \ No newline at end of file diff --git a/maps/unused/BetaCeladonMansion.blk b/maps/unused/BetaCeladonMansion.blk new file mode 100644 index 000000000..8d3e219df --- /dev/null +++ b/maps/unused/BetaCeladonMansion.blk @@ -0,0 +1 @@ +? +,/ \ No newline at end of file diff --git a/maps/unused/BetaCherrygroveCity.blk b/maps/unused/BetaCherrygroveCity.blk new file mode 100644 index 000000000..440952f6f --- /dev/null +++ b/maps/unused/BetaCherrygroveCity.blk @@ -0,0 +1,9 @@ + +aaaaaaaa + +a6 +a6YEa6Y,-6YG./a52vUa551 + +aaaaa5555 + +aaaa \ No newline at end of file diff --git a/maps/unused/BetaCianwoodCity.blk b/maps/unused/BetaCianwoodCity.blk new file mode 100644 index 000000000..d946e1de7 --- /dev/null +++ b/maps/unused/BetaCianwoodCity.blk @@ -0,0 +1 @@ +aaaaXaaTyaaX5ETy5Tv455aTvvyfaXYaaXYEaaeaaa \ No newline at end of file diff --git a/maps/unused/BetaCinnabarPokemonLabHallway.blk b/maps/unused/BetaCinnabarPokemonLabHallway.blk new file mode 100644 index 000000000..7a6502a26 --- /dev/null +++ b/maps/unused/BetaCinnabarPokemonLabHallway.blk @@ -0,0 +1,2 @@ +  +  \ No newline at end of file diff --git a/maps/unused/BetaCinnabarPokemonLabRoom1.blk b/maps/unused/BetaCinnabarPokemonLabRoom1.blk new file mode 100644 index 000000000..ef77b6561 --- /dev/null +++ b/maps/unused/BetaCinnabarPokemonLabRoom1.blk @@ -0,0 +1,2 @@ +  +  \ No newline at end of file diff --git a/maps/unused/BetaCinnabarPokemonLabRoom2.blk b/maps/unused/BetaCinnabarPokemonLabRoom2.blk new file mode 100644 index 000000000..822db175b --- /dev/null +++ b/maps/unused/BetaCinnabarPokemonLabRoom2.blk @@ -0,0 +1 @@ +  \ No newline at end of file diff --git a/maps/unused/BetaCinnabarPokemonLabRoom3.blk b/maps/unused/BetaCinnabarPokemonLabRoom3.blk new file mode 100644 index 000000000..d9a64a5da --- /dev/null +++ b/maps/unused/BetaCinnabarPokemonLabRoom3.blk @@ -0,0 +1 @@ +   \ No newline at end of file diff --git a/maps/unused/BetaEcruteakCity.blk b/maps/unused/BetaEcruteakCity.blk new file mode 100644 index 000000000..ce448c2ef --- /dev/null +++ b/maps/unused/BetaEcruteakCity.blk @@ -0,0 +1 @@ +?eeeeeeeeeeeb !bb$%b>$%`&;',-&'`$%`*"+#/*+aE$%dg,-b()#/tuWZWVWVWVWZ@AABGTU !FXY$%&'XYa$%*+VVZVVVVVVZaa()EatuIIJ~{@AAAAA HII \ No newline at end of file diff --git a/maps/unused/BetaElevator.blk b/maps/unused/BetaElevator.blk new file mode 100644 index 000000000..32fb22697 --- /dev/null +++ b/maps/unused/BetaElevator.blk @@ -0,0 +1 @@ +&$$$%$$$$$$$$$$$$$$$$$$ \ No newline at end of file diff --git a/maps/unused/BetaEmptyHouse.blk b/maps/unused/BetaEmptyHouse.blk new file mode 100644 index 000000000..dcec62794 --- /dev/null +++ b/maps/unused/BetaEmptyHouse.blk @@ -0,0 +1,15 @@ +  +   +  + + + +   +  +   +   +   + + % + +   \ No newline at end of file diff --git a/maps/unused/BetaFastShipInsideCutOut.blk b/maps/unused/BetaFastShipInsideCutOut.blk new file mode 100644 index 000000000..b385b0198 --- /dev/null +++ b/maps/unused/BetaFastShipInsideCutOut.blk @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/maps/unused/BetaGoldenrodCity.blk b/maps/unused/BetaGoldenrodCity.blk new file mode 100644 index 000000000..1a156122d --- /dev/null +++ b/maps/unused/BetaGoldenrodCity.blk @@ -0,0 +1,10 @@ + + + +FD + +JHU !Y$#Y"HEzv%&IIIIIIIIJII55)* @-.EAAAAAAAAAA FIHIJEEvvU55YY@AEYDFYHFzU5 + +B @55 + +F~D \ No newline at end of file diff --git a/maps/unused/BetaHerosHouse.blk b/maps/unused/BetaHerosHouse.blk new file mode 100644 index 000000000..b5b53b4bd --- /dev/null +++ b/maps/unused/BetaHerosHouse.blk @@ -0,0 +1 @@ + ! " \ No newline at end of file diff --git a/maps/unused/BetaHouse.blk b/maps/unused/BetaHouse.blk new file mode 100644 index 000000000..187a3cd32 --- /dev/null +++ b/maps/unused/BetaHouse.blk @@ -0,0 +1 @@ +*+,*-.12/0/ \ No newline at end of file diff --git a/maps/unused/BetaHouse2.blk b/maps/unused/BetaHouse2.blk new file mode 100644 index 000000000..993ea3a8d --- /dev/null +++ b/maps/unused/BetaHouse2.blk @@ -0,0 +1 @@ +?',9..',9 \ No newline at end of file diff --git a/maps/unused/BetaIlexForest.blk b/maps/unused/BetaIlexForest.blk new file mode 100644 index 000000000..3cde14007 --- /dev/null +++ b/maps/unused/BetaIlexForest.blk @@ -0,0 +1 @@ +hqqqqqihqqqqqilrrsm \ No newline at end of file diff --git a/maps/unused/BetaLakeOfRage.blk b/maps/unused/BetaLakeOfRage.blk new file mode 100644 index 000000000..d1d63a0d4 --- /dev/null +++ b/maps/unused/BetaLakeOfRage.blk @@ -0,0 +1 @@ +\^af\a\^afG^f\\f>^fTU^abfd?fdTvyY>dG\fd\X55Ya^d?f^Tvy55Y<d`f\\Ty555Y`f]\?\aX555Y\\^?Tvvy555Y^<fTvy555555Y^bd\bf^X5555555Ydf\ffTy5555555Y\b\af\fX55555Ya^d<d\daX555Yfd\\G`f^^\>e\adfa \ No newline at end of file diff --git a/maps/unused/BetaMahoganyTown.blk b/maps/unused/BetaMahoganyTown.blk new file mode 100644 index 000000000..6b4c62e10 --- /dev/null +++ b/maps/unused/BetaMahoganyTown.blk @@ -0,0 +1 @@ +`N=`RZW,-G./WEZWWG? \ No newline at end of file diff --git a/maps/unused/BetaNewBarkTown.blk b/maps/unused/BetaNewBarkTown.blk new file mode 100644 index 000000000..395c91f1b --- /dev/null +++ b/maps/unused/BetaNewBarkTown.blk @@ -0,0 +1 @@ +^]?II~IDGaaHTvEX5@~~{XDGGXHIIIIIIIaXvvvvvvvvv1 \ No newline at end of file diff --git a/maps/unused/BetaOlivineCity.blk b/maps/unused/BetaOlivineCity.blk new file mode 100644 index 000000000..749f05a5c --- /dev/null +++ b/maps/unused/BetaOlivineCity.blk @@ -0,0 +1,4 @@ +FDIJHIIIFDFZFDFDFFZFFZFFDFFZFAABFZFFDF|}FTvvvvvvvvvUDF|}FXYX55YDF|}FXYX55YHIIIJ|}FXYX556vvv + +JXYX5545552 +Xzvvvvy55255552vvvy555 555550555552995555~5555:5555 \ No newline at end of file diff --git a/maps/unused/BetaPewterMuseumOfScience1F.blk b/maps/unused/BetaPewterMuseumOfScience1F.blk new file mode 100644 index 000000000..1eec02a37 --- /dev/null +++ b/maps/unused/BetaPewterMuseumOfScience1F.blk @@ -0,0 +1,2 @@ + +  ! &! & \ No newline at end of file diff --git a/maps/unused/BetaPewterMuseumOfScience2F.blk b/maps/unused/BetaPewterMuseumOfScience2F.blk new file mode 100644 index 000000000..ac5622246 --- /dev/null +++ b/maps/unused/BetaPewterMuseumOfScience2F.blk @@ -0,0 +1 @@ +012! \ No newline at end of file diff --git a/maps/unused/BetaPokecenterMainHouse.blk b/maps/unused/BetaPokecenterMainHouse.blk new file mode 100644 index 000000000..261350738 --- /dev/null +++ b/maps/unused/BetaPokecenterMainHouse.blk @@ -0,0 +1 @@ +  ' \ No newline at end of file diff --git a/maps/unused/BetaPokecenterTradeStation.blk b/maps/unused/BetaPokecenterTradeStation.blk new file mode 100644 index 000000000..555abfa07 --- /dev/null +++ b/maps/unused/BetaPokecenterTradeStation.blk @@ -0,0 +1 @@ +' \ No newline at end of file diff --git a/maps/unused/BetaRocketHideout1.blk b/maps/unused/BetaRocketHideout1.blk new file mode 100644 index 000000000..988208073 --- /dev/null +++ b/maps/unused/BetaRocketHideout1.blk @@ -0,0 +1,5 @@ + + :?  > "! 89  *> *   89 :?:? )  ;?;? )  ? :)   ><) >>    )89      >>   8: ::?   ?< <>:) 5//////>89<)  +,/////- >>>> 1 8899///= + 5///->:?  1 = + >? ? ,/////-,////- \ No newline at end of file diff --git a/maps/unused/BetaRoute23EarlyVersion.blk b/maps/unused/BetaRoute23EarlyVersion.blk new file mode 100644 index 000000000..a62533dd4 --- /dev/null +++ b/maps/unused/BetaRoute23EarlyVersion.blk @@ -0,0 +1,7 @@ + + ! + +ohi +omhi!nm7:~nm'nm'nm'nm'nm'nm'nm'nm +^ +noo !hihi \ No newline at end of file diff --git a/maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk b/maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk new file mode 100644 index 000000000..a3aa06bd6 --- /dev/null +++ b/maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk @@ -0,0 +1 @@ + ,+ \ No newline at end of file diff --git a/maps/unused/BetaSproutTower1.blk b/maps/unused/BetaSproutTower1.blk new file mode 100644 index 000000000..6c0b2ea41 --- /dev/null +++ b/maps/unused/BetaSproutTower1.blk @@ -0,0 +1,3 @@ +      +   +    \ No newline at end of file diff --git a/maps/unused/BetaSproutTower2.blk b/maps/unused/BetaSproutTower2.blk new file mode 100644 index 000000000..a13cec16b --- /dev/null +++ b/maps/unused/BetaSproutTower2.blk @@ -0,0 +1,9 @@ +  +  +   +  +   +   +   +  + \ No newline at end of file diff --git a/maps/unused/BetaSproutTower3.blk b/maps/unused/BetaSproutTower3.blk new file mode 100644 index 000000000..846bb9016 --- /dev/null +++ b/maps/unused/BetaSproutTower3.blk @@ -0,0 +1,7 @@ +  +    +  +    +  +   + \ No newline at end of file diff --git a/maps/unused/BetaSproutTower5.blk b/maps/unused/BetaSproutTower5.blk new file mode 100644 index 000000000..baaeaa926 --- /dev/null +++ b/maps/unused/BetaSproutTower5.blk @@ -0,0 +1,9 @@ +  +  +  +  +  +     +  + +         \ No newline at end of file diff --git a/maps/unused/BetaSproutTower6.blk b/maps/unused/BetaSproutTower6.blk new file mode 100644 index 000000000..ea9395657 --- /dev/null +++ b/maps/unused/BetaSproutTower6.blk @@ -0,0 +1,4 @@ +  +              +   +   \ No newline at end of file diff --git a/maps/unused/BetaSproutTower7.blk b/maps/unused/BetaSproutTower7.blk new file mode 100644 index 000000000..bfa5da286 --- /dev/null +++ b/maps/unused/BetaSproutTower7.blk @@ -0,0 +1,8 @@ +  + +   +  +      +    +   +  \ No newline at end of file diff --git a/maps/unused/BetaSproutTower8.blk b/maps/unused/BetaSproutTower8.blk new file mode 100644 index 000000000..254c0c565 --- /dev/null +++ b/maps/unused/BetaSproutTower8.blk @@ -0,0 +1,5 @@ +   +     +   +     +     \ No newline at end of file diff --git a/maps/unused/BetaSproutTower9.blk b/maps/unused/BetaSproutTower9.blk new file mode 100644 index 000000000..f5737b226 --- /dev/null +++ b/maps/unused/BetaSproutTower9.blk @@ -0,0 +1 @@ +     \ No newline at end of file diff --git a/maps/unused/BetaSproutTowerCutOut1.blk b/maps/unused/BetaSproutTowerCutOut1.blk new file mode 100644 index 000000000..21808bb71 --- /dev/null +++ b/maps/unused/BetaSproutTowerCutOut1.blk @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/maps/unused/BetaSproutTowerCutOut2.blk b/maps/unused/BetaSproutTowerCutOut2.blk new file mode 100644 index 000000000..21808bb71 --- /dev/null +++ b/maps/unused/BetaSproutTowerCutOut2.blk @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/maps/unused/BetaSproutTowerCutOut3.blk b/maps/unused/BetaSproutTowerCutOut3.blk new file mode 100644 index 000000000..21808bb71 --- /dev/null +++ b/maps/unused/BetaSproutTowerCutOut3.blk @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/maps/unused/BetaUnknown.blk b/maps/unused/BetaUnknown.blk new file mode 100644 index 000000000..c3063adc7 --- /dev/null +++ b/maps/unused/BetaUnknown.blk @@ -0,0 +1 @@ +( \ No newline at end of file diff --git a/maps/unused/BetaVioletCity.blk b/maps/unused/BetaVioletCity.blk new file mode 100644 index 000000000..963dbb2ed --- /dev/null +++ b/maps/unused/BetaVioletCity.blk @@ -0,0 +1,7 @@ +??&;'TU&;'b?*"+XY*"+?=G^bXYTU]]]]]]]]]]]]]XYXYXYb`b !`GbD$%F` +&;' +bD()F`G*"+ +eeebDtuF` + +AEA +bpk`bsm`=]E`G`G?e`b`?eeeeeeeeeef`b \ No newline at end of file -- cgit v1.2.3 From bf074f359886707d2ffb2e0b525b03dc7af0fe29 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 16 Jan 2018 22:57:19 -0500 Subject: =?UTF-8?q?map=5Fheader=20=E2=86=92=20map=5Fdef;=20map=5Fheader=5F?= =?UTF-8?q?2=20=E2=86=92=20map=5Fdata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maps/AzaleaGym.asm | 4 ++-- maps/AzaleaMart.asm | 4 ++-- maps/AzaleaPokecenter1F.asm | 4 ++-- maps/AzaleaTown.asm | 4 ++-- maps/BattleTower1F.asm | 4 ++-- maps/BattleTowerBattleRoom.asm | 4 ++-- maps/BattleTowerElevator.asm | 4 ++-- maps/BattleTowerHallway.asm | 6 +++--- maps/BattleTowerOutside.asm | 4 ++-- maps/BillsHouse.asm | 4 ++-- maps/BlackthornCity.asm | 4 ++-- maps/BlackthornDragonSpeechHouse.asm | 4 ++-- maps/BlackthornEmysHouse.asm | 4 ++-- maps/BlackthornGym1F.asm | 4 ++-- maps/BlackthornGym2F.asm | 4 ++-- maps/BlackthornMart.asm | 4 ++-- maps/BlackthornPokecenter1F.asm | 4 ++-- maps/BluesHouse.asm | 4 ++-- maps/BrunosRoom.asm | 4 ++-- maps/BurnedTower1F.asm | 4 ++-- maps/BurnedTowerB1F.asm | 4 ++-- maps/CeladonCafe.asm | 4 ++-- maps/CeladonCity.asm | 4 ++-- maps/CeladonDeptStore1F.asm | 4 ++-- maps/CeladonDeptStore2F.asm | 4 ++-- maps/CeladonDeptStore3F.asm | 4 ++-- maps/CeladonDeptStore4F.asm | 4 ++-- maps/CeladonDeptStore5F.asm | 4 ++-- maps/CeladonDeptStore6F.asm | 4 ++-- maps/CeladonDeptStoreElevator.asm | 4 ++-- maps/CeladonGameCorner.asm | 4 ++-- maps/CeladonGameCornerPrizeRoom.asm | 4 ++-- maps/CeladonGym.asm | 4 ++-- maps/CeladonMansion1F.asm | 4 ++-- maps/CeladonMansion2F.asm | 4 ++-- maps/CeladonMansion3F.asm | 4 ++-- maps/CeladonMansionRoof.asm | 4 ++-- maps/CeladonMansionRoofHouse.asm | 4 ++-- maps/CeladonPokecenter1F.asm | 4 ++-- maps/CeladonPokecenter2FBeta.asm | 4 ++-- maps/CeruleanCity.asm | 4 ++-- maps/CeruleanGym.asm | 4 ++-- maps/CeruleanGymBadgeSpeechHouse.asm | 4 ++-- maps/CeruleanMart.asm | 4 ++-- maps/CeruleanPokecenter1F.asm | 4 ++-- maps/CeruleanPokecenter2FBeta.asm | 4 ++-- maps/CeruleanPoliceStation.asm | 4 ++-- maps/CeruleanTradeSpeechHouse.asm | 4 ++-- maps/CharcoalKiln.asm | 4 ++-- maps/CherrygroveCity.asm | 4 ++-- maps/CherrygroveEvolutionSpeechHouse.asm | 4 ++-- maps/CherrygroveGymSpeechHouse.asm | 4 ++-- maps/CherrygroveMart.asm | 4 ++-- maps/CherrygrovePokecenter1F.asm | 4 ++-- maps/CianwoodCity.asm | 4 ++-- maps/CianwoodGym.asm | 4 ++-- maps/CianwoodLugiaSpeechHouse.asm | 4 ++-- maps/CianwoodPharmacy.asm | 4 ++-- maps/CianwoodPhotoStudio.asm | 4 ++-- maps/CianwoodPokecenter1F.asm | 4 ++-- maps/CinnabarIsland.asm | 4 ++-- maps/CinnabarPokecenter1F.asm | 4 ++-- maps/CinnabarPokecenter2FBeta.asm | 4 ++-- maps/Colosseum.asm | 4 ++-- maps/CopycatsHouse1F.asm | 4 ++-- maps/CopycatsHouse2F.asm | 4 ++-- maps/DanceTheatre.asm | 4 ++-- maps/DarkCaveBlackthornEntrance.asm | 4 ++-- maps/DarkCaveVioletEntrance.asm | 4 ++-- maps/DayCare.asm | 4 ++-- maps/DiglettsCave.asm | 4 ++-- maps/DragonShrine.asm | 4 ++-- maps/DragonsDen1F.asm | 4 ++-- maps/DragonsDenB1F.asm | 4 ++-- maps/EarlsPokemonAcademy.asm | 4 ++-- maps/EcruteakCity.asm | 4 ++-- maps/EcruteakGym.asm | 4 ++-- maps/EcruteakHouse.asm | 4 ++-- maps/EcruteakItemfinderHouse.asm | 4 ++-- maps/EcruteakLugiaSpeechHouse.asm | 4 ++-- maps/EcruteakMart.asm | 4 ++-- maps/EcruteakPokecenter1F.asm | 4 ++-- maps/ElmsHouse.asm | 4 ++-- maps/ElmsLab.asm | 4 ++-- maps/FastShip1F.asm | 4 ++-- maps/FastShipB1F.asm | 4 ++-- maps/FastShipCabins_NNW_NNE_NE.asm | 4 ++-- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 4 ++-- maps/FastShipCabins_SW_SSW_NW.asm | 4 ++-- maps/FightingDojo.asm | 4 ++-- maps/FuchsiaBillSpeechHouse.asm | 4 ++-- maps/FuchsiaCity.asm | 8 ++++---- maps/FuchsiaGym.asm | 4 ++-- maps/FuchsiaMart.asm | 4 ++-- maps/FuchsiaPokecenter1F.asm | 4 ++-- maps/FuchsiaPokecenter2FBeta.asm | 4 ++-- maps/GoldenrodBikeShop.asm | 4 ++-- maps/GoldenrodBillsHouse.asm | 4 ++-- maps/GoldenrodCity.asm | 4 ++-- maps/GoldenrodDeptStore1F.asm | 4 ++-- maps/GoldenrodDeptStore2F.asm | 4 ++-- maps/GoldenrodDeptStore3F.asm | 4 ++-- maps/GoldenrodDeptStore4F.asm | 4 ++-- maps/GoldenrodDeptStore5F.asm | 4 ++-- maps/GoldenrodDeptStore6F.asm | 4 ++-- maps/GoldenrodDeptStoreB1F.asm | 4 ++-- maps/GoldenrodDeptStoreElevator.asm | 4 ++-- maps/GoldenrodDeptStoreRoof.asm | 4 ++-- maps/GoldenrodFlowerShop.asm | 4 ++-- maps/GoldenrodGameCorner.asm | 4 ++-- maps/GoldenrodGym.asm | 4 ++-- maps/GoldenrodHappinessRater.asm | 4 ++-- maps/GoldenrodMagnetTrainStation.asm | 4 ++-- maps/GoldenrodNameRater.asm | 4 ++-- maps/GoldenrodPPSpeechHouse.asm | 4 ++-- maps/GoldenrodPokeComCenter2FMobile.asm | 4 ++-- maps/GoldenrodPokecenter1F.asm | 4 ++-- maps/GoldenrodUnderground.asm | 4 ++-- maps/GoldenrodUndergroundSwitchRoomEntrances.asm | 4 ++-- maps/GoldenrodUndergroundWarehouse.asm | 4 ++-- maps/GuideGentsHouse.asm | 4 ++-- maps/HallOfFame.asm | 4 ++-- maps/IcePath1F.asm | 4 ++-- maps/IcePathB1F.asm | 4 ++-- maps/IcePathB2FBlackthornSide.asm | 4 ++-- maps/IcePathB2FMahoganySide.asm | 4 ++-- maps/IcePathB3F.asm | 4 ++-- maps/IlexForest.asm | 4 ++-- maps/IlexForestAzaleaGate.asm | 4 ++-- maps/IndigoPlateauPokecenter1F.asm | 4 ++-- maps/KarensRoom.asm | 4 ++-- maps/KogasRoom.asm | 4 ++-- maps/KrissHouse1F.asm | 4 ++-- maps/KrissHouse2F.asm | 4 ++-- maps/KrissNeighborsHouse.asm | 4 ++-- maps/KurtsHouse.asm | 4 ++-- maps/LakeOfRage.asm | 4 ++-- maps/LakeOfRageHiddenPowerHouse.asm | 4 ++-- maps/LakeOfRageMagikarpHouse.asm | 4 ++-- maps/LancesRoom.asm | 4 ++-- maps/LavRadioTower1F.asm | 4 ++-- maps/LavenderMart.asm | 4 ++-- maps/LavenderNameRater.asm | 4 ++-- maps/LavenderPokecenter1F.asm | 4 ++-- maps/LavenderPokecenter2FBeta.asm | 4 ++-- maps/LavenderSpeechHouse.asm | 4 ++-- maps/LavenderTown.asm | 4 ++-- maps/MahoganyGym.asm | 4 ++-- maps/MahoganyMart1F.asm | 4 ++-- maps/MahoganyPokecenter1F.asm | 4 ++-- maps/MahoganyRedGyaradosSpeechHouse.asm | 4 ++-- maps/MahoganyTown.asm | 4 ++-- maps/ManiasHouse.asm | 4 ++-- maps/MobileBattleRoom.asm | 4 ++-- maps/MobileTradeRoomMobile.asm | 4 ++-- maps/MountMoon.asm | 4 ++-- maps/MountMoonGiftShop.asm | 4 ++-- maps/MountMoonSquare.asm | 4 ++-- maps/MountMortar1FInside.asm | 4 ++-- maps/MountMortar1FOutside.asm | 4 ++-- maps/MountMortar2FInside.asm | 4 ++-- maps/MountMortarB1F.asm | 4 ++-- maps/MoveDeletersHouse.asm | 4 ++-- maps/MrFujisHouse.asm | 4 ++-- maps/MrPokemonsHouse.asm | 4 ++-- maps/MrPsychicsHouse.asm | 4 ++-- maps/NationalPark.asm | 4 ++-- maps/NationalParkBugContest.asm | 4 ++-- maps/NewBarkTown.asm | 4 ++-- maps/OaksLab.asm | 4 ++-- maps/OlivineCafe.asm | 4 ++-- maps/OlivineCity.asm | 4 ++-- maps/OlivineGoodRodHouse.asm | 4 ++-- maps/OlivineGym.asm | 4 ++-- maps/OlivineHouseBeta.asm | 4 ++-- maps/OlivineLighthouse1F.asm | 4 ++-- maps/OlivineLighthouse2F.asm | 4 ++-- maps/OlivineLighthouse3F.asm | 4 ++-- maps/OlivineLighthouse4F.asm | 4 ++-- maps/OlivineLighthouse5F.asm | 4 ++-- maps/OlivineLighthouse6F.asm | 4 ++-- maps/OlivineMart.asm | 4 ++-- maps/OlivinePokecenter1F.asm | 4 ++-- maps/OlivinePort.asm | 4 ++-- maps/OlivinePortPassage.asm | 4 ++-- maps/OlivinePunishmentSpeechHouse.asm | 4 ++-- maps/OlivineTimsHouse.asm | 4 ++-- maps/PalletTown.asm | 4 ++-- maps/PewterCity.asm | 4 ++-- maps/PewterGym.asm | 4 ++-- maps/PewterMart.asm | 4 ++-- maps/PewterNidoranSpeechHouse.asm | 4 ++-- maps/PewterPokecenter1F.asm | 4 ++-- maps/PewterPokecenter2FBeta.asm | 4 ++-- maps/PewterSnoozeSpeechHouse.asm | 4 ++-- maps/PokeSeersHouse.asm | 4 ++-- maps/Pokecenter2F.asm | 4 ++-- maps/PokemonFanClub.asm | 4 ++-- maps/PowerPlant.asm | 4 ++-- maps/RadioTower1F.asm | 4 ++-- maps/RadioTower2F.asm | 4 ++-- maps/RadioTower3F.asm | 4 ++-- maps/RadioTower4F.asm | 4 ++-- maps/RadioTower5F.asm | 4 ++-- maps/RedsHouse1F.asm | 4 ++-- maps/RedsHouse2F.asm | 4 ++-- maps/RockTunnel1F.asm | 4 ++-- maps/RockTunnelB1F.asm | 4 ++-- maps/Route1.asm | 4 ++-- maps/Route10North.asm | 4 ++-- maps/Route10Pokecenter1F.asm | 4 ++-- maps/Route10Pokecenter2FBeta.asm | 4 ++-- maps/Route10South.asm | 4 ++-- maps/Route11.asm | 4 ++-- maps/Route12.asm | 4 ++-- maps/Route12SuperRodHouse.asm | 4 ++-- maps/Route13.asm | 4 ++-- maps/Route14.asm | 4 ++-- maps/Route15.asm | 4 ++-- maps/Route15FuchsiaGate.asm | 4 ++-- maps/Route16.asm | 4 ++-- maps/Route16FuchsiaSpeechHouse.asm | 4 ++-- maps/Route16Gate.asm | 4 ++-- maps/Route17.asm | 4 ++-- maps/Route17Route18Gate.asm | 4 ++-- maps/Route18.asm | 4 ++-- maps/Route19.asm | 6 +++--- maps/Route19FuchsiaGate.asm | 4 ++-- maps/Route2.asm | 4 ++-- maps/Route20.asm | 4 ++-- maps/Route21.asm | 4 ++-- maps/Route22.asm | 4 ++-- maps/Route23.asm | 4 ++-- maps/Route24.asm | 4 ++-- maps/Route25.asm | 4 ++-- maps/Route26.asm | 4 ++-- maps/Route26DayofWeekSiblingsHouse.asm | 4 ++-- maps/Route26HealSpeechHouse.asm | 4 ++-- maps/Route27.asm | 4 ++-- maps/Route27SandstormHouse.asm | 4 ++-- maps/Route28.asm | 4 ++-- maps/Route28FamousSpeechHouse.asm | 4 ++-- maps/Route29.asm | 4 ++-- maps/Route29Route46Gate.asm | 4 ++-- maps/Route2Gate.asm | 4 ++-- maps/Route2NuggetSpeechHouse.asm | 4 ++-- maps/Route3.asm | 4 ++-- maps/Route30.asm | 4 ++-- maps/Route30BerrySpeechHouse.asm | 4 ++-- maps/Route31.asm | 4 ++-- maps/Route31VioletGate.asm | 4 ++-- maps/Route32.asm | 4 ++-- maps/Route32Pokecenter1F.asm | 4 ++-- maps/Route32RuinsOfAlphGate.asm | 4 ++-- maps/Route33.asm | 4 ++-- maps/Route34.asm | 4 ++-- maps/Route34IlexForestGate.asm | 4 ++-- maps/Route35.asm | 4 ++-- maps/Route35GoldenrodGate.asm | 4 ++-- maps/Route35NationalParkGate.asm | 4 ++-- maps/Route36.asm | 4 ++-- maps/Route36NationalParkGate.asm | 4 ++-- maps/Route36RuinsOfAlphGate.asm | 4 ++-- maps/Route37.asm | 4 ++-- maps/Route38.asm | 4 ++-- maps/Route38EcruteakGate.asm | 4 ++-- maps/Route39.asm | 4 ++-- maps/Route39Barn.asm | 4 ++-- maps/Route39Farmhouse.asm | 4 ++-- maps/Route4.asm | 4 ++-- maps/Route40.asm | 4 ++-- maps/Route40BattleTowerGate.asm | 4 ++-- maps/Route41.asm | 4 ++-- maps/Route42.asm | 4 ++-- maps/Route42EcruteakGate.asm | 4 ++-- maps/Route43.asm | 4 ++-- maps/Route43Gate.asm | 4 ++-- maps/Route43MahoganyGate.asm | 4 ++-- maps/Route44.asm | 4 ++-- maps/Route45.asm | 4 ++-- maps/Route46.asm | 4 ++-- maps/Route5.asm | 4 ++-- maps/Route5CleanseTagSpeechHouse.asm | 4 ++-- maps/Route5SaffronGate.asm | 4 ++-- maps/Route5UndergroundPathEntrance.asm | 4 ++-- maps/Route6.asm | 4 ++-- maps/Route6SaffronGate.asm | 4 ++-- maps/Route6UndergroundPathEntrance.asm | 4 ++-- maps/Route7.asm | 4 ++-- maps/Route7SaffronGate.asm | 4 ++-- maps/Route8.asm | 4 ++-- maps/Route8SaffronGate.asm | 4 ++-- maps/Route9.asm | 4 ++-- maps/RuinsOfAlphAerodactylChamber.asm | 4 ++-- maps/RuinsOfAlphAerodactylItemRoom.asm | 4 ++-- maps/RuinsOfAlphAerodactylWordRoom.asm | 4 ++-- maps/RuinsOfAlphHoOhChamber.asm | 4 ++-- maps/RuinsOfAlphHoOhItemRoom.asm | 4 ++-- maps/RuinsOfAlphHoOhWordRoom.asm | 4 ++-- maps/RuinsOfAlphInnerChamber.asm | 4 ++-- maps/RuinsOfAlphKabutoChamber.asm | 4 ++-- maps/RuinsOfAlphKabutoItemRoom.asm | 4 ++-- maps/RuinsOfAlphKabutoWordRoom.asm | 4 ++-- maps/RuinsOfAlphOmanyteChamber.asm | 4 ++-- maps/RuinsOfAlphOmanyteItemRoom.asm | 4 ++-- maps/RuinsOfAlphOmanyteWordRoom.asm | 4 ++-- maps/RuinsOfAlphOutside.asm | 4 ++-- maps/RuinsOfAlphResearchCenter.asm | 4 ++-- maps/SafariZoneBeta.asm | 4 ++-- maps/SafariZoneFuchsiaGateBeta.asm | 4 ++-- maps/SafariZoneMainOffice.asm | 4 ++-- maps/SafariZoneWardensHome.asm | 4 ++-- maps/SaffronCity.asm | 4 ++-- maps/SaffronGym.asm | 4 ++-- maps/SaffronMagnetTrainStation.asm | 4 ++-- maps/SaffronMart.asm | 4 ++-- maps/SaffronPokecenter1F.asm | 4 ++-- maps/SaffronPokecenter2FBeta.asm | 4 ++-- maps/SeafoamGym.asm | 4 ++-- maps/SilphCo1F.asm | 4 ++-- maps/SilverCaveItemRooms.asm | 4 ++-- maps/SilverCaveOutside.asm | 4 ++-- maps/SilverCavePokecenter1F.asm | 4 ++-- maps/SilverCaveRoom1.asm | 4 ++-- maps/SilverCaveRoom2.asm | 4 ++-- maps/SilverCaveRoom3.asm | 4 ++-- maps/SlowpokeWellB1F.asm | 4 ++-- maps/SlowpokeWellB2F.asm | 4 ++-- maps/SoulHouse.asm | 4 ++-- maps/SproutTower1F.asm | 4 ++-- maps/SproutTower2F.asm | 4 ++-- maps/SproutTower3F.asm | 4 ++-- maps/TeamRocketBaseB1F.asm | 4 ++-- maps/TeamRocketBaseB2F.asm | 4 ++-- maps/TeamRocketBaseB3F.asm | 4 ++-- maps/TimeCapsule.asm | 4 ++-- maps/TinTower1F.asm | 4 ++-- maps/TinTower2F.asm | 4 ++-- maps/TinTower3F.asm | 4 ++-- maps/TinTower4F.asm | 4 ++-- maps/TinTower5F.asm | 4 ++-- maps/TinTower6F.asm | 4 ++-- maps/TinTower7F.asm | 4 ++-- maps/TinTower8F.asm | 4 ++-- maps/TinTower9F.asm | 4 ++-- maps/TinTowerRoof.asm | 4 ++-- maps/TohjoFalls.asm | 4 ++-- maps/TradeCenter.asm | 4 ++-- maps/TrainerHouse1F.asm | 4 ++-- maps/TrainerHouseB1F.asm | 4 ++-- maps/UndergroundPath.asm | 4 ++-- maps/UnionCave1F.asm | 4 ++-- maps/UnionCaveB1F.asm | 4 ++-- maps/UnionCaveB2F.asm | 4 ++-- maps/VermilionCity.asm | 4 ++-- maps/VermilionGym.asm | 4 ++-- maps/VermilionHouseDiglettsCaveSpeechHouse.asm | 4 ++-- maps/VermilionHouseFishingSpeechHouse.asm | 4 ++-- maps/VermilionMagnetTrainSpeechHouse.asm | 4 ++-- maps/VermilionMart.asm | 4 ++-- maps/VermilionPokecenter1F.asm | 4 ++-- maps/VermilionPokecenter2FBeta.asm | 4 ++-- maps/VermilionPort.asm | 4 ++-- maps/VermilionPortPassage.asm | 4 ++-- maps/VictoryRoad.asm | 4 ++-- maps/VictoryRoadGate.asm | 4 ++-- maps/VioletCity.asm | 4 ++-- maps/VioletGym.asm | 4 ++-- maps/VioletKylesHouse.asm | 4 ++-- maps/VioletMart.asm | 4 ++-- maps/VioletNicknameSpeechHouse.asm | 4 ++-- maps/VioletPokecenter1F.asm | 4 ++-- maps/ViridianCity.asm | 4 ++-- maps/ViridianGym.asm | 4 ++-- maps/ViridianMart.asm | 4 ++-- maps/ViridianNicknameSpeechHouse.asm | 4 ++-- maps/ViridianPokecenter1F.asm | 4 ++-- maps/ViridianPokecenter2FBeta.asm | 4 ++-- maps/WhirlIslandB1F.asm | 4 ++-- maps/WhirlIslandB2F.asm | 4 ++-- maps/WhirlIslandCave.asm | 4 ++-- maps/WhirlIslandLugiaChamber.asm | 4 ++-- maps/WhirlIslandNE.asm | 4 ++-- maps/WhirlIslandNW.asm | 4 ++-- maps/WhirlIslandSE.asm | 4 ++-- maps/WhirlIslandSW.asm | 4 ++-- maps/WillsRoom.asm | 4 ++-- maps/WiseTriosRoom.asm | 4 ++-- 388 files changed, 780 insertions(+), 780 deletions(-) (limited to 'maps') diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index c10add3c4..3675392fc 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -7,7 +7,7 @@ const_value set 2 const AZALEAGYM_TWIN2 const AZALEAGYM_GYM_GUY -AzaleaGym_MapScriptHeader: +AzaleaGym_MapScripts: .SceneScripts: db 0 @@ -361,7 +361,7 @@ AzaleaGymGuyWinText: cont "#MON is bright!" done -AzaleaGym_MapEventHeader: +AzaleaGym_MapEvents: ; filler db 0, 0 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 8d9374955..8ecf94d92 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -3,7 +3,7 @@ const_value set 2 const AZALEAMART_COOLTRAINER_M const AZALEAMART_BUG_CATCHER -AzaleaMart_MapScriptHeader: +AzaleaMart_MapScripts: .SceneScripts: db 0 @@ -45,7 +45,7 @@ AzaleaMartBugCatcherText: cont "times." done -AzaleaMart_MapEventHeader: +AzaleaMart_MapEvents: ; filler db 0, 0 diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm index e4d950442..6e65c2c01 100644 --- a/maps/AzaleaPokecenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const AZALEAPOKECENTER1F_FISHING_GURU const AZALEAPOKECENTER1F_POKEFAN_F -AzaleaPokecenter1F_MapScriptHeader: +AzaleaPokecenter1F_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -76,7 +76,7 @@ AzaleaPokecenter1FPokefanFText: line "APRICORNS." done -AzaleaPokecenter1F_MapEventHeader: +AzaleaPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index a345898f0..61fa44392 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -12,7 +12,7 @@ const_value set 2 const AZALEATOWN_AZALEA_ROCKET3 const AZALEATOWN_KURT_OUTSIDE -AzaleaTown_MapScriptHeader: +AzaleaTown_MapScripts: .SceneScripts: db 3 scene_script .DummyScene0 @@ -455,7 +455,7 @@ AzaleaTownIlexForestSignText: line "gate." done -AzaleaTown_MapEventHeader: +AzaleaTown_MapEvents: ; filler db 0, 0 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 637f5c292..b7113f347 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -5,7 +5,7 @@ const_value set 2 const BATTLETOWER1F_BUG_CATCHER const BATTLETOWER1F_GRANNY -BattleTower1F_MapScriptHeader: +BattleTower1F_MapScripts: .SceneScripts: db 2 scene_script .Scene0 @@ -793,7 +793,7 @@ Text_BattleTowerBugCatcher: ; 0x9f35b line "any fire #MON…" done -BattleTower1F_MapEventHeader: +BattleTower1F_MapEvents: ; filler db 0, 0 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 22cbdef3f..6e13536fc 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -2,7 +2,7 @@ const_value set 2 const BATTLETOWERBATTLEROOM_YOUNGSTER const BATTLETOWERBATTLEROOM_RECEPTIONIST -BattleTowerBattleRoom_MapScriptHeader: +BattleTowerBattleRoom_MapScripts: .SceneScripts: db 2 scene_script .EnterBattleRoom @@ -138,7 +138,7 @@ Text_ReturnedAfterSave_Mobile: line "after you SAVE." done -BattleTowerBattleRoom_MapEventHeader: +BattleTowerBattleRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index e7b70acdc..f9f32dfae 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -1,7 +1,7 @@ const_value set 2 const BATTLETOWERELEVATOR_RECEPTIONIST -BattleTowerElevator_MapScriptHeader: +BattleTowerElevator_MapScripts: .SceneScripts: db 2 scene_script .Scene0 @@ -44,7 +44,7 @@ MovementData_BattleTowerElevatorPlayerWalksIn: turn_head DOWN step_end -BattleTowerElevator_MapEventHeader: +BattleTowerElevator_MapEvents: ; filler db 0, 0 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index c12091582..6b50783f5 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -1,7 +1,7 @@ const_value set 2 const BATTLETOWERHALLWAY_RECEPTIONIST -BattleTowerHallway_MapScriptHeader: +BattleTowerHallway_MapScripts: .SceneScripts: db 2 scene_script .Scene0 @@ -76,7 +76,7 @@ BattleTowerHallway_MapScriptHeader: warpcheck end -BattleTowerHallway_MapEventHeader: +BattleTowerHallway_MapEvents: ; filler db 0, 0 @@ -97,4 +97,4 @@ BattleTowerHallway_MapEventHeader: .ObjectEvents: db 1 - object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1 + object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index adb0c5f21..a61717fd0 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -4,7 +4,7 @@ const_value set 2 const BATTLETOWEROUTSIDE_SAILOR const BATTLETOWEROUTSIDE_LASS -BattleTowerOutside_MapScriptHeader: +BattleTowerOutside_MapScripts: .SceneScripts: db 0 @@ -126,7 +126,7 @@ BattleTowerOutsideText_DoorsOpen: text "It's open!" done -BattleTowerOutside_MapEventHeader: +BattleTowerOutside_MapEvents: ; filler db 0, 0 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 0dc2a7cd0..a4f2e0c0e 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const BILLSHOUSE_GRAMPS -BillsHouse_MapScriptHeader: +BillsHouse_MapScripts: .SceneScripts: db 0 @@ -353,7 +353,7 @@ BillsGrandpaPichuText: line "evolves." done -BillsHouse_MapEventHeader: +BillsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 178e986bd..396599703 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -9,7 +9,7 @@ const_value set 2 const BLACKTHORNCITY_SANTOS const BLACKTHORNCITY_COOLTRAINER_F2 -BlackthornCity_MapScriptHeader: +BlackthornCity_MapScripts: .SceneScripts: db 0 @@ -312,7 +312,7 @@ BlackthornCityTrainerTipsText: cont "problem." done -BlackthornCity_MapEventHeader: +BlackthornCity_MapEvents: ; filler db 0, 0 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 2e8bbfa0b..74621532f 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY const BLACKTHORNDRAGONSPEECHHOUSE_EKANS -BlackthornDragonSpeechHouse_MapScriptHeader: +BlackthornDragonSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -47,7 +47,7 @@ BlackthornDragonSpeechHouseDratiniText: text "DRATINI: Draa!" done -BlackthornDragonSpeechHouse_MapEventHeader: +BlackthornDragonSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index c74db5f89..d8277c74f 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const BLACKTHORNEMYSHOUSE_EMY -BlackthornEmysHouse_MapScriptHeader: +BlackthornEmysHouse_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ Emy: EmysHouseBookshelf: jumpstd magazinebookshelf -BlackthornEmysHouse_MapEventHeader: +BlackthornEmysHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 8e997132a..920442fe9 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -5,7 +5,7 @@ const_value set 2 const BLACKTHORNGYM1F_COOLTRAINER_F const BLACKTHORNGYM1F_GYM_GUY -BlackthornGym1F_MapScriptHeader: +BlackthornGym1F_MapScripts: .SceneScripts: db 0 @@ -386,7 +386,7 @@ BlackthornGymGuyWinText: cont "#MON CHAMPION!" done -BlackthornGym1F_MapEventHeader: +BlackthornGym1F_MapEvents: ; filler db 0, 0 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 2f23f7c9e..7d08bcebb 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -8,7 +8,7 @@ const_value set 2 const BLACKTHORNGYM2F_BOULDER5 const BLACKTHORNGYM2F_BOULDER6 -BlackthornGym2F_MapScriptHeader: +BlackthornGym2F_MapScripts: .SceneScripts: db 0 @@ -125,7 +125,7 @@ BlackthornGym2FBoulderFellText: line "through!" done -BlackthornGym2F_MapEventHeader: +BlackthornGym2F_MapEvents: ; filler db 0, 0 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index d6bf89c2c..4b4b74324 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -3,7 +3,7 @@ const_value set 2 const BLACKTHORNMART_COOLTRAINER_M const BLACKTHORNMART_BLACK_BELT -BlackthornMart_MapScriptHeader: +BlackthornMart_MapScripts: .SceneScripts: db 0 @@ -46,7 +46,7 @@ BlackthornMartBlackBeltText: cont "REPEL sprays." done -BlackthornMart_MapEventHeader: +BlackthornMart_MapEvents: ; filler db 0, 0 diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index af2a4e00b..45c925561 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const BLACKTHORNPOKECENTER1F_TWIN const BLACKTHORNPOKECENTER1F_COOLTRAINER_M -BlackthornPokecenter1F_MapScriptHeader: +BlackthornPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -49,7 +49,7 @@ BlackthornPokecenter1FTwinText: cont "forget an HM move." done -BlackthornPokecenter1F_MapEventHeader: +BlackthornPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index ba1871480..f31fefb9d 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const BLUESHOUSE_DAISY -BluesHouse_MapScriptHeader: +BluesHouse_MapScripts: .SceneScripts: db 0 @@ -144,7 +144,7 @@ DaisyCantGroomEggText: cont "groom an EGG." done -BluesHouse_MapEventHeader: +BluesHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 568ca0476..bdb93065e 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -1,7 +1,7 @@ const_value set 2 const BRUNOSROOM_BRUNO -BrunosRoom_MapScriptHeader: +BrunosRoom_MapScripts: .SceneScripts: db 2 scene_script .LockDoor @@ -124,7 +124,7 @@ BrunoScript_BrunoDefeatText: line "challenge!" done -BrunosRoom_MapEventHeader: +BrunosRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index d35fd0a00..2aca9c74e 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -5,7 +5,7 @@ const_value set 2 const BURNEDTOWER1F_MORTY const BURNEDTOWER1F_POKE_BALL -BurnedTower1F_MapScriptHeader: +BurnedTower1F_MapScripts: .SceneScripts: db 3 scene_script .EusineScene @@ -277,7 +277,7 @@ BurnedTower1FMortyText: line "TOWER with him." done -BurnedTower1F_MapEventHeader: +BurnedTower1F_MapEvents: ; filler db 0, 0 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index d8f1516e5..7fb711543 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -9,7 +9,7 @@ const_value set 2 const BURNEDTOWERB1F_POKE_BALL const BURNEDTOWERB1F_EUSINE -BurnedTowerB1F_MapScriptHeader: +BurnedTowerB1F_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -235,7 +235,7 @@ BurnedTowerB1FEusineText: para "Farewell!" done -BurnedTowerB1F_MapEventHeader: +BurnedTowerB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 9a1b58799..d30baf17d 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -5,7 +5,7 @@ const_value set 2 const CELADONCAFE_FISHER3 const CELADONCAFE_TEACHER -CeladonCafe_MapScriptHeader: +CeladonCafe_MapScripts: .SceneScripts: db 0 @@ -207,7 +207,7 @@ NoRoomForLeftoversText: line "hold another item…" done -CeladonCafe_MapEventHeader: +CeladonCafe_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index bcd254a2f..8075a5343 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -9,7 +9,7 @@ const_value set 2 const CELADONCITY_TEACHER2 const CELADONCITY_LASS -CeladonCity_MapScriptHeader: +CeladonCity_MapScripts: .SceneScripts: db 0 @@ -234,7 +234,7 @@ CeladonCityTrainerTipsText: cont "STORE!" done -CeladonCity_MapEventHeader: +CeladonCity_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 7bf379a0e..7f838179d 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -3,7 +3,7 @@ const_value set 2 const CELADONDEPTSTORE1F_GENTLEMAN const CELADONDEPTSTORE1F_TEACHER -CeladonDeptStore1F_MapScriptHeader: +CeladonDeptStore1F_MapScripts: .SceneScripts: db 0 @@ -73,7 +73,7 @@ CeladonDeptStore1FDirectoryText: line " SQUARE" done -CeladonDeptStore1F_MapEventHeader: +CeladonDeptStore1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index db93e4ee7..eb9bb8dbc 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -4,7 +4,7 @@ const_value set 2 const CELADONDEPTSTORE2F_POKEFAN_M const CELADONDEPTSTORE2F_YOUNGSTER -CeladonDeptStore2F_MapScriptHeader: +CeladonDeptStore2F_MapScripts: .SceneScripts: db 0 @@ -68,7 +68,7 @@ CeladonDeptStore2FDirectoryText: line " MARKET" done -CeladonDeptStore2F_MapEventHeader: +CeladonDeptStore2F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index cf941d4c8..01cd14f57 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -5,7 +5,7 @@ const_value set 2 const CELADONDEPTSTORE3F_GAMEBOY_KID2 const CELADONDEPTSTORE3F_SUPER_NERD -CeladonDeptStore3F_MapScriptHeader: +CeladonDeptStore3F_MapScripts: .SceneScripts: db 0 @@ -94,7 +94,7 @@ CeladonDeptStore3FDirectoryText: line "Stronger!" done -CeladonDeptStore3F_MapEventHeader: +CeladonDeptStore3F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index dff331264..e3869c990 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -3,7 +3,7 @@ const_value set 2 const CELADONDEPTSTORE4F_SUPER_NERD const CELADONDEPTSTORE4F_YOUNGSTER -CeladonDeptStore4F_MapScriptHeader: +CeladonDeptStore4F_MapScripts: .SceneScripts: db 0 @@ -50,7 +50,7 @@ CeladonDeptStore4FDirectoryText: para "4F: WISEMAN GIFTS" done -CeladonDeptStore4F_MapEventHeader: +CeladonDeptStore4F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index b0fa491b5..a14e8c7be 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -5,7 +5,7 @@ const_value set 2 const CELADONDEPTSTORE5F_SAILOR const CELADONDEPTSTORE5F_TEACHER -CeladonDeptStore5F_MapScriptHeader: +CeladonDeptStore5F_MapScripts: .SceneScripts: db 0 @@ -71,7 +71,7 @@ CeladonDeptStore5FDirectoryText: text "5F: DRUG STORE" done -CeladonDeptStore5F_MapEventHeader: +CeladonDeptStore5F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 50a581c91..3971efeed 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -2,7 +2,7 @@ const_value set 2 const CELADONDEPTSTORE6F_SUPER_NERD const CELADONDEPTSTORE6F_YOUNGSTER -CeladonDeptStore6F_MapScriptHeader: +CeladonDeptStore6F_MapScripts: .SceneScripts: db 0 @@ -145,7 +145,7 @@ CeladonDeptStore6FDirectoryText: line "VENDING MACHINES" done -CeladonDeptStore6F_MapEventHeader: +CeladonDeptStore6F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index 13317c02a..b5045880b 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -1,4 +1,4 @@ -CeladonDeptStoreElevator_MapScriptHeader: +CeladonDeptStoreElevator_MapScripts: .SceneScripts: db 0 @@ -27,7 +27,7 @@ CeladonDeptStoreElevatorData: elevfloor FLOOR_6F, 2, CELADON_DEPT_STORE_6F db -1 ; end -CeladonDeptStoreElevator_MapEventHeader: +CeladonDeptStoreElevator_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 7310e2e35..5d3382f53 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -9,7 +9,7 @@ const_value set 2 const CELADONGAMECORNER_GYM_GUY const CELADONGAMECORNER_GRAMPS -CeladonGameCorner_MapScriptHeader: +CeladonGameCorner_MapScripts: .SceneScripts: db 0 @@ -281,7 +281,7 @@ UnknownText_0x72567: para "Huh? It's empty!" done -CeladonGameCorner_MapEventHeader: +CeladonGameCorner_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 3407943be..1caed4b19 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -2,7 +2,7 @@ const_value set 2 const CELADONGAMECORNERPRIZEROOM_GENTLEMAN const CELADONGAMECORNERPRIZEROOM_PHARMACIST -CeladonGameCornerPrizeRoom_MapScriptHeader: +CeladonGameCornerPrizeRoom_MapScripts: .SceneScripts: db 0 @@ -263,7 +263,7 @@ CeladonPrizeRoom_NoCoinCaseText: line "a COIN CASE." done -CeladonGameCornerPrizeRoom_MapEventHeader: +CeladonGameCornerPrizeRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 2cd4d74ad..53f09324a 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -6,7 +6,7 @@ const_value set 2 const CELADONGYM_TWIN1 const CELADONGYM_TWIN2 -CeladonGym_MapScriptHeader: +CeladonGym_MapScripts: .SceneScripts: db 0 @@ -267,7 +267,7 @@ TwinsJoandzoe2AfterBattleText: line "much stronger!" done -CeladonGym_MapEventHeader: +CeladonGym_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 892401afe..4f6e0f94d 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -4,7 +4,7 @@ const_value set 2 const CELADONMANSION1F_CLEFAIRY const CELADONMANSION1F_GROWLITHE2 -CeladonMansion1F_MapScriptHeader: +CeladonMansion1F_MapScripts: .SceneScripts: db 0 @@ -74,7 +74,7 @@ CeladonMansionManagersSuiteSignText: line "MANAGER'S SUITE" done -CeladonMansion1F_MapEventHeader: +CeladonMansion1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index 7af437c21..e463c5b07 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -1,4 +1,4 @@ -CeladonMansion2F_MapScriptHeader: +CeladonMansion2F_MapScripts: .SceneScripts: db 0 @@ -49,7 +49,7 @@ CeladonMansion2FSignText: line "MEETING ROOM" done -CeladonMansion2F_MapEventHeader: +CeladonMansion2F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 895e73e14..bb6bb2f3f 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -4,7 +4,7 @@ const_value set 2 const CELADONMANSION3F_SUPER_NERD const CELADONMANSION3F_FISHER -CeladonMansion3F_MapScriptHeader: +CeladonMansion3F_MapScripts: .SceneScripts: db 0 @@ -189,7 +189,7 @@ UnknownText_0x71996: cont "a # DOLL." done -CeladonMansion3F_MapEventHeader: +CeladonMansion3F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index bf53f8b4f..d3a3c7623 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -1,7 +1,7 @@ const_value set 2 const CELADONMANSIONROOF_FISHER -CeladonMansionRoof_MapScriptHeader: +CeladonMansionRoof_MapScripts: .SceneScripts: db 0 @@ -33,7 +33,7 @@ UnknownText_0x71aa1: line "moustache!" done -CeladonMansionRoof_MapEventHeader: +CeladonMansionRoof_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 6fdd96afe..f49d12535 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const CELADONMANSIONROOFHOUSE_PHARMACIST -CeladonMansionRoofHouse_MapScriptHeader: +CeladonMansionRoofHouse_MapScripts: .SceneScripts: db 0 @@ -116,7 +116,7 @@ UnknownText_0x71db3: line "victim's HP." done -CeladonMansionRoofHouse_MapEventHeader: +CeladonMansionRoofHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 252d14b89..9a3fa4a23 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const CELADONPOKECENTER1F_COOLTRAINER_F const CELADONPOKECENTER1F_EUSINE -CeladonPokecenter1F_MapScriptHeader: +CeladonPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -145,7 +145,7 @@ NoBeastsText: line "you, !" done -CeladonPokecenter1F_MapEventHeader: +CeladonPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonPokecenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm index 2dcb0e1eb..06212496b 100644 --- a/maps/CeladonPokecenter2FBeta.asm +++ b/maps/CeladonPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -CeladonPokecenter2FBeta_MapScriptHeader: +CeladonPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -CeladonPokecenter2FBeta_MapEventHeader: +CeladonPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 23dd9444a..9980a4487 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -6,7 +6,7 @@ const_value set 2 const CERULEANCITY_FISHER const CERULEANCITY_YOUNGSTER -CeruleanCity_MapScriptHeader: +CeruleanCity_MapScripts: .SceneScripts: db 0 @@ -275,7 +275,7 @@ CeruleanLockedDoorText: text "It's locked…" done -CeruleanCity_MapEventHeader: +CeruleanCity_MapEvents: ; filler db 0, 0 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 144b690b1..b1076ded5 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -6,7 +6,7 @@ const_value set 2 const CERULEANGYM_SWIMMER_GUY const CERULEANGYM_GYM_GUY -CeruleanGym_MapScriptHeader: +CeruleanGym_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -362,7 +362,7 @@ CeruleanGymGuyWinText: cont "great battle!" done -CeruleanGym_MapEventHeader: +CeruleanGym_MapEvents: ; filler db 0, 0 diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 5c8beb81b..82d9db826 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M -CeruleanGymBadgeSpeechHouse_MapScriptHeader: +CeruleanGymBadgeSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -16,7 +16,7 @@ CeruleanGymBadgeSpeechHousePokefanMText: line "KANTO GYM BADGES?" done -CeruleanGymBadgeSpeechHouse_MapEventHeader: +CeruleanGymBadgeSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index b9d2226ff..c89621b6a 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -3,7 +3,7 @@ const_value set 2 const CERULEANMART_COOLTRAINER_M const CERULEANMART_COOLTRAINER_F -CeruleanMart_MapScriptHeader: +CeruleanMart_MapScripts: .SceneScripts: db 0 @@ -45,7 +45,7 @@ CeruleanMart_CooltrainerFText: cont "CERULEAN's CAPE." done -CeruleanMart_MapEventHeader: +CeruleanMart_MapEvents: ; filler db 0, 0 diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 74b5b2bbb..2efd5f743 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -3,7 +3,7 @@ const_value set 2 const CERULEANPOKECENTER1F_SUPER_NERD const CERULEANPOKECENTER1F_GYM_GUY -CeruleanPokecenter1F_MapScriptHeader: +CeruleanPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -62,7 +62,7 @@ CeruleanPokecenter1FGymGuyText: line "JOHTO accessible." done -CeruleanPokecenter1F_MapEventHeader: +CeruleanPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeruleanPokecenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm index a0c49e759..467377caa 100644 --- a/maps/CeruleanPokecenter2FBeta.asm +++ b/maps/CeruleanPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -CeruleanPokecenter2FBeta_MapScriptHeader: +CeruleanPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -CeruleanPokecenter2FBeta_MapEventHeader: +CeruleanPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 77ff3baf8..ca77bf0cd 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -3,7 +3,7 @@ const_value set 2 const CERULEANPOLICESTATION_POKEFAN_F const CERULEANPOLICESTATION_DIGLETT -CeruleanPoliceStation_MapScriptHeader: +CeruleanPoliceStation_MapScripts: .SceneScripts: db 0 @@ -43,7 +43,7 @@ CeruleanDiglettText: text "DIGLETT: Dug dug." done -CeruleanPoliceStation_MapEventHeader: +CeruleanPoliceStation_MapEvents: ; filler db 0, 0 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 289358996..8fdd470ae 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -4,7 +4,7 @@ const_value set 2 const CERULEANTRADESPEECHHOUSE_RHYDON const CERULEANTRADESPEECHHOUSE_ZUBAT -CeruleanTradeSpeechHouse_MapScriptHeader: +CeruleanTradeSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -53,7 +53,7 @@ UnknownText_0x1881b5: text "ZUBAT: Zuba zubaa." done -CeruleanTradeSpeechHouse_MapEventHeader: +CeruleanTradeSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 2b5942001..3eaa2464b 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -3,7 +3,7 @@ const_value set 2 const CHARCOALKILN_YOUNGSTER const CHARCOALKILN_MOLTRES -CharcoalKiln_MapScriptHeader: +CharcoalKiln_MapScripts: .SceneScripts: db 0 @@ -148,7 +148,7 @@ FarfetchdText: text "FARFETCH'D: Kwaa!" done -CharcoalKiln_MapEventHeader: +CharcoalKiln_MapEvents: ; filler db 0, 0 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 37464afd5..5e001f445 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -5,7 +5,7 @@ const_value set 2 const CHERRYGROVECITY_YOUNGSTER const CHERRYGROVECITY_FISHER -CherrygroveCity_MapScriptHeader: +CherrygroveCity_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -546,7 +546,7 @@ GuideGentsHouseSignText: text "GUIDE GENT'S HOUSE" done -CherrygroveCity_MapEventHeader: +CherrygroveCity_MapEvents: ; filler db 0, 0 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index 1b32f92b2..c79941cb2 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const CHERRYGROVEEVOLUTIONSPEECHHOUSE_LASS const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER -CherrygroveEvolutionSpeechHouse_MapScriptHeader: +CherrygroveEvolutionSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -41,7 +41,7 @@ UnknownText_0x196cfc: line "if one did that!" done -CherrygroveEvolutionSpeechHouse_MapEventHeader: +CherrygroveEvolutionSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 084092251..2709ed1c0 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER -CherrygroveGymSpeechHouse_MapScriptHeader: +CherrygroveGymSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -44,7 +44,7 @@ CherrygroveGymSpeechHouseBugCatcherText: line "them tougher!" done -CherrygroveGymSpeechHouse_MapEventHeader: +CherrygroveGymSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index caee8ba37..7a4b6dc0b 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -3,7 +3,7 @@ const_value set 2 const CHERRYGROVEMART_COOLTRAINER_M const CHERRYGROVEMART_YOUNGSTER -CherrygroveMart_MapScriptHeader: +CherrygroveMart_MapScripts: .SceneScripts: db 0 @@ -71,7 +71,7 @@ CherrygroveMartYoungsterText: line "ANTIDOTE with you." done -CherrygroveMart_MapEventHeader: +CherrygroveMart_MapEvents: ; filler db 0, 0 diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index 30e6c179c..202d87e50 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const CHERRYGROVEPOKECENTER1F_GENTLEMAN const CHERRYGROVEPOKECENTER1F_TEACHER -CherrygrovePokecenter1F_MapScriptHeader: +CherrygrovePokecenter1F_MapScripts: .SceneScripts: db 0 @@ -68,7 +68,7 @@ UnknownText_0x196a46: line "there already!" done -CherrygrovePokecenter1F_MapEventHeader: +CherrygrovePokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 44d61317a..f05b7aeb3 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -12,7 +12,7 @@ const_value set 2 const CIANWOODCITY_EUSINE const CIANWOODCITY_SUICUNE -CianwoodCity_MapScriptHeader: +CianwoodCity_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -380,7 +380,7 @@ CianwoodPokeSeerSignText: line "AHEAD" done -CianwoodCity_MapEventHeader: +CianwoodCity_MapEvents: ; filler db 0, 0 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 95aa6aaf0..1ca8a0a5e 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -9,7 +9,7 @@ const_value set 2 const CIANWOODGYM_BOULDER3 const CIANWOODGYM_BOULDER4 -CianwoodGym_MapScriptHeader: +CianwoodGym_MapScripts: .SceneScripts: db 0 @@ -305,7 +305,7 @@ BlackbeltLungAfterText: cont "shattered…" done -CianwoodGym_MapEventHeader: +CianwoodGym_MapEvents: ; filler db 0, 0 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 9a0cf5b7a..4b3099eec 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const CIANWOODLUGIASPEECHHOUSE_LASS const CIANWOODLUGIASPEECHHOUSE_TWIN -CianwoodLugiaSpeechHouse_MapScriptHeader: +CianwoodLugiaSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -61,7 +61,7 @@ CianwoodLugiaSpeechHouseTwinText: cont "get past them." done -CianwoodLugiaSpeechHouse_MapEventHeader: +CianwoodLugiaSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 629294333..696a16610 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -1,7 +1,7 @@ const_value set 2 const CIANWOODPHARMACY_PHARMACIST -CianwoodPharmacy_MapScriptHeader: +CianwoodPharmacy_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -72,7 +72,7 @@ PharmacistDescribeSecretpotionText: line "an emergency." done -CianwoodPharmacy_MapEventHeader: +CianwoodPharmacy_MapEvents: ; filler db 0, 0 diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index 5b7f63206..bbf2eb3d9 100644 --- a/maps/CianwoodPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -1,7 +1,7 @@ const_value set 2 const CIANWOODPHOTOSTUDIO_FISHING_GURU -CianwoodPhotoStudio_MapScriptHeader: +CianwoodPhotoStudio_MapScripts: .SceneScripts: db 0 @@ -48,7 +48,7 @@ UnknownText_0x9e156: line "memento…" done -CianwoodPhotoStudio_MapEventHeader: +CianwoodPhotoStudio_MapEvents: ; filler db 0, 0 diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index 3bf9a1b3a..0f97e011b 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const CIANWOODPOKECENTER1F_GYM_GUY const CIANWOODPOKECENTER1F_SUPER_NERD -CianwoodPokecenter1F_MapScriptHeader: +CianwoodPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -131,7 +131,7 @@ CianwoodPokecenter1FSuperNerdText: line "off my #MON!" done -CianwoodPokecenter1F_MapEventHeader: +CianwoodPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 36d25a127..ed4765d18 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -1,7 +1,7 @@ const_value set 2 const CINNABARISLAND_BLUE -CinnabarIsland_MapScriptHeader: +CinnabarIsland_MapScripts: .SceneScripts: db 0 @@ -127,7 +127,7 @@ CinnabarIslandSignText: line "Burning Desire" done -CinnabarIsland_MapEventHeader: +CinnabarIsland_MapEvents: ; filler db 0, 0 diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index e74bd85ab..17fe1b97c 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -3,7 +3,7 @@ const_value set 2 const CINNABARPOKECENTER1F_COOLTRAINER_F const CINNABARPOKECENTER1F_FISHER -CinnabarPokecenter1F_MapScriptHeader: +CinnabarPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -34,7 +34,7 @@ CinnabarPokecenter1FFisherText: cont "erupted." done -CinnabarPokecenter1F_MapEventHeader: +CinnabarPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CinnabarPokecenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm index 1e110c8fe..f2621c43c 100644 --- a/maps/CinnabarPokecenter2FBeta.asm +++ b/maps/CinnabarPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -CinnabarPokecenter2FBeta_MapScriptHeader: +CinnabarPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -CinnabarPokecenter2FBeta_MapEventHeader: +CinnabarPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index eba9d42fc..6f8538bac 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -2,7 +2,7 @@ const_value set 2 const COLOSSEUM_CHRIS1 const COLOSSEUM_CHRIS2 -Colosseum_MapScriptHeader: +Colosseum_MapScripts: .SceneScripts: db 3 scene_script .InitializeColosseum @@ -62,7 +62,7 @@ ChrisScript_0x193499: line "ready." done -Colosseum_MapEventHeader: +Colosseum_MapEvents: ; filler db 0, 0 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 925f7683a..695329ded 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -3,7 +3,7 @@ const_value set 2 const COPYCATSHOUSE1F_POKEFAN_F const COPYCATSHOUSE1F_CLEFAIRY -CopycatsHouse1F_MapScriptHeader: +CopycatsHouse1F_MapScripts: .SceneScripts: db 0 @@ -72,7 +72,7 @@ UnknownText_0x18ae4b: text "BLISSEY: Bliisii!" done -CopycatsHouse1F_MapEventHeader: +CopycatsHouse1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 78890e37c..74f6af110 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -6,7 +6,7 @@ const_value set 2 const COPYCATSHOUSE2F_BIRDDOLL const COPYCATSHOUSE2F_COPYCAT2 ; if player is female -CopycatsHouse2F_MapScriptHeader: +CopycatsHouse2F_MapScripts: .SceneScripts: db 0 @@ -360,7 +360,7 @@ CopycatsHouse2FDollText: para "It's only a doll…" done -CopycatsHouse2F_MapEventHeader: +CopycatsHouse2F_MapEvents: ; filler db 0, 0 diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index c4ec8bbe2..bb698becd 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -9,7 +9,7 @@ const_value set 2 const DANCETHEATRE_COOLTRAINER_M const DANCETHEATRE_GRANNY -DanceTheatre_MapScriptHeader: +DanceTheatre_MapScripts: .SceneScripts: db 0 @@ -337,7 +337,7 @@ FancyPanelText: cont "with flowers." done -DanceTheatre_MapEventHeader: +DanceTheatre_MapEvents: ; filler db 0, 0 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index bd6272298..63ea46aa3 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -3,7 +3,7 @@ const_value set 2 const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL1 const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2 -DarkCaveBlackthornEntrance_MapScriptHeader: +DarkCaveBlackthornEntrance_MapScripts: .SceneScripts: db 0 @@ -61,7 +61,7 @@ DarkCaveBlackthornEntrancePharmacistText2: cont "type moves." done -DarkCaveBlackthornEntrance_MapEventHeader: +DarkCaveBlackthornEntrance_MapEvents: ; filler db 0, 0 diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index b7806dcef..3eed4f41c 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -8,7 +8,7 @@ const_value set 2 const DARKCAVEVIOLETENTRANCE_POKE_BALL3 const DARKCAVEVIOLETENTRANCE_POKE_BALL4 -DarkCaveVioletEntrance_MapScriptHeader: +DarkCaveVioletEntrance_MapScripts: .SceneScripts: db 0 @@ -33,7 +33,7 @@ DarkCaveVioletEntranceRock: DarkCaveVioletEntranceHiddenElixer: hiddenitem EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER -DarkCaveVioletEntrance_MapEventHeader: +DarkCaveVioletEntrance_MapEvents: ; filler db 0, 0 diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 447f52971..93461c3a8 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -2,7 +2,7 @@ const_value set 2 const DAYCARE_GRAMPS const DAYCARE_GRANNY -DayCare_MapScriptHeader: +DayCare_MapScripts: .SceneScripts: db 0 @@ -155,7 +155,7 @@ DayCareText_PartyFull: line "this." done -DayCare_MapEventHeader: +DayCare_MapEvents: ; filler db 0, 0 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 92e39d7b4..b7ff38465 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -1,7 +1,7 @@ const_value set 2 const DIGLETTSCAVE_POKEFAN_M -DiglettsCave_MapScriptHeader: +DiglettsCave_MapScripts: .SceneScripts: db 0 @@ -22,7 +22,7 @@ DiglettsCavePokefanMText: line "shocking." done -DiglettsCave_MapEventHeader: +DiglettsCave_MapEvents: ; filler db 0, 0 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 6bdd57bfa..fc1774eab 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -4,7 +4,7 @@ const_value set 2 const DRAGONSHRINE_ELDER3 const DRAGONSHRINE_CLAIR -DragonShrine_MapScriptHeader: +DragonShrine_MapScripts: .SceneScripts: db 2 scene_script .DragonShrineTest @@ -657,7 +657,7 @@ DragonShrineSpeechlessText: text "<......><......><......><......><......><......>" done -DragonShrine_MapEventHeader: +DragonShrine_MapEvents: ; filler db 0, 0 diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index 8ab1c9bb4..0ff616c59 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -1,11 +1,11 @@ -DragonsDen1F_MapScriptHeader: +DragonsDen1F_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -DragonsDen1F_MapEventHeader: +DragonsDen1F_MapEvents: ; filler db 0, 0 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 678678c07..10b079edf 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -9,7 +9,7 @@ const_value set 2 const DRAGONSDENB1F_POKE_BALL2 const DRAGONSDENB1F_POKE_BALL3 -DragonsDenB1F_MapScriptHeader: +DragonsDenB1F_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -406,7 +406,7 @@ Text_NoRoomForDragonFang: cont "items." done -DragonsDenB1F_MapEventHeader: +DragonsDenB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 8f39eb85f..1936858dd 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -6,7 +6,7 @@ const_value set 2 const EARLSPOKEMONACADEMY_YOUNGSTER2 const EARLSPOKEMONACADEMY_POKEDEX -EarlsPokemonAcademy_MapScriptHeader: +EarlsPokemonAcademy_MapScripts: .SceneScripts: db 0 @@ -411,7 +411,7 @@ AcademyStickerMachineText: para "stickers!" done -EarlsPokemonAcademy_MapEventHeader: +EarlsPokemonAcademy_MapEvents: ; filler db 0, 0 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index a81a466e2..5e3dada98 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -7,7 +7,7 @@ const_value set 2 const ECRUTEAKCITY_YOUNGSTER const ECRUTEAKCITY_GRAMPS3 -EcruteakCity_MapScriptHeader: +EcruteakCity_MapScripts: .SceneScripts: db 0 @@ -259,7 +259,7 @@ BurnedTowerSignText: line "as it is unsafe." done -EcruteakCity_MapEventHeader: +EcruteakCity_MapEvents: ; filler db 0, 0 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 7b1fa9e1c..70776d1ee 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -7,7 +7,7 @@ const_value set 2 const ECRUTEAKGYM_GYM_GUY const ECRUTEAKGYM_GRAMPS -EcruteakGym_MapScriptHeader: +EcruteakGym_MapScripts: .SceneScripts: db 2 scene_script .ForcedToLeave @@ -386,7 +386,7 @@ UnknownText_0x9a49c: para "Hohohoho." done -EcruteakGym_MapEventHeader: +EcruteakGym_MapEvents: ; filler db 0, 0 diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 57c040d43..0c557274f 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -4,7 +4,7 @@ const_value set 2 const ECRUTEAKHOUSE_SAGE3 const ECRUTEAKHOUSE_GRAMPS -EcruteakHouse_MapScriptHeader: +EcruteakHouse_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -277,7 +277,7 @@ EcruteakHouseGrampsText: line "never to return." done -EcruteakHouse_MapEventHeader: +EcruteakHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 011976f7e..0d956a181 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ECRUTEAKITEMFINDERHOUSE_COOLTRAINER_M const ECRUTEAKITEMFINDERHOUSE_POKEDEX -EcruteakItemfinderHouse_MapScriptHeader: +EcruteakItemfinderHouse_MapScripts: .SceneScripts: db 0 @@ -162,7 +162,7 @@ EcruteakThreeMonText: line "grassland." done -EcruteakItemfinderHouse_MapEventHeader: +EcruteakItemfinderHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index e33ce1bf4..4b39f93eb 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ECRUTEAKLUGIASPEECHHOUSE_GRAMPS const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER -EcruteakLugiaSpeechHouse_MapScriptHeader: +EcruteakLugiaSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -44,7 +44,7 @@ EcruteakLugiaSpeechHouseYoungsterText: line "must be powerful." done -EcruteakLugiaSpeechHouse_MapEventHeader: +EcruteakLugiaSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 6859ce5b9..c69de9a7d 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -3,7 +3,7 @@ const_value set 2 const ECRUTEAKMART_SUPER_NERD const ECRUTEAKMART_GRANNY -EcruteakMart_MapScriptHeader: +EcruteakMart_MapScripts: .SceneScripts: db 0 @@ -45,7 +45,7 @@ EcruteakMartGrannyText: line "right up." done -EcruteakMart_MapEventHeader: +EcruteakMart_MapEvents: ; filler db 0, 0 diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index 100009393..409181ddc 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const ECRUTEAKPOKECENTER1F_GYM_GUY const ECRUTEAKPOKECENTER1F_BILL -EcruteakPokecenter1F_MapScriptHeader: +EcruteakPokecenter1F_MapScripts: .SceneScripts: db 2 scene_script .MeetBill @@ -206,7 +206,7 @@ EcruteakPokecenter1FGymGuyText: line "acy. I know it!" done -EcruteakPokecenter1F_MapEventHeader: +EcruteakPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 72e3f68e2..292562f85 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ELMSHOUSE_ELMS_WIFE const ELMSHOUSE_ELMS_SON -ElmsHouse_MapScriptHeader: +ElmsHouse_MapScripts: .SceneScripts: db 0 @@ -83,7 +83,7 @@ ElmsHousePCText: cont "search papers." done -ElmsHouse_MapEventHeader: +ElmsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index d1c0824e9..12623fee2 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -6,7 +6,7 @@ const_value set 2 const ELMSLAB_POKE_BALL3 const ELMSLAB_OFFICER -ElmsLab_MapScriptHeader: +ElmsLab_MapScripts: .SceneScripts: db 6 scene_script .MeetElm @@ -1370,7 +1370,7 @@ ElmsLabPCText: line "screen…" done -ElmsLab_MapEventHeader: +ElmsLab_MapEvents: ; filler db 0, 0 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 844810350..6dfb2350d 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -4,7 +4,7 @@ const_value set 2 const FASTSHIP1F_SAILOR3 const FASTSHIP1F_GENTLEMAN -FastShip1F_MapScriptHeader: +FastShip1F_MapScripts: .SceneScripts: db 3 scene_script .DummyScene0 @@ -285,7 +285,7 @@ UnknownText_0x754be: cont "VERMILION CITY." done -FastShip1F_MapEventHeader: +FastShip1F_MapEvents: ; filler db 0, 0 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 988ab724e..c179b490a 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -12,7 +12,7 @@ const_value set 2 const FASTSHIPB1F_YOUNGSTER1 const FASTSHIPB1F_YOUNGSTER2 -FastShipB1F_MapScriptHeader: +FastShipB1F_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -448,7 +448,7 @@ SchoolboyRickyAfterBattleText: cont "stone panels." done -FastShipB1F_MapEventHeader: +FastShipB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index f9145bcf7..a6ff922dd 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -7,7 +7,7 @@ const_value set 2 const FASTSHIPCABINS_NNW_NNE_NE_GENTLEMAN const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST -FastShipCabins_NNW_NNE_NE_MapScriptHeader: +FastShipCabins_NNW_NNE_NE_MapScripts: .SceneScripts: db 0 @@ -266,7 +266,7 @@ BurglarCoreyAfterBattleText: line "lost it…" done -FastShipCabins_NNW_NNE_NE_MapEventHeader: +FastShipCabins_NNW_NNE_NE_MapEvents: ; filler db 0, 0 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index c4c192865..5c038275d 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -11,7 +11,7 @@ const_value set 2 const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_POKEFAN_F const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2 -FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader: +FastShipCabins_SE_SSE_CaptainsCabin_MapScripts: .SceneScripts: db 0 @@ -462,7 +462,7 @@ SSAquaHasArrivedVermilionText: cont "VERMILION CITY." done -FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: +FastShipCabins_SE_SSE_CaptainsCabin_MapEvents: ; filler db 0, 0 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index a7f5b69e8..d4d35f584 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -4,7 +4,7 @@ const_value set 2 const FASTSHIPCABINS_SW_SSW_NW_BUENA const FASTSHIPCABINS_SW_SSW_NW_ROCKER -FastShipCabins_SW_SSW_NW_MapScriptHeader: +FastShipCabins_SW_SSW_NW_MapScripts: .SceneScripts: db 0 @@ -222,7 +222,7 @@ FastShipArrivedVermilionText: cont "VERMILION CITY." done -FastShipCabins_SW_SSW_NW_MapEventHeader: +FastShipCabins_SW_SSW_NW_MapEvents: ; filler db 0, 0 diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 01cdea5b5..46cc7ddeb 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -2,7 +2,7 @@ const_value set 2 const FIGHTINGDOJO_BLACK_BELT const FIGHTINGDOJO_POKE_BALL -FightingDojo_MapScriptHeader: +FightingDojo_MapScripts: .SceneScripts: db 0 @@ -42,7 +42,7 @@ FightingDojoSign1Text: line "side!" done -FightingDojo_MapEventHeader: +FightingDojo_MapEvents: ; filler db 0, 0 diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index a1e468976..8a72256b6 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const FUCHSIABILLSPEECHHOUSE_POKEFAN_F const FUCHSIABILLSPEECHHOUSE_YOUNGSTER -FuchsiaBillSpeechHouse_MapScriptHeader: +FuchsiaBillSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -27,7 +27,7 @@ FuchsiaBillSpeechHouseYoungsterText: cont "CYCLING ROAD." done -FuchsiaBillSpeechHouse_MapEventHeader: +FuchsiaBillSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 8010d3beb..34a636aaf 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -4,7 +4,7 @@ const_value set 2 const FUCHSIACITY_TEACHER const FUCHSIACITY_FRUIT_TREE -FuchsiaCity_MapScriptHeader: +FuchsiaCity_MapScripts: .SceneScripts: db 0 @@ -124,7 +124,7 @@ NoLitteringSignText: line "waste with you." done -FuchsiaCity_MapEventHeader: +FuchsiaCity_MapEvents: ; filler db 0, 0 @@ -139,8 +139,8 @@ FuchsiaCity_MapEventHeader: warp_def 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA warp_def 37, 22, 1, ROUTE_15_FUCHSIA_GATE warp_def 37, 23, 2, ROUTE_15_FUCHSIA_GATE - warp_def 7, 35, 1, ROUTE_19___FUCHSIA_GATE - warp_def 8, 35, 2, ROUTE_19___FUCHSIA_GATE + warp_def 7, 35, 1, ROUTE_19_FUCHSIA_GATE + warp_def 8, 35, 2, ROUTE_19_FUCHSIA_GATE .CoordEvents: db 0 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 1d5e50368..a691d1d50 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -6,7 +6,7 @@ const_value set 2 const FUCHSIAGYM_FUCHSIA_GYM_4 const FUCHSIAGYM_GYM_GUY -FuchsiaGym_MapScriptHeader: +FuchsiaGym_MapScripts: .SceneScripts: db 0 @@ -380,7 +380,7 @@ FuchsiaGymGuyWinText: cont "from JOHTO!" done -FuchsiaGym_MapEventHeader: +FuchsiaGym_MapEvents: ; filler db 0, 0 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 48ffdba5f..4ab7932f3 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -3,7 +3,7 @@ const_value set 2 const FUCHSIAMART_FISHER const FUCHSIAMART_COOLTRAINER_F -FuchsiaMart_MapScriptHeader: +FuchsiaMart_MapScripts: .SceneScripts: db 0 @@ -37,7 +37,7 @@ FuchsiaMartCooltrainerFText: cont "town." done -FuchsiaMart_MapEventHeader: +FuchsiaMart_MapEvents: ; filler db 0, 0 diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index 1e7b32c9e..9bc8775a6 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const FUCHSIAPOKECENTER1F_COOLTRAINER_F const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR -FuchsiaPokecenter1F_MapScriptHeader: +FuchsiaPokecenter1F_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -88,7 +88,7 @@ UnknownText_0x19654e: line "like her now!" done -FuchsiaPokecenter1F_MapEventHeader: +FuchsiaPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/FuchsiaPokecenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm index 619022047..dc61c55ab 100644 --- a/maps/FuchsiaPokecenter2FBeta.asm +++ b/maps/FuchsiaPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -FuchsiaPokecenter2FBeta_MapScriptHeader: +FuchsiaPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -FuchsiaPokecenter2FBeta_MapEventHeader: +FuchsiaPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index c8838afe5..48cc677ab 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -1,7 +1,7 @@ const_value set 2 const GOLDENRODBIKESHOP_CLERK -GoldenrodBikeShop_MapScriptHeader: +GoldenrodBikeShop_MapScripts: .SceneScripts: db 0 @@ -102,7 +102,7 @@ UnknownText_0x548ed: line "BICYCLE!" done -GoldenrodBikeShop_MapEventHeader: +GoldenrodBikeShop_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index e2b286848..33c8dbd17 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const GOLDENRODBILLSHOUSE_POKEFAN_F const GOLDENRODBILLSHOUSE_TWIN -GoldenrodBillsHouse_MapScriptHeader: +GoldenrodBillsHouse_MapScripts: .SceneScripts: db 0 @@ -242,7 +242,7 @@ UnknownText_0x55069: line "system." done -GoldenrodBillsHouse_MapEventHeader: +GoldenrodBillsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index dcc29b99a..ebda2c594 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -15,7 +15,7 @@ const_value set 2 const GOLDENRODCITY_ROCKET6 const GOLDENRODCITY_POKEFAN_M2 -GoldenrodCity_MapScriptHeader: +GoldenrodCity_MapScripts: .SceneScripts: db 0 @@ -551,7 +551,7 @@ UnknownText_0x1991cf: text "" done -GoldenrodCity_MapEventHeader: +GoldenrodCity_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 27bf60e58..6f07b6ad4 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -4,7 +4,7 @@ const_value set 2 const GOLDENRODDEPTSTORE1F_BUG_CATCHER const GOLDENRODDEPTSTORE1F_GENTLEMAN -GoldenrodDeptStore1F_MapScriptHeader: +GoldenrodDeptStore1F_MapScripts: .SceneScripts: db 0 @@ -78,7 +78,7 @@ GoldenrodDeptStore1FDirectoryText: para "ROOFTOP LOOKOUT" done -GoldenrodDeptStore1F_MapEventHeader: +GoldenrodDeptStore1F_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index ae78a5fe9..bfe6a398f 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -5,7 +5,7 @@ const_value set 2 const GOLDENRODDEPTSTORE2F_COOLTRAINER_F const GOLDENRODDEPTSTORE2F_GENTLEMAN -GoldenrodDeptStore2F_MapScriptHeader: +GoldenrodDeptStore2F_MapScripts: .SceneScripts: db 0 @@ -100,7 +100,7 @@ GoldenrodDeptStore2FDirectoryText: line " MARKET" done -GoldenrodDeptStore2F_MapEventHeader: +GoldenrodDeptStore2F_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 27bc44953..c495cb440 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -3,7 +3,7 @@ const_value set 2 const GOLDENRODDEPTSTORE3F_SUPER_NERD const GOLDENRODDEPTSTORE3F_ROCKER -GoldenrodDeptStore3F_MapScriptHeader: +GoldenrodDeptStore3F_MapScripts: .SceneScripts: db 0 @@ -56,7 +56,7 @@ GoldenrodDeptStore3FDirectoryText: line " COLLECTION" done -GoldenrodDeptStore3F_MapEventHeader: +GoldenrodDeptStore3F_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 94705ac98..03882b8f2 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -4,7 +4,7 @@ const_value set 2 const GOLDENRODDEPTSTORE4F_BUG_CATCHER const GOLDENRODDEPTSTORE4F_GAMEBOY_KID -GoldenrodDeptStore4F_MapScriptHeader: +GoldenrodDeptStore4F_MapScripts: .SceneScripts: db 0 @@ -77,7 +77,7 @@ GoldenrodDeptStore4FDirectoryText: para "4F MEDICINE BOX" done -GoldenrodDeptStore4F_MapEventHeader: +GoldenrodDeptStore4F_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 00a2ff11e..94da64d2f 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -6,7 +6,7 @@ const_value set 2 const GOLDENRODDEPTSTORE5F_CARRIE const GOLDENRODDEPTSTORE5F_RECEPTIONIST -GoldenrodDeptStore5F_MapScriptHeader: +GoldenrodDeptStore5F_MapScripts: .SceneScripts: db 0 @@ -217,7 +217,7 @@ GoldenrodDeptStore5FDirectoryText: para "5F TM CORNER" done -GoldenrodDeptStore5F_MapEventHeader: +GoldenrodDeptStore5F_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index b224ce74c..ed4309de2 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -2,7 +2,7 @@ const_value set 2 const GOLDENRODDEPTSTORE6F_LASS const GOLDENRODDEPTSTORE6F_SUPER_NERD -GoldenrodDeptStore6F_MapScriptHeader: +GoldenrodDeptStore6F_MapScripts: .SceneScripts: db 0 @@ -147,7 +147,7 @@ GoldenrodDeptStore6FDirectoryText: para "6F TRANQUIL SQUARE" done -GoldenrodDeptStore6F_MapEventHeader: +GoldenrodDeptStore6F_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 7922e4185..7d39dd8a9 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -8,7 +8,7 @@ const_value set 2 const GOLDENRODDEPTSTOREB1F_BLACK_BELT3 const GOLDENRODDEPTSTOREB1F_MACHOP -GoldenrodDeptStoreB1F_MapScriptHeader: +GoldenrodDeptStoreB1F_MapScripts: .SceneScripts: db 0 @@ -109,7 +109,7 @@ UnknownText_0x7d8bb: text "MACHOKE: Maaacho!" done -GoldenrodDeptStoreB1F_MapEventHeader: +GoldenrodDeptStoreB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 7d921dd57..6ff041e9f 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -1,4 +1,4 @@ -GoldenrodDeptStoreElevator_MapScriptHeader: +GoldenrodDeptStoreElevator_MapScripts: .SceneScripts: db 0 @@ -54,7 +54,7 @@ Elevator_0x566e0: elevfloor FLOOR_6F, 2, GOLDENROD_DEPT_STORE_6F db -1 ; end -GoldenrodDeptStoreElevator_MapEventHeader: +GoldenrodDeptStoreElevator_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 8fcadbb3f..cbc2a6b76 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -8,7 +8,7 @@ const_value set 2 const GOLDENRODDEPTSTOREROOF_TEACHER const GOLDENRODDEPTSTOREROOF_BUG_CATCHER -GoldenrodDeptStoreRoof_MapScriptHeader: +GoldenrodDeptStoreRoof_MapScripts: .SceneScripts: db 0 @@ -211,7 +211,7 @@ PokeDollVendingMachineText: line "empty…" done -GoldenrodDeptStoreRoof_MapEventHeader: +GoldenrodDeptStoreRoof_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index e35ac3352..38a8edc3f 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -2,7 +2,7 @@ const_value set 2 const GOLDENRODFLOWERSHOP_TEACHER const GOLDENRODFLOWERSHOP_FLORIA -GoldenrodFlowerShop_MapScriptHeader: +GoldenrodFlowerShop_MapScripts: .SceneScripts: db 0 @@ -159,7 +159,7 @@ UnknownText_0x55604: line "#MON!" done -GoldenrodFlowerShop_MapEventHeader: +GoldenrodFlowerShop_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 6db56d9bd..d467e84c3 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -12,7 +12,7 @@ const_value set 2 const GOLDENRODGAMECORNER_POKEFAN_M2 const GOLDENRODGAMECORNER_POKEFAN_M3 -GoldenrodGameCorner_MapScriptHeader: +GoldenrodGameCorner_MapScripts: .SceneScripts: db 0 @@ -436,7 +436,7 @@ GoldenrodGameCornerLeftTheirDrinkText: para "It smells sweet." done -GoldenrodGameCorner_MapEventHeader: +GoldenrodGameCorner_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 598fa8673..f4eac1b6b 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -6,7 +6,7 @@ const_value set 2 const GOLDENRODGYM_BUENA2 const GOLDENRODGYM_GYM_GUY -GoldenrodGym_MapScriptHeader: +GoldenrodGym_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -379,7 +379,7 @@ GoldenrodGymGuyWinText: cont "the ladies here." done -GoldenrodGym_MapEventHeader: +GoldenrodGym_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index f6eaad339..4fa8506dc 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -3,7 +3,7 @@ const_value set 2 const GOLDENRODHAPPINESSRATER_POKEFAN_M const GOLDENRODHAPPINESSRATER_TWIN -GoldenrodHappinessRater_MapScriptHeader: +GoldenrodHappinessRater_MapScripts: .SceneScripts: db 0 @@ -136,7 +136,7 @@ GoldenrodHappinessRaterTwinText: cont "acts really glad!" done -GoldenrodHappinessRater_MapEventHeader: +GoldenrodHappinessRater_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index f92d2e3da..c0f749413 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -2,7 +2,7 @@ const_value set 2 const GOLDENRODMAGNETTRAINSTATION_OFFICER const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN -GoldenrodMagnetTrainStation_MapScriptHeader: +GoldenrodMagnetTrainStation_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -164,7 +164,7 @@ GoldenrodMagnetTrainStationGentlemanText: cont "to KANTO." done -GoldenrodMagnetTrainStation_MapEventHeader: +GoldenrodMagnetTrainStation_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index a9effc92d..fc3369a21 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -1,7 +1,7 @@ const_value set 2 const GOLDENRODNAMERATER_NAME_RATER -GoldenrodNameRater_MapScriptHeader: +GoldenrodNameRater_MapScripts: .SceneScripts: db 0 @@ -24,7 +24,7 @@ GoldenrodNameRaterRadio: INCLUDE "data/unused/sweet_honey_text.asm" -GoldenrodNameRater_MapEventHeader: +GoldenrodNameRater_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index d8e898a79..416ed37c7 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const GOLDENRODPPSPEECHHOUSE_FISHER const GOLDENRODPPSPEECHHOUSE_LASS -GoldenrodPPSpeechHouse_MapScriptHeader: +GoldenrodPPSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -51,7 +51,7 @@ GoldenrodPPSpeechHouseLassText: cont "an item." done -GoldenrodPPSpeechHouse_MapEventHeader: +GoldenrodPPSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 3405df60a..1d8179da7 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -3,7 +3,7 @@ const_value set 2 const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST2 const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST3 -GoldenrodPokeComCenter2FMobile_MapScriptHeader: +GoldenrodPokeComCenter2FMobile_MapScripts: .SceneScripts: db 0 @@ -262,7 +262,7 @@ UnknownText_0x62b26: para "<......> <......> <......>" done -GoldenrodPokeComCenter2FMobile_MapEventHeader: +GoldenrodPokeComCenter2FMobile_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 6e48e20dc..f01194311 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const GOLDENRODPOKECENTER1F_LASS const GOLDENRODPOKECENTER1F_POKEFAN_F -GoldenrodPokecenter1F_MapScriptHeader: +GoldenrodPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -804,7 +804,7 @@ UnknownText_0x62549: line "the EON MAIL." done -GoldenrodPokecenter1F_MapEventHeader: +GoldenrodPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index 6727d9d52..c60f68ee5 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -9,7 +9,7 @@ const_value set 2 const GOLDENRODUNDERGROUND_SUPER_NERD6 const GOLDENRODUNDERGROUND_GRANNY -GoldenrodUnderground_MapScriptHeader: +GoldenrodUnderground_MapScripts: .SceneScripts: db 0 @@ -646,7 +646,7 @@ UnknownText_0x7c91a: line "THIS POINT" done -GoldenrodUnderground_MapEventHeader: +GoldenrodUnderground_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 85eb1bc1b..e01ee8470 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -43,7 +43,7 @@ const_value set 2 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_POKE_BALL2 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER -GoldenrodUndergroundSwitchRoomEntrances_MapScriptHeader: +GoldenrodUndergroundSwitchRoomEntrances_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -929,7 +929,7 @@ SwitchRoomText_Emergency: line "EMERGENCY." done -GoldenrodUndergroundSwitchRoomEntrances_MapEventHeader: +GoldenrodUndergroundSwitchRoomEntrances_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index e87f3ab1b..be5aa7e31 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -7,7 +7,7 @@ const_value set 2 const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL2 const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL3 -GoldenrodUndergroundWarehouse_MapScriptHeader: +GoldenrodUndergroundWarehouse_MapScripts: .SceneScripts: db 0 @@ -210,7 +210,7 @@ UnknownText_0x7dc8d: line "MON nationwide!" done -GoldenrodUndergroundWarehouse_MapEventHeader: +GoldenrodUndergroundWarehouse_MapEvents: ; filler db 0, 0 diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index ee9ef7533..136d0da66 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const GUIDEGENTSHOUSE_GRAMPS -GuideGentsHouse_MapScriptHeader: +GuideGentsHouse_MapScripts: .SceneScripts: db 0 @@ -27,7 +27,7 @@ GuideGentsHouseGuideGentText: line "with kindness!" done -GuideGentsHouse_MapEventHeader: +GuideGentsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 4ee1734a5..3f5f6ee10 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -1,7 +1,7 @@ const_value set 2 const HALLOFFAME_LANCE -HallOfFame_MapScriptHeader: +HallOfFame_MapScripts: .SceneScripts: db 2 scene_script .EnterHallOfFame @@ -110,7 +110,7 @@ HallOfFame_LanceText: line "as CHAMPIONS!" done -HallOfFame_MapEventHeader: +HallOfFame_MapEvents: ; filler db 0, 0 diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index ac49f10aa..84abeb680 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -3,7 +3,7 @@ const_value set 2 const ICEPATH1F_POKE_BALL2 const ICEPATH1F_POKE_BALL3 -IcePath1F_MapScriptHeader: +IcePath1F_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ IcePath1FPPUp: IcePath1FProtein: itemball PROTEIN -IcePath1F_MapEventHeader: +IcePath1F_MapEvents: ; filler db 0, 0 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 2d1bd1aad..2df927ebd 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -5,7 +5,7 @@ const_value set 2 const ICEPATHB1F_BOULDER4 const ICEPATHB1F_POKE_BALL -IcePathB1F_MapScriptHeader: +IcePathB1F_MapScripts: .SceneScripts: db 0 @@ -75,7 +75,7 @@ IcePathBoulderFellThroughText: line "through." done -IcePathB1F_MapEventHeader: +IcePathB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 544d7d600..1fe814b66 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -1,7 +1,7 @@ const_value set 2 const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL -IcePathB2FBlackthornSide_MapScriptHeader: +IcePathB2FBlackthornSide_MapScripts: .SceneScripts: db 0 @@ -14,7 +14,7 @@ IcePathB2FBlackthornSideTMRest: IcePathB2FBlackthornSideHiddenIceHeal: hiddenitem EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL -IcePathB2FBlackthornSide_MapEventHeader: +IcePathB2FBlackthornSide_MapEvents: ; filler db 0, 0 diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 915794dec..d70dc8492 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -6,7 +6,7 @@ const_value set 2 const ICEPATHB2FMAHOGANYSIDE_POKE_BALL1 const ICEPATHB2FMAHOGANYSIDE_POKE_BALL2 -IcePathB2FMahoganySide_MapScriptHeader: +IcePathB2FMahoganySide_MapScripts: .SceneScripts: db 0 @@ -30,7 +30,7 @@ IcePathB2FMahoganySideBoulderText: line "imbedded in ice." done -IcePathB2FMahoganySide_MapEventHeader: +IcePathB2FMahoganySide_MapEvents: ; filler db 0, 0 diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index cfdf2387b..40809dbe3 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -2,7 +2,7 @@ const_value set 2 const ICEPATHB3F_POKE_BALL const ICEPATHB3F_ROCK -IcePathB3F_MapScriptHeader: +IcePathB3F_MapScripts: .SceneScripts: db 0 @@ -15,7 +15,7 @@ IcePathB3FNevermeltice: IcePathB3FRock: jumpstd smashrock -IcePathB3F_MapEventHeader: +IcePathB3F_MapEvents: ; filler db 0, 0 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 4eae83fac..01351cd84 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -11,7 +11,7 @@ const_value set 2 const ILEXFOREST_POKE_BALL3 const ILEXFOREST_POKE_BALL4 -IlexForest_MapScriptHeader: +IlexForest_MapScripts: .SceneScripts: db 0 @@ -937,7 +937,7 @@ BugCatcherWayneAfterBattleText: cont "places too." done -IlexForest_MapEventHeader: +IlexForest_MapEvents: ; filler db 0, 0 diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 0bb508be3..c66483971 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ILEXFORESTAZALEAGATE_OFFICER const ILEXFORESTAZALEAGATE_GRANNY -IlexForestAzaleaGate_MapScriptHeader: +IlexForestAzaleaGate_MapScripts: .SceneScripts: db 0 @@ -30,7 +30,7 @@ IlexForestAzaleaGateGrannyText: line "mischief!" done -IlexForestAzaleaGate_MapEventHeader: +IlexForestAzaleaGate_MapEvents: ; filler db 0, 0 diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index f3f79d99f..17a4d0663 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -6,7 +6,7 @@ const_value set 2 const INDIGOPLATEAUPOKECENTER1F_GRAMPS const INDIGOPLATEAUPOKECENTER1F_ABRA -IndigoPlateauPokecenter1F_MapScriptHeader: +IndigoPlateauPokecenter1F_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -302,7 +302,7 @@ AbraText: text "ABRA: Aabra…" done -IndigoPlateauPokecenter1F_MapEventHeader: +IndigoPlateauPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 6eccbad60..4ceed61fc 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -1,7 +1,7 @@ const_value set 2 const KARENSROOM_KAREN -KarensRoom_MapScriptHeader: +KarensRoom_MapScripts: .SceneScripts: db 2 scene_script .LockDoor @@ -132,7 +132,7 @@ KarenScript_KarenDefeatText: line "PION is waiting." done -KarensRoom_MapEventHeader: +KarensRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 04580cdbb..d448d4661 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -1,7 +1,7 @@ const_value set 2 const KOGASROOM_KOGA -KogasRoom_MapScriptHeader: +KogasRoom_MapScripts: .SceneScripts: db 2 scene_script .LockDoor @@ -129,7 +129,7 @@ KogaScript_KogaDefeatText: cont "abilities to test!" done -KogasRoom_MapEventHeader: +KogasRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index e6bc721aa..f94534332 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -5,7 +5,7 @@ const_value set 2 const KRISSHOUSE1F_MOM4 const KRISSHOUSE1F_POKEFAN_F -KrissHouse1F_MapScriptHeader: +KrissHouse1F_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -385,7 +385,7 @@ TVText: line "rolling too!" done -KrissHouse1F_MapEventHeader: +KrissHouse1F_MapEvents: ; filler db 0, 0 diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 9d59396ac..dcd63af1e 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -4,7 +4,7 @@ const_value set 2 const KRISSHOUSE2F_DOLL_2 const KRISSHOUSE2F_BIG_DOLL -KrissHouse2F_MapScriptHeader: +KrissHouse2F_MapScripts: .SceneScripts: db 0 @@ -115,7 +115,7 @@ KrisRadioText4: line "#MON CHANNEL…" done -KrissHouse2F_MapEventHeader: +KrissHouse2F_MapEvents: ; filler db 0, 0 diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 4c3b2a2b6..457660d97 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const KRISSNEIGHBORSHOUSE_COOLTRAINER_F const KRISSNEIGHBORSHOUSE_POKEFAN_F -KrissNeighborsHouse_MapScriptHeader: +KrissNeighborsHouse_MapScripts: .SceneScripts: db 0 @@ -98,7 +98,7 @@ KrisNeighborRadioText4: line "#MON CHANNEL…" done -KrissNeighborsHouse_MapEventHeader: +KrissNeighborsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 478e94e5c..eb2bbcb89 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -5,7 +5,7 @@ const_value set 2 const KURTSHOUSE_KURT2 const KURTSHOUSE_TWIN2 -KurtsHouse_MapScriptHeader: +KurtsHouse_MapScripts: .SceneScripts: db 0 @@ -676,7 +676,7 @@ KurtsHouseCelebiStatueText: cont "tector." done -KurtsHouse_MapEventHeader: +KurtsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 882e42b22..fdbbeb438 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -12,7 +12,7 @@ const_value set 2 const LAKEOFRAGE_POKE_BALL1 const LAKEOFRAGE_POKE_BALL2 -LakeOfRage_MapScriptHeader: +LakeOfRage_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -493,7 +493,7 @@ UnknownText_0x70903: line "HOUSE" done -LakeOfRage_MapEventHeader: +LakeOfRage_MapEvents: ; filler db 0, 0 diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index 1d41eaa43..9d346ab0a 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER -LakeOfRageHiddenPowerHouse_MapScriptHeader: +LakeOfRageHiddenPowerHouse_MapScripts: .SceneScripts: db 0 @@ -67,7 +67,7 @@ HiddenPowerGuyText3: text "I am meditating…" done -LakeOfRageHiddenPowerHouse_MapEventHeader: +LakeOfRageHiddenPowerHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index 8e164b6f9..c77d823c0 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU -LakeOfRageMagikarpHouse_MapScriptHeader: +LakeOfRageMagikarpHouse_MapScripts: .SceneScripts: db 0 @@ -206,7 +206,7 @@ UnknownText_0x19aabc: text_from_ram StringBuffer4 db "@@" -LakeOfRageMagikarpHouse_MapEventHeader: +LakeOfRageMagikarpHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 545457982..c073f0f1e 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -3,7 +3,7 @@ const_value set 2 const LANCESROOM_MARY const LANCESROOM_OAK -LancesRoom_MapScriptHeader: +LancesRoom_MapScripts: .SceneScripts: db 2 scene_script .LockDoor @@ -337,7 +337,7 @@ UnknownText_0x1813c5: cont "the interview!" done -LancesRoom_MapEventHeader: +LancesRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 4ab8c6f48..d16bce5f1 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -5,7 +5,7 @@ const_value set 2 const LAVRADIOTOWER1F_GENTLEMAN const LAVRADIOTOWER1F_SUPER_NERD2 -LavRadioTower1F_MapScriptHeader: +LavRadioTower1F_MapScripts: .SceneScripts: db 0 @@ -221,7 +221,7 @@ UnknownText_0x7f36b: line "reference library." done -LavRadioTower1F_MapEventHeader: +LavRadioTower1F_MapEvents: ; filler db 0, 0 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 34c8572de..f55db399b 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -3,7 +3,7 @@ const_value set 2 const LAVENDERMART_POKEFAN_M const LAVENDERMART_ROCKER -LavenderMart_MapScriptHeader: +LavenderMart_MapScripts: .SceneScripts: db 0 @@ -47,7 +47,7 @@ LavenderMartRockerText: line "I had some." done -LavenderMart_MapEventHeader: +LavenderMart_MapEvents: ; filler db 0, 0 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 9b7435312..544c51d5b 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -1,7 +1,7 @@ const_value set 2 const LAVENDERNAMERATER_NAME_RATER -LavenderNameRater_MapScriptHeader: +LavenderNameRater_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -23,7 +23,7 @@ LavenderNameRater: LavenderNameRaterUnusedBookshelf: jumpstd difficultbookshelf -LavenderNameRater_MapEventHeader: +LavenderNameRater_MapEvents: ; filler db 0, 0 diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index 307eabe1c..7436697ea 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const LAVENDERPOKECENTER1F_TEACHER const LAVENDERPOKECENTER1F_YOUNGSTER -LavenderPokecenter1F_MapScriptHeader: +LavenderPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -80,7 +80,7 @@ UnknownText_0x7e7ed: cont "smoothly again." done -LavenderPokecenter1F_MapEventHeader: +LavenderPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/LavenderPokecenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm index bacb7e91b..537f10ea1 100644 --- a/maps/LavenderPokecenter2FBeta.asm +++ b/maps/LavenderPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -LavenderPokecenter2FBeta_MapScriptHeader: +LavenderPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -LavenderPokecenter2FBeta_MapEventHeader: +LavenderPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm index ac9decf52..eacb6b4d6 100644 --- a/maps/LavenderSpeechHouse.asm +++ b/maps/LavenderSpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const LAVENDERSPEECHHOUSE_POKEFAN_F -LavenderSpeechHouse_MapScriptHeader: +LavenderSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -28,7 +28,7 @@ LavenderSpeechHousePokefanFText: line "built." done -LavenderSpeechHouse_MapEventHeader: +LavenderSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 57806ef41..655acb3b3 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -4,7 +4,7 @@ const_value set 2 const LAVENDERTOWN_GRAMPS const LAVENDERTOWN_YOUNGSTER -LavenderTown_MapScriptHeader: +LavenderTown_MapScripts: .SceneScripts: db 0 @@ -105,7 +105,7 @@ SoulHouseSignText: line "#MON Rest Easy" done -LavenderTown_MapEventHeader: +LavenderTown_MapEvents: ; filler db 0, 0 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 3c403a735..20ab72ab1 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -7,7 +7,7 @@ const_value set 2 const MAHOGANYGYM_ROCKER3 const MAHOGANYGYM_GYM_GUY -MahoganyGym_MapScriptHeader: +MahoganyGym_MapScripts: .SceneScripts: db 0 @@ -372,7 +372,7 @@ MahoganyGymGuyWinText: line "eration gap!" done -MahoganyGym_MapEventHeader: +MahoganyGym_MapEvents: ; filler db 0, 0 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index e0c610f71..a216b1079 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -5,7 +5,7 @@ const_value set 2 const MAHOGANYMART1F_DRAGON const MAHOGANYMART1F_GRANNY -MahoganyMart1F_MapScriptHeader: +MahoganyMart1F_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -220,7 +220,7 @@ UnknownText_0x6c5ba: line "I'll go first." done -MahoganyMart1F_MapEventHeader: +MahoganyMart1F_MapEvents: ; filler db 0, 0 diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index 055a4b566..9a0cfdf24 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const MAHOGANYPOKECENTER1F_YOUNGSTER const MAHOGANYPOKECENTER1F_COOLTRAINER_F -MahoganyPokecenter1F_MapScriptHeader: +MahoganyPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -53,7 +53,7 @@ MahoganyPokecenter1FCooltrainerFText: cont "more slowly." done -MahoganyPokecenter1F_MapEventHeader: +MahoganyPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 8d90d58a6..d6ed88a36 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const MAHOGANYREDGYARADOSSPEECHHOUSE_BLACK_BELT const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER -MahoganyRedGyaradosSpeechHouse_MapScriptHeader: +MahoganyRedGyaradosSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -60,7 +60,7 @@ UnknownText_0x199a3d: line "It's creepy." done -MahoganyRedGyaradosSpeechHouse_MapEventHeader: +MahoganyRedGyaradosSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index fcb24323b..d53aabce0 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -4,7 +4,7 @@ const_value set 2 const MAHOGANYTOWN_FISHER const MAHOGANYTOWN_LASS -MahoganyTown_MapScriptHeader: +MahoganyTown_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -244,7 +244,7 @@ MahoganyGymSignText: line "Winter's Harshness" done -MahoganyTown_MapEventHeader: +MahoganyTown_MapEvents: ; filler db 0, 0 diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 0bcc5e5d1..d5d3febb6 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const MANIASHOUSE_ROCKER -ManiasHouse_MapScriptHeader: +ManiasHouse_MapScripts: .SceneScripts: db 0 @@ -199,7 +199,7 @@ ManiaText_ShuckleIsYourLastMon: line "in battle?" done -ManiasHouse_MapEventHeader: +ManiasHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 0af2068f8..d65ae1006 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -1,4 +1,4 @@ -MobileBattleRoom_MapScriptHeader: +MobileBattleRoom_MapScripts: .SceneScripts: db 2 scene_script .InitializeMobileBattleRoom @@ -66,7 +66,7 @@ MobileBattleRoom_HealText: cont "before battle." done -MobileBattleRoom_MapEventHeader: +MobileBattleRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index e7c4c7b09..53713c9de 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -1,4 +1,4 @@ -MobileTradeRoomMobile_MapScriptHeader: +MobileTradeRoomMobile_MapScripts: .SceneScripts: db 2 scene_script .InitializeMobileTradeRoomMobile @@ -34,7 +34,7 @@ MobileTradeRoomMobile_EstablishingCommsText: line "communications…" done -MobileTradeRoomMobile_MapEventHeader: +MobileTradeRoomMobile_MapEvents: ; filler db 0, 0 diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 531c8a327..1823757ec 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -1,7 +1,7 @@ const_value set 2 const MOUNTMOON_SILVER -MountMoon_MapScriptHeader: +MountMoon_MapScripts: .SceneScripts: db 2 scene_script .RivalEncounter @@ -160,7 +160,7 @@ MountMoonSilverTextLoss: cont "greatest trainer." done -MountMoon_MapEventHeader: +MountMoon_MapEvents: ; filler db 0, 0 diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index ade5a35ff..b24a98e20 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -4,7 +4,7 @@ const_value set 2 const MOUNTMOONGIFTSHOP_LASS1 ; morning only const MOUNTMOONGIFTSHOP_LASS2 ; day only -MountMoonGiftShop_MapScriptHeader: +MountMoonGiftShop_MapScripts: .SceneScripts: db 0 @@ -27,7 +27,7 @@ MountMoonGiftShopLassText: cont "come out to play." done -MountMoonGiftShop_MapEventHeader: +MountMoonGiftShop_MapEvents: ; filler db 0, 0 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index c914e669f..1d9848f3b 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -3,7 +3,7 @@ const_value set 2 const MOUNTMOONSQUARE_FAIRY2 const MOUNTMOONSQUARE_ROCK -MountMoonSquare_MapScriptHeader: +MountMoonSquare_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -132,7 +132,7 @@ DontLitterSignText: line "DON'T LITTER" done -MountMoonSquare_MapEventHeader: +MountMoonSquare_MapEvents: ; filler db 0, 0 diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 983fd9839..a67ba1144 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -10,7 +10,7 @@ const_value set 2 const MOUNTMORTAR1FINSIDE_POKE_BALL6 const MOUNTMORTAR1FINSIDE_POKE_BALL7 -MountMortar1FInside_MapScriptHeader: +MountMortar1FInside_MapScripts: .SceneScripts: db 0 @@ -116,7 +116,7 @@ SupernerdMarkusAfterBattleText: line "WATERFALL?" done -MountMortar1FInside_MapEventHeader: +MountMortar1FInside_MapEvents: ; filler db 0, 0 diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index 4e8dcf331..d38f4f732 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -2,7 +2,7 @@ const_value set 2 const MOUNTMORTAR1FOUTSIDE_POKE_BALL1 const MOUNTMORTAR1FOUTSIDE_POKE_BALL2 -MountMortar1FOutside_MapScriptHeader: +MountMortar1FOutside_MapScripts: .SceneScripts: db 0 @@ -18,7 +18,7 @@ MountMortar1FOutsideRevive: MountMortar1FOutsideHiddenHyperPotion: hiddenitem EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION -MountMortar1FOutside_MapEventHeader: +MountMortar1FOutside_MapEvents: ; filler db 0, 0 diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 4d401da9c..66120731f 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -7,7 +7,7 @@ const_value set 2 const MOUNTMORTAR2FINSIDE_POKE_BALL6 const MOUNTMORTAR2FINSIDE_SUPER_NERD -MountMortar2FInside_MapScriptHeader: +MountMortar2FInside_MapScripts: .SceneScripts: db 0 @@ -66,7 +66,7 @@ SupernerdHughAfterBattleText: line "use STRENGTH?" done -MountMortar2FInside_MapEventHeader: +MountMortar2FInside_MapEvents: ; filler db 0, 0 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 2bfea9fec..7d798c22e 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -7,7 +7,7 @@ const_value set 2 const MOUNTMORTARB1F_POKE_BALL4 const MOUNTMORTARB1F_POKE_BALL5 -MountMortarB1F_MapScriptHeader: +MountMortarB1F_MapScripts: .SceneScripts: db 0 @@ -134,7 +134,7 @@ UnknownText_0x7e3df: line "in your party!" done -MountMortarB1F_MapEventHeader: +MountMortarB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index c51f0a9e1..0635be308 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const MOVEDELETERSHOUSE_SUPER_NERD -MoveDeletersHouse_MapScriptHeader: +MoveDeletersHouse_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ MoveDeleter: MoveDeletersHouseBookshelf: jumpstd difficultbookshelf -MoveDeletersHouse_MapEventHeader: +MoveDeletersHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 856b62503..403134bae 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -5,7 +5,7 @@ const_value set 2 const MRFUJISHOUSE_NIDORINO const MRFUJISHOUSE_PIDGEY -MrFujisHouse_MapScriptHeader: +MrFujisHouse_MapScripts: .SceneScripts: db 0 @@ -79,7 +79,7 @@ MrFujisPidgeyText: text "PIDGEY: Pijji!" done -MrFujisHouse_MapEventHeader: +MrFujisHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index d0bb13037..8ac7d0a09 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const MRPOKEMONSHOUSE_GENTLEMAN const MRPOKEMONSHOUSE_OAK -MrPokemonsHouse_MapScriptHeader: +MrPokemonsHouse_MapScripts: .SceneScripts: db 2 scene_script .MeetMrPokemon @@ -372,7 +372,7 @@ MrPokemonsHouse_StrangeCoinsText: line "another country…" done -MrPokemonsHouse_MapEventHeader: +MrPokemonsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 75bd52ae5..042b922d0 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const MRPSYCHICSHOUSE_FISHING_GURU -MrPsychicsHouse_MapScriptHeader: +MrPsychicsHouse_MapScripts: .SceneScripts: db 0 @@ -47,7 +47,7 @@ MrPsychicText2: line "target's SPCL.DEF." done -MrPsychicsHouse_MapEventHeader: +MrPsychicsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 56f861384..9429c5845 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -14,7 +14,7 @@ const_value set 2 const NATIONALPARK_GAMEBOY_KID const NATIONALPARK_POKE_BALL2 -NationalPark_MapScriptHeader: +NationalPark_MapScripts: .SceneScripts: db 0 @@ -513,7 +513,7 @@ UnknownText_0x5c7c6: cont "pressing START." done -NationalPark_MapEventHeader: +NationalPark_MapEvents: ; filler db 0, 0 diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 07e6455ac..c69e55854 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -12,7 +12,7 @@ const_value set 2 const NATIONALPARKBUGCONTEST_POKE_BALL1 const NATIONALPARKBUGCONTEST_POKE_BALL2 -NationalParkBugContest_MapScriptHeader: +NationalParkBugContest_MapScripts: .SceneScripts: db 0 @@ -220,7 +220,7 @@ UnknownText_0x5cc1d: cont "pressing START." done -NationalParkBugContest_MapEventHeader: +NationalParkBugContest_MapEvents: ; filler db 0, 0 diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index dee94a7c9..9bfacc2c8 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -3,7 +3,7 @@ const_value set 2 const NEWBARKTOWN_FISHER const NEWBARKTOWN_SILVER -NewBarkTown_MapScriptHeader: +NewBarkTown_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -281,7 +281,7 @@ ElmsHouseSignText: text "ELM'S HOUSE" done -NewBarkTown_MapEventHeader: +NewBarkTown_MapEvents: ; filler db 0, 0 diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 6021bc980..d78641c28 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -4,7 +4,7 @@ const_value set 2 const OAKSLAB_SCIENTIST2 const OAKSLAB_SCIENTIST3 -OaksLab_MapScriptHeader: +OaksLab_MapScripts: .SceneScripts: db 0 @@ -256,7 +256,7 @@ OaksLabPCText: line "TOWN 8-)" done -OaksLab_MapEventHeader: +OaksLab_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 1aea5f518..269357d21 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -3,7 +3,7 @@ const_value set 2 const OLIVINECAFE_FISHING_GURU const OLIVINECAFE_SAILOR2 -OlivineCafe_MapScriptHeader: +OlivineCafe_MapScripts: .SceneScripts: db 0 @@ -78,7 +78,7 @@ OlivineCafeSailorText: line "stop eating!" done -OlivineCafe_MapEventHeader: +OlivineCafe_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index fce28ceaa..e2fd0c4c7 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -4,7 +4,7 @@ const_value set 2 const OLIVINECITY_SAILOR2 const OLIVINECITY_OLIVINE_RIVAL -OlivineCity_MapScriptHeader: +OlivineCity_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -287,7 +287,7 @@ UnknownText_0x1a8cba: text "BATTLE TOWER AHEAD" done -OlivineCity_MapEventHeader: +OlivineCity_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 4e5285c77..3f7c3eced 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const OLIVINEGOODRODHOUSE_FISHING_GURU -OlivineGoodRodHouse_MapScriptHeader: +OlivineGoodRodHouse_MapScripts: .SceneScripts: db 0 @@ -82,7 +82,7 @@ HaveGoodRodText: line "Land the big one?" done -OlivineGoodRodHouse_MapEventHeader: +OlivineGoodRodHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 514b8e89a..40e2bd711 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -2,7 +2,7 @@ const_value set 2 const OLIVINEGYM_JASMINE const OLIVINEGYM_GYM_GUY -OlivineGym_MapScriptHeader: +OlivineGym_MapScripts: .SceneScripts: db 0 @@ -197,7 +197,7 @@ OlivineGymGuyPreText: cont "sionate." done -OlivineGym_MapEventHeader: +OlivineGym_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index d1171bbef..336469c21 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -2,7 +2,7 @@ const_value set 2 const OLIVINEHOUSEBETA_TEACHER const OLIVINEHOUSEBETA_RHYDON -OlivineHouseBeta_MapScriptHeader: +OlivineHouseBeta_MapScripts: .SceneScripts: db 0 @@ -39,7 +39,7 @@ UnknownText_0x9c5f0: text "RHYDON: Gugooh!" done -OlivineHouseBeta_MapEventHeader: +OlivineHouseBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 3fd387dcf..769bf13da 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -2,7 +2,7 @@ const_value set 2 const OLIVINELIGHTHOUSE1F_SAILOR const OLIVINELIGHTHOUSE1F_POKEFAN_F -OlivineLighthouse1F_MapScriptHeader: +OlivineLighthouse1F_MapScripts: .SceneScripts: db 0 @@ -36,7 +36,7 @@ OlivineLighthouse1FPokefanFText: cont "those #MON." done -OlivineLighthouse1F_MapEventHeader: +OlivineLighthouse1F_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index e078bba2b..d2fd6427f 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -2,7 +2,7 @@ const_value set 2 const OLIVINELIGHTHOUSE2F_SAILOR const OLIVINELIGHTHOUSE2F_GENTLEMAN -OlivineLighthouse2F_MapScriptHeader: +OlivineLighthouse2F_MapScripts: .SceneScripts: db 0 @@ -204,7 +204,7 @@ UnknownText_0x5b1b6: cont "before." done -OlivineLighthouse2F_MapEventHeader: +OlivineLighthouse2F_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 2c6662029..2cd0dc64c 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -4,7 +4,7 @@ const_value set 2 const OLIVINELIGHTHOUSE3F_YOUNGSTER const OLIVINELIGHTHOUSE3F_POKE_BALL -OlivineLighthouse3F_MapScriptHeader: +OlivineLighthouse3F_MapScripts: .SceneScripts: db 0 @@ -112,7 +112,7 @@ GentlemanPrestonAfterBattleText: cont "like ONIX." done -OlivineLighthouse3F_MapEventHeader: +OlivineLighthouse3F_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 34d03971d..7580d3499 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -2,7 +2,7 @@ const_value set 2 const OLIVINELIGHTHOUSE4F_SAILOR const OLIVINELIGHTHOUSE4F_LASS -OlivineLighthouse4F_MapScriptHeader: +OlivineLighthouse4F_MapScripts: .SceneScripts: db 0 @@ -81,7 +81,7 @@ LassConnie1AfterBattleText: line "back to the GYM." done -OlivineLighthouse4F_MapEventHeader: +OlivineLighthouse4F_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index fdd32455c..ccee7f0c7 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -5,7 +5,7 @@ const_value set 2 const OLIVINELIGHTHOUSE5F_POKE_BALL2 const OLIVINELIGHTHOUSE5F_POKE_BALL3 -OlivineLighthouse5F_MapScriptHeader: +OlivineLighthouse5F_MapScripts: .SceneScripts: db 0 @@ -90,7 +90,7 @@ BirdKeeperDenisAfterBattleText: cont "across the sea…" done -OlivineLighthouse5F_MapEventHeader: +OlivineLighthouse5F_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index e0bd4febf..d036dc56f 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -3,7 +3,7 @@ const_value set 2 const OLIVINELIGHTHOUSE6F_MONSTER const OLIVINELIGHTHOUSE6F_POKE_BALL -OlivineLighthouse6F_MapScriptHeader: +OlivineLighthouse6F_MapScripts: .SceneScripts: db 0 @@ -257,7 +257,7 @@ UnknownText_0x60f3d: line "Palulu!" done -OlivineLighthouse6F_MapEventHeader: +OlivineLighthouse6F_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index b486e0867..ea980fe3c 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -3,7 +3,7 @@ const_value set 2 const OLIVINEMART_COOLTRAINER_F const OLIVINEMART_LASS -OlivineMart_MapScriptHeader: +OlivineMart_MapScripts: .SceneScripts: db 0 @@ -45,7 +45,7 @@ OlivineMartLassText: line "It's a secret!" done -OlivineMart_MapEventHeader: +OlivineMart_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index 81f172258..3345636ff 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const OLIVINEPOKECENTER1F_FISHER const OLIVINEPOKECENTER1F_TEACHER -OlivinePokecenter1F_MapScriptHeader: +OlivinePokecenter1F_MapScripts: .SceneScripts: db 0 @@ -47,7 +47,7 @@ OlivinePokecenter1FTeacherText: cont "rare #MON." done -OlivinePokecenter1F_MapEventHeader: +OlivinePokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 063f7db28..0b9b8882a 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -7,7 +7,7 @@ const_value set 2 const OLIVINEPORT_YOUNGSTER const OLIVINEPORT_COOLTRAINER_F -OlivinePort_MapScriptHeader: +OlivinePort_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -384,7 +384,7 @@ OlivinePortSailorText: line "allowed in." done -OlivinePort_MapEventHeader: +OlivinePort_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index e79db48cc..5b9615a73 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -1,7 +1,7 @@ const_value set 2 const OLIVINEPORTPASSAGE_POKEFAN_M -OlivinePortPassage_MapScriptHeader: +OlivinePortPassage_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ OlivinePortPassagePokefanMText: line "days." done -OlivinePortPassage_MapEventHeader: +OlivinePortPassage_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index b1217a545..ed0e86e32 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const OLIVINEPUNISHMENTSPEECHHOUSE_POKEFAN_M const OLIVINEPUNISHMENTSPEECHHOUSE_LASS -OlivinePunishmentSpeechHouse_MapScriptHeader: +OlivinePunishmentSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -39,7 +39,7 @@ OlivinePunishmentSpeechHouseDaughterText: cont "always scares me." done -OlivinePunishmentSpeechHouse_MapEventHeader: +OlivinePunishmentSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 33c5a746c..5d1b19263 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const OLIVINETIMSHOUSE_TIM -OlivineTimsHouse_MapScriptHeader: +OlivineTimsHouse_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ Tim: TimsHouseBookshelf: jumpstd magazinebookshelf -OlivineTimsHouse_MapEventHeader: +OlivineTimsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index e1e6006c9..8e18b6d08 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -2,7 +2,7 @@ const_value set 2 const PALLETTOWN_TEACHER const PALLETTOWN_FISHER -PalletTown_MapScriptHeader: +PalletTown_MapScripts: .SceneScripts: db 0 @@ -69,7 +69,7 @@ BluesHouseSignText: text "BLUE'S HOUSE" done -PalletTown_MapEventHeader: +PalletTown_MapEvents: ; filler db 0, 0 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 876bacfb0..a4467ec4a 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -5,7 +5,7 @@ const_value set 2 const PEWTERCITY_FRUIT_TREE1 const PEWTERCITY_FRUIT_TREE2 -PewterCity_MapScriptHeader: +PewterCity_MapScripts: .SceneScripts: db 0 @@ -152,7 +152,7 @@ PewterCityWelcomeSignText: line "PEWTER CITY!" done -PewterCity_MapEventHeader: +PewterCity_MapEvents: ; filler db 0, 0 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 305baf7fa..9e6395f13 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -3,7 +3,7 @@ const_value set 2 const PEWTERGYM_YOUNGSTER const PEWTERGYM_GYM_GUY -PewterGym_MapScriptHeader: +PewterGym_MapScripts: .SceneScripts: db 0 @@ -208,7 +208,7 @@ PewterGymGuyWinText: line "that seriously." done -PewterGym_MapEventHeader: +PewterGym_MapEvents: ; filler db 0, 0 diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index f34ac5a46..cc5047d7c 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -3,7 +3,7 @@ const_value set 2 const PEWTERMART_YOUNGSTER const PEWTERMART_SUPER_NERD -PewterMart_MapScriptHeader: +PewterMart_MapScripts: .SceneScripts: db 0 @@ -45,7 +45,7 @@ PewterMartSuperNerdText: line "excellent." done -PewterMart_MapEventHeader: +PewterMart_MapEvents: ; filler db 0, 0 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index f6b96845b..b70294cef 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const PEWTERNIDORANSPEECHHOUSE_SUPER_NERD const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M -PewterNidoranSpeechHouse_MapScriptHeader: +PewterNidoranSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -28,7 +28,7 @@ PewterNidoranText: text "NIDORAN: Gau gau!" done -PewterNidoranSpeechHouse_MapEventHeader: +PewterNidoranSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index b587e3b0d..25234385d 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const PEWTERPOKECENTER1F_BUG_CATCHER const PEWTERPOKECENTER1F_CHRIS -PewterPokecenter1F_MapScriptHeader: +PewterPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -67,7 +67,7 @@ PewterPokecenter1FBugCatcherText: line "#MON is asleep." done -PewterPokecenter1F_MapEventHeader: +PewterPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/PewterPokecenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm index 6e7809106..0e6e7b916 100644 --- a/maps/PewterPokecenter2FBeta.asm +++ b/maps/PewterPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -PewterPokecenter2FBeta_MapScriptHeader: +PewterPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -PewterPokecenter2FBeta_MapEventHeader: +PewterPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 2f9bd429b..43e423cc4 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const PEWTERSNOOZESPEECHHOUSE_GRAMPS -PewterSnoozeSpeechHouse_MapScriptHeader: +PewterSnoozeSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -20,7 +20,7 @@ PewterSnoozeSpeechHouseGrampsText: cont "…Zzzz…" done -PewterSnoozeSpeechHouse_MapEventHeader: +PewterSnoozeSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 7f105c02e..89dfe05ba 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const POKESEERSHOUSE_GRANNY -PokeSeersHouse_MapScriptHeader: +PokeSeersHouse_MapScripts: .SceneScripts: db 0 @@ -16,7 +16,7 @@ SeerScript: closetext end -PokeSeersHouse_MapEventHeader: +PokeSeersHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 946bceaf7..8dc1c8eb0 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -4,7 +4,7 @@ const_value set 2 const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST const POKECENTER2F_OFFICER -Pokecenter2F_MapScriptHeader: +Pokecenter2F_MapScripts: .SceneScripts: db 6 scene_script .Scene0 @@ -1022,7 +1022,7 @@ Text_BrokeStadiumRules: line "when you're ready." done -Pokecenter2F_MapEventHeader: +Pokecenter2F_MapEvents: ; filler db 0, 0 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 4740f745b..0c8bb70ec 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -6,7 +6,7 @@ const_value set 2 const POKEMONFANCLUB_FAIRY const POKEMONFANCLUB_ODDISH -PokemonFanClub_MapScriptHeader: +PokemonFanClub_MapScripts: .SceneScripts: db 0 @@ -296,7 +296,7 @@ UnknownText_0x191e29: line "brag right back!" done -PokemonFanClub_MapEventHeader: +PokemonFanClub_MapEvents: ; filler db 0, 0 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index f3b02fe44..ef855e40e 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -7,7 +7,7 @@ const_value set 2 const POWERPLANT_FISHER const POWERPLANT_FOREST -PowerPlant_MapScriptHeader: +PowerPlant_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -388,7 +388,7 @@ UnknownText_0x189475: line "electricity out!" done -PowerPlant_MapEventHeader: +PowerPlant_MapEvents: ; filler db 0, 0 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 05a2a8cb8..646eaae1f 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -6,7 +6,7 @@ const_value set 2 const RADIOTOWER1F_GENTLEMAN const RADIOTOWER1F_COOLTRAINER_F -RadioTower1F_MapScriptHeader: +RadioTower1F_MapScripts: .SceneScripts: db 0 @@ -472,7 +472,7 @@ UnknownText_0x5d631: cont "ent ID numbers!" done -RadioTower1F_MapEventHeader: +RadioTower1F_MapEvents: ; filler db 0, 0 diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 358bf14a7..99f4dbe4c 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -11,7 +11,7 @@ const_value set 2 const RADIOTOWER2F_BUENA const RADIOTOWER2F_RECEPTIONIST -RadioTower2F_MapScriptHeader: +RadioTower2F_MapScripts: .SceneScripts: db 0 @@ -710,7 +710,7 @@ UnknownText_0x5e463: line "#MON Radio" done -RadioTower2F_MapEventHeader: +RadioTower2F_MapEvents: ; filler db 0, 0 diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 7c2862e80..030aec018 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -7,7 +7,7 @@ const_value set 2 const RADIOTOWER3F_ROCKET3 const RADIOTOWER3F_SCIENTIST -RadioTower3F_MapScriptHeader: +RadioTower3F_MapScripts: .SceneScripts: db 0 @@ -328,7 +328,7 @@ UnknownText_0x5eae4: line "Host DJ BEN" done -RadioTower3F_MapEventHeader: +RadioTower3F_MapEvents: ; filler db 0, 0 diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 3beb7211c..99815f819 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -7,7 +7,7 @@ const_value set 2 const RADIOTOWER4F_ROCKET_GIRL const RADIOTOWER4F_SCIENTIST -RadioTower4F_MapScriptHeader: +RadioTower4F_MapScripts: .SceneScripts: db 0 @@ -245,7 +245,7 @@ UnknownText_0x5f00d: text "4F STUDIO 2" done -RadioTower4F_MapEventHeader: +RadioTower4F_MapEvents: ; filler db 0, 0 diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 615365caf..009c1e91d 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -5,7 +5,7 @@ const_value set 2 const RADIOTOWER5F_ROCKER const RADIOTOWER5F_POKE_BALL -RadioTower5F_MapScriptHeader: +RadioTower5F_MapScripts: .SceneScripts: db 3 scene_script .DummyScene0 @@ -420,7 +420,7 @@ SignpostRadioTower5FStudio: text "5F STUDIO 1" done -RadioTower5F_MapEventHeader: +RadioTower5F_MapEvents: ; filler db 0, 0 diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 07f23a582..2f9d2828a 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -1,7 +1,7 @@ const_value set 2 const REDSHOUSE1F_REDS_MOM -RedsHouse1F_MapScriptHeader: +RedsHouse1F_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -74,7 +74,7 @@ RedsHouse1FTVText: cont "in JOHTO…" done -RedsHouse1F_MapEventHeader: +RedsHouse1F_MapEvents: ; filler db 0, 0 diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index 073985eaa..b69790cdd 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -1,4 +1,4 @@ -RedsHouse2F_MapScriptHeader: +RedsHouse2F_MapScripts: .SceneScripts: db 0 @@ -25,7 +25,7 @@ RedsHouse2FPCText: cont "in a long time…" done -RedsHouse2F_MapEventHeader: +RedsHouse2F_MapEvents: ; filler db 0, 0 diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 6288f23f3..570b4b2f5 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -2,7 +2,7 @@ const_value set 2 const ROCKTUNNEL1F_POKE_BALL1 const ROCKTUNNEL1F_POKE_BALL2 -RockTunnel1F_MapScriptHeader: +RockTunnel1F_MapScripts: .SceneScripts: db 0 @@ -21,7 +21,7 @@ RockTunnel1FHiddenXAccuracy: RockTunnel1FHiddenXDefend: hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND -RockTunnel1F_MapEventHeader: +RockTunnel1F_MapEvents: ; filler db 0, 0 diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 26b465c11..d94f1f412 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -3,7 +3,7 @@ const_value set 2 const ROCKTUNNELB1F_POKE_BALL2 const ROCKTUNNELB1F_POKE_BALL3 -RockTunnelB1F_MapScriptHeader: +RockTunnelB1F_MapScripts: .SceneScripts: db 0 @@ -22,7 +22,7 @@ RockTunnelB1FRevive: RockTunnelB1FHiddenMaxPotion: hiddenitem EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION -RockTunnelB1F_MapEventHeader: +RockTunnelB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/Route1.asm b/maps/Route1.asm index d079ba955..8be70d4d6 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE1_COOLTRAINER_F const ROUTE1_FRUIT_TREE -Route1_MapScriptHeader: +Route1_MapScripts: .SceneScripts: db 0 @@ -80,7 +80,7 @@ Route1SignText: line "VIRIDIAN CITY" done -Route1_MapEventHeader: +Route1_MapEvents: ; filler db 0, 0 diff --git a/maps/Route10North.asm b/maps/Route10North.asm index 918d3af57..feb7dd033 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -1,4 +1,4 @@ -Route10North_MapScriptHeader: +Route10North_MapScripts: .SceneScripts: db 0 @@ -15,7 +15,7 @@ PowerPlantSignText: text "KANTO POWER PLANT" done -Route10North_MapEventHeader: +Route10North_MapEvents: ; filler db 0, 0 diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index c0bd2b5ec..4a75da2ec 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE10POKECENTER1F_GYM_GUY const ROUTE10POKECENTER1F_COOLTRAINER_F -Route10Pokecenter1F_MapScriptHeader: +Route10Pokecenter1F_MapScripts: .SceneScripts: db 0 @@ -80,7 +80,7 @@ Route10Pokecenter1FCooltrainerFText: line "PLANT." done -Route10Pokecenter1F_MapEventHeader: +Route10Pokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/Route10Pokecenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm index 5a13e4025..c3b2d39cc 100644 --- a/maps/Route10Pokecenter2FBeta.asm +++ b/maps/Route10Pokecenter2FBeta.asm @@ -1,11 +1,11 @@ -Route10Pokecenter2FBeta_MapScriptHeader: +Route10Pokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -Route10Pokecenter2FBeta_MapEventHeader: +Route10Pokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 2c904beff..a03a5d485 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE10SOUTH_POKEFAN_M1 const ROUTE10SOUTH_POKEFAN_M2 -Route10South_MapScriptHeader: +Route10South_MapScripts: .SceneScripts: db 0 @@ -75,7 +75,7 @@ Route10SignText: line "LAVENDER TOWN" done -Route10South_MapEventHeader: +Route10South_MapEvents: ; filler db 0, 0 diff --git a/maps/Route11.asm b/maps/Route11.asm index ecb1003a7..353877969 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -5,7 +5,7 @@ const_value set 2 const ROUTE11_YOUNGSTER4 const ROUTE11_FRUIT_TREE -Route11_MapScriptHeader: +Route11_MapScripts: .SceneScripts: db 0 @@ -145,7 +145,7 @@ Route11SignText: text "ROUTE 11" done -Route11_MapEventHeader: +Route11_MapEvents: ; filler db 0, 0 diff --git a/maps/Route12.asm b/maps/Route12.asm index ac585f51b..3aaf37991 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -6,7 +6,7 @@ const_value set 2 const ROUTE12_POKE_BALL1 const ROUTE12_POKE_BALL2 -Route12_MapScriptHeader: +Route12_MapScripts: .SceneScripts: db 0 @@ -166,7 +166,7 @@ FishingSpotSignText: text "FISHING SPOT" done -Route12_MapEventHeader: +Route12_MapEvents: ; filler db 0, 0 diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index b951102e1..ca39effaf 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE12SUPERRODHOUSE_FISHING_GURU -Route12SuperRodHouse_MapScriptHeader: +Route12SuperRodHouse_MapScripts: .SceneScripts: db 0 @@ -79,7 +79,7 @@ UnknownText_0x7f5ec: line "deceived me?" done -Route12SuperRodHouse_MapEventHeader: +Route12SuperRodHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route13.asm b/maps/Route13.asm index 014bd4c70..88753afbb 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -5,7 +5,7 @@ const_value set 2 const ROUTE13_POKEFAN_M2 const ROUTE13_POKEFAN_M3 -Route13_MapScriptHeader: +Route13_MapScripts: .SceneScripts: db 0 @@ -191,7 +191,7 @@ Route13DirectionsSignText: line "CITY" done -Route13_MapEventHeader: +Route13_MapEvents: ; filler db 0, 0 diff --git a/maps/Route14.asm b/maps/Route14.asm index e16f62e91..3f5a58357 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE14_POKEFAN_M2 const ROUTE14_KIM -Route14_MapScriptHeader: +Route14_MapScripts: .SceneScripts: db 0 @@ -115,7 +115,7 @@ PokefanmTrevorAfterBattleText: line "got my #MON…" done -Route14_MapEventHeader: +Route14_MapEvents: ; filler db 0, 0 diff --git a/maps/Route15.asm b/maps/Route15.asm index 59232fd8f..58fe79c9b 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -7,7 +7,7 @@ const_value set 2 const ROUTE15_TEACHER2 const ROUTE15_POKE_BALL -Route15_MapScriptHeader: +Route15_MapScripts: .SceneScripts: db 0 @@ -201,7 +201,7 @@ Route15SignText: line "LAVENDER TOWN" done -Route15_MapEventHeader: +Route15_MapEvents: ; filler db 0, 0 diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 292131d91..80966bd2b 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE15FUCHSIAGATE_OFFICER -Route15FuchsiaGate_MapScriptHeader: +Route15FuchsiaGate_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ Route15FuchsiaGateOfficerText: line "Don't give up!" done -Route15FuchsiaGate_MapEventHeader: +Route15FuchsiaGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route16.asm b/maps/Route16.asm index 8d7141f57..0e0fb2dc4 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -1,4 +1,4 @@ -Route16_MapScriptHeader: +Route16_MapScripts: .SceneScripts: db 0 @@ -28,7 +28,7 @@ CyclingRoadSignText: line "ALL THE WAY!" done -Route16_MapEventHeader: +Route16_MapEvents: ; filler db 0, 0 diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 8f48fe4b3..1d709e4ea 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD -Route16FuchsiaSpeechHouse_MapScriptHeader: +Route16FuchsiaSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -22,7 +22,7 @@ Route16FuchsiaSpeechHouseSuperNerdText: line "FUCHSIA CITY." done -Route16FuchsiaSpeechHouse_MapEventHeader: +Route16FuchsiaSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index eb57b0662..d59425640 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE16GATE_OFFICER -Route16Gate_MapScriptHeader: +Route16Gate_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -60,7 +60,7 @@ UnknownText_0x73496: line "BICYCLE." done -Route16Gate_MapEventHeader: +Route16Gate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route17.asm b/maps/Route17.asm index 9ed64340e..b2c1a820d 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE17_BIKER3 const ROUTE17_BIKER4 -Route17_MapScriptHeader: +Route17_MapScripts: .SceneScripts: db 0 @@ -132,7 +132,7 @@ BikerCharlesAfterBattleText: cont "Take it easy!" done -Route17_MapEventHeader: +Route17_MapEvents: ; filler db 0, 0 diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm index 6596d3809..367a2634b 100644 --- a/maps/Route17Route18Gate.asm +++ b/maps/Route17Route18Gate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE17ROUTE18GATE_OFFICER -Route17Route18Gate_MapScriptHeader: +Route17Route18Gate_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -51,7 +51,7 @@ UnknownText_0x7364d: line "BICYCLE to go on." done -Route17Route18Gate_MapEventHeader: +Route17Route18Gate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route18.asm b/maps/Route18.asm index 0487cc797..8cff37f09 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE18_YOUNGSTER1 const ROUTE18_YOUNGSTER2 -Route18_MapScriptHeader: +Route18_MapScripts: .SceneScripts: db 0 @@ -77,7 +77,7 @@ Route18SignText: line "FUCHSIA CITY" done -Route18_MapEventHeader: +Route18_MapEvents: ; filler db 0, 0 diff --git a/maps/Route19.asm b/maps/Route19.asm index 5309598b6..4c32af13f 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -6,7 +6,7 @@ const_value set 2 const ROUTE19_FISHER1 const ROUTE19_FISHER2 -Route19_MapScriptHeader: +Route19_MapScripts: .SceneScripts: db 0 @@ -234,13 +234,13 @@ CarefulSwimmingSignText: para "FUCHSIA POLICE" done -Route19_MapEventHeader: +Route19_MapEvents: ; filler db 0, 0 .Warps: db 1 - warp_def 7, 3, 3, ROUTE_19___FUCHSIA_GATE + warp_def 7, 3, 3, ROUTE_19_FUCHSIA_GATE .CoordEvents: db 0 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index c366c63d5..4446de2e3 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE19FUCHSIAGATE_OFFICER -Route19FuchsiaGate_MapScriptHeader: +Route19FuchsiaGate_MapScripts: .SceneScripts: db 0 @@ -45,7 +45,7 @@ UnknownText_0x1ab48a: line "That's great!" done -Route19FuchsiaGate_MapEventHeader: +Route19FuchsiaGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route2.asm b/maps/Route2.asm index 508758448..09b885df3 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -8,7 +8,7 @@ const_value set 2 const ROUTE2_POKE_BALL4 const ROUTE2_FRUIT_TREE -Route2_MapScriptHeader: +Route2_MapScripts: .SceneScripts: db 0 @@ -146,7 +146,7 @@ UnknownText_0x1ac49f: text "DIGLETT'S CAVE" done -Route2_MapEventHeader: +Route2_MapEvents: ; filler db 0, 0 diff --git a/maps/Route20.asm b/maps/Route20.asm index 67118d5cb..e7a776b2b 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE20_SWIMMER_GIRL2 const ROUTE20_SWIMMER_GUY -Route20_MapScriptHeader: +Route20_MapScripts: .SceneScripts: db 0 @@ -112,7 +112,7 @@ CinnabarGymSignText: line "LEADER: BLAINE" done -Route20_MapEventHeader: +Route20_MapEvents: ; filler db 0, 0 diff --git a/maps/Route21.asm b/maps/Route21.asm index 97acd08ec..e6b4eb564 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE21_SWIMMER_GUY const ROUTE21_FISHER -Route21_MapScriptHeader: +Route21_MapScripts: .SceneScripts: db 0 @@ -89,7 +89,7 @@ FisherArnoldAfterBattleText: line "to fishing…" done -Route21_MapEventHeader: +Route21_MapEvents: ; filler db 0, 0 diff --git a/maps/Route22.asm b/maps/Route22.asm index 3c5aead91..c9d520cb1 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -1,4 +1,4 @@ -Route22_MapScriptHeader: +Route22_MapScripts: .SceneScripts: db 0 @@ -15,7 +15,7 @@ VictoryRoadEntranceSignText: line "ENTRANCE" done -Route22_MapEventHeader: +Route22_MapEvents: ; filler db 0, 0 diff --git a/maps/Route23.asm b/maps/Route23.asm index c82ae6462..99c527303 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -1,4 +1,4 @@ -Route23_MapScriptHeader: +Route23_MapScripts: .SceneScripts: db 0 @@ -22,7 +22,7 @@ IndigoPlateauSignText: para "#MON LEAGUE HQ" done -Route23_MapEventHeader: +Route23_MapEvents: ; filler db 0, 0 diff --git a/maps/Route24.asm b/maps/Route24.asm index e598c01a1..afb4a514e 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE24_ROCKET -Route24_MapScriptHeader: +Route24_MapScripts: .SceneScripts: db 0 @@ -118,7 +118,7 @@ UnknownText_0x1adee1: cont "from, me?" done -Route24_MapEventHeader: +Route24_MapEvents: ; filler db 0, 0 diff --git a/maps/Route25.asm b/maps/Route25.asm index 15a2ded4e..616a8ff8f 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -11,7 +11,7 @@ const_value set 2 const ROUTE25_COOLTRAINER_M2 const ROUTE25_POKE_BALL -Route25_MapScriptHeader: +Route25_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -429,7 +429,7 @@ BillsHouseSignText: text "BILL'S HOUSE" done -Route25_MapEventHeader: +Route25_MapEvents: ; filler db 0, 0 diff --git a/maps/Route26.asm b/maps/Route26.asm index 148d5e96c..293a0add7 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -8,7 +8,7 @@ const_value set 2 const ROUTE26_FRUIT_TREE const ROUTE26_POKE_BALL -Route26_MapScriptHeader: +Route26_MapScripts: .SceneScripts: db 0 @@ -412,7 +412,7 @@ Route26SignText: line "RECEPTION GATE" done -Route26_MapEventHeader: +Route26_MapEvents: ; filler db 0, 0 diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm index d304ce29f..e958d81f2 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/Route26DayofWeekSiblingsHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE26DAYOFWEEKSIBLINGSHOUSE_POKEDEX -Route26DayofWeekSiblingsHouse_MapScriptHeader: +Route26DayofWeekSiblingsHouse_MapScripts: .SceneScripts: db 0 @@ -70,7 +70,7 @@ UnknownText_0x7b2b9: line "ROUTE 37" done -Route26DayofWeekSiblingsHouse_MapEventHeader: +Route26DayofWeekSiblingsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index e60b83ce4..d1759dc9d 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE26HEALSPEECHHOUSE_TEACHER -Route26HealSpeechHouse_MapScriptHeader: +Route26HealSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -48,7 +48,7 @@ UnknownText_0x7b18b: para "Keep at it!" done -Route26HealSpeechHouse_MapEventHeader: +Route26HealSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route27.asm b/maps/Route27.asm index a21606768..513466a18 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -9,7 +9,7 @@ const_value set 2 const ROUTE27_POKE_BALL2 const ROUTE27_FISHER -Route27_MapScriptHeader: +Route27_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -467,7 +467,7 @@ TohjoFallsSignText: line "KANTO AND JOHTO" done -Route27_MapEventHeader: +Route27_MapEvents: ; filler db 0, 0 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index a892e22e3..629af1536 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE27SANDSTORMHOUSE_GRANNY -Route27SandstormHouse_MapScriptHeader: +Route27SandstormHouse_MapScripts: .SceneScripts: db 0 @@ -93,7 +93,7 @@ SandstormHouseWomanDisloyalText: cont "and trainers." done -Route27SandstormHouse_MapEventHeader: +Route27SandstormHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route28.asm b/maps/Route28.asm index 225039518..0599fd9d9 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -1,4 +1,4 @@ -Route28_MapScriptHeader: +Route28_MapScripts: .SceneScripts: db 0 @@ -15,7 +15,7 @@ Route28SignText: text "ROUTE 28" done -Route28_MapEventHeader: +Route28_MapEvents: ; filler db 0, 0 diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index fe833982d..662e7279b 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE28FAMOUSSPEECHHOUSE_CELEBRITY const ROUTE28FAMOUSSPEECHHOUSE_FEAROW -Route28FamousSpeechHouse_MapScriptHeader: +Route28FamousSpeechHouse_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -70,7 +70,7 @@ CelebritysFearowText: text "FEAROW: Feero!" done -Route28FamousSpeechHouse_MapEventHeader: +Route28FamousSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route29.asm b/maps/Route29.asm index 8cd26f84b..6c7239d92 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -8,7 +8,7 @@ const_value set 2 const ROUTE29_TUSCANY const ROUTE29_POKE_BALL -Route29_MapScriptHeader: +Route29_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -415,7 +415,7 @@ Route29Sign2Text: line "NEW BARK TOWN" done -Route29_MapEventHeader: +Route29_MapEvents: ; filler db 0, 0 diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm index e3366fae7..f0b69ab5d 100644 --- a/maps/Route29Route46Gate.asm +++ b/maps/Route29Route46Gate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE29ROUTE46GATE_OFFICER const ROUTE29ROUTE46GATE_YOUNGSTER -Route29Route46Gate_MapScriptHeader: +Route29Route46Gate_MapScripts: .SceneScripts: db 0 @@ -36,7 +36,7 @@ Route29Route46GateYoungsterText: line "everywhere." done -Route29Route46Gate_MapEventHeader: +Route29Route46Gate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 7607bc1fc..60585b267 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE2GATE_SCIENTIST -Route2Gate_MapScriptHeader: +Route2Gate_MapScripts: .SceneScripts: db 0 @@ -25,7 +25,7 @@ Route2GateScientistText: cont "TOWN." done -Route2Gate_MapEventHeader: +Route2Gate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index e42337e6a..231b568ed 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE2NUGGETSPEECHHOUSE_FISHER -Route2NuggetSpeechHouse_MapScriptHeader: +Route2NuggetSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -52,7 +52,7 @@ UnknownText_0x9b8e5: line "have to do!" done -Route2NuggetSpeechHouse_MapEventHeader: +Route2NuggetSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route3.asm b/maps/Route3.asm index e0498e167..6ce01aeb1 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE3_YOUNGSTER2 const ROUTE3_FISHER2 -Route3_MapScriptHeader: +Route3_MapScripts: .SceneScripts: db 0 @@ -132,7 +132,7 @@ UnknownText_0x1ae163: line "stairs." done -Route3_MapEventHeader: +Route3_MapEvents: ; filler db 0, 0 diff --git a/maps/Route30.asm b/maps/Route30.asm index 4884beeee..df8b593d6 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -11,7 +11,7 @@ const_value set 2 const ROUTE30_COOLTRAINER_F const ROUTE30_POKE_BALL -Route30_MapScriptHeader: +Route30_MapScripts: .SceneScripts: db 0 @@ -406,7 +406,7 @@ YoungsterJoeyText_GiveHPUpAfterBattle: line "tougher too." done -Route30_MapEventHeader: +Route30_MapEvents: ; filler db 0, 0 diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index a912fd529..96605b3c8 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE30BERRYSPEECHHOUSE_POKEFAN_M -Route30BerrySpeechHouse_MapScriptHeader: +Route30BerrySpeechHouse_MapScripts: .SceneScripts: db 0 @@ -46,7 +46,7 @@ UnknownText_0x196dec: cont "drop right off." done -Route30BerrySpeechHouse_MapEventHeader: +Route30BerrySpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route31.asm b/maps/Route31.asm index 15a76a3cf..f8ea93d2a 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -7,7 +7,7 @@ const_value set 2 const ROUTE31_POKE_BALL1 const ROUTE31_POKE_BALL2 -Route31_MapScriptHeader: +Route31_MapScripts: .SceneScripts: db 0 @@ -417,7 +417,7 @@ DarkCaveSignText: text "DARK CAVE" done -Route31_MapEventHeader: +Route31_MapEvents: ; filler db 0, 0 diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 4195528ff..6d62f9398 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE31VIOLETGATE_OFFICER const ROUTE31VIOLETGATE_COOLTRAINER_F -Route31VioletGate_MapScriptHeader: +Route31VioletGate_MapScripts: .SceneScripts: db 0 @@ -27,7 +27,7 @@ Route31VioletGateCooltrainerFText: cont "phone home!" done -Route31VioletGate_MapEventHeader: +Route31VioletGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route32.asm b/maps/Route32.asm index 369dac494..afd946c2b 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -14,7 +14,7 @@ const_value set 2 const ROUTE32_FRIEDA const ROUTE32_POKE_BALL2 -Route32_MapScriptHeader: +Route32_MapScripts: .SceneScripts: db 3 scene_script .DummyScene0 @@ -928,7 +928,7 @@ Route32UnionCaveSignText: line "AHEAD" done -Route32_MapEventHeader: +Route32_MapEvents: ; filler db 0, 0 diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index a29d79b8d..5bedc7853 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE32POKECENTER1F_FISHING_GURU const ROUTE32POKECENTER1F_COOLTRAINER_F -Route32Pokecenter1F_MapScriptHeader: +Route32Pokecenter1F_MapScripts: .SceneScripts: db 0 @@ -94,7 +94,7 @@ Route32Pokecenter1FCooltrainerFText: cont "power…" done -Route32Pokecenter1F_MapEventHeader: +Route32Pokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index 6bfa8ec27..345e46dd4 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE32RUINSOFALPHGATE_POKEFAN_M const ROUTE32RUINSOFALPHGATE_YOUNGSTER -Route32RuinsOfAlphGate_MapScriptHeader: +Route32RuinsOfAlphGate_MapScripts: .SceneScripts: db 0 @@ -46,7 +46,7 @@ Route32RuinsOfAlphGateYoungsterText: cont "what they are." done -Route32RuinsOfAlphGate_MapEventHeader: +Route32RuinsOfAlphGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route33.asm b/maps/Route33.asm index 5ab8610d7..be2abbf4c 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE33_LASS const ROUTE33_FRUIT_TREE -Route33_MapScriptHeader: +Route33_MapScripts: .SceneScripts: db 0 @@ -194,7 +194,7 @@ Route33SignText: text "ROUTE 33" done -Route33_MapEventHeader: +Route33_MapEvents: ; filler db 0, 0 diff --git a/maps/Route34.asm b/maps/Route34.asm index 04ea74ab7..786ffb022 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -13,7 +13,7 @@ const_value set 2 const ROUTE34_COOLTRAINER_F3 const ROUTE34_POKE_BALL -Route34_MapScriptHeader: +Route34_MapScripts: .SceneScripts: db 0 @@ -760,7 +760,7 @@ DayCareSignText: line "#MON FOR YOU!" done -Route34_MapEventHeader: +Route34_MapEvents: ; filler db 0, 0 diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index db9f31f39..38dc04729 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE34ILEXFORESTGATE_LASS const ROUTE34ILEXFORESTGATE_TEACHER2 -Route34IlexForestGate_MapScriptHeader: +Route34IlexForestGate_MapScripts: .SceneScripts: db 0 @@ -135,7 +135,7 @@ Route34IlexForestGateLassText: cont "type #MON." done -Route34IlexForestGate_MapEventHeader: +Route34IlexForestGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route35.asm b/maps/Route35.asm index a8a8bfe46..467fb6c5a 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -11,7 +11,7 @@ const_value set 2 const ROUTE35_FRUIT_TREE const ROUTE35_POKE_BALL -Route35_MapScriptHeader: +Route35_MapScripts: .SceneScripts: db 0 @@ -462,7 +462,7 @@ Route35SignText: text "ROUTE 35" done -Route35_MapEventHeader: +Route35_MapEvents: ; filler db 0, 0 diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 77820e889..a783781dd 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE35GOLDENRODGATE_POKEFAN_F const ROUTE35GOLDENRODGATE_FISHER -Route35GoldenrodGate_MapScriptHeader: +Route35GoldenrodGate_MapScripts: .SceneScripts: db 0 @@ -195,7 +195,7 @@ Route35GoldenrodGateFisherText: line "different kinds." done -Route35GoldenrodGate_MapEventHeader: +Route35GoldenrodGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index c5d9b6c34..d4318db8f 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE35NATIONALPARKGATE_YOUNGSTER const ROUTE35NATIONALPARKGATE_OFFICER2 -Route35NationalParkGate_MapScriptHeader: +Route35NationalParkGate_MapScripts: .SceneScripts: db 3 scene_script .DummyScene0 @@ -437,7 +437,7 @@ UnknownText_0x6a90e: line "the contest." done -Route35NationalParkGate_MapEventHeader: +Route35NationalParkGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route36.asm b/maps/Route36.asm index bc94bf2b2..fceef3306 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -9,7 +9,7 @@ const_value set 2 const ROUTE36_FLORIA const ROUTE36_SUICUNE -Route36_MapScriptHeader: +Route36_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -659,7 +659,7 @@ Route36TrainerTips2Text: line "landmarks." done -Route36_MapEventHeader: +Route36_MapEvents: ; filler db 0, 0 diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 24854b9e3..42e26b4b2 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -12,7 +12,7 @@ const_value set 2 const ROUTE36NATIONALPARKGATE_YOUNGSTER7 const ROUTE36NATIONALPARKGATE_OFFICER2 -Route36NationalParkGate_MapScriptHeader: +Route36NationalParkGate_MapScripts: .SceneScripts: db 3 scene_script .DummyScene0 @@ -849,7 +849,7 @@ UnknownText_0x6b97f: cont "for you." done -Route36NationalParkGate_MapEventHeader: +Route36NationalParkGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index 316b2d4b4..c7355dd04 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE36RUINSOFALPHGATE_OFFICER const ROUTE36RUINSOFALPHGATE_GRAMPS -Route36RuinsOfAlphGate_MapScriptHeader: +Route36RuinsOfAlphGate_MapScripts: .SceneScripts: db 0 @@ -34,7 +34,7 @@ Route36RuinsOfAlphGateGrampsText: line "RUINS OF ALPH." done -Route36RuinsOfAlphGate_MapEventHeader: +Route36RuinsOfAlphGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route37.asm b/maps/Route37.asm index 233a299b9..27dd38893 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -7,7 +7,7 @@ const_value set 2 const ROUTE37_FRUIT_TREE2 const ROUTE37_FRUIT_TREE3 -Route37_MapScriptHeader: +Route37_MapScripts: .SceneScripts: db 0 @@ -237,7 +237,7 @@ Route37SignText: text "ROUTE 37" done -Route37_MapEventHeader: +Route37_MapEvents: ; filler db 0, 0 diff --git a/maps/Route38.asm b/maps/Route38.asm index c91ad06c1..c228429ba 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -7,7 +7,7 @@ const_value set 2 const ROUTE38_FRUIT_TREE const ROUTE38_BUENA2 -Route38_MapScriptHeader: +Route38_MapScripts: .SceneScripts: db 0 @@ -472,7 +472,7 @@ Route38TrainerTipsText: cont "its evolution." done -Route38_MapEventHeader: +Route38_MapEvents: ; filler db 0, 0 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index 8e117196c..fa7280b57 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE38ECRUTEAKGATE_OFFICER -Route38EcruteakGate_MapScriptHeader: +Route38EcruteakGate_MapScripts: .SceneScripts: db 0 @@ -24,7 +24,7 @@ Route38EcruteakGateOfficerText: line "way to get here." done -Route38EcruteakGate_MapEventHeader: +Route38EcruteakGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route39.asm b/maps/Route39.asm index 6038df139..9af608cbc 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -10,7 +10,7 @@ const_value set 2 const ROUTE39_FRUIT_TREE const ROUTE39_POKEFAN_F2 -Route39_MapScriptHeader: +Route39_MapScripts: .SceneScripts: db 0 @@ -343,7 +343,7 @@ Route39TrainerTipsText: line "any tree you see!" done -Route39_MapEventHeader: +Route39_MapEvents: ; filler db 0, 0 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 6234a9cf4..682b2dea1 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE39BARN_TWIN2 const ROUTE39BARN_MOOMOO -Route39Barn_MapScriptHeader: +Route39Barn_MapScripts: .SceneScripts: db 0 @@ -188,7 +188,7 @@ Text_RefusedToGiveBerry: para "MILTANK looks sad." done -Route39Barn_MapEventHeader: +Route39Barn_MapEvents: ; filler db 0, 0 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 15f8c2a6d..9f46263de 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE39FARMHOUSE_POKEFAN_M const ROUTE39FARMHOUSE_POKEFAN_F -Route39Farmhouse_MapScriptHeader: +Route39Farmhouse_MapScripts: .SceneScripts: db 0 @@ -192,7 +192,7 @@ FarmerFText_SnoreSpeech: cont "it, hon." done -Route39Farmhouse_MapEventHeader: +Route39Farmhouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route4.asm b/maps/Route4.asm index c28394c0f..a0bf7c4bc 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE4_LASS2 const ROUTE4_POKE_BALL -Route4_MapScriptHeader: +Route4_MapScripts: .SceneScripts: db 0 @@ -120,7 +120,7 @@ MtMoonSquareSignText: line "stairs." done -Route4_MapEventHeader: +Route4_MapEvents: ; filler db 0, 0 diff --git a/maps/Route40.asm b/maps/Route40.asm index 28461eac8..9124da140 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -12,7 +12,7 @@ const_value set 2 const ROUTE40_LASS2 const ROUTE40_STANDING_YOUNGSTER -Route40_MapScriptHeader: +Route40_MapScripts: .SceneScripts: db 0 @@ -337,7 +337,7 @@ Route40SignText: line "OLIVINE CITY" done -Route40_MapEventHeader: +Route40_MapEvents: ; filler db 0, 0 diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 9562c3ae4..edd8fb7ff 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE40BATTLETOWERGATE_ROCKER const ROUTE40BATTLETOWERGATE_TWIN -Route40BattleTowerGate_MapScriptHeader: +Route40BattleTowerGate_MapScripts: .SceneScripts: db 0 @@ -70,7 +70,7 @@ Route40BattleTowerGateTwinText: line "them now!" done -Route40BattleTowerGate_MapEventHeader: +Route40BattleTowerGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route41.asm b/maps/Route41.asm index 29eb35e04..4b66164dd 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -10,7 +10,7 @@ const_value set 2 const ROUTE41_SWIMMER_GIRL4 const ROUTE41_SWIMMER_GIRL5 -Route41_MapScriptHeader: +Route41_MapScripts: .SceneScripts: db 0 @@ -341,7 +341,7 @@ SwimmerfWendyAfterBattleText: line "it's scary." done -Route41_MapEventHeader: +Route41_MapEvents: ; filler db 0, 0 diff --git a/maps/Route42.asm b/maps/Route42.asm index 46606e647..c9d9ac30e 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -9,7 +9,7 @@ const_value set 2 const ROUTE42_POKE_BALL2 const ROUTE42_SUICUNE -Route42_MapScriptHeader: +Route42_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -318,7 +318,7 @@ Route42Sign2Text: line "MAHOGANY TOWN" done -Route42_MapEventHeader: +Route42_MapEvents: ; filler db 0, 0 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index 89bf4b494..f873e7fed 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE42ECRUTEAKGATE_OFFICER -Route42EcruteakGate_MapScriptHeader: +Route42EcruteakGate_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ Route42EcruteakGateOfficerText: line "get lost in there." done -Route42EcruteakGate_MapEventHeader: +Route42EcruteakGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route43.asm b/maps/Route43.asm index afad4a606..890acfaf8 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -8,7 +8,7 @@ const_value set 2 const ROUTE43_FRUIT_TREE const ROUTE43_POKE_BALL -Route43_MapScriptHeader: +Route43_MapScripts: .SceneScripts: db 0 @@ -500,7 +500,7 @@ Route43TrainerTipsText: line "#MON's type." done -Route43_MapEventHeader: +Route43_MapEvents: ; filler db 0, 0 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 7548394a5..51d095e3c 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -5,7 +5,7 @@ const_value set 2 const ROUTE43GATE_ROCKET1 const ROUTE43GATE_ROCKET2 -Route43Gate_MapScriptHeader: +Route43Gate_MapScripts: .SceneScripts: db 2 scene_script .RocketShakedown @@ -247,7 +247,7 @@ OfficerText_AvoidGrass: cont "the grass." done -Route43Gate_MapEventHeader: +Route43Gate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index 5cbd1d617..d3d2758ea 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE43MAHOGANYGATE_OFFICER -Route43MahoganyGate_MapScriptHeader: +Route43MahoganyGate_MapScripts: .SceneScripts: db 0 @@ -38,7 +38,7 @@ UnknownText_0x19ab65: cont "days." done -Route43MahoganyGate_MapEventHeader: +Route43MahoganyGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route44.asm b/maps/Route44.asm index 31fe9223f..6ab469c04 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -11,7 +11,7 @@ const_value set 2 const ROUTE44_POKE_BALL2 const ROUTE44_POKE_BALL3 -Route44_MapScriptHeader: +Route44_MapScripts: .SceneScripts: db 0 @@ -506,7 +506,7 @@ Route44Sign2Text: line "BLACKTHORN CITY" done -Route44_MapEventHeader: +Route44_MapEvents: ; filler db 0, 0 diff --git a/maps/Route45.asm b/maps/Route45.asm index 63db10a95..2b026b8d4 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -13,7 +13,7 @@ const_value set 2 const ROUTE45_POKE_BALL4 const ROUTE45_YOUNGSTER -Route45_MapScriptHeader: +Route45_MapScripts: .SceneScripts: db 0 @@ -531,7 +531,7 @@ Route45SignText: line "MOUNTAIN RD. AHEAD" done -Route45_MapEventHeader: +Route45_MapEvents: ; filler db 0, 0 diff --git a/maps/Route46.asm b/maps/Route46.asm index 6edd26404..777e63501 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -6,7 +6,7 @@ const_value set 2 const ROUTE46_FRUIT_TREE2 const ROUTE46_POKE_BALL -Route46_MapScriptHeader: +Route46_MapScripts: .SceneScripts: db 0 @@ -250,7 +250,7 @@ Route46SignText: line "MOUNTAIN RD. AHEAD" done -Route46_MapEventHeader: +Route46_MapEvents: ; filler db 0, 0 diff --git a/maps/Route5.asm b/maps/Route5.asm index 1e2ea7741..9bdf8a023 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE5_POKEFAN_M -Route5_MapScriptHeader: +Route5_MapScripts: .SceneScripts: db 0 @@ -39,7 +39,7 @@ HouseForSaleSignText: line "Nobody lives here." done -Route5_MapEventHeader: +Route5_MapEvents: ; filler db 0, 0 diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index 320ddef89..f044a48b0 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE5CLEANSETAGSPEECHHOUSE_GRANNY const ROUTE5CLEANSETAGSPEECHHOUSE_TEACHER -Route5CleanseTagSpeechHouse_MapScriptHeader: +Route5CleanseTagSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -60,7 +60,7 @@ Route5CleanseTagSpeechHouseTeacherText: line "startled you." done -Route5CleanseTagSpeechHouse_MapEventHeader: +Route5CleanseTagSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm index cf945b7dc..1f8bb9b94 100644 --- a/maps/Route5SaffronGate.asm +++ b/maps/Route5SaffronGate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE5SAFFRONGATE_OFFICER -Route5SaffronGate_MapScriptHeader: +Route5SaffronGate_MapScripts: .SceneScripts: db 0 @@ -20,7 +20,7 @@ Route5SaffronGateOfficerText: cont "don't you agree?" done -Route5SaffronGate_MapEventHeader: +Route5SaffronGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm index 954b16ecb..2bdb75ca0 100644 --- a/maps/Route5UndergroundPathEntrance.asm +++ b/maps/Route5UndergroundPathEntrance.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER -Route5UndergroundPathEntrance_MapScriptHeader: +Route5UndergroundPathEntrance_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ Route5UndergroundPathEntranceTeacherText: line "love to visit!" done -Route5UndergroundPathEntrance_MapEventHeader: +Route5UndergroundPathEntrance_MapEvents: ; filler db 0, 0 diff --git a/maps/Route6.asm b/maps/Route6.asm index d19033031..9a66c5844 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE6_POKEFAN_M2 const ROUTE6_POKEFAN_M3 -Route6_MapScriptHeader: +Route6_MapScripts: .SceneScripts: db 0 @@ -91,7 +91,7 @@ PokefanmAllanAfterBattleText: cont "your heart melt?" done -Route6_MapEventHeader: +Route6_MapEvents: ; filler db 0, 0 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 713e1476e..b2dbf0e6c 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE6SAFFRONGATE_OFFICER -Route6SaffronGate_MapScriptHeader: +Route6SaffronGate_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -57,7 +57,7 @@ UnknownText_0x1927cb: line "FRON." done -Route6SaffronGate_MapEventHeader: +Route6SaffronGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route6UndergroundPathEntrance.asm b/maps/Route6UndergroundPathEntrance.asm index 126406e10..aad70ec88 100644 --- a/maps/Route6UndergroundPathEntrance.asm +++ b/maps/Route6UndergroundPathEntrance.asm @@ -1,11 +1,11 @@ -Route6UndergroundPathEntrance_MapScriptHeader: +Route6UndergroundPathEntrance_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -Route6UndergroundPathEntrance_MapEventHeader: +Route6UndergroundPathEntrance_MapEvents: ; filler db 0, 0 diff --git a/maps/Route7.asm b/maps/Route7.asm index 54887e894..f10b33ccc 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -1,4 +1,4 @@ -Route7_MapScriptHeader: +Route7_MapScripts: .SceneScripts: db 0 @@ -34,7 +34,7 @@ Route7LockedDoorText: text "It's locked…" done -Route7_MapEventHeader: +Route7_MapEvents: ; filler db 0, 0 diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index c72a3a571..bd0c2fced 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE7SAFFRONGATE_OFFICER -Route7SaffronGate_MapScriptHeader: +Route7SaffronGate_MapScripts: .SceneScripts: db 0 @@ -45,7 +45,7 @@ UnknownText_0x73592: line "through." done -Route7SaffronGate_MapEventHeader: +Route7SaffronGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route8.asm b/maps/Route8.asm index 1ad467aba..10df64842 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -6,7 +6,7 @@ const_value set 2 const ROUTE8_SUPER_NERD2 const ROUTE8_FRUIT_TREE -Route8_MapScriptHeader: +Route8_MapScripts: .SceneScripts: db 0 @@ -172,7 +172,7 @@ Route8UndergroundPathSignText: line "read…" done -Route8_MapEventHeader: +Route8_MapEvents: ; filler db 0, 0 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index 7dc6507ed..dc9968b1d 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE8SAFFRONGATE_OFFICER -Route8SaffronGate_MapScriptHeader: +Route8SaffronGate_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ Route8SaffronGateOfficerText: line "RADIO TOWER there." done -Route8SaffronGate_MapEventHeader: +Route8SaffronGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route9.asm b/maps/Route9.asm index f98b45310..cd1831f98 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -6,7 +6,7 @@ const_value set 2 const ROUTE9_POKEFAN_M1 const ROUTE9_POKEFAN_M2 -Route9_MapScriptHeader: +Route9_MapScripts: .SceneScripts: db 0 @@ -205,7 +205,7 @@ Route9SignText: line "ROCK TUNNEL" done -Route9_MapEventHeader: +Route9_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 86934ba61..3a195d430 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -1,4 +1,4 @@ -RuinsOfAlphAerodactylChamber_MapScriptHeader: +RuinsOfAlphAerodactylChamber_MapScripts: .SceneScripts: db 2 scene_script .CheckWall @@ -143,7 +143,7 @@ UnknownText_0x58ee7: line "fangs." done -RuinsOfAlphAerodactylChamber_MapEventHeader: +RuinsOfAlphAerodactylChamber_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm index 8e2822d0b..8be5e878b 100644 --- a/maps/RuinsOfAlphAerodactylItemRoom.asm +++ b/maps/RuinsOfAlphAerodactylItemRoom.asm @@ -4,7 +4,7 @@ const_value set 2 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL4 -RuinsOfAlphAerodactylItemRoom_MapScriptHeader: +RuinsOfAlphAerodactylItemRoom_MapScripts: .SceneScripts: db 0 @@ -32,7 +32,7 @@ UnknownText_0x59ac1: cont "MON." done -RuinsOfAlphAerodactylItemRoom_MapEventHeader: +RuinsOfAlphAerodactylItemRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm index b19ad5cc2..d991d80bc 100644 --- a/maps/RuinsOfAlphAerodactylWordRoom.asm +++ b/maps/RuinsOfAlphAerodactylWordRoom.asm @@ -1,11 +1,11 @@ -RuinsOfAlphAerodactylWordRoom_MapScriptHeader: +RuinsOfAlphAerodactylWordRoom_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -RuinsOfAlphAerodactylWordRoom_MapEventHeader: +RuinsOfAlphAerodactylWordRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index c63ce2fae..06a8d67fb 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -1,4 +1,4 @@ -RuinsOfAlphHoOhChamber_MapScriptHeader: +RuinsOfAlphHoOhChamber_MapScripts: .SceneScripts: db 2 scene_script .CheckWall @@ -144,7 +144,7 @@ UnknownText_0x586aa: line "wings." done -RuinsOfAlphHoOhChamber_MapEventHeader: +RuinsOfAlphHoOhChamber_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm index 01c34011e..e8ad02a27 100644 --- a/maps/RuinsOfAlphHoOhItemRoom.asm +++ b/maps/RuinsOfAlphHoOhItemRoom.asm @@ -4,7 +4,7 @@ const_value set 2 const RUINSOFALPHHOOHITEMROOM_POKE_BALL3 const RUINSOFALPHHOOHITEMROOM_POKE_BALL4 -RuinsOfAlphHoOhItemRoom_MapScriptHeader: +RuinsOfAlphHoOhItemRoom_MapScripts: .SceneScripts: db 0 @@ -32,7 +32,7 @@ UnknownText_0x59923: cont "MON." done -RuinsOfAlphHoOhItemRoom_MapEventHeader: +RuinsOfAlphHoOhItemRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm index 079c7859f..a9b3be9cd 100644 --- a/maps/RuinsOfAlphHoOhWordRoom.asm +++ b/maps/RuinsOfAlphHoOhWordRoom.asm @@ -1,11 +1,11 @@ -RuinsOfAlphHoOhWordRoom_MapScriptHeader: +RuinsOfAlphHoOhWordRoom_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -RuinsOfAlphHoOhWordRoom_MapEventHeader: +RuinsOfAlphHoOhWordRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index a7c329068..27e696a85 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -3,7 +3,7 @@ const_value set 2 const RUINSOFALPHINNERCHAMBER_TEACHER const RUINSOFALPHINNERCHAMBER_GRAMPS -RuinsOfAlphInnerChamber_MapScriptHeader: +RuinsOfAlphInnerChamber_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -76,7 +76,7 @@ RuinsOfAlphInnerChamberStatueText: cont "MON." done -RuinsOfAlphInnerChamber_MapEventHeader: +RuinsOfAlphInnerChamber_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index b6733ec8f..f59b6d537 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -2,7 +2,7 @@ const_value set 2 const RUINSOFALPHKABUTOCHAMBER_RECEPTIONIST const RUINSOFALPHKABUTOCHAMBER_SCIENTIST -RuinsOfAlphKabutoChamber_MapScriptHeader: +RuinsOfAlphKabutoChamber_MapScripts: .SceneScripts: db 2 scene_script .CheckWall @@ -255,7 +255,7 @@ UnknownText_0x58b3f: line "scanned the area." done -RuinsOfAlphKabutoChamber_MapEventHeader: +RuinsOfAlphKabutoChamber_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm index 910f5837c..3e5d41515 100644 --- a/maps/RuinsOfAlphKabutoItemRoom.asm +++ b/maps/RuinsOfAlphKabutoItemRoom.asm @@ -4,7 +4,7 @@ const_value set 2 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL3 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL4 -RuinsOfAlphKabutoItemRoom_MapScriptHeader: +RuinsOfAlphKabutoItemRoom_MapScripts: .SceneScripts: db 0 @@ -32,7 +32,7 @@ UnknownText_0x599ad: cont "MON." done -RuinsOfAlphKabutoItemRoom_MapEventHeader: +RuinsOfAlphKabutoItemRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm index fc6c21f9a..ad29b5760 100644 --- a/maps/RuinsOfAlphKabutoWordRoom.asm +++ b/maps/RuinsOfAlphKabutoWordRoom.asm @@ -1,11 +1,11 @@ -RuinsOfAlphKabutoWordRoom_MapScriptHeader: +RuinsOfAlphKabutoWordRoom_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -RuinsOfAlphKabutoWordRoom_MapEventHeader: +RuinsOfAlphKabutoWordRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 87edcc536..9385eb2ff 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -1,4 +1,4 @@ -RuinsOfAlphOmanyteChamber_MapScriptHeader: +RuinsOfAlphOmanyteChamber_MapScripts: .SceneScripts: db 2 scene_script .CheckWall @@ -144,7 +144,7 @@ UnknownText_0x58d26: line "its ten tentacles." done -RuinsOfAlphOmanyteChamber_MapEventHeader: +RuinsOfAlphOmanyteChamber_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm index 292dbac4d..3f4570b2b 100644 --- a/maps/RuinsOfAlphOmanyteItemRoom.asm +++ b/maps/RuinsOfAlphOmanyteItemRoom.asm @@ -4,7 +4,7 @@ const_value set 2 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4 -RuinsOfAlphOmanyteItemRoom_MapScriptHeader: +RuinsOfAlphOmanyteItemRoom_MapScripts: .SceneScripts: db 0 @@ -32,7 +32,7 @@ UnknownText_0x59a37: cont "MON." done -RuinsOfAlphOmanyteItemRoom_MapEventHeader: +RuinsOfAlphOmanyteItemRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm index 4ed4e32bc..b2f68e0a3 100644 --- a/maps/RuinsOfAlphOmanyteWordRoom.asm +++ b/maps/RuinsOfAlphOmanyteWordRoom.asm @@ -1,11 +1,11 @@ -RuinsOfAlphOmanyteWordRoom_MapScriptHeader: +RuinsOfAlphOmanyteWordRoom_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -RuinsOfAlphOmanyteWordRoom_MapEventHeader: +RuinsOfAlphOmanyteWordRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 39c85fa05..3c674d8c8 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -5,7 +5,7 @@ const_value set 2 const RUINSOFALPHOUTSIDE_YOUNGSTER2 const RUINSOFALPHOUTSIDE_YOUNGSTER3 -RuinsOfAlphOutside_MapScriptHeader: +RuinsOfAlphOutside_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -280,7 +280,7 @@ UnknownText_0x5848e: line "message!" done -RuinsOfAlphOutside_MapEventHeader: +RuinsOfAlphOutside_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 920617df8..1595ce59a 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -3,7 +3,7 @@ const_value set 2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST3 -RuinsOfAlphResearchCenter_MapScriptHeader: +RuinsOfAlphResearchCenter_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -392,7 +392,7 @@ UnknownText_0x59886: cont "Ancients…" done -RuinsOfAlphResearchCenter_MapEventHeader: +RuinsOfAlphResearchCenter_MapEvents: ; filler db 0, 0 diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index d1b4e6f1a..a96f55dea 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -1,11 +1,11 @@ -SafariZoneBeta_MapScriptHeader: +SafariZoneBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -SafariZoneBeta_MapEventHeader: +SafariZoneBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index e2ba63f2e..562775013 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -1,11 +1,11 @@ -SafariZoneFuchsiaGateBeta_MapScriptHeader: +SafariZoneFuchsiaGateBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -SafariZoneFuchsiaGateBeta_MapEventHeader: +SafariZoneFuchsiaGateBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index 2c7ac5e3d..1ee13106f 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -1,11 +1,11 @@ -SafariZoneMainOffice_MapScriptHeader: +SafariZoneMainOffice_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -SafariZoneMainOffice_MapEventHeader: +SafariZoneMainOffice_MapEvents: ; filler db 0, 0 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 487dff77d..e7295d594 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -1,7 +1,7 @@ const_value set 2 const SAFARIZONEWARDENSHOME_LASS -SafariZoneWardensHome_MapScriptHeader: +SafariZoneWardensHome_MapScripts: .SceneScripts: db 0 @@ -76,7 +76,7 @@ SafariZonePhotoText: line "frolicking in it." done -SafariZoneWardensHome_MapEventHeader: +SafariZoneWardensHome_MapEvents: ; filler db 0, 0 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index d016d61c7..d4c470571 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -8,7 +8,7 @@ const_value set 2 const SAFFRONCITY_YOUNGSTER2 const SAFFRONCITY_LASS2 -SaffronCity_MapScriptHeader: +SaffronCity_MapScripts: .SceneScripts: db 0 @@ -265,7 +265,7 @@ SaffronCityMagnetTrainStationSignText: cont "STATION" done -SaffronCity_MapEventHeader: +SaffronCity_MapEvents: ; filler db 0, 0 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 909c2754a..a2ba7497d 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -6,7 +6,7 @@ const_value set 2 const SAFFRONGYM_YOUNGSTER2 const SAFFRONGYM_GYM_GUY -SaffronGym_MapScriptHeader: +SaffronGym_MapScripts: .SceneScripts: db 0 @@ -290,7 +290,7 @@ SaffronGymGuyWinText: line "fantastic battle!" done -SaffronGym_MapEventHeader: +SaffronGym_MapEvents: ; filler db 0, 0 diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index 471462840..0d69d2017 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -4,7 +4,7 @@ const_value set 2 const SAFFRONMAGNETTRAINSTATION_TEACHER const SAFFRONMAGNETTRAINSTATION_LASS -SaffronMagnetTrainStation_MapScriptHeader: +SaffronMagnetTrainStation_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -215,7 +215,7 @@ SaffronMagnetTrainStationLassText: line "TRAIN have PASSES." done -SaffronMagnetTrainStation_MapEventHeader: +SaffronMagnetTrainStation_MapEvents: ; filler db 0, 0 diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 34f936298..d7619320c 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -3,7 +3,7 @@ const_value set 2 const SAFFRONMART_COOLTRAINER_M const SAFFRONMART_COOLTRAINER_F -SaffronMart_MapScriptHeader: +SaffronMart_MapScripts: .SceneScripts: db 0 @@ -37,7 +37,7 @@ SaffronMartCooltrainerFText: line "how sometime?" done -SaffronMart_MapEventHeader: +SaffronMart_MapEvents: ; filler db 0, 0 diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index 7e11928ae..d53fdb684 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const SAFFRONPOKECENTER1F_FISHER const SAFFRONPOKECENTER1F_YOUNGSTER -SaffronPokecenter1F_MapScriptHeader: +SaffronPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -111,7 +111,7 @@ SaffronPokecenter1FYoungsterText: line "SAFFRON." done -SaffronPokecenter1F_MapEventHeader: +SaffronPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/SaffronPokecenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm index fd0835f50..ebc2bb6c8 100644 --- a/maps/SaffronPokecenter2FBeta.asm +++ b/maps/SaffronPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -SaffronPokecenter2FBeta_MapScriptHeader: +SaffronPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -SaffronPokecenter2FBeta_MapEventHeader: +SaffronPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 225dab027..885d04c60 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -2,7 +2,7 @@ const_value set 2 const SEAFOAMGYM_BLAINE const SEAFOAMGYM_GYM_GUY -SeafoamGym_MapScriptHeader: +SeafoamGym_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -157,7 +157,7 @@ SeafoamGymGuyWinText2: line "for a building." done -SeafoamGym_MapEventHeader: +SeafoamGym_MapEvents: ; filler db 0, 0 diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index f714ba24c..83c75ef6c 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -2,7 +2,7 @@ const_value set 2 const SILPHCO1F_RECEPTIONIST const SILPHCO1F_OFFICER -SilphCo1F_MapScriptHeader: +SilphCo1F_MapScripts: .SceneScripts: db 0 @@ -55,7 +55,7 @@ UnknownText_0x18aca8: line "anywhere yet." done -SilphCo1F_MapEventHeader: +SilphCo1F_MapEvents: ; filler db 0, 0 diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index 6a381bf3b..d218da44c 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -2,7 +2,7 @@ const_value set 2 const SILVERCAVEITEMROOMS_POKE_BALL1 const SILVERCAVEITEMROOMS_POKE_BALL2 -SilverCaveItemRooms_MapScriptHeader: +SilverCaveItemRooms_MapScripts: .SceneScripts: db 0 @@ -15,7 +15,7 @@ SilverCaveItemRoomsMaxRevive: SilverCaveItemRoomsFullRestore: itemball FULL_RESTORE -SilverCaveItemRooms_MapEventHeader: +SilverCaveItemRooms_MapEvents: ; filler db 0, 0 diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 0672b7dab..3e51cf7b2 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -1,4 +1,4 @@ -SilverCaveOutside_MapScriptHeader: +SilverCaveOutside_MapScripts: .SceneScripts: db 0 @@ -23,7 +23,7 @@ MtSilverSignText: text "MT.SILVER" done -SilverCaveOutside_MapEventHeader: +SilverCaveOutside_MapEvents: ; filler db 0, 0 diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index 4363edcfc..76b1e744f 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -2,7 +2,7 @@ const_value set 2 const SILVERCAVEPOKECENTER1F_NURSE const SILVERCAVEPOKECENTER1F_GRANNY -SilverCavePokecenter1F_MapScriptHeader: +SilverCavePokecenter1F_MapScripts: .SceneScripts: db 0 @@ -29,7 +29,7 @@ SilverCavePokecenter1FGrannyText: line "anywhere…" done -SilverCavePokecenter1F_MapEventHeader: +SilverCavePokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index f75946854..fd04a1a6d 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -4,7 +4,7 @@ const_value set 2 const SILVERCAVEROOM1_POKE_BALL3 const SILVERCAVEROOM1_POKE_BALL4 -SilverCaveRoom1_MapScriptHeader: +SilverCaveRoom1_MapScripts: .SceneScripts: db 0 @@ -29,7 +29,7 @@ SilverCaveRoom1HiddenDireHit: SilverCaveRoom1HiddenUltraBall: hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL -SilverCaveRoom1_MapEventHeader: +SilverCaveRoom1_MapEvents: ; filler db 0, 0 diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 57072f858..eb6b9fd69 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -3,7 +3,7 @@ const_value set 2 const SILVERCAVEROOM2_POKE_BALL2 const SILVERCAVEROOM2_POKE_BALL3 -SilverCaveRoom2_MapScriptHeader: +SilverCaveRoom2_MapScripts: .SceneScripts: db 0 @@ -22,7 +22,7 @@ SilverCaveRoom2PPUp: SilverCaveRoom2HiddenMaxPotion: hiddenitem EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION -SilverCaveRoom2_MapEventHeader: +SilverCaveRoom2_MapEvents: ; filler db 0, 0 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 076f8ebe1..2fd816bda 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -1,7 +1,7 @@ const_value set 2 const SILVERCAVEROOM3_RED -SilverCaveRoom3_MapScriptHeader: +SilverCaveRoom3_MapScripts: .SceneScripts: db 0 @@ -50,7 +50,7 @@ Red: line "<......>" done -SilverCaveRoom3_MapEventHeader: +SilverCaveRoom3_MapEvents: ; filler db 0, 0 diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index a7bc02439..4937a259f 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -9,7 +9,7 @@ const_value set 2 const SLOWPOKEWELLB1F_BOULDER const SLOWPOKEWELLB1F_POKE_BALL -SlowpokeWellB1F_MapScriptHeader: +SlowpokeWellB1F_MapScripts: .SceneScripts: db 0 @@ -320,7 +320,7 @@ SlowpokeWellB1FTaillessSlowpokeText: line "its TAIL cut off…" done -SlowpokeWellB1F_MapEventHeader: +SlowpokeWellB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index c30261b25..70fef8c70 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -2,7 +2,7 @@ const_value set 2 const SLOWPOKEWELLB2F_GYM_GUY const SLOWPOKEWELLB2F_POKE_BALL -SlowpokeWellB2F_MapScriptHeader: +SlowpokeWellB2F_MapScripts: .SceneScripts: db 0 @@ -61,7 +61,7 @@ UnknownText_0x5adf2: cont "one evolve." done -SlowpokeWellB2F_MapEventHeader: +SlowpokeWellB2F_MapEvents: ; filler db 0, 0 diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 4bd994c93..15ac8e2b3 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -4,7 +4,7 @@ const_value set 2 const SOULHOUSE_LASS const SOULHOUSE_GRANNY -SoulHouse_MapScriptHeader: +SoulHouse_MapScripts: .SceneScripts: db 0 @@ -72,7 +72,7 @@ SoulHouseGrannyText: line "my grandchildren…" done -SoulHouse_MapEventHeader: +SoulHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index cafee1eea..3f9887fe2 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -6,7 +6,7 @@ const_value set 2 const SPROUTTOWER1F_SAGE3 const SPROUTTOWER1F_POKE_BALL -SproutTower1F_MapScriptHeader: +SproutTower1F_MapScripts: .SceneScripts: db 0 @@ -102,7 +102,7 @@ UnknownText_0x1846d6: line "distinguished." done -SproutTower1F_MapEventHeader: +SproutTower1F_MapEvents: ; filler db 0, 0 diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index bf3611ead..cd0c46fd7 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -3,7 +3,7 @@ const_value set 2 const SPROUTTOWER2F_SAGE2 const SPROUTTOWER2F_POKE_BALL -SproutTower2F_MapScriptHeader: +SproutTower2F_MapScripts: .SceneScripts: db 0 @@ -84,7 +84,7 @@ UnknownText_0x1848c8: line "distinguished." done -SproutTower2F_MapEventHeader: +SproutTower2F_MapEvents: ; filler db 0, 0 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 95d850fb7..2b459c55d 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -7,7 +7,7 @@ const_value set 2 const SPROUTTOWER3F_POKE_BALL2 const SPROUTTOWER3F_SILVER -SproutTower3F_MapScriptHeader: +SproutTower3F_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -329,7 +329,7 @@ UnknownText_0x184f61: line "distinguished." done -SproutTower3F_MapEventHeader: +SproutTower3F_MapEvents: ; filler db 0, 0 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 6364a44a0..7ecb7b71a 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -6,7 +6,7 @@ const_value set 2 const TEAMROCKETBASEB1F_POKE_BALL2 const TEAMROCKETBASEB1F_POKE_BALL3 -TeamRocketBaseB1F_MapScriptHeader: +TeamRocketBaseB1F_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -726,7 +726,7 @@ UnknownText_0x6cdd0: line "turned off." done -TeamRocketBaseB1F_MapEventHeader: +TeamRocketBaseB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 62197eec6..da8881af5 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -14,7 +14,7 @@ const_value set 2 const TEAMROCKETBASEB2F_ROCKET4 const TEAMROCKETBASEB2F_POKE_BALL -TeamRocketBaseB2F_MapScriptHeader: +TeamRocketBaseB2F_MapScripts: .SceneScripts: db 4 scene_script .DummyScene0 @@ -908,7 +908,7 @@ UnknownText_0x6de03: line "broadcast." done -TeamRocketBaseB2F_MapEventHeader: +TeamRocketBaseB2F_MapEvents: ; filler db 0, 0 diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 38734063a..f0c9af09e 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -14,7 +14,7 @@ const_value set 2 const TEAMROCKETBASEB3F_POKE_BALL4 const TEAMROCKETBASEB3F_POKE_BALL5 -TeamRocketBaseB3F_MapScriptHeader: +TeamRocketBaseB3F_MapScripts: .SceneScripts: db 4 scene_script .LanceGetsPassword @@ -565,7 +565,7 @@ UnknownText_0x6e9a3: para "The door opened!" done -TeamRocketBaseB3F_MapEventHeader: +TeamRocketBaseB3F_MapEvents: ; filler db 0, 0 diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 3ea686c32..cb3d5f3a8 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -2,7 +2,7 @@ const_value set 2 const TIMECAPSULE_CHRIS1 const TIMECAPSULE_CHRIS2 -TimeCapsule_MapScriptHeader: +TimeCapsule_MapScripts: .SceneScripts: db 2 scene_script .InitializeTimeCapsule @@ -53,7 +53,7 @@ UnknownText_0x193521: line "ready." done -TimeCapsule_MapEventHeader: +TimeCapsule_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index f439b8a6c..cb04e8845 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -10,7 +10,7 @@ const_value set 2 const TINTOWER1F_SAGE5 const TINTOWER1F_SAGE6 -TinTower1F_MapScriptHeader: +TinTower1F_MapScripts: .SceneScripts: db 2 scene_script .FaceSuicune @@ -522,7 +522,7 @@ TinTower1FSage6Text2: line "with SUICUNE." done -TinTower1F_MapEventHeader: +TinTower1F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index d980cc891..02012d6f8 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -1,11 +1,11 @@ -TinTower2F_MapScriptHeader: +TinTower2F_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -TinTower2F_MapEventHeader: +TinTower2F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 7e6263538..505073594 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -1,7 +1,7 @@ const_value set 2 const TINTOWER3F_POKE_BALL -TinTower3F_MapScriptHeader: +TinTower3F_MapScripts: .SceneScripts: db 0 @@ -11,7 +11,7 @@ TinTower3F_MapScriptHeader: TinTower3FFullHeal: itemball FULL_HEAL -TinTower3F_MapEventHeader: +TinTower3F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 4faf141cd..67fd4fda6 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -3,7 +3,7 @@ const_value set 2 const TINTOWER4F_POKE_BALL2 const TINTOWER4F_POKE_BALL3 -TinTower4F_MapScriptHeader: +TinTower4F_MapScripts: .SceneScripts: db 0 @@ -22,7 +22,7 @@ TinTower4FEscapeRope: TinTower4FHiddenMaxPotion: hiddenitem EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION -TinTower4F_MapEventHeader: +TinTower4F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 4bb02de9d..ee2980b33 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -1,7 +1,7 @@ const_value set 2 const TINTOWER5F_POKE_BALL -TinTower5F_MapScriptHeader: +TinTower5F_MapScripts: .SceneScripts: db 0 @@ -17,7 +17,7 @@ TinTower5FHiddenFullRestore: TinTower5FHiddenCarbos: hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS -TinTower5F_MapEventHeader: +TinTower5F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 025ee8988..5d587373d 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -1,7 +1,7 @@ const_value set 2 const TINTOWER6F_POKE_BALL -TinTower6F_MapScriptHeader: +TinTower6F_MapScripts: .SceneScripts: db 0 @@ -11,7 +11,7 @@ TinTower6F_MapScriptHeader: TinTower6FMaxPotion: itemball MAX_POTION -TinTower6F_MapEventHeader: +TinTower6F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 981e247d1..ab10bf4c2 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -1,7 +1,7 @@ const_value set 2 const TINTOWER7F_POKE_BALL -TinTower7F_MapScriptHeader: +TinTower7F_MapScripts: .SceneScripts: db 0 @@ -11,7 +11,7 @@ TinTower7F_MapScriptHeader: TinTower7FMaxRevive: itemball MAX_REVIVE -TinTower7F_MapEventHeader: +TinTower7F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index d8413bd0b..4e10ac13f 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -3,7 +3,7 @@ const_value set 2 const TINTOWER8F_POKE_BALL2 const TINTOWER8F_POKE_BALL3 -TinTower8F_MapScriptHeader: +TinTower8F_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ TinTower8FMaxElixer: TinTower8FFullRestore: itemball FULL_RESTORE -TinTower8F_MapEventHeader: +TinTower8F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 5b3280474..a540b891f 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -1,7 +1,7 @@ const_value set 2 const TINTOWER9F_POKE_BALL -TinTower9F_MapScriptHeader: +TinTower9F_MapScripts: .SceneScripts: db 0 @@ -21,7 +21,7 @@ TinTower9FUnusedLugiaText: text "LUGIA: Gyaaan!" done -TinTower9F_MapEventHeader: +TinTower9F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index b04c47800..3cfca7cf9 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -1,7 +1,7 @@ const_value set 2 const TINTOWERROOF_HO_OH -TinTowerRoof_MapScriptHeader: +TinTowerRoof_MapScripts: .SceneScripts: db 0 @@ -44,7 +44,7 @@ HoOhText: text "Shaoooh!" done -TinTowerRoof_MapEventHeader: +TinTowerRoof_MapEvents: ; filler db 0, 0 diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 18d55bd3a..c9982b094 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -1,7 +1,7 @@ const_value set 2 const TOHJOFALLS_POKE_BALL -TohjoFalls_MapScriptHeader: +TohjoFalls_MapScripts: .SceneScripts: db 0 @@ -11,7 +11,7 @@ TohjoFalls_MapScriptHeader: TohjoFallsMoonStone: itemball MOON_STONE -TohjoFalls_MapEventHeader: +TohjoFalls_MapEvents: ; filler db 0, 0 diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index deffd661b..62232df4f 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -2,7 +2,7 @@ const_value set 2 const TRADECENTER_CHRIS1 const TRADECENTER_CHRIS2 -TradeCenter_MapScriptHeader: +TradeCenter_MapScripts: .SceneScripts: db 2 scene_script .InitializeTradeCenter @@ -53,7 +53,7 @@ ChrisScript_0x19340b: line "ready." done -TradeCenter_MapEventHeader: +TradeCenter_MapEvents: ; filler db 0, 0 diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index bcfb08bb0..d3fcfca04 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -5,7 +5,7 @@ const_value set 2 const TRAINERHOUSE1F_YOUNGSTER const TRAINERHOUSE1F_GENTLEMAN -TrainerHouse1F_MapScriptHeader: +TrainerHouse1F_MapScripts: .SceneScripts: db 0 @@ -137,7 +137,7 @@ UnknownText_0x9b2c1: line "illegible…" done -TrainerHouse1F_MapEventHeader: +TrainerHouse1F_MapEvents: ; filler db 0, 0 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index a525c39b8..bb6fd4316 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -2,7 +2,7 @@ const_value set 2 const TRAINERHOUSEB1F_RECEPTIONIST const TRAINERHOUSEB1F_CHRIS -TrainerHouseB1F_MapScriptHeader: +TrainerHouseB1F_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -169,7 +169,7 @@ TrainerHouseB1FCalBeforeText: cont "could battle you." done -TrainerHouseB1F_MapEventHeader: +TrainerHouseB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm index 0f47d7cb8..6834c043e 100644 --- a/maps/UndergroundPath.asm +++ b/maps/UndergroundPath.asm @@ -1,4 +1,4 @@ -UndergroundPath_MapScriptHeader: +UndergroundPath_MapScripts: .SceneScripts: db 0 @@ -11,7 +11,7 @@ UndergroundPathHiddenFullRestore: UndergroundPathHiddenXSpecial: hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL -UndergroundPath_MapEventHeader: +UndergroundPath_MapEvents: ; filler db 0, 0 diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index dfc9a9f65..77ed8bbb6 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -9,7 +9,7 @@ const_value set 2 const UNIONCAVE1F_POKE_BALL3 const UNIONCAVE1F_POKE_BALL4 -UnionCave1F_MapScriptHeader: +UnionCave1F_MapScripts: .SceneScripts: db 0 @@ -199,7 +199,7 @@ UnknownText_0x59f29: text "UNION CAVE" done -UnionCave1F_MapEventHeader: +UnionCave1F_MapEvents: ; filler db 0, 0 diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index b232aa6e4..980855221 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -7,7 +7,7 @@ const_value set 2 const UNIONCAVEB1F_BOULDER const UNIONCAVEB1F_POKE_BALL2 -UnionCaveB1F_MapScriptHeader: +UnionCaveB1F_MapScripts: .SceneScripts: db 0 @@ -152,7 +152,7 @@ PokemaniacCalvinAfterBattleText: cont "PROF.ELM." done -UnionCaveB1F_MapEventHeader: +UnionCaveB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index ec6c30385..5f2baabf2 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -6,7 +6,7 @@ const_value set 2 const UNIONCAVEB2F_POKE_BALL2 const UNIONCAVEB2F_LAPRAS -UnionCaveB2F_MapScriptHeader: +UnionCaveB2F_MapScripts: .SceneScripts: db 0 @@ -141,7 +141,7 @@ CooltrainerfEmmaAfterBattleText: line "that #MON…" done -UnionCaveB2F_MapEventHeader: +UnionCaveB2F_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 63bd8116f..2430b97d3 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -6,7 +6,7 @@ const_value set 2 const VERMILIONCITY_BIG_SNORLAX const VERMILIONCITY_POKEFAN_M -VermilionCity_MapScriptHeader: +VermilionCity_MapScripts: .SceneScripts: db 0 @@ -267,7 +267,7 @@ VermilionCityPortSignText: line "ENTRANCE" done -VermilionCity_MapEventHeader: +VermilionCity_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index ac70f5c95..31f19615d 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -5,7 +5,7 @@ const_value set 2 const VERMILIONGYM_SUPER_NERD const VERMILIONGYM_GYM_GUY -VermilionGym_MapScriptHeader: +VermilionGym_MapScripts: .SceneScripts: db 0 @@ -260,7 +260,7 @@ UnknownText_0x19261e: line "but trash." done -VermilionGym_MapEventHeader: +VermilionGym_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index 5682dc084..718d5e005 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const VERMILIONHOUSEDIGLETTSCAVESPEECHHOUSE_GENTLEMAN -VermilionHouseDiglettsCaveSpeechHouse_MapScriptHeader: +VermilionHouseDiglettsCaveSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -20,7 +20,7 @@ VermilionHouseDiglettsCaveSpeechHouseGentlemanText: line "to a distant town." done -VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader: +VermilionHouseDiglettsCaveSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm index c2d3fd2f2..72ed1ba4a 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionHouseFishingSpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const VERMILIONHOUSEFISHINGSPEECHHOUSE_FISHING_GURU -VermilionHouseFishingSpeechHouse_MapScriptHeader: +VermilionHouseFishingSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -50,7 +50,7 @@ FishingDudesHousePhotoText: line "great time…" done -VermilionHouseFishingSpeechHouse_MapEventHeader: +VermilionHouseFishingSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index d1eae85c3..e2ba0b77c 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const VERMILIONMAGNETTRAINSPEECHHOUSE_POKEFAN_F const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER -VermilionMagnetTrainSpeechHouse_MapScriptHeader: +VermilionMagnetTrainSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -33,7 +33,7 @@ VermilionMagnetTrainSpeechHouseYoungsterText: cont "the MAGNET TRAIN." done -VermilionMagnetTrainSpeechHouse_MapEventHeader: +VermilionMagnetTrainSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 87cb81e66..b72ea6aec 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -3,7 +3,7 @@ const_value set 2 const VERMILIONMART_SUPER_NERD const VERMILIONMART_BUENA -VermilionMart_MapScriptHeader: +VermilionMart_MapScripts: .SceneScripts: db 0 @@ -36,7 +36,7 @@ VermilionMartBuenaText: cont "SAFFRON." done -VermilionMart_MapEventHeader: +VermilionMart_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index 354716b85..43821efdc 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const VERMILIONPOKECENTER1F_SAILOR const VERMILIONPOKECENTER1F_BUG_CATCHER -VermilionPokecenter1F_MapScriptHeader: +VermilionPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -76,7 +76,7 @@ VermilionPokecenter1FBugCatcherText: line "got them in JOHTO." done -VermilionPokecenter1F_MapEventHeader: +VermilionPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionPokecenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm index 281198a7d..a82bd9e48 100644 --- a/maps/VermilionPokecenter2FBeta.asm +++ b/maps/VermilionPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -VermilionPokecenter2FBeta_MapScriptHeader: +VermilionPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -VermilionPokecenter2FBeta_MapEventHeader: +VermilionPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index b1204a0e5..c71739ef6 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -3,7 +3,7 @@ const_value set 2 const VERMILIONPORT_SAILOR2 const VERMILIONPORT_SUPER_NERD -VermilionPort_MapScriptHeader: +VermilionPort_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -298,7 +298,7 @@ UnknownText_0x750a6: cont "there." done -VermilionPort_MapEventHeader: +VermilionPort_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index e728d387a..1e078e525 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -1,7 +1,7 @@ const_value set 2 const VERMILIONPORTPASSAGE_TEACHER -VermilionPortPassage_MapScriptHeader: +VermilionPortPassage_MapScripts: .SceneScripts: db 0 @@ -18,7 +18,7 @@ VermilionPortPassageTeacherText: cont "every week." done -VermilionPortPassage_MapEventHeader: +VermilionPortPassage_MapEvents: ; filler db 0, 0 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index d8fc51043..e0389faeb 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -6,7 +6,7 @@ const_value set 2 const VICTORYROAD_POKE_BALL4 const VICTORYROAD_POKE_BALL5 -VictoryRoad_MapScriptHeader: +VictoryRoad_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -238,7 +238,7 @@ UnknownText_0x747aa: line "thing else." done -VictoryRoad_MapEventHeader: +VictoryRoad_MapEvents: ; filler db 0, 0 diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index f1ae34fab..b466a32b6 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -3,7 +3,7 @@ const_value set 2 const VICTORYROADGATE_BLACK_BELT1 const VICTORYROADGATE_BLACK_BELT2 -VictoryRoadGate_MapScriptHeader: +VictoryRoadGate_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -97,7 +97,7 @@ VictoryRoadGateRightBlackBeltText: line "ready for you!" done -VictoryRoadGate_MapEventHeader: +VictoryRoadGate_MapEvents: ; filler db 0, 0 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 63dd3b92c..6890ffa8a 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -8,7 +8,7 @@ const_value set 2 const VIOLETCITY_POKE_BALL1 const VIOLETCITY_POKE_BALL2 -VioletCity_MapScriptHeader: +VioletCity_MapScripts: .SceneScripts: db 0 @@ -278,7 +278,7 @@ EarlsPokemonAcademySignText: line "ACADEMY" done -VioletCity_MapEventHeader: +VioletCity_MapEvents: ; filler db 0, 0 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index fc7cb0169..12480e21f 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -4,7 +4,7 @@ const_value set 2 const VIOLETGYM_YOUNGSTER2 const VIOLETGYM_GYM_GUY -VioletGym_MapScriptHeader: +VioletGym_MapScripts: .SceneScripts: db 0 @@ -281,7 +281,7 @@ VioletGymGuyWinText: line "time at all!" done -VioletGym_MapEventHeader: +VioletGym_MapEvents: ; filler db 0, 0 diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm index 2fa0e84b3..4d903cb70 100644 --- a/maps/VioletKylesHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const VIOLETKYLESHOUSE_POKEFAN_M const VIOLETKYLESHOUSE_KYLE -VioletKylesHouse_MapScriptHeader: +VioletKylesHouse_MapScripts: .SceneScripts: db 0 @@ -32,7 +32,7 @@ VioletKylesHousePokefanMText: line "disobey you." done -VioletKylesHouse_MapEventHeader: +VioletKylesHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index ffb19d838..e1a86e0c7 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -3,7 +3,7 @@ const_value set 2 const VIOLETMART_GRANNY const VIOLETMART_COOLTRAINER_M -VioletMart_MapScriptHeader: +VioletMart_MapScripts: .SceneScripts: db 0 @@ -48,7 +48,7 @@ VioletMartCooltrainerMText: line "items." done -VioletMart_MapEventHeader: +VioletMart_MapEvents: ; filler db 0, 0 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index ae047457a..7ec074324 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const VIOLETNICKNAMESPEECHHOUSE_LASS const VIOLETNICKNAMESPEECHHOUSE_BIRD -VioletNicknameSpeechHouse_MapScriptHeader: +VioletNicknameSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -44,7 +44,7 @@ UnknownText_0x6947c: text "STRAWBERRY: Pijji!" done -VioletNicknameSpeechHouse_MapEventHeader: +VioletNicknameSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 757ab1f44..9413849b8 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const VIOLETPOKECENTER1F_YOUNGSTER const VIOLETPOKECENTER1F_SCIENTIST -VioletPokecenter1F_MapScriptHeader: +VioletPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -215,7 +215,7 @@ VioletPokecenter1FYoungsterText: line "they please." done -VioletPokecenter1F_MapEventHeader: +VioletPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index c29422c52..1825c1bc7 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -4,7 +4,7 @@ const_value set 2 const VIRIDIANCITY_FISHER const VIRIDIANCITY_YOUNGSTER -ViridianCity_MapScriptHeader: +ViridianCity_MapScripts: .SceneScripts: db 0 @@ -215,7 +215,7 @@ TrainerHouseSignText: line "Trainer Battles" done -ViridianCity_MapEventHeader: +ViridianCity_MapEvents: ; filler db 0, 0 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 19f8654d9..ed47a099e 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -2,7 +2,7 @@ const_value set 2 const VIRIDIANGYM_BLUE const VIRIDIANGYM_GYM_GUY -ViridianGym_MapScriptHeader: +ViridianGym_MapScripts: .SceneScripts: db 0 @@ -169,7 +169,7 @@ ViridianGymGuyWinText: line "tears to my eyes." done -ViridianGym_MapEventHeader: +ViridianGym_MapEvents: ; filler db 0, 0 diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 049ee3e35..275b57e2d 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -3,7 +3,7 @@ const_value set 2 const VIRIDIANMART_LASS const VIRIDIANMART_COOLTRAINER_M -ViridianMart_MapScriptHeader: +ViridianMart_MapScripts: .SceneScripts: db 0 @@ -36,7 +36,7 @@ ViridianMartCooltrainerMText: line "south of here." done -ViridianMart_MapEventHeader: +ViridianMart_MapEvents: ; filler db 0, 0 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 8403fbc1c..10d2c52e5 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -4,7 +4,7 @@ const_value set 2 const VIRIDIANNICKNAMESPEECHHOUSE_SPEARY const VIRIDIANNICKNAMESPEECHHOUSE_RATTEY -ViridianNicknameSpeechHouse_MapScriptHeader: +ViridianNicknameSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -61,7 +61,7 @@ RatteyText: text "RATTEY: Kikiii!" done -ViridianNicknameSpeechHouse_MapEventHeader: +ViridianNicknameSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index 54ca8d696..86f767a5f 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const VIRIDIANPOKECENTER1F_COOLTRAINER_F const VIRIDIANPOKECENTER1F_BUG_CATCHER -ViridianPokecenter1F_MapScriptHeader: +ViridianPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -71,7 +71,7 @@ ViridianPokecenter1FBugCatcherText: line "come a GYM LEADER." done -ViridianPokecenter1F_MapEventHeader: +ViridianPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/ViridianPokecenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm index 2b119c1bb..3a00d3be1 100644 --- a/maps/ViridianPokecenter2FBeta.asm +++ b/maps/ViridianPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -ViridianPokecenter2FBeta_MapScriptHeader: +ViridianPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -ViridianPokecenter2FBeta_MapEventHeader: +ViridianPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index c84725509..8b816062f 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -6,7 +6,7 @@ const_value set 2 const WHIRLISLANDB1F_POKE_BALL5 const WHIRLISLANDB1F_BOULDER -WhirlIslandB1F_MapScriptHeader: +WhirlIslandB1F_MapScripts: .SceneScripts: db 0 @@ -40,7 +40,7 @@ WhirlIslandB1FHiddenUltraBall: WhirlIslandB1FHiddenFullRestore: hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE -WhirlIslandB1F_MapEventHeader: +WhirlIslandB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index 34632a517..d589b7d05 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -3,7 +3,7 @@ const_value set 2 const WHIRLISLANDB2F_POKE_BALL2 const WHIRLISLANDB2F_POKE_BALL3 -WhirlIslandB2F_MapScriptHeader: +WhirlIslandB2F_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ WhirlIslandB2FMaxRevive: WhirlIslandB2FMaxElixer: itemball MAX_ELIXER -WhirlIslandB2F_MapEventHeader: +WhirlIslandB2F_MapEvents: ; filler db 0, 0 diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index 4c3af9b8c..29c8500bb 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -1,11 +1,11 @@ -WhirlIslandCave_MapScriptHeader: +WhirlIslandCave_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -WhirlIslandCave_MapEventHeader: +WhirlIslandCave_MapEvents: ; filler db 0, 0 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 7ee64bf74..aa0a15c1e 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -1,7 +1,7 @@ const_value set 2 const WHIRLISLANDLUGIACHAMBER_LUGIA -WhirlIslandLugiaChamber_MapScriptHeader: +WhirlIslandLugiaChamber_MapScripts: .SceneScripts: db 0 @@ -43,7 +43,7 @@ LugiaText: text "Gyaaas!" done -WhirlIslandLugiaChamber_MapEventHeader: +WhirlIslandLugiaChamber_MapEvents: ; filler db 0, 0 diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 7ed3e883c..b022a4c72 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -1,7 +1,7 @@ const_value set 2 const WHIRLISLANDNE_POKE_BALL -WhirlIslandNE_MapScriptHeader: +WhirlIslandNE_MapScripts: .SceneScripts: db 0 @@ -11,7 +11,7 @@ WhirlIslandNE_MapScriptHeader: WhirlIslandNEUltraBall: itemball ULTRA_BALL -WhirlIslandNE_MapEventHeader: +WhirlIslandNE_MapEvents: ; filler db 0, 0 diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index ed40fe8d5..e8475c19b 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -1,11 +1,11 @@ -WhirlIslandNW_MapScriptHeader: +WhirlIslandNW_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -WhirlIslandNW_MapEventHeader: +WhirlIslandNW_MapEvents: ; filler db 0, 0 diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index edc3aa418..3e7edc484 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -1,11 +1,11 @@ -WhirlIslandSE_MapScriptHeader: +WhirlIslandSE_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -WhirlIslandSE_MapEventHeader: +WhirlIslandSE_MapEvents: ; filler db 0, 0 diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index e1c212d75..b80b00b6a 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -1,7 +1,7 @@ const_value set 2 const WHIRLISLANDSW_POKE_BALL -WhirlIslandSW_MapScriptHeader: +WhirlIslandSW_MapScripts: .SceneScripts: db 0 @@ -11,7 +11,7 @@ WhirlIslandSW_MapScriptHeader: WhirlIslandSWUltraBall: itemball ULTRA_BALL -WhirlIslandSW_MapEventHeader: +WhirlIslandSW_MapEvents: ; filler db 0, 0 diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 9ea754d1a..5198c8407 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -1,7 +1,7 @@ const_value set 2 const WILLSROOM_WILL -WillsRoom_MapScriptHeader: +WillsRoom_MapScripts: .SceneScripts: db 2 scene_script .LockDoor @@ -128,7 +128,7 @@ WillScript_WillDefeatText: line "of the ELITE FOUR." done -WillsRoom_MapEventHeader: +WillsRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index c3440c889..ef30655c2 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -6,7 +6,7 @@ const_value set 2 const WISETRIOSROOM_SAGE5 const WISETRIOSROOM_SAGE6 -WiseTriosRoom_MapScriptHeader: +WiseTriosRoom_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -344,7 +344,7 @@ UnknownText_0x98db5: line "you to the test." done -WiseTriosRoom_MapEventHeader: +WiseTriosRoom_MapEvents: ; filler db 0, 0 -- cgit v1.2.3 From c70e8eec499ce70ffff03b38ae6ea987d99608e7 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 17 Jan 2018 13:23:43 -0500 Subject: Comment on changeblock ids --- maps/BlackthornGym1F.asm | 6 +++--- maps/BrunosRoom.asm | 24 ++++++++++++------------ maps/BurnedTower1F.asm | 12 ++++++------ maps/BurnedTowerB1F.asm | 8 ++++---- maps/CeladonDeptStore6F.asm | 6 +++--- maps/GoldenrodDeptStoreB1F.asm | 8 ++++---- maps/GoldenrodDeptStoreRoof.asm | 8 ++++---- maps/GoldenrodUnderground.asm | 4 ++-- maps/GoldenrodUndergroundSwitchRoomEntrances.asm | 1 + maps/KarensRoom.asm | 24 ++++++++++++------------ maps/KogasRoom.asm | 24 ++++++++++++------------ maps/LancesRoom.asm | 16 ++++++++-------- maps/MahoganyMart1F.asm | 4 ++-- maps/RadioTower3F.asm | 8 ++++---- maps/Route19.asm | 12 ++++++------ maps/RuinsOfAlphAerodactylChamber.asm | 12 ++++++------ maps/RuinsOfAlphHoOhChamber.asm | 12 ++++++------ maps/RuinsOfAlphKabutoChamber.asm | 12 ++++++------ maps/RuinsOfAlphOmanyteChamber.asm | 12 ++++++------ maps/TeamRocketBaseB2F.asm | 8 ++++---- maps/TeamRocketBaseB3F.asm | 4 ++-- maps/TinTower1F.asm | 4 ++-- maps/WillsRoom.asm | 24 ++++++++++++------------ 23 files changed, 127 insertions(+), 126 deletions(-) (limited to 'maps') diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 920442fe9..25de39246 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -16,15 +16,15 @@ BlackthornGym1F_MapScripts: .Boulders: checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_1 iffalse .skip1 - changeblock 8, 2, $3b + changeblock 8, 2, $3b ; fallen boulder 2 .skip1 checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_2 iffalse .skip2 - changeblock 2, 4, $3a + changeblock 2, 4, $3a ; fallen boulder 1 .skip2 checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_3 iffalse .skip3 - changeblock 8, 6, $3b + changeblock 8, 6, $3b ; fallen boulder 2 .skip3 return diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index bdb93065e..9ddbb5664 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -20,21 +20,21 @@ BrunosRoom_MapScripts: .BrunosRoomDoors: checkevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED - iffalse .KeepDoorClosed - changeblock 4, 14, $2a -.KeepDoorClosed: + iffalse .KeepEntranceOpen + changeblock 4, 14, $2a ; wall +.KeepEntranceOpen: checkevent EVENT_BRUNOS_ROOM_EXIT_OPEN - iffalse .OpenDoor - changeblock 4, 2, $16 -.OpenDoor: + iffalse .KeepExitClosed + changeblock 4, 2, $16 ; open door +.KeepExitClosed: return .BrunosDoorLocksBehindYou: - applymovement PLAYER, MovementData_0x1809f9 + applymovement PLAYER, BrunosRoom_EnterMovement refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock 4, 14, $2a + changeblock 4, 14, $2a ; wall reloadmappart closetext setscene 1 @@ -46,7 +46,7 @@ BrunoScript_Battle: faceplayer opentext checkevent EVENT_BEAT_ELITE_4_BRUNO - iftrue UnknownScript_0x1809f3 + iftrue BrunoScript_AfterBattle writetext BrunoScript_BrunoBeforeText waitbutton closetext @@ -60,20 +60,20 @@ BrunoScript_Battle: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock 4, 2, $16 + changeblock 4, 2, $16 ; open door reloadmappart closetext setevent EVENT_BRUNOS_ROOM_EXIT_OPEN waitsfx end -UnknownScript_0x1809f3: +BrunoScript_AfterBattle: writetext BrunoScript_BrunoDefeatText waitbutton closetext end -MovementData_0x1809f9: +BrunosRoom_EnterMovement: step UP step UP step UP diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 2aca9c74e..4c307d710 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -28,13 +28,13 @@ BurnedTower1F_MapScripts: .HoleAndLadder: checkevent EVENT_HOLE_IN_BURNED_TOWER - iftrue .Next - changeblock 10, 8, $32 ; hole -.Next: + iftrue .KeepHoleOpen + changeblock 10, 8, $32 ; floor +.KeepHoleOpen: checkevent EVENT_RELEASED_THE_BEASTS - iftrue .Done + iftrue .HideBasement changeblock 6, 14, $09 ; ladder -.Done: +.HideBasement: return .MeetEusine: @@ -106,7 +106,7 @@ BurnedTowerRivalBattleScript: showemote EMOTE_SHOCK, PLAYER, 15 playsound SFX_ENTER_DOOR waitsfx - changeblock 10, 8, $25 + changeblock 10, 8, $25 ; hole reloadmappart pause 15 applymovement PLAYER, BurnedTower1FMovement_PlayerStartsToFall diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 7fb711543..3ad1d60f4 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -27,9 +27,9 @@ BurnedTowerB1F_MapScripts: .LadderCallback: checkevent EVENT_RELEASED_THE_BEASTS - iftrue .NoChange - changeblock 6, 14, $02 -.NoChange: + iftrue .HideLadder + changeblock 6, 14, $02 ; floor +.HideLadder: return ReleaseTheBeasts: @@ -93,7 +93,7 @@ ReleaseTheBeasts: setevent EVENT_BURNED_TOWER_1F_EUSINE appear BURNEDTOWERB1F_EUSINE refreshscreen - changeblock 6, 14, $1b + changeblock 6, 14, $1b ; ladder reloadmappart closetext setscene 1 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 3971efeed..b63ec99da 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -8,10 +8,10 @@ CeladonDeptStore6F_MapScripts: .MapCallbacks: db 1 - callback MAPCALLBACK_TILES, .Callback + callback MAPCALLBACK_TILES, .HideRooftopStairs -.Callback: - changeblock 12, 0, $03 +.HideRooftopStairs: + changeblock 12, 0, $03 ; wall return CeladonDeptStore6FSuperNerdScript: diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 7d39dd8a9..4d0603d0f 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -23,7 +23,7 @@ UnknownScript_0x7d781: jump UnknownScript_0x7d791 UnknownScript_0x7d78a: - changeblock 16, 4, $0d + changeblock 16, 4, $0d ; floor jump UnknownScript_0x7d791 UnknownScript_0x7d791: @@ -31,15 +31,15 @@ UnknownScript_0x7d791: iftrue .Layout2 checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 iftrue .Layout3 - changeblock 10, 8, $0d + changeblock 10, 8, $0d ; floor return .Layout2: - changeblock 4, 10, $0d + changeblock 4, 10, $0d ; floor return .Layout3: - changeblock 10, 12, $0d + changeblock 10, 12, $0d ; floor return UnknownScript_0x7d7ac: diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index cbc2a6b76..55f885e62 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -19,12 +19,12 @@ GoldenrodDeptStoreRoof_MapScripts: .CheckSaleChangeBlock: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON - iftrue .ChangeBlock + iftrue .SaleIsOn return -.ChangeBlock: - changeblock 0, 2, $3f - changeblock 0, 4, $0f +.SaleIsOn: + changeblock 0, 2, $3f ; cardboard boxes + changeblock 0, 4, $0f ; vendor booth return .CheckSaleChangeClerk: diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index c60f68ee5..e8e566666 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -45,7 +45,7 @@ GoldenrodUnderground_MapScripts: return .LockBasementDoor: - changeblock 18, 6, $3d + changeblock 18, 6, $3d ; locked door return .CheckDayOfWeek: @@ -384,7 +384,7 @@ BasementDoorScript:: writetext UnknownText_0x7c5d6 waitbutton closetext - changeblock 18, 6, $2e + changeblock 18, 6, $2e ; unlocked door reloadmappart closetext setevent EVENT_USED_BASEMENT_KEY diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index e01ee8470..621c133fd 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -1,3 +1,4 @@ +; block ids UNDERGROUND_DOOR_CLOSED1 EQU $2a UNDERGROUND_DOOR_CLOSED2 EQU $3e UNDERGROUND_DOOR_CLOSED3 EQU $3f diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 4ceed61fc..eef62321d 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -20,21 +20,21 @@ KarensRoom_MapScripts: .KarensRoomDoors: checkevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED - iffalse .KeepDoorsClosed - changeblock 4, 14, $2a -.KeepDoorsClosed: + iffalse .KeepEntranceOpen + changeblock 4, 14, $2a ; wall +.KeepEntranceOpen: checkevent EVENT_KARENS_ROOM_EXIT_OPEN - iffalse .OpenDoors - changeblock 4, 2, $16 -.OpenDoors: + iffalse .KeepExitClosed + changeblock 4, 2, $16 ; open door +.KeepExitClosed: return .KarensDoorLocksBehindYou: - applymovement PLAYER, MovementData_0x180c22 + applymovement PLAYER, KarensMovementData_0x18078e refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock 4, 14, $2a + changeblock 4, 14, $2a ; wall reloadmappart closetext setscene 1 @@ -46,7 +46,7 @@ KarenScript_Battle: faceplayer opentext checkevent EVENT_BEAT_ELITE_4_KAREN - iftrue UnknownScript_0x180c1c + iftrue KarenScript_AfterBattle writetext KarenScript_KarenBeforeText waitbutton closetext @@ -60,20 +60,20 @@ KarenScript_Battle: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock 4, 2, $16 + changeblock 4, 2, $16 ; open door reloadmappart closetext setevent EVENT_KARENS_ROOM_EXIT_OPEN waitsfx end -UnknownScript_0x180c1c: +KarenScript_AfterBattle: writetext KarenScript_KarenDefeatText waitbutton closetext end -MovementData_0x180c22: +KarensMovementData_0x18078e: step UP step UP step UP diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index d448d4661..fe1badec4 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -20,21 +20,21 @@ KogasRoom_MapScripts: .KogasRoomDoors: checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED - iffalse .KeepDoorsClosed - changeblock 4, 14, $2a -.KeepDoorsClosed: + iffalse .KeepEntranceOpen + changeblock 4, 14, $2a ; wall +.KeepEntranceOpen: checkevent EVENT_KOGAS_ROOM_EXIT_OPEN - iffalse .OpenDoors - changeblock 4, 2, $16 -.OpenDoors: + iffalse .KeepExitClosed + changeblock 4, 2, $16 ; open door +.KeepExitClosed: return .KogasDoorLocksBehindYou: - applymovement PLAYER, MovementData_0x18078e + applymovement PLAYER, KogasMovementData_0x18078e refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock 4, 14, $2a + changeblock 4, 14, $2a ; wall reloadmappart closetext setscene 1 @@ -46,7 +46,7 @@ KogaScript_Battle: faceplayer opentext checkevent EVENT_BEAT_ELITE_4_KOGA - iftrue UnknownScript_0x180788 + iftrue KogaScript_AfterBattle writetext KogaScript_KogaBeforeText waitbutton closetext @@ -60,20 +60,20 @@ KogaScript_Battle: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock 4, 2, $16 + changeblock 4, 2, $16 ; open door reloadmappart closetext setevent EVENT_KOGAS_ROOM_EXIT_OPEN waitsfx end -UnknownScript_0x180788: +KogaScript_AfterBattle: writetext KogaScript_KogaDefeatText waitbutton closetext end -MovementData_0x18078e: +KogasMovementData_0x18078e: step UP step UP step UP diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index c073f0f1e..a3336251b 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -22,13 +22,13 @@ LancesRoom_MapScripts: .LancesRoomDoors: checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED - iffalse .KeepDoorsClosed - changeblock 4, 22, $34 -.KeepDoorsClosed: + iffalse .KeepEntranceOpen + changeblock 4, 22, $34 ; wall +.KeepEntranceOpen: checkevent EVENT_LANCES_ROOM_EXIT_OPEN - iffalse .OpenDoors - changeblock 4, 0, $0b -.OpenDoors: + iffalse .KeepExitClosed + changeblock 4, 0, $0b ; open door +.KeepExitClosed: return .LancesDoorLocksBehindYou: @@ -36,7 +36,7 @@ LancesRoom_MapScripts: refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock 4, 22, $34 + changeblock 4, 22, $34 ; wall reloadmappart closetext setscene 1 @@ -69,7 +69,7 @@ LanceScript_0x180e7b: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock 4, 0, $0b + changeblock 4, 0, $0b ; open door reloadmappart closetext setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index a216b1079..5b3cfd43c 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -28,7 +28,7 @@ MahoganyMart1F_MapScripts: return .ShowStairs: - changeblock 6, 2, $1e + changeblock 6, 2, $1e ; stairs return PharmacistScript_0x6c367: @@ -89,7 +89,7 @@ UnknownScript_0x6c38f: waitbutton showemote EMOTE_SHOCK, MAHOGANYMART1F_PHARMACIST, 10 playsound SFX_FAINT - changeblock 6, 2, $1e + changeblock 6, 2, $1e ; stairs reloadmappart closetext setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 030aec018..0efc9e2db 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -21,8 +21,8 @@ RadioTower3F_MapScripts: return .Change: - changeblock 14, 2, $2a - changeblock 14, 4, $01 + changeblock 14, 2, $2a ; open shutter + changeblock 14, 4, $01 ; floor return RadioTower3FSuperNerdScript: @@ -143,8 +143,8 @@ UnknownScript_0x5e605: waitbutton setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER playsound SFX_ENTER_DOOR - changeblock 14, 2, $2a - changeblock 14, 4, $01 + changeblock 14, 2, $2a ; open shutter + changeblock 14, 4, $01 ; floor reloadmappart closetext waitsfx diff --git a/maps/Route19.asm b/maps/Route19.asm index 4c32af13f..8767a8b3b 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -17,12 +17,12 @@ Route19_MapScripts: .ClearRocks: checkevent EVENT_CINNABAR_ROCKS_CLEARED iftrue .Done - changeblock 6, 6, $7a - changeblock 8, 6, $7a - changeblock 10, 6, $7a - changeblock 12, 8, $7a - changeblock 4, 8, $7a - changeblock 10, 10, $7a + changeblock 6, 6, $7a ; rock + changeblock 8, 6, $7a ; rock + changeblock 10, 6, $7a ; rock + changeblock 12, 8, $7a ; rock + changeblock 4, 8, $7a ; rock + changeblock 10, 10, $7a ; rock .Done: return diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 3a195d430..91f2967a3 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -23,15 +23,15 @@ RuinsOfAlphAerodactylChamber_MapScripts: .HiddenDoors: checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER iftrue .WallOpen - changeblock 4, 0, $2e + changeblock 4, 0, $2e ; closed wall .WallOpen: checkevent EVENT_SOLVED_AERODACTYL_PUZZLE iffalse .FloorClosed return .FloorClosed: - changeblock 2, 2, $01 - changeblock 4, 2, $02 + changeblock 2, 2, $01 ; left floor + changeblock 4, 2, $02 ; right floor return .WallOpenScript: @@ -40,7 +40,7 @@ RuinsOfAlphAerodactylChamber_MapScripts: showemote EMOTE_SHOCK, PLAYER, 20 pause 30 playsound SFX_STRENGTH - changeblock 4, 0, $30 + changeblock 4, 0, $30 ; open wall reloadmappart earthquake 50 setscene 1 @@ -62,8 +62,8 @@ UnknownScript_0x58df7: setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 - changeblock 2, 2, $18 - changeblock 4, 2, $19 + changeblock 2, 2, $18 ; left hole + changeblock 4, 2, $19 ; right hole reloadmappart playsound SFX_STRENGTH earthquake 80 diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 06a8d67fb..173f35e39 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -24,15 +24,15 @@ RuinsOfAlphHoOhChamber_MapScripts: .HiddenDoors: checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue .WallOpen - changeblock 4, 0, $2e + changeblock 4, 0, $2e ; closed wall .WallOpen: checkevent EVENT_SOLVED_HO_OH_PUZZLE iffalse .FloorClosed return .FloorClosed: - changeblock 2, 2, $01 - changeblock 4, 2, $02 + changeblock 2, 2, $01 ; left floor + changeblock 4, 2, $02 ; right floor return .WallOpenScript: @@ -41,7 +41,7 @@ RuinsOfAlphHoOhChamber_MapScripts: showemote EMOTE_SHOCK, PLAYER, 20 pause 30 playsound SFX_STRENGTH - changeblock 4, 0, $30 + changeblock 4, 0, $30 ; open wall reloadmappart earthquake 50 setscene 1 @@ -63,8 +63,8 @@ UnknownScript_0x585ba: setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 - changeblock 2, 2, $18 - changeblock 4, 2, $19 + changeblock 2, 2, $18 ; left hole + changeblock 4, 2, $19 ; right hole reloadmappart playsound SFX_STRENGTH earthquake 80 diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index f59b6d537..df4bcb881 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -27,15 +27,15 @@ RuinsOfAlphKabutoChamber_MapScripts: .HiddenDoors: checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue .WallOpen - changeblock 4, 0, $2e + changeblock 4, 0, $2e ; closed wall .WallOpen: checkevent EVENT_SOLVED_KABUTO_PUZZLE iffalse .FloorClosed return .FloorClosed: - changeblock 2, 2, $01 - changeblock 4, 2, $02 + changeblock 2, 2, $01 ; left floor + changeblock 4, 2, $02 ; right floor return .WallOpenScript: @@ -44,7 +44,7 @@ RuinsOfAlphKabutoChamber_MapScripts: showemote EMOTE_SHOCK, PLAYER, 20 pause 30 playsound SFX_STRENGTH - changeblock 4, 0, $30 + changeblock 4, 0, $30 ; open wall reloadmappart earthquake 50 setscene 1 @@ -70,8 +70,8 @@ UnknownScript_0x58778: setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 - changeblock 2, 2, $18 - changeblock 4, 2, $19 + changeblock 2, 2, $18 ; left hole + changeblock 4, 2, $19 ; right hole reloadmappart playsound SFX_STRENGTH earthquake 80 diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 9385eb2ff..e9c937526 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -24,15 +24,15 @@ RuinsOfAlphOmanyteChamber_MapScripts: .HiddenDoors: checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue .WallOpen - changeblock 4, 0, $2e + changeblock 4, 0, $2e ; closed wall .WallOpen: checkevent EVENT_SOLVED_OMANYTE_PUZZLE iffalse .FloorClosed return .FloorClosed: - changeblock 2, 2, $01 - changeblock 4, 2, $02 + changeblock 2, 2, $01 ; left floor + changeblock 4, 2, $02 ; right floor return .WallOpenScript: @@ -41,7 +41,7 @@ RuinsOfAlphOmanyteChamber_MapScripts: showemote EMOTE_SHOCK, PLAYER, 20 pause 30 playsound SFX_STRENGTH - changeblock 4, 0, $30 + changeblock 4, 0, $30 ; open wall reloadmappart earthquake 50 setscene 1 @@ -63,8 +63,8 @@ UnknownScript_0x58c36: setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 - changeblock 2, 2, $18 - changeblock 4, 2, $19 + changeblock 2, 2, $18 ; left hole + changeblock 4, 2, $19 ; right hole reloadmappart playsound SFX_STRENGTH earthquake 80 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index da8881af5..abfd227a1 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -40,11 +40,11 @@ TeamRocketBaseB2F_MapScripts: .TransmitterDoorCallback: checkevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER - iftrue .Change + iftrue .OpenDoor return -.Change: - changeblock 14, 12, $07 +.OpenDoor: + changeblock 14, 12, $07 ; floor return UnknownScript_0x6cf95: @@ -330,7 +330,7 @@ UnknownScript_0x6d1e8: writetext UnknownText_0x6dd6b waitbutton playsound SFX_ENTER_DOOR - changeblock 14, 12, $07 + changeblock 14, 12, $07 ; floor reloadmappart closetext setevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index f0c9af09e..3f7fe5d39 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -45,7 +45,7 @@ TeamRocketBaseB3F_MapScripts: return .OpenSesame: - changeblock 10, 8, $07 + changeblock 10, 8, $07 ; floor return LanceGetPasswordScript: @@ -194,7 +194,7 @@ TeamRocketBaseB3FLockedDoor: writetext UnknownText_0x6e9a3 waitbutton playsound SFX_ENTER_DOOR - changeblock 10, 8, $07 + changeblock 10, 8, $07 ; floor reloadmappart closetext setevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index cb04e8845..cd20d59b2 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -79,7 +79,7 @@ TinTower1F_MapScripts: .StairsCallback: checkevent EVENT_GOT_RAINBOW_WING iftrue .DontHideStairs - changeblock 10, 2, $09 + changeblock 10, 2, $09 ; floor .DontHideStairs: return @@ -201,7 +201,7 @@ TinTower1FSage5Script: earthquake 72 waitsfx playsound SFX_STRENGTH - changeblock 10, 2, $20 + changeblock 10, 2, $20 ; stairs reloadmappart setevent EVENT_GOT_RAINBOW_WING closetext diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 5198c8407..1b0522ce9 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -20,21 +20,21 @@ WillsRoom_MapScripts: .WillsRoomDoors: checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED - iffalse .KeepDoorsClosed - changeblock 4, 14, $2a -.KeepDoorsClosed: + iffalse .KeepEntranceOpen + changeblock 4, 14, $2a ; wall +.KeepEntranceOpen: checkevent EVENT_WILLS_ROOM_EXIT_OPEN - iffalse .OpenDoors - changeblock 4, 2, $16 -.OpenDoors: + iffalse .KeepExitClosed + changeblock 4, 2, $16 ; open door +.KeepExitClosed: return .WillsDoorLocksBehindYou: - applymovement PLAYER, MovementData_0x18052c + applymovement PLAYER, WillsRoom_EnterMovement refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock 4, 14, $2a + changeblock 4, 14, $2a ; wall reloadmappart closetext setscene 1 @@ -46,7 +46,7 @@ WillScript_Battle: faceplayer opentext checkevent EVENT_BEAT_ELITE_4_WILL - iftrue WillScript_0x180526 + iftrue WillScript_AfterBattle writetext WillScript_WillBeforeText waitbutton closetext @@ -60,20 +60,20 @@ WillScript_Battle: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock 4, 2, $16 + changeblock 4, 2, $16 ; open door reloadmappart closetext setevent EVENT_WILLS_ROOM_EXIT_OPEN waitsfx end -WillScript_0x180526: +WillScript_AfterBattle: writetext WillScript_WillDefeatText waitbutton closetext end -MovementData_0x18052c: +WillsRoom_EnterMovement: step UP step UP step UP -- cgit v1.2.3 From 2acaa96cf16ce953a7149f300d54e5440abc27d8 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 18:34:20 -0500 Subject: More charmap and home/text.asm documentation for JP chars --- maps/CeladonDeptStore6F.asm | 2 +- maps/GoldenrodCity.asm | 2 +- maps/GoldenrodDeptStore6F.asm | 2 +- maps/Pokecenter2F.asm | 2 +- maps/Route35NationalParkGate.asm | 2 +- maps/Route36NationalParkGate.asm | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'maps') diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index b63ec99da..5a5e37afc 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -110,7 +110,7 @@ CeladonClangText: para "@" text_from_ram StringBuffer3 - text "" + text_start line "popped out." done diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index ebda2c594..89ca2bb0d 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -548,7 +548,7 @@ UnknownText_0x1991ac: done UnknownText_0x1991cf: - text "" + text_start done GoldenrodCity_MapEvents: diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index ed4309de2..73cb0f17e 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -103,7 +103,7 @@ GoldenrodClangText: text "Clang! A can of" line "@" text_from_ram StringBuffer3 - text "" + text_start cont "popped out!" done diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 8dc1c8eb0..11a73de07 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -915,7 +915,7 @@ Text_PleaseEnter: Text_RejectNewMon: text "Sorry--@" text_from_ram StringBuffer1 - text "" + text_start line "can't be taken." prompt diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index d4318db8f..754591060 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -374,7 +374,7 @@ UnknownText_0x6a71f: UnknownText_0x6a79a: text "You still have @" text_from_ram StringBuffer3 - text "" + text_start line "minute(s) left." para "Do you want to" diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 42e26b4b2..fa74c7ee5 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -624,7 +624,7 @@ UnknownText_0x6b209: UnknownText_0x6b284: text "You still have @" text_from_ram StringBuffer3 - text "" + text_start line "minute(s) left." para "Do you want to" -- cgit v1.2.3 From a3beba1e64bcdd71ade4595b37b033e74d87a78c Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 20:40:32 -0500 Subject: Use Japanese charmap definitions in strings --- maps/GoldenrodPokeComCenter2FMobile.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'maps') diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 1d8179da7..b8bcad2f3 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -99,8 +99,8 @@ MenuDataHeader_0x6264c: .MenuData2: db STATICMENU_CURSOR ; flags db 3 ; items - db "でんわ", $1f,"つかうとき@" ; Use phone - db "でんわ", $4a,"つながらないとき@" ; Don't use phone + db "でんわつかうとき@" ; Use phone + db "でんわつながらないとき@" ; Don't use phone db "やめる@" ; QUIT MapGoldenrodPokeComCenter2FMobileSignpost2Script: -- cgit v1.2.3 From e69544b61f5014b77852567efc3b78bc56982a20 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 02:30:19 -0500 Subject: More Unicode --- maps/AzaleaTown.asm | 4 ++-- maps/BurnedTower1F.asm | 2 +- maps/CeladonPokecenter1F.asm | 2 +- maps/CherrygroveCity.asm | 8 ++++---- maps/DragonShrine.asm | 4 ++-- maps/EcruteakHouse.asm | 2 +- maps/ElmsLab.asm | 2 +- maps/GoldenrodPokeComCenter2FMobile.asm | 4 ++-- maps/MountMoon.asm | 8 ++++---- maps/NewBarkTown.asm | 2 +- maps/RadioTower1F.asm | 4 ++-- maps/SilverCaveRoom3.asm | 8 ++++---- 12 files changed, 25 insertions(+), 25 deletions(-) (limited to 'maps') diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 61fa44392..16889aa51 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -376,11 +376,11 @@ AzaleaTownYoungsterText: AzaleaTownSlowpokeText1: text "SLOWPOKE: …" - para "<......> <......> <......>" + para "<……> <……> <……>" done AzaleaTownSlowpokeText2: - text "<......> <......>Yawn?" + text "<……> <……>Yawn?" done WoosterText: diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 4c307d710..f8e5ef52f 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -160,7 +160,7 @@ BurnedTower1FEusineMovement: step_end BurnedTowerSilver_BeforeText: - text "<......> <......> <......>" + text "<……> <……> <……>" para "…Oh, it's you." diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 9a3fa4a23..cfe31f624 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -133,7 +133,7 @@ NoBeastsText: para "#MON RAIKOU and" line "ENTEI?" - para "<......><......><......>" + para "<……><……><……>" para "Okay…" diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 5e001f445..ac3db17b6 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -433,7 +433,7 @@ GuideGentNoText: done UnknownText_0x19c4e2: - text "<......> <......> <......>" + text "<……> <……> <……>" para "You got a #MON" line "at the LAB." @@ -441,7 +441,7 @@ UnknownText_0x19c4e2: para "What a waste." line "A wimp like you." - para "<......> <......> <......>" + para "<……> <……> <……>" para "Don't you get what" line "I'm saying?" @@ -459,7 +459,7 @@ SilverCherrygroveWinText: done CherrygroveRivalText_YouLost: - text "<......> <......> <......>" + text "<……> <……> <……>" para "My name's ???." @@ -475,7 +475,7 @@ SilverCherrygroveLossText: done CherrygroveRivalText_YouWon: - text "<......> <......> <......>" + text "<……> <……> <……>" para "My name's ???." diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index fc1774eab..8be52840d 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -603,7 +603,7 @@ DragonShrineClairYouPassedText: para "You did fail?" - para "<......><......><......><......><......><......>" + para "<……><……><……><……><……><……>" para "…What? You passed?" done @@ -654,7 +654,7 @@ DragonShrineRisingBadgeExplanationText: done DragonShrineSpeechlessText: - text "<......><......><......><......><......><......>" + text "<……><……><……><……><……><……>" done DragonShrine_MapEvents: diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 0c557274f..436bdd0e3 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -202,7 +202,7 @@ UnknownText_0x98250: line "but I must ask you" cont "to leave." - para "<......><......><......>" + para "<……><……><……>" para "Ah!" diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 12623fee2..9322aefe8 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -794,7 +794,7 @@ ElmText_GotAnEmail: text "Oh, hey! I got an" line "e-mail!" - para "<......><......><......>" + para "<……><……><……>" line "Hm… Uh-huh…" para "Okay…" diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index b8bcad2f3..b3d4a43c3 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -239,7 +239,7 @@ UnknownText_0x62b26: line "OFFICE received an" cont "e-mail. It says…" - para "<......> <......> <......>" + para "<……> <……> <……>" para "To the #COM" line "CENTER staff…" @@ -259,7 +259,7 @@ UnknownText_0x62b26: para "the world can link" line "without barriers!" - para "<......> <......> <......>" + para "<……> <……> <……>" done GoldenrodPokeComCenter2FMobile_MapEvents: diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 1823757ec..38e5d436d 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -88,7 +88,7 @@ MountMoonSilverMovementAfter: step_end MountMoonSilverTextBefore: - text "<......> <......> <......>" + text "<……> <……> <……>" para "It's been a while," line "." @@ -108,7 +108,7 @@ MountMoonSilverTextBefore: done MountMoonSilverTextWin: - text "<......> <......> <......>" + text "<……> <……> <……>" para "I thought I raised" line "my #MON to be" @@ -121,7 +121,7 @@ MountMoonSilverTextWin: done MountMoonSilverTextAfter: - text "<......> <......> <......>" + text "<……> <……> <……>" para "…You won, fair" line "and square." @@ -147,7 +147,7 @@ MountMoonSilverTextAfter: done MountMoonSilverTextLoss: - text "<......> <......> <......>" + text "<……> <……> <……>" para "I've repaid my" line "debt to you." diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 9bfacc2c8..f4cad71eb 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -249,7 +249,7 @@ Text_ElmDiscoveredNewMon: done NewBarkTownRivalText1: - text "<......>" + text "<……>" para "So this is the" line "famous ELM #MON" diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 646eaae1f..96cd013c6 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -249,8 +249,8 @@ UnknownText_0x5cf5a: done UnknownText_0x5cf79: - text "<......>" - line "<......>" + text "<……>" + line "<……>" done UnknownText_0x5cf7e: diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 2fd816bda..705ca0cc1 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -37,8 +37,8 @@ Red: end .Text1: - text "<......>" - line "<......>" + text "<……>" + line "<……>" done .Text2: @@ -46,8 +46,8 @@ Red: done .Text3: - text "<......>" - line "<......>" + text "<……>" + line "<……>" done SilverCaveRoom3_MapEvents: -- cgit v1.2.3 From b071dd364f715165d6eec99ebbd1e4aed4b84bde Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 21:49:16 -0500 Subject: =?UTF-8?q?Japanese=20characters=20in=20Japanese=20text=20(e.g.=20?= =?UTF-8?q?"=E3=82=A9"=20not=20","=20for=20$f4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maps/GoldenrodPokeComCenter2FMobile.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'maps') diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index b3d4a43c3..d45b3ac56 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -57,7 +57,7 @@ MenuDataHeader_0x62602: .MenuData2: db STATICMENU_CURSOR ; flags db 3 ; items - db "# つうしん クラブ@" ; # COM CLUB + db "#　つうしん　クラブ@" ; # COM CLUB db "モバイルセンター@" ; MOBILE CENTER db "やめる@" ; QUIT -- cgit v1.2.3 From 8127d1fbcfccb7cd5c3e210699dd540e370b6634 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 20 Jan 2018 12:05:16 -0500 Subject: Rename BATTLETOWER_NROF constants --- maps/BattleTowerBattleRoom.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'maps') diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 6e13536fc..8fcc8dba4 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -37,7 +37,7 @@ Script_BattleRoomLoop: ; 0x9f425 reloadmap if_not_equal $0, Script_FailedBattleTowerChallenge copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64 - if_equal BATTLETOWER_NROFTRAINERS, Script_BeatenAllTrainers + if_equal BATTLETOWER_STREAK_SIZE, Script_BeatenAllTrainers applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksOut warpsound disappear BATTLETOWERBATTLEROOM_YOUNGSTER -- cgit v1.2.3 From 05382d3e3c03616d6edf21833e89a8264a8cd10a Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 20 Jan 2018 12:25:55 -0500 Subject: PARTY_LENGTH; MON_NAME; sgb_border.bin --- maps/BattleTowerBattleRoom.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'maps') diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 8fcc8dba4..dd8e08e0f 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -37,7 +37,7 @@ Script_BattleRoomLoop: ; 0x9f425 reloadmap if_not_equal $0, Script_FailedBattleTowerChallenge copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64 - if_equal BATTLETOWER_STREAK_SIZE, Script_BeatenAllTrainers + if_equal BATTLETOWER_STREAK_LENGTH, Script_BeatenAllTrainers applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksOut warpsound disappear BATTLETOWERBATTLEROOM_YOUNGSTER -- cgit v1.2.3