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