Remove unreferenced map script heading labels

docs/map_scripts.md

@@ -11,14 +11,14 @@
 ## <code>MapName_MapScripts:</code>
 
 
-### <code>.SceneScripts: db <i>N</i></code>
+### <code>db <i>N</i> ; scene scripts</code>
 
 <pre>
 	scene_script <i>script</i>
 </pre>
 
 
-### <code>.MapCallbacks: db <i>N</i></code>
+### <code>db <i>N</i> ; callbacks</code>
 
 <pre>
 	callback <i>type</i>, <i>script</i>
@@ -70,26 +70,25 @@ Callback types:
 ## <code>MapName_MapEvents:</code>
 
 ```asm
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 ```
 
 
-### <code>.Warps: db <i>N</i></code>
+### <code>db <i>N</i> ; warp events</code>
 
 <pre>
 	warp_event <i>x</i>, <i>y</i>, <i>warp_id</i>, <i>map</i>
 </pre>
 
 
-### <code>.CoordEvents: db <i>N</i></code>
+### <code>db <i>N</i> ; coord events</code>
 
 <pre>
 	coord_event <i>x</i>, <i>y</i>, <i>scene_id</i>, <i>script</i>
 </pre>
 
 
-### <code>.BGEvents: db <i>N</i></code>
+### <code>db <i>N</i> ; bg events</code>
 
 <pre>
 	bg_event <i>x</i>, <i>y</i>, <i>type</i>, <i>script</i>
@@ -115,7 +114,7 @@ BG event types:
 
 - `BGEVENT_COPY`
 
-### <code>.ObjectEvents: db <i>N</i></code>
+### <code>db <i>N</i> ; object events</code>
 
 <pre>
 	object_event <i>x</i>, <i>y</i>, <i>sprite</i>, <i>movement</i>, <i>rx</i>, <i>ry</i>, <i>h1</i>, <i>h2</i>, <i>palette</i>, <i>type</i>, <i>range</i>, <i>script</i>, <i>event_flag</i>

maps/AzaleaGym.asm

@@ -8,11 +8,9 @@ const_value set 2
 	const AZALEAGYM_GYM_GUY
 
 AzaleaGym_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 AzaleaGymBugsyScript:
 	faceplayer
@@ -362,24 +360,19 @@ AzaleaGymGuyWinText:
 	done
 
 AzaleaGym_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 4, 15, 5, AZALEA_TOWN
 	warp_event 5, 15, 5, AZALEA_TOWN
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 3, 13, BGEVENT_READ, AzaleaGymStatue
 	bg_event 6, 13, BGEVENT_READ, AzaleaGymStatue
 
-.ObjectEvents:
+	db 7 ; object events
-	db 7
 	object_event 5, 7, SPRITE_BUGSY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
 	object_event 5, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1
 	object_event 8, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1

maps/AzaleaMart.asm

@@ -4,11 +4,9 @@ const_value set 2
 	const AZALEAMART_BUG_CATCHER
 
 AzaleaMart_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 AzaleaMartClerkScript:
 	opentext
@@ -46,22 +44,17 @@ AzaleaMartBugCatcherText:
 	done
 
 AzaleaMart_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 3, AZALEA_TOWN
 	warp_event 3, 7, 3, AZALEA_TOWN
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 3 ; object events
-	db 3
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1
 	object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1
 	object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1

maps/AzaleaPokecenter1F.asm

@@ -5,12 +5,10 @@ const_value set 2
 	const AZALEAPOKECENTER1F_POKEFAN_F
 
 AzaleaPokecenter1F_MapScripts:
-.SceneScripts:
+	db 1 ; scene scripts
-	db 1
 	scene_script .DummyScene
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 .DummyScene:
 	end
@@ -77,23 +75,18 @@ AzaleaPokecenter1FPokefanFText:
 	done
 
 AzaleaPokecenter1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 3, 7, 1, AZALEA_TOWN
 	warp_event 4, 7, 1, AZALEA_TOWN
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 4 ; object events
-	db 4
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1
 	object_event 9, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1
 	object_event 6, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1

maps/AzaleaTown.asm

@@ -13,14 +13,12 @@ const_value set 2
 	const AZALEATOWN_KURT_OUTSIDE
 
 AzaleaTown_MapScripts:
-.SceneScripts:
+	db 3 ; scene scripts
-	db 3
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 	scene_script .DummyScene2
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_NEWMAP, .Flypoint
 
 .DummyScene0:
@@ -456,11 +454,9 @@ AzaleaTownIlexForestSignText:
 	done
 
 AzaleaTown_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 8 ; warp events
-	db 8
 	warp_event 15, 9, 1, AZALEA_POKECENTER_1F
 	warp_event 21, 13, 1, CHARCOAL_KILN
 	warp_event 21, 5, 2, AZALEA_MART
@@ -470,14 +466,12 @@ AzaleaTown_MapEvents:
 	warp_event 2, 10, 3, ILEX_FOREST_AZALEA_GATE
 	warp_event 2, 11, 4, ILEX_FOREST_AZALEA_GATE
 
-.CoordEvents:
+	db 3 ; coord events
-	db 3
 	coord_event 5, 10, 1, AzaleaTownRivalBattleScene1
 	coord_event 5, 11, 1, AzaleaTownRivalBattleScene2
 	coord_event 9, 6, 2, AzaleaTownCelebiScene
 
-.BGEvents:
+	db 9 ; bg events
-	db 9
 	bg_event 19, 9, BGEVENT_READ, AzaleaTownSign
 	bg_event 10, 9, BGEVENT_READ, KurtsHouseSign
 	bg_event 14, 15, BGEVENT_READ, AzaleaGymSign
@@ -488,8 +482,7 @@ AzaleaTown_MapEvents:
 	bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign
 	bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal
 
-.ObjectEvents:
+	db 12 ; object events
-	db 12
 	object_event 31, 9, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
 	object_event 21, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1
 	object_event 15, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1

maps/BattleTower1F.asm

@@ -6,13 +6,11 @@ const_value set 2
 	const BATTLETOWER1F_GRANNY
 
 BattleTower1F_MapScripts:
-.SceneScripts:
+	db 2 ; scene scripts
-	db 2
 	scene_script .Scene0
 	scene_script .Scene1
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 .Scene0:
 	writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS
@@ -794,24 +792,19 @@ Text_BattleTowerBugCatcher: ; 0x9f35b
 	done
 
 BattleTower1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 7, 9, 3, BATTLE_TOWER_OUTSIDE
 	warp_event 8, 9, 4, BATTLE_TOWER_OUTSIDE
 	warp_event 7, 0, 1, BATTLE_TOWER_ELEVATOR
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 1 ; bg events
-	db 1
 	bg_event 6, 6, BGEVENT_READ, MapBattleTower1FSignpost0Script
 
-.ObjectEvents:
+	db 5 ; object events
-	db 5
 	object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1
 	object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1
 	object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1

maps/BattleTowerBattleRoom.asm

@@ -3,13 +3,11 @@ const_value set 2
 	const BATTLETOWERBATTLEROOM_RECEPTIONIST
 
 BattleTowerBattleRoom_MapScripts:
-.SceneScripts:
+	db 2 ; scene scripts
-	db 2
 	scene_script .EnterBattleRoom
 	scene_script .DummyScene
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 .EnterBattleRoom: ; 0x9f419
 	disappear BATTLETOWERBATTLEROOM_YOUNGSTER
@@ -139,21 +137,16 @@ Text_ReturnedAfterSave_Mobile:
 	done
 
 BattleTowerBattleRoom_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 3, 7, 4, BATTLE_TOWER_HALLWAY
 	warp_event 4, 7, 4, BATTLE_TOWER_HALLWAY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 2 ; object events
-	db 2
 	object_event 4, 0, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
 	object_event 1, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1

maps/BattleTowerElevator.asm

@@ -2,13 +2,11 @@ const_value set 2
 	const BATTLETOWERELEVATOR_RECEPTIONIST
 
 BattleTowerElevator_MapScripts:
-.SceneScripts:
+	db 2 ; scene scripts
-	db 2
 	scene_script .Scene0
 	scene_script .Scene1
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 .Scene0:
 	priorityjump .RideElevator
@@ -45,20 +43,15 @@ MovementData_BattleTowerElevatorPlayerWalksIn:
 	step_end
 
 BattleTowerElevator_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 1, 3, 1, BATTLE_TOWER_HALLWAY
 	warp_event 2, 3, 1, BATTLE_TOWER_HALLWAY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 1 ; object events
-	db 1
 	object_event 1, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1

maps/BattleTowerHallway.asm

@@ -2,13 +2,11 @@ const_value set 2
 	const BATTLETOWERHALLWAY_RECEPTIONIST
 
 BattleTowerHallway_MapScripts:
-.SceneScripts:
+	db 2 ; scene scripts
-	db 2
 	scene_script .Scene0
 	scene_script .Scene1
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 .Scene0:
 	priorityjump .ChooseBattleRoom
@@ -77,11 +75,9 @@ BattleTowerHallway_MapScripts:
 	end
 
 BattleTowerHallway_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 6 ; warp events
-	db 6
 	warp_event 11, 1, 1, BATTLE_TOWER_ELEVATOR
 	warp_event 5, 0, 1, BATTLE_TOWER_BATTLE_ROOM
 	warp_event 7, 0, 1, BATTLE_TOWER_BATTLE_ROOM
@@ -89,12 +85,9 @@ BattleTowerHallway_MapEvents:
 	warp_event 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM
 	warp_event 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 1 ; object events
-	db 1
 	object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1

maps/BattleTowerOutside.asm

@@ -5,11 +5,9 @@ const_value set 2
 	const BATTLETOWEROUTSIDE_LASS
 
 BattleTowerOutside_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 2 ; callbacks
-	db 2
 	callback MAPCALLBACK_TILES, .Callback1
 	callback MAPCALLBACK_OBJECTS, .Callback2
 
@@ -127,25 +125,20 @@ BattleTowerOutsideText_DoorsOpen:
 	done
 
 BattleTowerOutside_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 4 ; warp events
-	db 4
 	warp_event 8, 21, 3, ROUTE_40_BATTLE_TOWER_GATE
 	warp_event 9, 21, 4, ROUTE_40_BATTLE_TOWER_GATE
 	warp_event 8, 9, 1, BATTLE_TOWER_1F
 	warp_event 9, 9, 2, BATTLE_TOWER_1F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 1 ; bg events
-	db 1
 	bg_event 10, 10, BGEVENT_READ, MapBattleTowerOutsideSignpost0Script
 
-.ObjectEvents:
+	db 4 ; object events
-	db 4
 	object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
 	object_event 13, 11, SPRITE_BUENA, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1
 	object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR

maps/BillsBrothersHouse.asm

@@ -3,11 +3,9 @@ const_value set 2
 	const BILLSBROTHERSHOUSE_YOUNGSTER
 
 BillsBrothersHouse_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 BillsBrotherScript:
 	jumptextfaceplayer BillsBrotherText
@@ -28,21 +26,16 @@ BillsBrothersHouseYoungsterText:
 	done
 
 BillsBrothersHouse_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 4, FUCHSIA_CITY
 	warp_event 3, 7, 4, FUCHSIA_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 2 ; object events
-	db 2
 	object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsBrotherScript, -1
 	object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsBrothersHouseYoungsterScript, -1

maps/BillsFamilysHouse.asm

@@ -4,11 +4,9 @@ const_value set 2
 	const BILLSFAMILYSHOUSE_TWIN
 
 BillsFamilysHouse_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 BillScript:
 	faceplayer
@@ -243,25 +241,20 @@ UnknownText_0x55069:
 	done
 
 BillsFamilysHouse_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 4, GOLDENROD_CITY
 	warp_event 3, 7, 4, GOLDENROD_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 3 ; bg events
-	db 3
 	bg_event 0, 1, BGEVENT_READ, BillsHouseBookshelf2
 	bg_event 1, 1, BGEVENT_READ, BillsHouseBookshelf1
 	bg_event 7, 1, BGEVENT_READ, BillsHouseRadio
 
-.ObjectEvents:
+	db 3 ; object events
-	db 3
 	object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillScript, EVENT_MET_BILL
 	object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMomScript, -1
 	object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSisterScript, -1

maps/BillsHouse.asm

@@ -2,11 +2,9 @@ const_value set 2
 	const BILLSHOUSE_GRAMPS
 
 BillsHouse_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 BillsGrandpa:
 	faceplayer
@@ -354,20 +352,15 @@ BillsGrandpaPichuText:
 	done
 
 BillsHouse_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 1, ROUTE_25
 	warp_event 3, 7, 1, ROUTE_25
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 1 ; object events
-	db 1
 	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1

maps/BlackthornCity.asm

@@ -10,11 +10,9 @@ const_value set 2
 	const BLACKTHORNCITY_COOLTRAINER_F2
 
 BlackthornCity_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 2 ; callbacks
-	db 2
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 	callback MAPCALLBACK_OBJECTS, .Santos
 
@@ -313,11 +311,9 @@ BlackthornCityTrainerTipsText:
 	done
 
 BlackthornCity_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 8 ; warp events
-	db 8
 	warp_event 18, 11, 1, BLACKTHORN_GYM_1F
 	warp_event 13, 21, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE
 	warp_event 29, 23, 1, BLACKTHORN_EMYS_HOUSE
@@ -327,11 +323,9 @@ BlackthornCity_MapEvents:
 	warp_event 36, 9, 2, ICE_PATH_1F
 	warp_event 20, 1, 1, DRAGONS_DEN_1F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 7 ; bg events
-	db 7
 	bg_event 34, 24, BGEVENT_READ, BlackthornCitySign
 	bg_event 17, 13, BGEVENT_READ, BlackthornGymSign
 	bg_event 7, 31, BGEVENT_READ, MoveDeletersHouseSign
@@ -340,8 +334,7 @@ BlackthornCity_MapEvents:
 	bg_event 16, 29, BGEVENT_READ, BlackthornCityMartSign
 	bg_event 22, 29, BGEVENT_READ, BlackthornCityPokecenterSign
 
-.ObjectEvents:
+	db 9 ; object events
-	db 9
 	object_event 18, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
 	object_event 19, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
 	object_event 20, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN

maps/BlackthornDragonSpeechHouse.asm

@@ -3,11 +3,9 @@ const_value set 2
 	const BLACKTHORNDRAGONSPEECHHOUSE_EKANS
 
 BlackthornDragonSpeechHouse_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 BlackthornDragonSpeechHouseGrannyScript:
 	jumptextfaceplayer BlackthornDragonSpeechHouseGrannyText
@@ -48,21 +46,16 @@ BlackthornDragonSpeechHouseDratiniText:
 	done
 
 BlackthornDragonSpeechHouse_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 2, BLACKTHORN_CITY
 	warp_event 3, 7, 2, BLACKTHORN_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 2 ; object events
-	db 2
 	object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1
 	object_event 5, 5, SPRITE_EKANS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1

maps/BlackthornEmysHouse.asm

@@ -2,11 +2,9 @@ const_value set 2
 	const BLACKTHORNEMYSHOUSE_EMY
 
 BlackthornEmysHouse_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 Emy:
 	faceplayer
@@ -20,22 +18,17 @@ EmysHouseBookshelf:
 	jumpstd magazinebookshelf
 
 BlackthornEmysHouse_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 3, BLACKTHORN_CITY
 	warp_event 3, 7, 3, BLACKTHORN_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 0, 1, BGEVENT_READ, EmysHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf
 
-.ObjectEvents:
+	db 1 ; object events
-	db 1
 	object_event 2, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1

maps/BlackthornGym1F.asm

@@ -6,11 +6,9 @@ const_value set 2
 	const BLACKTHORNGYM1F_GYM_GUY
 
 BlackthornGym1F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_TILES, .Boulders
 
 .Boulders:
@@ -387,11 +385,9 @@ BlackthornGymGuyWinText:
 	done
 
 BlackthornGym1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 7 ; warp events
-	db 7
 	warp_event 4, 17, 1, BLACKTHORN_CITY
 	warp_event 5, 17, 1, BLACKTHORN_CITY
 	warp_event 1, 7, 1, BLACKTHORN_GYM_2F
@@ -400,16 +396,13 @@ BlackthornGym1F_MapEvents:
 	warp_event 7, 7, 4, BLACKTHORN_GYM_2F
 	warp_event 7, 6, 5, BLACKTHORN_GYM_2F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 3, 15, BGEVENT_READ, BlackthornGymStatue
 	bg_event 6, 15, BGEVENT_READ, BlackthornGymStatue
 
-.ObjectEvents:
+	db 5 ; object events
-	db 5
 	object_event 5, 3, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1
 	object_event 6, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1
 	object_event 1, 14, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1

maps/BlackthornGym2F.asm

@@ -9,11 +9,9 @@ const_value set 2
 	const BLACKTHORNGYM2F_BOULDER6
 
 BlackthornGym2F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable
 
 .SetUpStoneTable:
@@ -126,25 +124,20 @@ BlackthornGym2FBoulderFellText:
 	done
 
 BlackthornGym2F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 5 ; warp events
-	db 5
 	warp_event 1, 7, 3, BLACKTHORN_GYM_1F
 	warp_event 7, 9, 4, BLACKTHORN_GYM_1F
 	warp_event 2, 5, 5, BLACKTHORN_GYM_1F ; hole
 	warp_event 8, 7, 6, BLACKTHORN_GYM_1F ; hole
 	warp_event 8, 3, 7, BLACKTHORN_GYM_1F ; hole
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 8 ; object events
-	db 8
 	object_event 4, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1
 	object_event 4, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1
 	object_event 8, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1

maps/BlackthornMart.asm

@@ -4,11 +4,9 @@ const_value set 2
 	const BLACKTHORNMART_BLACK_BELT
 
 BlackthornMart_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 BlackthornMartClerkScript:
 	opentext
@@ -47,22 +45,17 @@ BlackthornMartBlackBeltText:
 	done
 
 BlackthornMart_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 4, BLACKTHORN_CITY
 	warp_event 3, 7, 4, BLACKTHORN_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 3 ; object events
-	db 3
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1
 	object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1
 	object_event 5, 2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1

maps/BlackthornPokecenter1F.asm

@@ -5,11 +5,9 @@ const_value set 2
 	const BLACKTHORNPOKECENTER1F_COOLTRAINER_M
 
 BlackthornPokecenter1F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 BlackthornPokecenter1FNurseScript:
 	jumpstd pokecenternurse
@@ -50,23 +48,18 @@ BlackthornPokecenter1FTwinText:
 	done
 
 BlackthornPokecenter1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 3, 7, 5, BLACKTHORN_CITY
 	warp_event 4, 7, 5, BLACKTHORN_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 4 ; object events
-	db 4
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1
 	object_event 5, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1
 	object_event 1, 4, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1

maps/BluesHouse.asm

@@ -2,11 +2,9 @@ const_value set 2
 	const BLUESHOUSE_DAISY
 
 BluesHouse_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 DaisyScript:
 	faceplayer
@@ -145,20 +143,15 @@ DaisyCantGroomEggText:
 	done
 
 BluesHouse_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 2, PALLET_TOWN
 	warp_event 3, 7, 2, PALLET_TOWN
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 1 ; object events
-	db 1
 	object_event 2, 3, SPRITE_DAISY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1

maps/BrunosRoom.asm

@@ -2,13 +2,11 @@ const_value set 2
 	const BRUNOSROOM_BRUNO
 
 BrunosRoom_MapScripts:
-.SceneScripts:
+	db 2 ; scene scripts
-	db 2
 	scene_script .LockDoor
 	scene_script .DummyScene
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_TILES, .BrunosRoomDoors
 
 .LockDoor:
@@ -125,22 +123,17 @@ BrunoScript_BrunoDefeatText:
 	done
 
 BrunosRoom_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 4 ; warp events
-	db 4
 	warp_event 4, 17, 3, KOGAS_ROOM
 	warp_event 5, 17, 4, KOGAS_ROOM
 	warp_event 4, 2, 1, KARENS_ROOM
 	warp_event 5, 2, 2, KARENS_ROOM
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 1 ; object events
-	db 1
 	object_event 5, 7, SPRITE_BRUNO, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1

maps/BurnedTower1F.asm

@@ -6,14 +6,12 @@ const_value set 2
 	const BURNEDTOWER1F_POKE_BALL
 
 BurnedTower1F_MapScripts:
-.SceneScripts:
+	db 3 ; scene scripts
-	db 3
 	scene_script .EusineScene
 	scene_script .DummyScene1
 	scene_script .DummyScene2
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_TILES, .HoleAndLadder
 
 .EusineScene:
@@ -278,11 +276,9 @@ BurnedTower1FMortyText:
 	done
 
 BurnedTower1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 14 ; warp events
-	db 14
 	warp_event 9, 15, 13, ECRUTEAK_CITY
 	warp_event 10, 15, 13, ECRUTEAK_CITY
 	warp_event 10, 9,  1, BURNED_TOWER_B1F
@@ -298,17 +294,14 @@ BurnedTower1F_MapEvents:
 	warp_event 15, 14,  5, BURNED_TOWER_B1F
 	warp_event 7, 15,  6, BURNED_TOWER_B1F
 
-.CoordEvents:
+	db 1 ; coord events
-	db 1
 	coord_event 11, 9, 1, BurnedTowerRivalBattleScript
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther
 	bg_event 13, 11, BGEVENT_ITEM, BurnedTower1FHiddenUltraBall
 
-.ObjectEvents:
+	db 5 ; object events
-	db 5
 	object_event 15, 4, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1
 	object_event 12, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE
 	object_event 8, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER

maps/BurnedTowerB1F.asm

@@ -10,13 +10,11 @@ const_value set 2
 	const BURNEDTOWERB1F_EUSINE
 
 BurnedTowerB1F_MapScripts:
-.SceneScripts:
+	db 2 ; scene scripts
-	db 2
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_TILES, .LadderCallback
 
 .DummyScene0:
@@ -236,11 +234,9 @@ BurnedTowerB1FEusineText:
 	done
 
 BurnedTowerB1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 6 ; warp events
-	db 6
 	warp_event 10, 9, 3, BURNED_TOWER_1F
 	warp_event 17, 7, 7, BURNED_TOWER_1F
 	warp_event 10, 8, 9, BURNED_TOWER_1F
@@ -248,15 +244,12 @@ BurnedTowerB1F_MapEvents:
 	warp_event 17, 14, 12, BURNED_TOWER_1F
 	warp_event 7, 15, 14, BURNED_TOWER_1F
 
-.CoordEvents:
+	db 1 ; coord events
-	db 1
 	coord_event 10, 6, 0, ReleaseTheBeasts
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 9 ; object events
-	db 9
 	object_event 17, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1
 	object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
 	object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1

maps/CeladonCafe.asm

@@ -6,11 +6,9 @@ const_value set 2
 	const CELADONCAFE_TEACHER
 
 CeladonCafe_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CeladonCafeChef:
 	faceplayer
@@ -208,24 +206,19 @@ NoRoomForLeftoversText:
 	done
 
 CeladonCafe_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 6, 7, 9, CELADON_CITY
 	warp_event 7, 7, 9, CELADON_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 5, 0, BGEVENT_READ, EatathonContestPoster
 	bg_event 7, 1, BGEVENT_READ, CeladonCafeTrashcan
 
-.ObjectEvents:
+	db 5 ; object events
-	db 5
 	object_event 9, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1
 	object_event 4, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1
 	object_event 1, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1

maps/CeladonCity.asm

@@ -10,11 +10,9 @@ const_value set 2
 	const CELADONCITY_LASS
 
 CeladonCity_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -235,11 +233,9 @@ CeladonCityTrainerTipsText:
 	done
 
 CeladonCity_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 9 ; warp events
-	db 9
 	warp_event 4, 9, 1, CELADON_DEPT_STORE_1F
 	warp_event 16, 9, 1, CELADON_MANSION_1F
 	warp_event 16, 3, 3, CELADON_MANSION_1F
@@ -250,11 +246,9 @@ CeladonCity_MapEvents:
 	warp_event 10, 29, 1, CELADON_GYM
 	warp_event 25, 29, 1, CELADON_CAFE
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 8 ; bg events
-	db 8
 	bg_event 23, 21, BGEVENT_READ, CeladonCitySign
 	bg_event 11, 31, BGEVENT_READ, CeladonGymSign
 	bg_event 6, 9, BGEVENT_READ, CeladonCityDeptStoreSign
@@ -264,8 +258,7 @@ CeladonCity_MapEvents:
 	bg_event 30, 9, BGEVENT_READ, CeladonCityPokecenterSign
 	bg_event 37, 21, BGEVENT_ITEM, CeladonCityHiddenPpUp
 
-.ObjectEvents:
+	db 9 ; object events
-	db 9
 	object_event 26, 11, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityFisherScript, -1
 	object_event 27, 11, SPRITE_POLIWAG, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1
 	object_event 20, 24, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1

maps/CeladonDeptStore1F.asm

@@ -4,11 +4,9 @@ const_value set 2
 	const CELADONDEPTSTORE1F_TEACHER
 
 CeladonDeptStore1F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CeladonDeptStore1FReceptionistScript:
 	jumptextfaceplayer CeladonDeptStore1FReceptionistText
@@ -74,26 +72,21 @@ CeladonDeptStore1FDirectoryText:
 	done
 
 CeladonDeptStore1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 4 ; warp events
-	db 4
 	warp_event 7, 7, 1, CELADON_CITY
 	warp_event 8, 7, 1, CELADON_CITY
 	warp_event 15, 0, 2, CELADON_DEPT_STORE_2F
 	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore1FDirectory
 	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton
 
-.ObjectEvents:
+	db 3 ; object events
-	db 3
 	object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1
 	object_event 11, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1
 	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1

maps/CeladonDeptStore2F.asm

@@ -5,11 +5,9 @@ const_value set 2
 	const CELADONDEPTSTORE2F_YOUNGSTER
 
 CeladonDeptStore2F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 ClerkScript_0x70bad:
 	faceplayer
@@ -69,25 +67,20 @@ CeladonDeptStore2FDirectoryText:
 	done
 
 CeladonDeptStore2F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 12, 0, 1, CELADON_DEPT_STORE_3F
 	warp_event 15, 0, 3, CELADON_DEPT_STORE_1F
 	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore2FDirectory
 	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore2FElevatorButton
 
-.ObjectEvents:
+	db 4 ; object events
-	db 4
 	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1
 	object_event 14, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1
 	object_event 5, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1

maps/CeladonDeptStore3F.asm

@@ -6,11 +6,9 @@ const_value set 2
 	const CELADONDEPTSTORE3F_SUPER_NERD
 
 CeladonDeptStore3F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 ClerkScript_0x70d29:
 	faceplayer
@@ -95,25 +93,20 @@ CeladonDeptStore3FDirectoryText:
 	done
 
 CeladonDeptStore3F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 12, 0, 1, CELADON_DEPT_STORE_2F
 	warp_event 15, 0, 2, CELADON_DEPT_STORE_4F
 	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore3FDirectory
 	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore3FElevatorButton
 
-.ObjectEvents:
+	db 5 ; object events
-	db 5
 	object_event 7, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1
 	object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1
 	object_event 9, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1

maps/CeladonDeptStore4F.asm

@@ -4,11 +4,9 @@ const_value set 2
 	const CELADONDEPTSTORE4F_YOUNGSTER
 
 CeladonDeptStore4F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 ClerkScript_0x70f0d:
 	faceplayer
@@ -51,25 +49,20 @@ CeladonDeptStore4FDirectoryText:
 	done
 
 CeladonDeptStore4F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 12, 0, 1, CELADON_DEPT_STORE_5F
 	warp_event 15, 0, 2, CELADON_DEPT_STORE_3F
 	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore4FDirectory
 	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore4FElevatorButton
 
-.ObjectEvents:
+	db 3 ; object events
-	db 3
 	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1
 	object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1
 	object_event 8, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1

maps/CeladonDeptStore5F.asm

@@ -6,11 +6,9 @@ const_value set 2
 	const CELADONDEPTSTORE5F_TEACHER
 
 CeladonDeptStore5F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 ClerkScript_0x71004:
 	faceplayer
@@ -72,25 +70,20 @@ CeladonDeptStore5FDirectoryText:
 	done
 
 CeladonDeptStore5F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 12, 0, 1, CELADON_DEPT_STORE_4F
 	warp_event 15, 0, 1, CELADON_DEPT_STORE_6F
 	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore5FDirectory
 	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore5FElevatorButton
 
-.ObjectEvents:
+	db 5 ; object events
-	db 5
 	object_event 7, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1
 	object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1
 	object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1

maps/CeladonDeptStore6F.asm

@@ -3,11 +3,9 @@ const_value set 2
 	const CELADONDEPTSTORE6F_YOUNGSTER
 
 CeladonDeptStore6F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_TILES, .HideRooftopStairs
 
 .HideRooftopStairs:
@@ -146,19 +144,15 @@ CeladonDeptStore6FDirectoryText:
 	done
 
 CeladonDeptStore6F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 15, 0, 2, CELADON_DEPT_STORE_5F
 	warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 6 ; bg events
-	db 6
 	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore6FDirectory
 	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton
 	bg_event 8, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
@@ -166,7 +160,6 @@ CeladonDeptStore6F_MapEvents:
 	bg_event 10, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
 	bg_event 11, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
 
-.ObjectEvents:
+	db 2 ; object events
-	db 2
 	object_event 9, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1
 	object_event 12, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1

maps/CeladonDeptStoreElevator.asm

@@ -1,9 +1,7 @@
 CeladonDeptStoreElevator_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CeladonDeptStoreElevatorScript:
 	opentext
@@ -28,20 +26,15 @@ CeladonDeptStoreElevatorData:
 	db -1 ; end
 
 CeladonDeptStoreElevator_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 1, 3, -1, CELADON_DEPT_STORE_1F
 	warp_event 2, 3, -1, CELADON_DEPT_STORE_1F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 1 ; bg events
-	db 1
 	bg_event 3, 0, BGEVENT_READ, CeladonDeptStoreElevatorScript
 
-.ObjectEvents:
+	db 0 ; object events
-	db 0

maps/CeladonGameCorner.asm

@@ -10,11 +10,9 @@ const_value set 2
 	const CELADONGAMECORNER_GRAMPS
 
 CeladonGameCorner_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CeladonGameCornerClerkScript:
 	jumpstd gamecornercoinvendor
@@ -282,19 +280,15 @@ UnknownText_0x72567:
 	done
 
 CeladonGameCorner_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 14, 13, 6, CELADON_CITY
 	warp_event 15, 13, 6, CELADON_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 38 ; bg events
-	db 38
 	bg_event 1, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript
 	bg_event 1, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript
 	bg_event 1, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript
@@ -334,8 +328,7 @@ CeladonGameCorner_MapEvents:
 	bg_event 15, 0, BGEVENT_READ, CeladonGameCornerPoster1Script
 	bg_event 9, 0, BGEVENT_READ, CeladonGameCornerPoster2Script
 
-.ObjectEvents:
+	db 9 ; object events
-	db 9
 	object_event 5, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1
 	object_event 3, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1
 	object_event 14, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1

maps/CeladonGameCornerPrizeRoom.asm

@@ -3,11 +3,9 @@ const_value set 2
 	const CELADONGAMECORNERPRIZEROOM_PHARMACIST
 
 CeladonGameCornerPrizeRoom_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CeladonGameCornerPrizeRoomGentlemanScript:
 	jumptextfaceplayer CeladonGameCornerPrizeRoomGentlemanText
@@ -264,23 +262,18 @@ CeladonPrizeRoom_NoCoinCaseText:
 	done
 
 CeladonGameCornerPrizeRoom_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 5, 7, CELADON_CITY
 	warp_event 3, 5, 7, CELADON_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 2, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomTMVendor
 	bg_event 4, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomPokemonVendor
 
-.ObjectEvents:
+	db 2 ; object events
-	db 2
 	object_event 0, 2, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1
 	object_event 4, 4, SPRITE_PHARMACIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1

maps/CeladonGym.asm

@@ -7,11 +7,9 @@ const_value set 2
 	const CELADONGYM_TWIN2
 
 CeladonGym_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 ErikaScript_0x72a6a:
 	faceplayer
@@ -268,24 +266,19 @@ TwinsJoandzoe2AfterBattleText:
 	done
 
 CeladonGym_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 4, 17, 8, CELADON_CITY
 	warp_event 5, 17, 8, CELADON_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 3, 15, BGEVENT_READ, CeladonGymStatue
 	bg_event 6, 15, BGEVENT_READ, CeladonGymStatue
 
-.ObjectEvents:
+	db 6 ; object events
-	db 6
 	object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1
 	object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1
 	object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1

maps/CeladonMansion1F.asm

@@ -5,11 +5,9 @@ const_value set 2
 	const CELADONMANSION1F_GROWLITHE2
 
 CeladonMansion1F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CeladonMansionManager:
 	jumptextfaceplayer CeladonMansionManagerText
@@ -75,28 +73,23 @@ CeladonMansionManagersSuiteSignText:
 	done
 
 CeladonMansion1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 5 ; warp events
-	db 5
 	warp_event 6, 9, 2, CELADON_CITY
 	warp_event 7, 9, 2, CELADON_CITY
 	warp_event 3, 0, 3, CELADON_CITY
 	warp_event 0, 0, 1, CELADON_MANSION_2F
 	warp_event 7, 0, 4, CELADON_MANSION_2F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 3 ; bg events
-	db 3
 	bg_event 5, 8, BGEVENT_UP, CeladonMansionManagersSuiteSign
 	bg_event 0, 3, BGEVENT_READ, CeladonMansion1fBookshelf
 	bg_event 2, 3, BGEVENT_READ, CeladonMansion1fBookshelf
 
-.ObjectEvents:
+	db 4 ; object events
-	db 4
 	object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1
 	object_event 2, 6, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1
 	object_event 3, 4, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1

maps/CeladonMansion2F.asm

@@ -1,9 +1,7 @@
 CeladonMansion2F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CeladonMansion2FComputer:
 	jumptext CeladonMansion2FComputerText
@@ -50,24 +48,19 @@ CeladonMansion2FSignText:
 	done
 
 CeladonMansion2F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 4 ; warp events
-	db 4
 	warp_event 0, 0, 4, CELADON_MANSION_1F
 	warp_event 1, 0, 2, CELADON_MANSION_3F
 	warp_event 6, 0, 3, CELADON_MANSION_3F
 	warp_event 7, 0, 5, CELADON_MANSION_1F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 3 ; bg events
-	db 3
 	bg_event 0, 3, BGEVENT_READ, CeladonMansion2FComputer
 	bg_event 5, 8, BGEVENT_UP, CeladonMansion2FSign
 	bg_event 2, 3, BGEVENT_READ, CeladonMansion2FBookshelf
 
-.ObjectEvents:
+	db 0 ; object events
-	db 0

maps/CeladonMansion3F.asm

@@ -5,11 +5,9 @@ const_value set 2
 	const CELADONMANSION3F_FISHER
 
 CeladonMansion3F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CooltrainerMScript_0x71670:
 	faceplayer
@@ -190,28 +188,23 @@ UnknownText_0x71996:
 	done
 
 CeladonMansion3F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 4 ; warp events
-	db 4
 	warp_event 0, 0, 1, CELADON_MANSION_ROOF
 	warp_event 1, 0, 2, CELADON_MANSION_2F
 	warp_event 6, 0, 3, CELADON_MANSION_2F
 	warp_event 7, 0, 2, CELADON_MANSION_ROOF
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 4 ; bg events
-	db 4
 	bg_event 5, 8, BGEVENT_UP, MapCeladonMansion3FSignpost0Script
 	bg_event 4, 3, BGEVENT_UP, MapCeladonMansion3FSignpost1Script
 	bg_event 1, 6, BGEVENT_UP, MapCeladonMansion3FSignpost2Script
 	bg_event 1, 3, BGEVENT_UP, MapCeladonMansion3FSignpost3Script
 
-.ObjectEvents:
+	db 4 ; object events
-	db 4
 	object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1
 	object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1
 	object_event 0, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1

maps/CeladonMansionRoof.asm

@@ -2,11 +2,9 @@ const_value set 2
 	const CELADONMANSIONROOF_FISHER
 
 CeladonMansionRoof_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CeladonMansionRoofFisherScript:
 	jumptextfaceplayer CeladonMansionRoofFisherText
@@ -34,22 +32,17 @@ UnknownText_0x71aa1:
 	done
 
 CeladonMansionRoof_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 1, 1, 1, CELADON_MANSION_3F
 	warp_event 6, 1, 4, CELADON_MANSION_3F
 	warp_event 2, 5, 1, CELADON_MANSION_ROOF_HOUSE
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 1 ; bg events
-	db 1
 	bg_event 6, 1, BGEVENT_LEFT, MapCeladonMansionRoofSignpost0Script
 
-.ObjectEvents:
+	db 1 ; object events
-	db 1
 	object_event 7, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1

maps/CeladonMansionRoofHouse.asm

@@ -2,11 +2,9 @@ const_value set 2
 	const CELADONMANSIONROOFHOUSE_PHARMACIST
 
 CeladonMansionRoofHouse_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 PharmacistScript_0x71afd:
 	faceplayer
@@ -117,20 +115,15 @@ UnknownText_0x71db3:
 	done
 
 CeladonMansionRoofHouse_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 3, CELADON_MANSION_ROOF
 	warp_event 3, 7, 3, CELADON_MANSION_ROOF
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 1 ; object events
-	db 1
 	object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1

maps/CeladonPokecenter1F.asm

@@ -6,11 +6,9 @@ const_value set 2
 	const CELADONPOKECENTER1F_EUSINE
 
 CeladonPokecenter1F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 NurseScript_0x71e22:
 	jumpstd pokecenternurse
@@ -146,23 +144,18 @@ NoBeastsText:
 	done
 
 CeladonPokecenter1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 3, 7, 5, CELADON_CITY
 	warp_event 4, 7, 5, CELADON_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 5 ; object events
-	db 5
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x71e22, -1
 	object_event 1, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1
 	object_event 0, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1

maps/CeladonPokecenter2FBeta.asm

@@ -1,23 +1,16 @@
 CeladonPokecenter2FBeta_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CeladonPokecenter2FBeta_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 1 ; warp events
-	db 1
 	warp_event 0, 7, 3, CELADON_POKECENTER_1F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 0 ; object events
-	db 0

maps/CeruleanCity.asm

@@ -7,11 +7,9 @@ const_value set 2
 	const CERULEANCITY_YOUNGSTER
 
 CeruleanCity_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -276,11 +274,9 @@ CeruleanLockedDoorText:
 	done
 
 CeruleanCity_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 6 ; warp events
-	db 6
 	warp_event 7, 15, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE
 	warp_event 28, 17, 1, CERULEAN_POLICE_STATION
 	warp_event 13, 19, 1, CERULEAN_TRADE_SPEECH_HOUSE
@@ -288,11 +284,9 @@ CeruleanCity_MapEvents:
 	warp_event 30, 23, 1, CERULEAN_GYM
 	warp_event 25, 29, 2, CERULEAN_MART
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 9 ; bg events
-	db 9
 	bg_event 23, 23, BGEVENT_READ, CeruleanCitySign
 	bg_event 27, 25, BGEVENT_READ, CeruleanGymSign
 	bg_event 11, 29, BGEVENT_READ, CeruleanBikeShopSign
@@ -303,8 +297,7 @@ CeruleanCity_MapEvents:
 	bg_event 26, 29, BGEVENT_READ, CeruleanCityMartSign
 	bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene
 
-.ObjectEvents:
+	db 6 ; object events
-	db 6
 	object_event 15, 23, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1
 	object_event 23, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCitySuperNerdScript, -1
 	object_event 20, 24, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1

maps/CeruleanGym.asm

@@ -7,13 +7,11 @@ const_value set 2
 	const CERULEANGYM_GYM_GUY
 
 CeruleanGym_MapScripts:
-.SceneScripts:
+	db 2 ; scene scripts
-	db 2
 	scene_script .DummyScene0
 	scene_script .GruntRunsOut
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 .DummyScene0:
 	end
@@ -363,25 +361,20 @@ CeruleanGymGuyWinText:
 	done
 
 CeruleanGym_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 4, 15, 5, CERULEAN_CITY
 	warp_event 5, 15, 5, CERULEAN_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 3 ; bg events
-	db 3
 	bg_event 3, 8, BGEVENT_ITEM, CeruleanGymHiddenMachinePart
 	bg_event 2, 13, BGEVENT_READ, CeruleanGymStatue1
 	bg_event 6, 13, BGEVENT_READ, CeruleanGymStatue2
 
-.ObjectEvents:
+	db 6 ; object events
-	db 6
 	object_event 4, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
 	object_event 5, 3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
 	object_event 4, 6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM

maps/CeruleanGymBadgeSpeechHouse.asm

@@ -2,11 +2,9 @@ const_value set 2
 	const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M
 
 CeruleanGymBadgeSpeechHouse_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CeruleanGymBadgeSpeechHousePokefanMScript:
 	jumptextfaceplayer CeruleanGymBadgeSpeechHousePokefanMText
@@ -17,20 +15,15 @@ CeruleanGymBadgeSpeechHousePokefanMText:
 	done
 
 CeruleanGymBadgeSpeechHouse_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 1, CERULEAN_CITY
 	warp_event 3, 7, 1, CERULEAN_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 1 ; object events
-	db 1
 	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1

maps/CeruleanMart.asm

@@ -4,11 +4,9 @@ const_value set 2
 	const CERULEANMART_COOLTRAINER_F
 
 CeruleanMart_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CeruleanMart_Clerk:
 	opentext
@@ -46,22 +44,17 @@ CeruleanMart_CooltrainerFText:
 	done
 
 CeruleanMart_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 6, CERULEAN_CITY
 	warp_event 3, 7, 6, CERULEAN_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 3 ; object events
-	db 3
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1
 	object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1
 	object_event 7, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1

maps/CeruleanPokecenter1F.asm

@@ -4,11 +4,9 @@ const_value set 2
 	const CERULEANPOKECENTER1F_GYM_GUY
 
 CeruleanPokecenter1F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 NurseScript_0x18820f:
 	jumpstd pokecenternurse
@@ -63,23 +61,18 @@ CeruleanPokecenter1FGymGuyText:
 	done
 
 CeruleanPokecenter1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 3, 7, 4, CERULEAN_CITY
 	warp_event 4, 7, 4, CERULEAN_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 3 ; object events
-	db 3
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18820f, -1
 	object_event 8, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1
 	object_event 1, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1

maps/CeruleanPokecenter2FBeta.asm

@@ -1,23 +1,16 @@
 CeruleanPokecenter2FBeta_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CeruleanPokecenter2FBeta_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 1 ; warp events
-	db 1
 	warp_event 0, 7, 1, CERULEAN_POKECENTER_1F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 0 ; object events
-	db 0

maps/CeruleanPoliceStation.asm

@@ -4,11 +4,9 @@ const_value set 2
 	const CERULEANPOLICESTATION_DIGLETT
 
 CeruleanPoliceStation_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CeruleanPoliceStationFishingGuruScript:
 	jumptextfaceplayer CeruleanPoliceStationFishingGuruText
@@ -44,22 +42,17 @@ CeruleanDiglettText:
 	done
 
 CeruleanPoliceStation_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 2, CERULEAN_CITY
 	warp_event 3, 7, 2, CERULEAN_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 3 ; object events
-	db 3
 	object_event 5, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1
 	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1
 	object_event 3, 5, SPRITE_DIGLETT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1

maps/CeruleanTradeSpeechHouse.asm

@@ -5,11 +5,9 @@ const_value set 2
 	const CERULEANTRADESPEECHHOUSE_ZUBAT
 
 CeruleanTradeSpeechHouse_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CeruleanTradeSpeechHouseGrannyScript:
 	jumptextfaceplayer CeruleanTradeSpeechHouseGrannyText
@@ -54,22 +52,17 @@ UnknownText_0x1881b5:
 	done
 
 CeruleanTradeSpeechHouse_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 3, CERULEAN_CITY
 	warp_event 3, 7, 3, CERULEAN_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 4 ; object events
-	db 4
 	object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1
 	object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1
 	object_event 5, 2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x188139, -1

maps/CharcoalKiln.asm

@@ -4,11 +4,9 @@ const_value set 2
 	const CHARCOALKILN_MOLTRES
 
 CharcoalKiln_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CharcoalKilnBoss:
 	faceplayer
@@ -149,25 +147,20 @@ FarfetchdText:
 	done
 
 CharcoalKiln_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 2, AZALEA_TOWN
 	warp_event 3, 7, 2, AZALEA_TOWN
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 3 ; bg events
-	db 3
 	bg_event 0, 1, BGEVENT_READ, CharcoalKilnBookshelf
 	bg_event 1, 1, BGEVENT_READ, CharcoalKilnBookshelf
 	bg_event 7, 1, BGEVENT_READ, CharcoalKilnRadio
 
-.ObjectEvents:
+	db 3 ; object events
-	db 3
 	object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
 	object_event 5, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
 	object_event 5, 6, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D

maps/CherrygroveCity.asm

@@ -6,13 +6,11 @@ const_value set 2
 	const CHERRYGROVECITY_FISHER
 
 CherrygroveCity_MapScripts:
-.SceneScripts:
+	db 2 ; scene scripts
-	db 2
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .DummyScene0:
@@ -547,31 +545,26 @@ GuideGentsHouseSignText:
 	done
 
 CherrygroveCity_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 5 ; warp events
-	db 5
 	warp_event 23, 3, 2, CHERRYGROVE_MART
 	warp_event 29, 3, 1, CHERRYGROVE_POKECENTER_1F
 	warp_event 17, 7, 1, CHERRYGROVE_GYM_SPEECH_HOUSE
 	warp_event 25, 9, 1, GUIDE_GENTS_HOUSE
 	warp_event 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
 
-.CoordEvents:
+	db 2 ; coord events
-	db 2
 	coord_event 33, 6, 1, CherrygroveSilverSceneNorth
 	coord_event 33, 7, 1, CherrygroveSilverSceneSouth
 
-.BGEvents:
+	db 4 ; bg events
-	db 4
 	bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign
 	bg_event 23, 9, BGEVENT_READ, GuideGentsHouseSign
 	bg_event 24, 3, BGEVENT_READ, CherrygroveCityMartSign
 	bg_event 30, 3, BGEVENT_READ, CherrygroveCityPokecenterSign
 
-.ObjectEvents:
+	db 5 ; object events
-	db 5
 	object_event 32, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
 	object_event 39, 6, SPRITE_SILVER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
 	object_event 27, 12, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1

maps/CherrygroveEvolutionSpeechHouse.asm

@@ -3,11 +3,9 @@ const_value set 2
 	const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER
 
 CherrygroveEvolutionSpeechHouse_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 YoungsterScript_0x196cb2:
 	opentext
@@ -42,23 +40,18 @@ UnknownText_0x196cfc:
 	done
 
 CherrygroveEvolutionSpeechHouse_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 5, CHERRYGROVE_CITY
 	warp_event 3, 7, 5, CHERRYGROVE_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 0, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
 
-.ObjectEvents:
+	db 2 ; object events
-	db 2
 	object_event 3, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LassScript_0x196cb9, -1
 	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1

maps/CherrygroveGymSpeechHouse.asm

@@ -3,11 +3,9 @@ const_value set 2
 	const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER
 
 CherrygroveGymSpeechHouse_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CherrygroveGymSpeechHousePokefanMScript:
 	jumptextfaceplayer CherrygroveGymSpeechHousePokefanMText
@@ -45,23 +43,18 @@ CherrygroveGymSpeechHouseBugCatcherText:
 	done
 
 CherrygroveGymSpeechHouse_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 3, CHERRYGROVE_CITY
 	warp_event 3, 7, 3, CHERRYGROVE_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 0, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
 
-.ObjectEvents:
+	db 2 ; object events
-	db 2
 	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1
 	object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1

maps/CherrygroveMart.asm

@@ -4,11 +4,9 @@ const_value set 2
 	const CHERRYGROVEMART_YOUNGSTER
 
 CherrygroveMart_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 ClerkScript_0x19680a:
 	opentext
@@ -72,22 +70,17 @@ CherrygroveMartYoungsterText:
 	done
 
 CherrygroveMart_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 1, CHERRYGROVE_CITY
 	warp_event 3, 7, 1, CHERRYGROVE_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 3 ; object events
-	db 3
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1
 	object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1
 	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1

maps/CherrygrovePokecenter1F.asm

@@ -5,11 +5,9 @@ const_value set 2
 	const CHERRYGROVEPOKECENTER1F_TEACHER
 
 CherrygrovePokecenter1F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 NurseScript_0x19696d:
 	jumpstd pokecenternurse
@@ -69,23 +67,18 @@ UnknownText_0x196a46:
 	done
 
 CherrygrovePokecenter1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 3, 7, 2, CHERRYGROVE_CITY
 	warp_event 4, 7, 2, CHERRYGROVE_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 4 ; object events
-	db 4
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19696d, -1
 	object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1
 	object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1

maps/CianwoodCity.asm

@@ -13,13 +13,11 @@ const_value set 2
 	const CIANWOODCITY_SUICUNE
 
 CianwoodCity_MapScripts:
-.SceneScripts:
+	db 2 ; scene scripts
-	db 2
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
 
 .DummyScene0:
@@ -381,11 +379,9 @@ CianwoodPokeSeerSignText:
 	done
 
 CianwoodCity_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 7 ; warp events
-	db 7
 	warp_event 17, 41, 1, MANIAS_HOUSE
 	warp_event 8, 43, 1, CIANWOOD_GYM
 	warp_event 23, 43, 1, CIANWOOD_POKECENTER_1F
@@ -394,12 +390,10 @@ CianwoodCity_MapEvents:
 	warp_event 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE
 	warp_event 5, 17, 1, POKE_SEERS_HOUSE
 
-.CoordEvents:
+	db 1 ; coord events
-	db 1
 	coord_event 11, 16, 1, CianwoodCitySuicuneAndEusine
 
-.BGEvents:
+	db 8 ; bg events
-	db 8
 	bg_event 20, 34, BGEVENT_READ, CianwoodCitySign
 	bg_event 7, 45, BGEVENT_READ, CianwoodGymSign
 	bg_event 24, 43, BGEVENT_READ, CianwoodPokecenterSign
@@ -409,8 +403,7 @@ CianwoodCity_MapEvents:
 	bg_event 4, 19, BGEVENT_ITEM, CianwoodCityHiddenRevive
 	bg_event 5, 29, BGEVENT_ITEM, CianwoodCityHiddenMaxEther
 
-.ObjectEvents:
+	db 12 ; object events
-	db 12
 	object_event 21, 37, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodCityYoungster, -1
 	object_event 17, 33, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1
 	object_event 14, 42, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityLass, -1

maps/CianwoodGym.asm

@@ -10,11 +10,9 @@ const_value set 2
 	const CIANWOODGYM_BOULDER4
 
 CianwoodGym_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 ChuckScript_0x9d60f:
 	faceplayer
@@ -306,24 +304,19 @@ BlackbeltLungAfterText:
 	done
 
 CianwoodGym_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 4, 17, 2, CIANWOOD_CITY
 	warp_event 5, 17, 2, CIANWOOD_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 3, 15, BGEVENT_READ, CianwoodGymStatue
 	bg_event 6, 15, BGEVENT_READ, CianwoodGymStatue
 
-.ObjectEvents:
+	db 9 ; object events
-	db 9
 	object_event 4, 1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1
 	object_event 2, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1
 	object_event 7, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1

maps/CianwoodLugiaSpeechHouse.asm

@@ -4,11 +4,9 @@ const_value set 2
 	const CIANWOODLUGIASPEECHHOUSE_TWIN
 
 CianwoodLugiaSpeechHouse_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CianwoodLugiaSpeechHouseTeacherScript:
 	jumptextfaceplayer CianwoodLugiaSpeechHouseTeacherText
@@ -62,24 +60,19 @@ CianwoodLugiaSpeechHouseTwinText:
 	done
 
 CianwoodLugiaSpeechHouse_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 6, CIANWOOD_CITY
 	warp_event 3, 7, 6, CIANWOOD_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 0, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
 	bg_event 1, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
 
-.ObjectEvents:
+	db 3 ; object events
-	db 3
 	object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1
 	object_event 6, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1
 	object_event 0, 2, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1

maps/CianwoodPharmacy.asm

@@ -2,12 +2,10 @@ const_value set 2
 	const CIANWOODPHARMACY_PHARMACIST
 
 CianwoodPharmacy_MapScripts:
-.SceneScripts:
+	db 1 ; scene scripts
-	db 1
 	scene_script .DummyScene
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 .DummyScene:
 	end
@@ -73,22 +71,17 @@ PharmacistDescribeSecretpotionText:
 	done
 
 CianwoodPharmacy_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 4, CIANWOOD_CITY
 	warp_event 3, 7, 4, CIANWOOD_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 0, 1, BGEVENT_READ, CianwoodPharmacyBookshelf
 	bg_event 1, 1, BGEVENT_READ, CianwoodPharmacyBookshelf
 
-.ObjectEvents:
+	db 1 ; object events
-	db 1
 	object_event 2, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1

maps/CianwoodPhotoStudio.asm

@@ -2,11 +2,9 @@ const_value set 2
 	const CIANWOODPHOTOSTUDIO_FISHING_GURU
 
 CianwoodPhotoStudio_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 FishingGuruScript_0x9e0e0:
 	faceplayer
@@ -49,20 +47,15 @@ UnknownText_0x9e156:
 	done
 
 CianwoodPhotoStudio_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 5, CIANWOOD_CITY
 	warp_event 3, 7, 5, CIANWOOD_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 1 ; object events
-	db 1
 	object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1

maps/CianwoodPokecenter1F.asm

@@ -5,11 +5,9 @@ const_value set 2
 	const CIANWOODPOKECENTER1F_SUPER_NERD
 
 CianwoodPokecenter1F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 NurseScript_0x9dbcf:
 	jumpstd pokecenternurse
@@ -132,23 +130,18 @@ CianwoodPokecenter1FSuperNerdText:
 	done
 
 CianwoodPokecenter1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 3, 7, 3, CIANWOOD_CITY
 	warp_event 4, 7, 3, CIANWOOD_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 4 ; object events
-	db 4
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1
 	object_event 1, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1
 	object_event 5, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1

maps/CinnabarIsland.asm

@@ -2,11 +2,9 @@ const_value set 2
 	const CINNABARISLAND_BLUE
 
 CinnabarIsland_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -128,23 +126,18 @@ CinnabarIslandSignText:
 	done
 
 CinnabarIsland_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 1 ; warp events
-	db 1
 	warp_event 11, 11, 1, CINNABAR_POKECENTER_1F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 4 ; bg events
-	db 4
 	bg_event 12, 11, BGEVENT_READ, CinnabarIslandPokecenterSign
 	bg_event 9, 11, BGEVENT_READ, CinnabarIslandGymSign
 	bg_event 7, 7, BGEVENT_READ, CinnabarIslandSign
 	bg_event 9, 1, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy
 
-.ObjectEvents:
+	db 1 ; object events
-	db 1
 	object_event 9, 6, SPRITE_BLUE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR

maps/CinnabarPokecenter1F.asm

@@ -4,11 +4,9 @@ const_value set 2
 	const CINNABARPOKECENTER1F_FISHER
 
 CinnabarPokecenter1F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 NurseScript_0x1ab32c:
 	jumpstd pokecenternurse
@@ -35,23 +33,18 @@ CinnabarPokecenter1FFisherText:
 	done
 
 CinnabarPokecenter1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 3, 7, 1, CINNABAR_ISLAND
 	warp_event 4, 7, 1, CINNABAR_ISLAND
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 3 ; object events
-	db 3
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1
 	object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1
 	object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1

maps/CinnabarPokecenter2FBeta.asm

@@ -1,23 +1,16 @@
 CinnabarPokecenter2FBeta_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CinnabarPokecenter2FBeta_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 1 ; warp events
-	db 1
 	warp_event 0, 7, 3, CINNABAR_POKECENTER_1F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 0 ; object events
-	db 0

maps/Colosseum.asm

@@ -3,14 +3,12 @@ const_value set 2
 	const COLOSSEUM_CHRIS2
 
 Colosseum_MapScripts:
-.SceneScripts:
+	db 3 ; scene scripts
-	db 3
 	scene_script .InitializeColosseum
 	scene_script .DummyScene1
 	scene_script .DummyScene2
 
-.MapCallbacks:
+	db 2 ; callbacks
-	db 2
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
 	callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F
 
@@ -63,23 +61,18 @@ ChrisScript_0x193499:
 	done
 
 Colosseum_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 4, 7, 3, POKECENTER_2F
 	warp_event 5, 7, 3, POKECENTER_2F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script
 	bg_event 5, 4, BGEVENT_LEFT, MapColosseumSignpost1Script
 
-.ObjectEvents:
+	db 2 ; object events
-	db 2
 	object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2

maps/CopycatsHouse1F.asm

@@ -4,11 +4,9 @@ const_value set 2
 	const COPYCATSHOUSE1F_CLEFAIRY
 
 CopycatsHouse1F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 CopycatsHouse1FPokefanMScript:
 	jumptextfaceplayer CopycatsHouse1FPokefanMText
@@ -73,23 +71,18 @@ UnknownText_0x18ae4b:
 	done
 
 CopycatsHouse1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 2, 7, 8, SAFFRON_CITY
 	warp_event 3, 7, 8, SAFFRON_CITY
 	warp_event 2, 0, 1, COPYCATS_HOUSE_2F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 3 ; object events
-	db 3
 	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1
 	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1
 	object_event 6, 6, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1

maps/CopycatsHouse2F.asm

@@ -7,11 +7,9 @@ const_value set 2
 	const COPYCATSHOUSE2F_COPYCAT2 ; if player is female
 
 CopycatsHouse2F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_OBJECTS, .Callback
 
 .Callback:
@@ -361,23 +359,18 @@ CopycatsHouse2FDollText:
 	done
 
 CopycatsHouse2F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 1 ; warp events
-	db 1
 	warp_event 3, 0, 3, COPYCATS_HOUSE_1F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 0, 1, BGEVENT_READ, CopycatsHouse2FBookshelf
 	bg_event 1, 1, BGEVENT_READ, CopycatsHouse2FBookshelf
 
-.ObjectEvents:
+	db 6 ; object events
-	db 6
 	object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1
 	object_event 6, 4, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CopycatsDodrio, -1
 	object_event 6, 1, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL

maps/DanceTheatre.asm

@@ -10,11 +10,9 @@ const_value set 2
 	const DANCETHEATRE_GRANNY
 
 DanceTheatre_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 TrainerKimonoGirlNaoko2:
 	trainer KIMONO_GIRL, NAOKO2, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script
@@ -338,24 +336,19 @@ FancyPanelText:
 	done
 
 DanceTheatre_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 5, 13, 8, ECRUTEAK_CITY
 	warp_event 6, 13, 8, ECRUTEAK_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 5, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script
 	bg_event 6, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script
 
-.ObjectEvents:
+	db 9 ; object events
-	db 9
 	object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1
 	object_event 2, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1
 	object_event 6, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1

maps/DarkCaveBlackthornEntrance.asm

@@ -4,11 +4,9 @@ const_value set 2
 	const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2
 
 DarkCaveBlackthornEntrance_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 DarkCaveBlackthornEntrancePharmacistScript:
 	faceplayer
@@ -62,22 +60,17 @@ DarkCaveBlackthornEntrancePharmacistText2:
 	done
 
 DarkCaveBlackthornEntrance_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 23, 3, 1, ROUTE_45
 	warp_event 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 3 ; object events
-	db 3
 	object_event 7, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1
 	object_event 21, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
 	object_event 7, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE

maps/DarkCaveVioletEntrance.asm

@@ -9,11 +9,9 @@ const_value set 2
 	const DARKCAVEVIOLETENTRANCE_POKE_BALL4
 
 DarkCaveVioletEntrance_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 DarkCaveVioletEntrancePotion:
 	itemball POTION
@@ -34,24 +32,19 @@ DarkCaveVioletEntranceHiddenElixer:
 	hiddenitem ELIXER, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER
 
 DarkCaveVioletEntrance_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 3, 15, 3, ROUTE_31
 	warp_event 17, 1, 2, DARK_CAVE_BLACKTHORN_ENTRANCE
 	warp_event 35, 33, 3, ROUTE_46
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 1 ; bg events
-	db 1
 	bg_event 26, 3, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer
 
-.ObjectEvents:
+	db 8 ; object events
-	db 8
 	object_event 6, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
 	object_event 16, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
 	object_event 27, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1

maps/DayCare.asm

@@ -3,11 +3,9 @@ const_value set 2
 	const DAYCARE_GRANNY
 
 DayCare_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_OBJECTS, .EggCheckCallback
 
 .EggCheckCallback:
@@ -156,25 +154,20 @@ DayCareText_PartyFull:
 	done
 
 DayCare_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 4 ; warp events
-	db 4
 	warp_event 0, 5, 3, ROUTE_34
 	warp_event 0, 6, 4, ROUTE_34
 	warp_event 2, 7, 5, ROUTE_34
 	warp_event 3, 7, 5, ROUTE_34
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 0, 1, BGEVENT_READ, DayCareBookshelf
 	bg_event 1, 1, BGEVENT_READ, DayCareBookshelf
 
-.ObjectEvents:
+	db 2 ; object events
-	db 2
 	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE
 	object_event 5, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DayCareLadyScript, -1

maps/DayOfWeekSiblingsHouse.asm

@@ -2,11 +2,9 @@ const_value set 2
 	const DAYOFWEEKSIBLINGSHOUSE_POKEDEX
 
 DayOfWeekSiblingsHouse_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 PokedexScript_0x7b1e4:
 	opentext
@@ -71,20 +69,15 @@ UnknownText_0x7b2b9:
 	done
 
 DayOfWeekSiblingsHouse_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 3, ROUTE_26
 	warp_event 3, 7, 3, ROUTE_26
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 1 ; object events
-	db 1
 	object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1

maps/DiglettsCave.asm

@@ -2,11 +2,9 @@ const_value set 2
 	const DIGLETTSCAVE_POKEFAN_M
 
 DiglettsCave_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 DiglettsCavePokefanMScript:
 	jumptextfaceplayer DiglettsCavePokefanMText
@@ -23,11 +21,9 @@ DiglettsCavePokefanMText:
 	done
 
 DiglettsCave_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 6 ; warp events
-	db 6
 	warp_event 3, 33, 10, VERMILION_CITY
 	warp_event 5, 31, 5, DIGLETTS_CAVE
 	warp_event 15, 5, 5, ROUTE_2
@@ -35,13 +31,10 @@ DiglettsCave_MapEvents:
 	warp_event 17, 33, 2, DIGLETTS_CAVE
 	warp_event 3, 3, 4, DIGLETTS_CAVE
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 1 ; bg events
-	db 1
 	bg_event 6, 11, BGEVENT_ITEM, DiglettsCaveHiddenMaxRevive
 
-.ObjectEvents:
+	db 1 ; object events
-	db 1
 	object_event 3, 31, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1

maps/DragonShrine.asm

@@ -5,13 +5,11 @@ const_value set 2
 	const DRAGONSHRINE_CLAIR
 
 DragonShrine_MapScripts:
-.SceneScripts:
+	db 2 ; scene scripts
-	db 2
 	scene_script .DragonShrineTest
 	scene_script .DummyScene
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 .DragonShrineTest:
 	priorityjump .DragonShrineTestScript
@@ -658,22 +656,17 @@ DragonShrineSpeechlessText:
 	done
 
 DragonShrine_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 4, 9, 2, DRAGONS_DEN_B1F
 	warp_event 5, 9, 2, DRAGONS_DEN_B1F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 4 ; object events
-	db 4
 	object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1

maps/DragonsDen1F.asm

@@ -1,26 +1,19 @@
 DragonsDen1F_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 DragonsDen1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 4 ; warp events
-	db 4
 	warp_event 3, 5, 8, BLACKTHORN_CITY
 	warp_event 3, 3, 4, DRAGONS_DEN_1F
 	warp_event 5, 15, 1, DRAGONS_DEN_B1F
 	warp_event 5, 13, 2, DRAGONS_DEN_1F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 0 ; object events
-	db 0

maps/DragonsDenB1F.asm

@@ -10,13 +10,11 @@ const_value set 2
 	const DRAGONSDENB1F_POKE_BALL3
 
 DragonsDenB1F_MapScripts:
-.SceneScripts:
+	db 2 ; scene scripts
-	db 2
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_NEWMAP, .CheckSilver
 
 .DummyScene0:
@@ -407,27 +405,22 @@ Text_NoRoomForDragonFang:
 	done
 
 DragonsDenB1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 20, 3, 3, DRAGONS_DEN_1F
 	warp_event 19, 29, 1, DRAGON_SHRINE
 
-.CoordEvents:
+	db 1 ; coord events
-	db 1
 	coord_event 19, 30, 1, DragonsDenB1F_ClairScene
 
-.BGEvents:
+	db 4 ; bg events
-	db 4
 	bg_event 18, 24, BGEVENT_READ, MapDragonsDenB1FSignpost0Script
 	bg_event 33, 29, BGEVENT_ITEM, DragonsDenB1FHiddenRevive
 	bg_event 21, 17, BGEVENT_ITEM, DragonsDenB1FHiddenMaxPotion
 	bg_event 31, 15, BGEVENT_ITEM, DragonsDenB1FHiddenMaxElixer
 
-.ObjectEvents:
+	db 9 ; object events
-	db 9
 	object_event 35, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
 	object_event 14, 30, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR
 	object_event 20, 23, SPRITE_SILVER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN

maps/EarlsPokemonAcademy.asm

@@ -7,11 +7,9 @@ const_value set 2
 	const EARLSPOKEMONACADEMY_POKEDEX
 
 EarlsPokemonAcademy_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 AcademyEarl:
 	applymovement EARLSPOKEMONACADEMY_EARL, MovementData_0x68b2d
@@ -412,26 +410,21 @@ AcademyStickerMachineText:
 	done
 
 EarlsPokemonAcademy_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 3, 15, 3, VIOLET_CITY
 	warp_event 4, 15, 3, VIOLET_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 4 ; bg events
-	db 4
 	bg_event 0, 1, BGEVENT_READ, AcademyBookshelf
 	bg_event 1, 1, BGEVENT_READ, AcademyBookshelf
 	bg_event 3, 0, BGEVENT_READ, AcademyBlackboard
 	bg_event 4, 0, BGEVENT_READ, AcademyBlackboard
 
-.ObjectEvents:
+	db 6 ; object events
-	db 6
 	object_event 4, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL
 	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1
 	object_event 3, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1

maps/EcruteakCity.asm

@@ -8,11 +8,9 @@ const_value set 2
 	const ECRUTEAKCITY_GRAMPS3
 
 EcruteakCity_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -260,11 +258,9 @@ BurnedTowerSignText:
 	done
 
 EcruteakCity_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 15 ; warp events
-	db 15
 	warp_event 35, 26, 1, ROUTE_42_ECRUTEAK_GATE
 	warp_event 35, 27, 2, ROUTE_42_ECRUTEAK_GATE
 	warp_event 18, 11, 1, ECRUTEAK_TIN_TOWER_ENTRANCE
@@ -281,11 +277,9 @@ EcruteakCity_MapEvents:
 	warp_event 0, 18, 3, ROUTE_38_ECRUTEAK_GATE
 	warp_event 0, 19, 4, ROUTE_38_ECRUTEAK_GATE
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 8 ; bg events
-	db 8
 	bg_event 15, 21, BGEVENT_READ, EcruteakCitySign
 	bg_event 38, 10, BGEVENT_READ, TinTowerSign
 	bg_event 8, 28, BGEVENT_READ, EcruteakGymSign
@@ -295,8 +289,7 @@ EcruteakCity_MapEvents:
 	bg_event 30, 21, BGEVENT_READ, EcruteakCityMartSign
 	bg_event 23, 14, BGEVENT_ITEM, EcruteakCityHiddenHyperPotion
 
-.ObjectEvents:
+	db 7 ; object events
-	db 7
 	object_event 18, 15, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1
 	object_event 20, 21, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1
 	object_event 21, 29, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLassScript, -1

maps/EcruteakGym.asm

@@ -8,13 +8,11 @@ const_value set 2
 	const ECRUTEAKGYM_GRAMPS
 
 EcruteakGym_MapScripts:
-.SceneScripts:
+	db 2 ; scene scripts
-	db 2
 	scene_script .ForcedToLeave
 	scene_script .DummyScene
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 .ForcedToLeave:
 	priorityjump EcruteakGymClosed
@@ -387,11 +385,9 @@ UnknownText_0x9a49c:
 	done
 
 EcruteakGym_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 33 ; warp events
-	db 33
 	warp_event 4, 17, 10, ECRUTEAK_CITY
 	warp_event 5, 17, 10, ECRUTEAK_CITY
 	warp_event 4, 14, 4, ECRUTEAK_GYM
@@ -426,16 +422,13 @@ EcruteakGym_MapEvents:
 	warp_event 7, 12, 3, ECRUTEAK_GYM
 	warp_event 7, 13, 3, ECRUTEAK_GYM
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 3, 15, BGEVENT_READ, EcruteakGymStatue
 	bg_event 6, 15, BGEVENT_READ, EcruteakGymStatue
 
-.ObjectEvents:
+	db 7 ; object events
-	db 7
 	object_event 5, 1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1
 	object_event 2, 7, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1
 	object_event 3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1

maps/EcruteakItemfinderHouse.asm

@@ -3,11 +3,9 @@ const_value set 2
 	const ECRUTEAKITEMFINDERHOUSE_POKEDEX
 
 EcruteakItemfinderHouse_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 EcruteakItemfinderGuy:
 	faceplayer
@@ -163,22 +161,17 @@ EcruteakThreeMonText:
 	done
 
 EcruteakItemfinderHouse_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 3, 7, 11, ECRUTEAK_CITY
 	warp_event 4, 7, 11, ECRUTEAK_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 1 ; bg events
-	db 1
 	bg_event 2, 1, BGEVENT_READ, ItemFinderHouseRadio
 
-.ObjectEvents:
+	db 2 ; object events
-	db 2
 	object_event 2, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakItemfinderGuy, -1
 	object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHistoryBook, -1

maps/EcruteakLugiaSpeechHouse.asm

@@ -3,11 +3,9 @@ const_value set 2
 	const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER
 
 EcruteakLugiaSpeechHouse_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 EcruteakLugiaSpeechHouseGrampsScript:
 	jumptextfaceplayer EcruteakLugiaSpeechHouseGrampsText
@@ -45,22 +43,17 @@ EcruteakLugiaSpeechHouseYoungsterText:
 	done
 
 EcruteakLugiaSpeechHouse_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 3, 7, 7, ECRUTEAK_CITY
 	warp_event 4, 7, 7, ECRUTEAK_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 1 ; bg events
-	db 1
 	bg_event 2, 1, BGEVENT_READ, LugiaSpeechHouseRadio
 
-.ObjectEvents:
+	db 2 ; object events
-	db 2
 	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1
 	object_event 5, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1

maps/EcruteakMart.asm

@@ -4,11 +4,9 @@ const_value set 2
 	const ECRUTEAKMART_GRANNY
 
 EcruteakMart_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 ClerkScript_0x99c3b:
 	opentext
@@ -46,22 +44,17 @@ EcruteakMartGrannyText:
 	done
 
 EcruteakMart_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 9, ECRUTEAK_CITY
 	warp_event 3, 7, 9, ECRUTEAK_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 3 ; object events
-	db 3
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1
 	object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1
 	object_event 6, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1

maps/EcruteakPokecenter1F.asm

@@ -6,13 +6,11 @@ const_value set 2
 	const ECRUTEAKPOKECENTER1F_BILL
 
 EcruteakPokecenter1F_MapScripts:
-.SceneScripts:
+	db 2 ; scene scripts
-	db 2
 	scene_script .MeetBill
 	scene_script .DummyScene
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 .MeetBill:
 	priorityjump .BillActivatesTimeCapsule
@@ -207,23 +205,18 @@ EcruteakPokecenter1FGymGuyText:
 	done
 
 EcruteakPokecenter1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 3, 7, 6, ECRUTEAK_CITY
 	warp_event 4, 7, 6, ECRUTEAK_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 5 ; object events
-	db 5
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1
 	object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1
 	object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1

maps/EcruteakTinTowerEntrance.asm

@@ -5,13 +5,11 @@ const_value set 2
 	const ECRUTEAKTINTOWERENTRANCE_GRAMPS
 
 EcruteakTinTowerEntrance_MapScripts:
-.SceneScripts:
+	db 2 ; scene scripts
-	db 2
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_OBJECTS, .InitializeSages
 
 .DummyScene0:
@@ -278,27 +276,22 @@ EcruteakTinTowerEntranceGrampsText:
 	done
 
 EcruteakTinTowerEntrance_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 5 ; warp events
-	db 5
 	warp_event 4, 17, 3, ECRUTEAK_CITY
 	warp_event 5, 17, 3, ECRUTEAK_CITY
 	warp_event 5, 3, 4, ECRUTEAK_TIN_TOWER_ENTRANCE
 	warp_event 17, 15, 3, ECRUTEAK_TIN_TOWER_ENTRANCE
 	warp_event 17, 3, 3, WISE_TRIOS_ROOM
 
-.CoordEvents:
+	db 2 ; coord events
-	db 2
 	coord_event 4, 7, 0, EcruteakTinTowerEntrance_CoordEvent1
 	coord_event 5, 7, 0, EcruteakTinTowerEntrance_CoordEvent2
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 4 ; object events
-	db 4
 	object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1
 	object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2
 	object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE

maps/ElmsHouse.asm

@@ -3,11 +3,9 @@ const_value set 2
 	const ELMSHOUSE_ELMS_SON
 
 ElmsHouse_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 ElmsWife:
 	jumptextfaceplayer ElmsWifeText
@@ -84,24 +82,19 @@ ElmsHousePCText:
 	done
 
 ElmsHouse_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 4, NEW_BARK_TOWN
 	warp_event 3, 7, 4, NEW_BARK_TOWN
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 3 ; bg events
-	db 3
 	bg_event 0, 1, BGEVENT_READ, ElmsHousePC
 	bg_event 6, 1, BGEVENT_READ, ElmsHouseBookshelf
 	bg_event 7, 1, BGEVENT_READ, ElmsHouseBookshelf
 
-.ObjectEvents:
+	db 2 ; object events
-	db 2
 	object_event 1, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1
 	object_event 5, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1

maps/ElmsLab.asm

@@ -7,8 +7,7 @@ const_value set 2
 	const ELMSLAB_OFFICER
 
 ElmsLab_MapScripts:
-.SceneScripts:
+	db 6 ; scene scripts
-	db 6
 	scene_script .MeetElm
 	scene_script .DummyScene1
 	scene_script .DummyScene2
@@ -16,8 +15,7 @@ ElmsLab_MapScripts:
 	scene_script .DummyScene4
 	scene_script .DummyScene5
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_OBJECTS, .MoveElmCallback
 
 .MeetElm:
@@ -1371,16 +1369,13 @@ ElmsLabPCText:
 	done
 
 ElmsLab_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 4, 11, 1, NEW_BARK_TOWN
 	warp_event 5, 11, 1, NEW_BARK_TOWN
 
-.CoordEvents:
+	db 8 ; coord events
-	db 8
 	coord_event 4, 6, 1, LabTryToLeaveScript
 	coord_event 5, 6, 1, LabTryToLeaveScript
 	coord_event 4, 5, 3, MeetCopScript
@@ -1390,8 +1385,7 @@ ElmsLab_MapEvents:
 	coord_event 4, 8, 6, AideScript_WalkBalls1
 	coord_event 5, 8, 6, AideScript_WalkBalls2
 
-.BGEvents:
+	db 16 ; bg events
-	db 16
 	bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine
 	bg_event 6, 1, BGEVENT_READ, ElmsLabBookshelf
 	bg_event 7, 1, BGEVENT_READ, ElmsLabBookshelf
@@ -1409,8 +1403,7 @@ ElmsLab_MapEvents:
 	bg_event 5, 0, BGEVENT_READ, ElmsLabWindow
 	bg_event 3, 5, BGEVENT_DOWN, ElmsLabPC
 
-.ObjectEvents:
+	db 6 ; object events
-	db 6
 	object_event 5, 2, SPRITE_ELM, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1
 	object_event 2, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
 	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB

maps/FastShip1F.asm

@@ -5,14 +5,12 @@ const_value set 2
 	const FASTSHIP1F_GENTLEMAN
 
 FastShip1F_MapScripts:
-.SceneScripts:
+	db 3 ; scene scripts
-	db 3
 	scene_script .DummyScene0
 	scene_script .EnterFastShip
 	scene_script .DummyScene2
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 .DummyScene0:
 	end
@@ -286,11 +284,9 @@ UnknownText_0x754be:
 	done
 
 FastShip1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 12 ; warp events
-	db 12
 	warp_event 25, 1, -1, FAST_SHIP_1F
 	warp_event 27, 8, 1, FAST_SHIP_CABINS_NNW_NNE_NE
 	warp_event 23, 8, 2, FAST_SHIP_CABINS_NNW_NNE_NE
@@ -304,16 +300,13 @@ FastShip1F_MapEvents:
 	warp_event 6, 12, 1, FAST_SHIP_B1F
 	warp_event 30, 14, 2, FAST_SHIP_B1F
 
-.CoordEvents:
+	db 2 ; coord events
-	db 2
 	coord_event 24, 6, 2, WorriedGrandpaSceneLeft
 	coord_event 25, 6, 2, WorriedGrandpaSceneRight
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 4 ; object events
-	db 4
 	object_event 25, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x75160, -1
 	object_event 14, 7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x751d0, -1
 	object_event 22, 17, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailorScript, -1

maps/FastShipB1F.asm

@@ -13,13 +13,11 @@ const_value set 2
 	const FASTSHIPB1F_YOUNGSTER2
 
 FastShipB1F_MapScripts:
-.SceneScripts:
+	db 2 ; scene scripts
-	db 2
 	scene_script .DummyScene0
 	scene_script .DummyScene1
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 .DummyScene0:
 	end
@@ -449,25 +447,20 @@ SchoolboyRickyAfterBattleText:
 	done
 
 FastShipB1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 5, 11, 11, FAST_SHIP_1F
 	warp_event 31, 13, 12, FAST_SHIP_1F
 
-.CoordEvents:
+	db 2 ; coord events
-	db 2
 	coord_event 30, 7, 0, UnknownScript_0x7673c
 	coord_event 31, 7, 0, UnknownScript_0x76751
 
-.BGEvents:
+	db 1 ; bg events
-	db 1
 	bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan
 
-.ObjectEvents:
+	db 12 ; object events
-	db 12
 	object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
 	object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
 	object_event 9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP

maps/FastShipCabins_NNW_NNE_NE.asm

@@ -8,11 +8,9 @@ const_value set 2
 	const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST
 
 FastShipCabins_NNW_NNE_NE_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 TrainerCooltrainermSean:
 	trainer COOLTRAINERM, SEAN, EVENT_BEAT_COOLTRAINERM_SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script
@@ -267,26 +265,21 @@ BurglarCoreyAfterBattleText:
 	done
 
 FastShipCabins_NNW_NNE_NE_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 2, 0, 2, FAST_SHIP_1F
 	warp_event 2, 12, 3, FAST_SHIP_1F
 	warp_event 2, 24, 4, FAST_SHIP_1F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 3 ; bg events
-	db 3
 	bg_event 6, 13, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
 	bg_event 7, 19, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
 	bg_event 7, 31, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
 
-.ObjectEvents:
+	db 7 ; object events
-	db 7
 	object_event 4, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
 	object_event 1, 5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
 	object_event 1, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND

maps/FastShipCabins_SE_SSE_CaptainsCabin.asm

@@ -12,11 +12,9 @@ const_value set 2
 	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2
 
 FastShipCabins_SE_SSE_CaptainsCabin_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 Unreferenced_0x75ea6:
 	end
@@ -463,11 +461,9 @@ SSAquaHasArrivedVermilionText:
 	done
 
 FastShipCabins_SE_SSE_CaptainsCabin_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 6 ; warp events
-	db 6
 	warp_event 2, 7, 8, FAST_SHIP_1F
 	warp_event 3, 7, 8, FAST_SHIP_1F
 	warp_event 2, 19, 9, FAST_SHIP_1F
@@ -475,15 +471,12 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEvents:
 	warp_event 2, 33, 10, FAST_SHIP_1F
 	warp_event 3, 33, 10, FAST_SHIP_1F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 1 ; bg events
-	db 1
 	bg_event 4, 25, BGEVENT_READ, FastShipCaptainsCabinTrashcan
 
-.ObjectEvents:
+	db 11 ; object events
-	db 11
 	object_event 3, 25, SPRITE_CAPTAIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1
 	object_event 2, 17, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaGrandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
 	object_event 3, 17, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterAfter, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1

maps/FastShipCabins_SW_SSW_NW.asm

@@ -5,11 +5,9 @@ const_value set 2
 	const FASTSHIPCABINS_SW_SSW_NW_ROCKER
 
 FastShipCabins_SW_SSW_NW_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 TrainerFirebreatherLyle:
 	trainer FIREBREATHER, LYLE, EVENT_BEAT_FIREBREATHER_LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script
@@ -223,28 +221,23 @@ FastShipArrivedVermilionText:
 	done
 
 FastShipCabins_SW_SSW_NW_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 5 ; warp events
-	db 5
 	warp_event 2, 0, 5, FAST_SHIP_1F
 	warp_event 2, 19, 6, FAST_SHIP_1F
 	warp_event 3, 19, 6, FAST_SHIP_1F
 	warp_event 2, 31, 7, FAST_SHIP_1F
 	warp_event 3, 31, 7, FAST_SHIP_1F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 3 ; bg events
-	db 3
 	bg_event 7, 1, BGEVENT_READ, FastShipBed
 	bg_event 7, 2, BGEVENT_READ, FastShipBed
 	bg_event 7, 7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan
 
-.ObjectEvents:
+	db 4 ; object events
-	db 4
 	object_event 1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
 	object_event 6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
 	object_event 1, 26, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND

maps/FightingDojo.asm

@@ -3,11 +3,9 @@ const_value set 2
 	const FIGHTINGDOJO_POKE_BALL
 
 FightingDojo_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 FightingDojoBlackBelt:
 	jumptextfaceplayer FightingDojoBlackBeltText
@@ -43,23 +41,18 @@ FightingDojoSign1Text:
 	done
 
 FightingDojo_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 4, 11, 1, SAFFRON_CITY
 	warp_event 5, 11, 1, SAFFRON_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 4, 0, BGEVENT_READ, MapFightingDojoSignpost0Script
 	bg_event 5, 0, BGEVENT_READ, MapFightingDojoSignpost1Script
 
-.ObjectEvents:
+	db 2 ; object events
-	db 2
 	object_event 4, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1
 	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND

maps/FuchsiaCity.asm

@@ -5,11 +5,9 @@ const_value set 2
 	const FUCHSIACITY_FRUIT_TREE
 
 FuchsiaCity_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 1 ; callbacks
-	db 1
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -125,11 +123,9 @@ NoLitteringSignText:
 	done
 
 FuchsiaCity_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 11 ; warp events
-	db 11
 	warp_event 5, 13, 2, FUCHSIA_MART
 	warp_event 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE
 	warp_event 8, 27, 1, FUCHSIA_GYM
@@ -142,11 +138,9 @@ FuchsiaCity_MapEvents:
 	warp_event 7, 35, 1, ROUTE_19_FUCHSIA_GATE
 	warp_event 8, 35, 2, ROUTE_19_FUCHSIA_GATE
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 8 ; bg events
-	db 8
 	bg_event 21, 15, BGEVENT_READ, FuchsiaCitySign
 	bg_event 5, 29, BGEVENT_READ, FuchsiaGymSign
 	bg_event 25, 15, BGEVENT_READ, SafariZoneOfficeSign
@@ -156,8 +150,7 @@ FuchsiaCity_MapEvents:
 	bg_event 20, 27, BGEVENT_READ, FuchsiaCityPokecenterSign
 	bg_event 6, 13, BGEVENT_READ, FuchsiaCityMartSign
 
-.ObjectEvents:
+	db 4 ; object events
-	db 4
 	object_event 23, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1
 	object_event 13, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1
 	object_event 16, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1

maps/FuchsiaGym.asm

@@ -7,11 +7,9 @@ const_value set 2
 	const FUCHSIAGYM_GYM_GUY
 
 FuchsiaGym_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 FuchsiaGymJanineScript:
 	checkflag ENGINE_SOULBADGE
@@ -381,24 +379,19 @@ FuchsiaGymGuyWinText:
 	done
 
 FuchsiaGym_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 4, 17, 3, FUCHSIA_CITY
 	warp_event 5, 17, 3, FUCHSIA_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 2 ; bg events
-	db 2
 	bg_event 3, 15, BGEVENT_READ, FuchsiaGymStatue
 	bg_event 6, 15, BGEVENT_READ, FuchsiaGymStatue
 
-.ObjectEvents:
+	db 6 ; object events
-	db 6
 	object_event 1, 10, SPRITE_JANINE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1
 	object_event 5, 7, SPRITE_FUCHSIA_GYM_1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassAliceScript, -1
 	object_event 5, 11, SPRITE_FUCHSIA_GYM_2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassLindaScript, -1

maps/FuchsiaMart.asm

@@ -4,11 +4,9 @@ const_value set 2
 	const FUCHSIAMART_COOLTRAINER_F
 
 FuchsiaMart_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 ClerkScript_0x195ce8:
 	opentext
@@ -38,22 +36,17 @@ FuchsiaMartCooltrainerFText:
 	done
 
 FuchsiaMart_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 1, FUCHSIA_CITY
 	warp_event 3, 7, 1, FUCHSIA_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 3 ; object events
-	db 3
 	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1
 	object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1
 	object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1

maps/FuchsiaPokecenter1F.asm

@@ -5,12 +5,10 @@ const_value set 2
 	const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR
 
 FuchsiaPokecenter1F_MapScripts:
-.SceneScripts:
+	db 1 ; scene scripts
-	db 1
 	scene_script .DummyScene
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 .DummyScene:
 	end
@@ -89,23 +87,18 @@ UnknownText_0x19654e:
 	done
 
 FuchsiaPokecenter1F_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 3 ; warp events
-	db 3
 	warp_event 3, 7, 5, FUCHSIA_CITY
 	warp_event 4, 7, 5, FUCHSIA_CITY
 	warp_event 0, 7, 1, POKECENTER_2F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 4 ; object events
-	db 4
 	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1
 	object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1
 	object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1

maps/FuchsiaPokecenter2FBeta.asm

@@ -1,23 +1,16 @@
 FuchsiaPokecenter2FBeta_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 FuchsiaPokecenter2FBeta_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 1 ; warp events
-	db 1
 	warp_event 0, 7, 3, FUCHSIA_POKECENTER_1F
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 0 ; bg events
-	db 0
 
-.ObjectEvents:
+	db 0 ; object events
-	db 0

maps/GoldenrodBikeShop.asm

@@ -2,11 +2,9 @@ const_value set 2
 	const GOLDENRODBIKESHOP_CLERK
 
 GoldenrodBikeShop_MapScripts:
-.SceneScripts:
+	db 0 ; scene scripts
-	db 0
 
-.MapCallbacks:
+	db 0 ; callbacks
-	db 0
 
 UnknownScript_0x5474f:
 	end
@@ -103,19 +101,15 @@ UnknownText_0x548ed:
 	done
 
 GoldenrodBikeShop_MapEvents:
-	; filler
+	db 0, 0 ; filler
-	db 0, 0
 
-.Warps:
+	db 2 ; warp events
-	db 2
 	warp_event 2, 7, 2, GOLDENROD_CITY
 	warp_event 3, 7, 2, GOLDENROD_CITY
 
-.CoordEvents:
+	db 0 ; coord events
-	db 0
 
-.BGEvents:
+	db 9 ; bg events
-	db 9
 	bg_event 1, 2, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
 	bg_event 0, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
 	bg_event 1, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
@@ -126,6 +120,5 @@ GoldenrodBikeShop_MapEvents:
 	bg_event 6, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
 	bg_event 7, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
 
-.ObjectEvents:
+	db 1 ; object events
-	db 1
 	object_event 7, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x54750, -1