diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-16 22:57:19 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-16 23:25:00 -0500 |
| commit | bf074f359886707d2ffb2e0b525b03dc7af0fe29 (patch) | |
| tree | 79ed0eaefcf076aaf7c216338750c934d3cee1b8 /maps | |
| parent | 3d0e1819e919676b90e2a8621149a0c12689dd37 (diff) | |
map_header → map_def; map_header_2 → map_data
Diffstat (limited to 'maps')
388 files changed, 780 insertions, 780 deletions
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, <PLAYER>!" 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 |