map_header → map_def; map_header_2 → map_data

2018-01-16 22:57:19 -05:00
parent 3d0e1819e9
commit bf074f3598
421 changed files with 2698 additions and 2699 deletions
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- a/Show More
+++ b/Show More