ref: 65480605e9f2ca576e3086907ee7163413117b78
parent: 4c4fca1028c2d0906dc101d89ca6e0be4664c342
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Tue Jan 30 09:15:47 EST 2018
Remove unreferenced map script heading labels
--- a/docs/map_scripts.md
+++ b/docs/map_scripts.md
@@ -11,7 +11,7 @@
## <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>
@@ -18,7 +18,7 @@
</pre>
-### <code>.MapCallbacks: db <i>N</i></code>
+### <code>db <i>N</i> ; callbacks</code>
<pre>
callback <i>type</i>, <i>script</i>
@@ -70,12 +70,11 @@
## <code>MapName_MapEvents:</code>
```asm
- ; filler
- db 0, 0
+ db 0, 0 ; filler
```
-### <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>
@@ -82,7 +81,7 @@
</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>
@@ -89,7 +88,7 @@
</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 @@
- `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>
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -8,11 +8,9 @@
const AZALEAGYM_GYM_GUY
AzaleaGym_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
AzaleaGymBugsyScript:
faceplayer
@@ -362,24 +360,19 @@
done
AzaleaGym_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 15, 5, AZALEA_TOWN
warp_event 5, 15, 5, AZALEA_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 3, 13, BGEVENT_READ, AzaleaGymStatue
bg_event 6, 13, BGEVENT_READ, AzaleaGymStatue
-.ObjectEvents:
- db 7
+ db 7 ; object events
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
--- a/maps/AzaleaMart.asm
+++ b/maps/AzaleaMart.asm
@@ -4,11 +4,9 @@
const AZALEAMART_BUG_CATCHER
AzaleaMart_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
AzaleaMartClerkScript:
opentext
@@ -46,22 +44,17 @@
done
AzaleaMart_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 3, AZALEA_TOWN
warp_event 3, 7, 3, AZALEA_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
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
--- a/maps/AzaleaPokecenter1F.asm
+++ b/maps/AzaleaPokecenter1F.asm
@@ -5,12 +5,10 @@
const AZALEAPOKECENTER1F_POKEFAN_F
AzaleaPokecenter1F_MapScripts:
-.SceneScripts:
- db 1
+ db 1 ; scene scripts
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene:
end
@@ -77,23 +75,18 @@
done
AzaleaPokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 1, AZALEA_TOWN
warp_event 4, 7, 1, AZALEA_TOWN
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
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
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -13,14 +13,12 @@
const AZALEATOWN_KURT_OUTSIDE
AzaleaTown_MapScripts:
-.SceneScripts:
- db 3
+ db 3 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
scene_script .DummyScene2
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .Flypoint
.DummyScene0:
@@ -456,11 +454,9 @@
done
AzaleaTown_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 8
+ db 8 ; warp events
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 @@
warp_event 2, 10, 3, ILEX_FOREST_AZALEA_GATE
warp_event 2, 11, 4, ILEX_FOREST_AZALEA_GATE
-.CoordEvents:
- db 3
+ db 3 ; coord events
coord_event 5, 10, 1, AzaleaTownRivalBattleScene1
coord_event 5, 11, 1, AzaleaTownRivalBattleScene2
coord_event 9, 6, 2, AzaleaTownCelebiScene
-.BGEvents:
- db 9
+ db 9 ; bg events
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 @@
bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign
bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal
-.ObjectEvents:
- db 12
+ db 12 ; object events
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
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -6,13 +6,11 @@
const BATTLETOWER1F_GRANNY
BattleTower1F_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .Scene0
scene_script .Scene1
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.Scene0:
writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS
@@ -794,24 +792,19 @@
done
BattleTower1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
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
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 6, 6, BGEVENT_READ, MapBattleTower1FSignpost0Script
-.ObjectEvents:
- db 5
+ db 5 ; object events
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
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -3,13 +3,11 @@
const BATTLETOWERBATTLEROOM_RECEPTIONIST
BattleTowerBattleRoom_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .EnterBattleRoom
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.EnterBattleRoom: ; 0x9f419
disappear BATTLETOWERBATTLEROOM_YOUNGSTER
@@ -139,21 +137,16 @@
done
BattleTowerBattleRoom_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 3, 7, 4, BATTLE_TOWER_HALLWAY
warp_event 4, 7, 4, BATTLE_TOWER_HALLWAY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
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
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -2,13 +2,11 @@
const BATTLETOWERELEVATOR_RECEPTIONIST
BattleTowerElevator_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .Scene0
scene_script .Scene1
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.Scene0:
priorityjump .RideElevator
@@ -45,20 +43,15 @@
step_end
BattleTowerElevator_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 1, 3, 1, BATTLE_TOWER_HALLWAY
warp_event 2, 3, 1, BATTLE_TOWER_HALLWAY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 1, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -2,13 +2,11 @@
const BATTLETOWERHALLWAY_RECEPTIONIST
BattleTowerHallway_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .Scene0
scene_script .Scene1
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.Scene0:
priorityjump .ChooseBattleRoom
@@ -77,11 +75,9 @@
end
BattleTowerHallway_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 6
+ db 6 ; warp events
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 @@
warp_event 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM
warp_event 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -5,11 +5,9 @@
const BATTLETOWEROUTSIDE_LASS
BattleTowerOutside_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 2
+ db 2 ; callbacks
callback MAPCALLBACK_TILES, .Callback1
callback MAPCALLBACK_OBJECTS, .Callback2
@@ -127,25 +125,20 @@
done
BattleTowerOutside_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
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
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 10, 10, BGEVENT_READ, MapBattleTowerOutsideSignpost0Script
-.ObjectEvents:
- db 4
+ db 4 ; object events
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
--- a/maps/BillsBrothersHouse.asm
+++ b/maps/BillsBrothersHouse.asm
@@ -3,11 +3,9 @@
const BILLSBROTHERSHOUSE_YOUNGSTER
BillsBrothersHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
BillsBrotherScript:
jumptextfaceplayer BillsBrotherText
@@ -28,21 +26,16 @@
done
BillsBrothersHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 4, FUCHSIA_CITY
warp_event 3, 7, 4, FUCHSIA_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
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
--- a/maps/BillsFamilysHouse.asm
+++ b/maps/BillsFamilysHouse.asm
@@ -4,11 +4,9 @@
const BILLSFAMILYSHOUSE_TWIN
BillsFamilysHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
BillScript:
faceplayer
@@ -243,25 +241,20 @@
done
BillsFamilysHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 4, GOLDENROD_CITY
warp_event 3, 7, 4, GOLDENROD_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 0, 1, BGEVENT_READ, BillsHouseBookshelf2
bg_event 1, 1, BGEVENT_READ, BillsHouseBookshelf1
bg_event 7, 1, BGEVENT_READ, BillsHouseRadio
-.ObjectEvents:
- db 3
+ db 3 ; object events
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
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -2,11 +2,9 @@
const BILLSHOUSE_GRAMPS
BillsHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
BillsGrandpa:
faceplayer
@@ -354,20 +352,15 @@
done
BillsHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 1, ROUTE_25
warp_event 3, 7, 1, ROUTE_25
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -10,11 +10,9 @@
const BLACKTHORNCITY_COOLTRAINER_F2
BlackthornCity_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 2
+ db 2 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_OBJECTS, .Santos
@@ -313,11 +311,9 @@
done
BlackthornCity_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 8
+ db 8 ; warp events
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 @@
warp_event 36, 9, 2, ICE_PATH_1F
warp_event 20, 1, 1, DRAGONS_DEN_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 7
+ db 7 ; bg events
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 @@
bg_event 16, 29, BGEVENT_READ, BlackthornCityMartSign
bg_event 22, 29, BGEVENT_READ, BlackthornCityPokecenterSign
-.ObjectEvents:
- db 9
+ db 9 ; object events
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
--- a/maps/BlackthornDragonSpeechHouse.asm
+++ b/maps/BlackthornDragonSpeechHouse.asm
@@ -3,11 +3,9 @@
const BLACKTHORNDRAGONSPEECHHOUSE_EKANS
BlackthornDragonSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
BlackthornDragonSpeechHouseGrannyScript:
jumptextfaceplayer BlackthornDragonSpeechHouseGrannyText
@@ -48,21 +46,16 @@
done
BlackthornDragonSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 2, BLACKTHORN_CITY
warp_event 3, 7, 2, BLACKTHORN_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
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
--- a/maps/BlackthornEmysHouse.asm
+++ b/maps/BlackthornEmysHouse.asm
@@ -2,11 +2,9 @@
const BLACKTHORNEMYSHOUSE_EMY
BlackthornEmysHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Emy:
faceplayer
@@ -20,22 +18,17 @@
jumpstd magazinebookshelf
BlackthornEmysHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 3, BLACKTHORN_CITY
warp_event 3, 7, 3, BLACKTHORN_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, EmysHouseBookshelf
bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -6,11 +6,9 @@
const BLACKTHORNGYM1F_GYM_GUY
BlackthornGym1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .Boulders
.Boulders:
@@ -387,11 +385,9 @@
done
BlackthornGym1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 7
+ db 7 ; warp events
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 @@
warp_event 7, 7, 4, BLACKTHORN_GYM_2F
warp_event 7, 6, 5, BLACKTHORN_GYM_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 3, 15, BGEVENT_READ, BlackthornGymStatue
bg_event 6, 15, BGEVENT_READ, BlackthornGymStatue
-.ObjectEvents:
- db 5
+ db 5 ; object events
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
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -9,11 +9,9 @@
const BLACKTHORNGYM2F_BOULDER6
BlackthornGym2F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable
.SetUpStoneTable:
@@ -126,11 +124,9 @@
done
BlackthornGym2F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
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
@@ -137,14 +133,11 @@
warp_event 8, 7, 6, BLACKTHORN_GYM_1F ; hole
warp_event 8, 3, 7, BLACKTHORN_GYM_1F ; hole
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 8
+ db 8 ; object events
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
--- a/maps/BlackthornMart.asm
+++ b/maps/BlackthornMart.asm
@@ -4,11 +4,9 @@
const BLACKTHORNMART_BLACK_BELT
BlackthornMart_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
BlackthornMartClerkScript:
opentext
@@ -47,22 +45,17 @@
done
BlackthornMart_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 4, BLACKTHORN_CITY
warp_event 3, 7, 4, BLACKTHORN_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
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
--- a/maps/BlackthornPokecenter1F.asm
+++ b/maps/BlackthornPokecenter1F.asm
@@ -5,11 +5,9 @@
const BLACKTHORNPOKECENTER1F_COOLTRAINER_M
BlackthornPokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
BlackthornPokecenter1FNurseScript:
jumpstd pokecenternurse
@@ -50,23 +48,18 @@
done
BlackthornPokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 5, BLACKTHORN_CITY
warp_event 4, 7, 5, BLACKTHORN_CITY
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
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
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -2,11 +2,9 @@
const BLUESHOUSE_DAISY
BluesHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
DaisyScript:
faceplayer
@@ -145,20 +143,15 @@
done
BluesHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 2, PALLET_TOWN
warp_event 3, 7, 2, PALLET_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_DAISY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -2,13 +2,11 @@
const BRUNOSROOM_BRUNO
BrunosRoom_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .LockDoor
scene_script .DummyScene
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .BrunosRoomDoors
.LockDoor:
@@ -125,22 +123,17 @@
done
BrunosRoom_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
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
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 5, 7, SPRITE_BRUNO, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -6,14 +6,12 @@
const BURNEDTOWER1F_POKE_BALL
BurnedTower1F_MapScripts:
-.SceneScripts:
- db 3
+ db 3 ; scene scripts
scene_script .EusineScene
scene_script .DummyScene1
scene_script .DummyScene2
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .HoleAndLadder
.EusineScene:
@@ -278,11 +276,9 @@
done
BurnedTower1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 14
+ db 14 ; warp events
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 @@
warp_event 15, 14, 5, BURNED_TOWER_B1F
warp_event 7, 15, 6, BURNED_TOWER_B1F
-.CoordEvents:
- db 1
+ db 1 ; coord events
coord_event 11, 9, 1, BurnedTowerRivalBattleScript
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther
bg_event 13, 11, BGEVENT_ITEM, BurnedTower1FHiddenUltraBall
-.ObjectEvents:
- db 5
+ db 5 ; object events
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
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -10,13 +10,11 @@
const BURNEDTOWERB1F_EUSINE
BurnedTowerB1F_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .LadderCallback
.DummyScene0:
@@ -236,11 +234,9 @@
done
BurnedTowerB1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 6
+ db 6 ; warp events
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 @@
warp_event 17, 14, 12, BURNED_TOWER_1F
warp_event 7, 15, 14, BURNED_TOWER_1F
-.CoordEvents:
- db 1
+ db 1 ; coord events
coord_event 10, 6, 0, ReleaseTheBeasts
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 9
+ db 9 ; object events
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
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -6,11 +6,9 @@
const CELADONCAFE_TEACHER
CeladonCafe_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CeladonCafeChef:
faceplayer
@@ -208,24 +206,19 @@
done
CeladonCafe_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 6, 7, 9, CELADON_CITY
warp_event 7, 7, 9, CELADON_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 5, 0, BGEVENT_READ, EatathonContestPoster
bg_event 7, 1, BGEVENT_READ, CeladonCafeTrashcan
-.ObjectEvents:
- db 5
+ db 5 ; object events
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
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -10,11 +10,9 @@
const CELADONCITY_LASS
CeladonCity_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -235,11 +233,9 @@
done
CeladonCity_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 9
+ db 9 ; warp events
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 @@
warp_event 10, 29, 1, CELADON_GYM
warp_event 25, 29, 1, CELADON_CAFE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 8
+ db 8 ; bg events
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 @@
bg_event 30, 9, BGEVENT_READ, CeladonCityPokecenterSign
bg_event 37, 21, BGEVENT_ITEM, CeladonCityHiddenPpUp
-.ObjectEvents:
- db 9
+ db 9 ; object events
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
--- a/maps/CeladonDeptStore1F.asm
+++ b/maps/CeladonDeptStore1F.asm
@@ -4,11 +4,9 @@
const CELADONDEPTSTORE1F_TEACHER
CeladonDeptStore1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CeladonDeptStore1FReceptionistScript:
jumptextfaceplayer CeladonDeptStore1FReceptionistText
@@ -74,26 +72,21 @@
done
CeladonDeptStore1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
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
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 14, 0, BGEVENT_READ, CeladonDeptStore1FDirectory
bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton
-.ObjectEvents:
- db 3
+ db 3 ; object events
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
--- a/maps/CeladonDeptStore2F.asm
+++ b/maps/CeladonDeptStore2F.asm
@@ -5,11 +5,9 @@
const CELADONDEPTSTORE2F_YOUNGSTER
CeladonDeptStore2F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x70bad:
faceplayer
@@ -69,25 +67,20 @@
done
CeladonDeptStore2F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
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
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 14, 0, BGEVENT_READ, CeladonDeptStore2FDirectory
bg_event 3, 0, BGEVENT_READ, CeladonDeptStore2FElevatorButton
-.ObjectEvents:
- db 4
+ db 4 ; object events
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
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -6,11 +6,9 @@
const CELADONDEPTSTORE3F_SUPER_NERD
CeladonDeptStore3F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x70d29:
faceplayer
@@ -95,25 +93,20 @@
done
CeladonDeptStore3F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
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
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 14, 0, BGEVENT_READ, CeladonDeptStore3FDirectory
bg_event 3, 0, BGEVENT_READ, CeladonDeptStore3FElevatorButton
-.ObjectEvents:
- db 5
+ db 5 ; object events
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
--- a/maps/CeladonDeptStore4F.asm
+++ b/maps/CeladonDeptStore4F.asm
@@ -4,11 +4,9 @@
const CELADONDEPTSTORE4F_YOUNGSTER
CeladonDeptStore4F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x70f0d:
faceplayer
@@ -51,25 +49,20 @@
done
CeladonDeptStore4F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
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
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 14, 0, BGEVENT_READ, CeladonDeptStore4FDirectory
bg_event 3, 0, BGEVENT_READ, CeladonDeptStore4FElevatorButton
-.ObjectEvents:
- db 3
+ db 3 ; object events
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
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -6,11 +6,9 @@
const CELADONDEPTSTORE5F_TEACHER
CeladonDeptStore5F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x71004:
faceplayer
@@ -72,25 +70,20 @@
done
CeladonDeptStore5F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
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
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 14, 0, BGEVENT_READ, CeladonDeptStore5FDirectory
bg_event 3, 0, BGEVENT_READ, CeladonDeptStore5FElevatorButton
-.ObjectEvents:
- db 5
+ db 5 ; object events
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
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -3,11 +3,9 @@
const CELADONDEPTSTORE6F_YOUNGSTER
CeladonDeptStore6F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .HideRooftopStairs
.HideRooftopStairs:
@@ -146,19 +144,15 @@
done
CeladonDeptStore6F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 15, 0, 2, CELADON_DEPT_STORE_5F
warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 6
+ db 6 ; bg events
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 @@
bg_event 10, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
bg_event 11, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
-.ObjectEvents:
- db 2
+ db 2 ; object events
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
--- a/maps/CeladonDeptStoreElevator.asm
+++ b/maps/CeladonDeptStoreElevator.asm
@@ -1,9 +1,7 @@
CeladonDeptStoreElevator_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CeladonDeptStoreElevatorScript:
opentext
@@ -28,20 +26,15 @@
db -1 ; end
CeladonDeptStoreElevator_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 1, 3, -1, CELADON_DEPT_STORE_1F
warp_event 2, 3, -1, CELADON_DEPT_STORE_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 3, 0, BGEVENT_READ, CeladonDeptStoreElevatorScript
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -10,11 +10,9 @@
const CELADONGAMECORNER_GRAMPS
CeladonGameCorner_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CeladonGameCornerClerkScript:
jumpstd gamecornercoinvendor
@@ -282,19 +280,15 @@
done
CeladonGameCorner_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 14, 13, 6, CELADON_CITY
warp_event 15, 13, 6, CELADON_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 38
+ db 38 ; bg events
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 @@
bg_event 15, 0, BGEVENT_READ, CeladonGameCornerPoster1Script
bg_event 9, 0, BGEVENT_READ, CeladonGameCornerPoster2Script
-.ObjectEvents:
- db 9
+ db 9 ; object events
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
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -3,11 +3,9 @@
const CELADONGAMECORNERPRIZEROOM_PHARMACIST
CeladonGameCornerPrizeRoom_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CeladonGameCornerPrizeRoomGentlemanScript:
jumptextfaceplayer CeladonGameCornerPrizeRoomGentlemanText
@@ -264,23 +262,18 @@
done
CeladonGameCornerPrizeRoom_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 5, 7, CELADON_CITY
warp_event 3, 5, 7, CELADON_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 2, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomTMVendor
bg_event 4, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomPokemonVendor
-.ObjectEvents:
- db 2
+ db 2 ; object events
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
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -7,11 +7,9 @@
const CELADONGYM_TWIN2
CeladonGym_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ErikaScript_0x72a6a:
faceplayer
@@ -268,24 +266,19 @@
done
CeladonGym_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 17, 8, CELADON_CITY
warp_event 5, 17, 8, CELADON_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 3, 15, BGEVENT_READ, CeladonGymStatue
bg_event 6, 15, BGEVENT_READ, CeladonGymStatue
-.ObjectEvents:
- db 6
+ db 6 ; object events
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
--- a/maps/CeladonMansion1F.asm
+++ b/maps/CeladonMansion1F.asm
@@ -5,11 +5,9 @@
const CELADONMANSION1F_GROWLITHE2
CeladonMansion1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CeladonMansionManager:
jumptextfaceplayer CeladonMansionManagerText
@@ -75,11 +73,9 @@
done
CeladonMansion1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 6, 9, 2, CELADON_CITY
warp_event 7, 9, 2, CELADON_CITY
warp_event 3, 0, 3, CELADON_CITY
@@ -86,17 +82,14 @@
warp_event 0, 0, 1, CELADON_MANSION_2F
warp_event 7, 0, 4, CELADON_MANSION_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 5, 8, BGEVENT_UP, CeladonMansionManagersSuiteSign
bg_event 0, 3, BGEVENT_READ, CeladonMansion1fBookshelf
bg_event 2, 3, BGEVENT_READ, CeladonMansion1fBookshelf
-.ObjectEvents:
- db 4
+ db 4 ; object events
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
--- a/maps/CeladonMansion2F.asm
+++ b/maps/CeladonMansion2F.asm
@@ -1,9 +1,7 @@
CeladonMansion2F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CeladonMansion2FComputer:
jumptext CeladonMansion2FComputerText
@@ -50,24 +48,19 @@
done
CeladonMansion2F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
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
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 0, 3, BGEVENT_READ, CeladonMansion2FComputer
bg_event 5, 8, BGEVENT_UP, CeladonMansion2FSign
bg_event 2, 3, BGEVENT_READ, CeladonMansion2FBookshelf
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -5,11 +5,9 @@
const CELADONMANSION3F_FISHER
CeladonMansion3F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CooltrainerMScript_0x71670:
faceplayer
@@ -190,28 +188,23 @@
done
CeladonMansion3F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
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
+ db 0 ; coord events
-.BGEvents:
- db 4
+ db 4 ; bg events
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
+ db 4 ; object events
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
--- a/maps/CeladonMansionRoof.asm
+++ b/maps/CeladonMansionRoof.asm
@@ -2,11 +2,9 @@
const CELADONMANSIONROOF_FISHER
CeladonMansionRoof_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CeladonMansionRoofFisherScript:
jumptextfaceplayer CeladonMansionRoofFisherText
@@ -34,22 +32,17 @@
done
CeladonMansionRoof_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
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
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 6, 1, BGEVENT_LEFT, MapCeladonMansionRoofSignpost0Script
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 7, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -2,11 +2,9 @@
const CELADONMANSIONROOFHOUSE_PHARMACIST
CeladonMansionRoofHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
PharmacistScript_0x71afd:
faceplayer
@@ -117,20 +115,15 @@
done
CeladonMansionRoofHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 3, CELADON_MANSION_ROOF
warp_event 3, 7, 3, CELADON_MANSION_ROOF
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -6,11 +6,9 @@
const CELADONPOKECENTER1F_EUSINE
CeladonPokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
NurseScript_0x71e22:
jumpstd pokecenternurse
@@ -146,23 +144,18 @@
done
CeladonPokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 5, CELADON_CITY
warp_event 4, 7, 5, CELADON_CITY
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 5
+ db 5 ; object events
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
--- a/maps/CeladonPokecenter2FBeta.asm
+++ b/maps/CeladonPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
CeladonPokecenter2FBeta_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CeladonPokecenter2FBeta_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 0, 7, 3, CELADON_POKECENTER_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -7,11 +7,9 @@
const CERULEANCITY_YOUNGSTER
CeruleanCity_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -276,11 +274,9 @@
done
CeruleanCity_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 6
+ db 6 ; warp events
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 @@
warp_event 30, 23, 1, CERULEAN_GYM
warp_event 25, 29, 2, CERULEAN_MART
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 9
+ db 9 ; bg events
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 @@
bg_event 26, 29, BGEVENT_READ, CeruleanCityMartSign
bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene
-.ObjectEvents:
- db 6
+ db 6 ; object events
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
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -7,13 +7,11 @@
const CERULEANGYM_GYM_GUY
CeruleanGym_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .GruntRunsOut
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene0:
end
@@ -363,25 +361,20 @@
done
CeruleanGym_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 15, 5, CERULEAN_CITY
warp_event 5, 15, 5, CERULEAN_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 3, 8, BGEVENT_ITEM, CeruleanGymHiddenMachinePart
bg_event 2, 13, BGEVENT_READ, CeruleanGymStatue1
bg_event 6, 13, BGEVENT_READ, CeruleanGymStatue2
-.ObjectEvents:
- db 6
+ db 6 ; object events
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
--- a/maps/CeruleanGymBadgeSpeechHouse.asm
+++ b/maps/CeruleanGymBadgeSpeechHouse.asm
@@ -2,11 +2,9 @@
const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M
CeruleanGymBadgeSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CeruleanGymBadgeSpeechHousePokefanMScript:
jumptextfaceplayer CeruleanGymBadgeSpeechHousePokefanMText
@@ -17,20 +15,15 @@
done
CeruleanGymBadgeSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 1, CERULEAN_CITY
warp_event 3, 7, 1, CERULEAN_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1
--- a/maps/CeruleanMart.asm
+++ b/maps/CeruleanMart.asm
@@ -4,11 +4,9 @@
const CERULEANMART_COOLTRAINER_F
CeruleanMart_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CeruleanMart_Clerk:
opentext
@@ -46,22 +44,17 @@
done
CeruleanMart_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 6, CERULEAN_CITY
warp_event 3, 7, 6, CERULEAN_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
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
--- a/maps/CeruleanPokecenter1F.asm
+++ b/maps/CeruleanPokecenter1F.asm
@@ -4,11 +4,9 @@
const CERULEANPOKECENTER1F_GYM_GUY
CeruleanPokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
NurseScript_0x18820f:
jumpstd pokecenternurse
@@ -63,23 +61,18 @@
done
CeruleanPokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 4, CERULEAN_CITY
warp_event 4, 7, 4, CERULEAN_CITY
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
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
--- a/maps/CeruleanPokecenter2FBeta.asm
+++ b/maps/CeruleanPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
CeruleanPokecenter2FBeta_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CeruleanPokecenter2FBeta_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 0, 7, 1, CERULEAN_POKECENTER_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/CeruleanPoliceStation.asm
+++ b/maps/CeruleanPoliceStation.asm
@@ -4,11 +4,9 @@
const CERULEANPOLICESTATION_DIGLETT
CeruleanPoliceStation_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CeruleanPoliceStationFishingGuruScript:
jumptextfaceplayer CeruleanPoliceStationFishingGuruText
@@ -44,22 +42,17 @@
done
CeruleanPoliceStation_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 2, CERULEAN_CITY
warp_event 3, 7, 2, CERULEAN_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
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
--- a/maps/CeruleanTradeSpeechHouse.asm
+++ b/maps/CeruleanTradeSpeechHouse.asm
@@ -5,11 +5,9 @@
const CERULEANTRADESPEECHHOUSE_ZUBAT
CeruleanTradeSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CeruleanTradeSpeechHouseGrannyScript:
jumptextfaceplayer CeruleanTradeSpeechHouseGrannyText
@@ -54,22 +52,17 @@
done
CeruleanTradeSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 3, CERULEAN_CITY
warp_event 3, 7, 3, CERULEAN_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
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
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -4,11 +4,9 @@
const CHARCOALKILN_MOLTRES
CharcoalKiln_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CharcoalKilnBoss:
faceplayer
@@ -149,25 +147,20 @@
done
CharcoalKiln_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 2, AZALEA_TOWN
warp_event 3, 7, 2, AZALEA_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 0, 1, BGEVENT_READ, CharcoalKilnBookshelf
bg_event 1, 1, BGEVENT_READ, CharcoalKilnBookshelf
bg_event 7, 1, BGEVENT_READ, CharcoalKilnRadio
-.ObjectEvents:
- db 3
+ db 3 ; object events
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
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -6,13 +6,11 @@
const CHERRYGROVECITY_FISHER
CherrygroveCity_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.DummyScene0:
@@ -547,11 +545,9 @@
done
CherrygroveCity_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 23, 3, 2, CHERRYGROVE_MART
warp_event 29, 3, 1, CHERRYGROVE_POKECENTER_1F
warp_event 17, 7, 1, CHERRYGROVE_GYM_SPEECH_HOUSE
@@ -558,20 +554,17 @@
warp_event 25, 9, 1, GUIDE_GENTS_HOUSE
warp_event 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 33, 6, 1, CherrygroveSilverSceneNorth
coord_event 33, 7, 1, CherrygroveSilverSceneSouth
-.BGEvents:
- db 4
+ db 4 ; bg events
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
+ db 5 ; object events
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
--- a/maps/CherrygroveEvolutionSpeechHouse.asm
+++ b/maps/CherrygroveEvolutionSpeechHouse.asm
@@ -3,11 +3,9 @@
const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER
CherrygroveEvolutionSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
YoungsterScript_0x196cb2:
opentext
@@ -42,23 +40,18 @@
done
CherrygroveEvolutionSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 5, CHERRYGROVE_CITY
warp_event 3, 7, 5, CHERRYGROVE_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
bg_event 1, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
-.ObjectEvents:
- db 2
+ db 2 ; object events
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
--- a/maps/CherrygroveGymSpeechHouse.asm
+++ b/maps/CherrygroveGymSpeechHouse.asm
@@ -3,11 +3,9 @@
const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER
CherrygroveGymSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CherrygroveGymSpeechHousePokefanMScript:
jumptextfaceplayer CherrygroveGymSpeechHousePokefanMText
@@ -45,23 +43,18 @@
done
CherrygroveGymSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 3, CHERRYGROVE_CITY
warp_event 3, 7, 3, CHERRYGROVE_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
bg_event 1, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
-.ObjectEvents:
- db 2
+ db 2 ; object events
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
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -4,11 +4,9 @@
const CHERRYGROVEMART_YOUNGSTER
CherrygroveMart_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x19680a:
opentext
@@ -72,22 +70,17 @@
done
CherrygroveMart_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 1, CHERRYGROVE_CITY
warp_event 3, 7, 1, CHERRYGROVE_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
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
--- a/maps/CherrygrovePokecenter1F.asm
+++ b/maps/CherrygrovePokecenter1F.asm
@@ -5,11 +5,9 @@
const CHERRYGROVEPOKECENTER1F_TEACHER
CherrygrovePokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
NurseScript_0x19696d:
jumpstd pokecenternurse
@@ -69,23 +67,18 @@
done
CherrygrovePokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 2, CHERRYGROVE_CITY
warp_event 4, 7, 2, CHERRYGROVE_CITY
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
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
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -13,13 +13,11 @@
const CIANWOODCITY_SUICUNE
CianwoodCity_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
.DummyScene0:
@@ -381,11 +379,9 @@
done
CianwoodCity_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 7
+ db 7 ; warp events
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 @@
warp_event 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE
warp_event 5, 17, 1, POKE_SEERS_HOUSE
-.CoordEvents:
- db 1
+ db 1 ; coord events
coord_event 11, 16, 1, CianwoodCitySuicuneAndEusine
-.BGEvents:
- db 8
+ db 8 ; bg events
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 @@
bg_event 4, 19, BGEVENT_ITEM, CianwoodCityHiddenRevive
bg_event 5, 29, BGEVENT_ITEM, CianwoodCityHiddenMaxEther
-.ObjectEvents:
- db 12
+ db 12 ; object events
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
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -10,11 +10,9 @@
const CIANWOODGYM_BOULDER4
CianwoodGym_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ChuckScript_0x9d60f:
faceplayer
@@ -306,24 +304,19 @@
done
CianwoodGym_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 17, 2, CIANWOOD_CITY
warp_event 5, 17, 2, CIANWOOD_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 3, 15, BGEVENT_READ, CianwoodGymStatue
bg_event 6, 15, BGEVENT_READ, CianwoodGymStatue
-.ObjectEvents:
- db 9
+ db 9 ; object events
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
--- a/maps/CianwoodLugiaSpeechHouse.asm
+++ b/maps/CianwoodLugiaSpeechHouse.asm
@@ -4,11 +4,9 @@
const CIANWOODLUGIASPEECHHOUSE_TWIN
CianwoodLugiaSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CianwoodLugiaSpeechHouseTeacherScript:
jumptextfaceplayer CianwoodLugiaSpeechHouseTeacherText
@@ -62,24 +60,19 @@
done
CianwoodLugiaSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 6, CIANWOOD_CITY
warp_event 3, 7, 6, CIANWOOD_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
bg_event 1, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
-.ObjectEvents:
- db 3
+ db 3 ; object events
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
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -2,12 +2,10 @@
const CIANWOODPHARMACY_PHARMACIST
CianwoodPharmacy_MapScripts:
-.SceneScripts:
- db 1
+ db 1 ; scene scripts
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene:
end
@@ -73,22 +71,17 @@
done
CianwoodPharmacy_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 4, CIANWOOD_CITY
warp_event 3, 7, 4, CIANWOOD_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, CianwoodPharmacyBookshelf
bg_event 1, 1, BGEVENT_READ, CianwoodPharmacyBookshelf
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1
--- a/maps/CianwoodPhotoStudio.asm
+++ b/maps/CianwoodPhotoStudio.asm
@@ -2,11 +2,9 @@
const CIANWOODPHOTOSTUDIO_FISHING_GURU
CianwoodPhotoStudio_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
FishingGuruScript_0x9e0e0:
faceplayer
@@ -49,20 +47,15 @@
done
CianwoodPhotoStudio_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 5, CIANWOOD_CITY
warp_event 3, 7, 5, CIANWOOD_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1
--- a/maps/CianwoodPokecenter1F.asm
+++ b/maps/CianwoodPokecenter1F.asm
@@ -5,11 +5,9 @@
const CIANWOODPOKECENTER1F_SUPER_NERD
CianwoodPokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
NurseScript_0x9dbcf:
jumpstd pokecenternurse
@@ -132,23 +130,18 @@
done
CianwoodPokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 3, CIANWOOD_CITY
warp_event 4, 7, 3, CIANWOOD_CITY
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
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
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -2,11 +2,9 @@
const CINNABARISLAND_BLUE
CinnabarIsland_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -128,23 +126,18 @@
done
CinnabarIsland_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 11, 11, 1, CINNABAR_POKECENTER_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 4
+ db 4 ; bg events
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
+ db 1 ; object events
object_event 9, 6, SPRITE_BLUE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR
--- a/maps/CinnabarPokecenter1F.asm
+++ b/maps/CinnabarPokecenter1F.asm
@@ -4,11 +4,9 @@
const CINNABARPOKECENTER1F_FISHER
CinnabarPokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
NurseScript_0x1ab32c:
jumpstd pokecenternurse
@@ -35,23 +33,18 @@
done
CinnabarPokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 1, CINNABAR_ISLAND
warp_event 4, 7, 1, CINNABAR_ISLAND
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
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
--- a/maps/CinnabarPokecenter2FBeta.asm
+++ b/maps/CinnabarPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
CinnabarPokecenter2FBeta_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CinnabarPokecenter2FBeta_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 0, 7, 3, CINNABAR_POKECENTER_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -3,14 +3,12 @@
const COLOSSEUM_CHRIS2
Colosseum_MapScripts:
-.SceneScripts:
- db 3
+ db 3 ; scene scripts
scene_script .InitializeColosseum
scene_script .DummyScene1
scene_script .DummyScene2
-.MapCallbacks:
- db 2
+ db 2 ; callbacks
callback MAPCALLBACK_OBJECTS, .SetWhichChris
callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F
@@ -63,23 +61,18 @@
done
Colosseum_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 7, 3, POKECENTER_2F
warp_event 5, 7, 3, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script
bg_event 5, 4, BGEVENT_LEFT, MapColosseumSignpost1Script
-.ObjectEvents:
- db 2
+ db 2 ; object events
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
--- a/maps/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -4,11 +4,9 @@
const COPYCATSHOUSE1F_CLEFAIRY
CopycatsHouse1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
CopycatsHouse1FPokefanMScript:
jumptextfaceplayer CopycatsHouse1FPokefanMText
@@ -73,23 +71,18 @@
done
CopycatsHouse1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
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
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
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
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -7,11 +7,9 @@
const COPYCATSHOUSE2F_COPYCAT2 ; if player is female
CopycatsHouse2F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .Callback
.Callback:
@@ -361,23 +359,18 @@
done
CopycatsHouse2F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 3, 0, 3, COPYCATS_HOUSE_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, CopycatsHouse2FBookshelf
bg_event 1, 1, BGEVENT_READ, CopycatsHouse2FBookshelf
-.ObjectEvents:
- db 6
+ db 6 ; object events
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
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -10,11 +10,9 @@
const DANCETHEATRE_GRANNY
DanceTheatre_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerKimonoGirlNaoko2:
trainer KIMONO_GIRL, NAOKO2, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script
@@ -338,24 +336,19 @@
done
DanceTheatre_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 5, 13, 8, ECRUTEAK_CITY
warp_event 6, 13, 8, ECRUTEAK_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 5, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script
bg_event 6, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script
-.ObjectEvents:
- db 9
+ db 9 ; object events
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
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -4,11 +4,9 @@
const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2
DarkCaveBlackthornEntrance_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
DarkCaveBlackthornEntrancePharmacistScript:
faceplayer
@@ -62,22 +60,17 @@
done
DarkCaveBlackthornEntrance_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 23, 3, 1, ROUTE_45
warp_event 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
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
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -9,11 +9,9 @@
const DARKCAVEVIOLETENTRANCE_POKE_BALL4
DarkCaveVioletEntrance_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
DarkCaveVioletEntrancePotion:
itemball POTION
@@ -34,24 +32,19 @@
hiddenitem ELIXER, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER
DarkCaveVioletEntrance_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
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
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 26, 3, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer
-.ObjectEvents:
- db 8
+ db 8 ; object events
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
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -3,11 +3,9 @@
const DAYCARE_GRANNY
DayCare_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .EggCheckCallback
.EggCheckCallback:
@@ -156,25 +154,20 @@
done
DayCare_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
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
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, DayCareBookshelf
bg_event 1, 1, BGEVENT_READ, DayCareBookshelf
-.ObjectEvents:
- db 2
+ db 2 ; object events
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
--- a/maps/DayOfWeekSiblingsHouse.asm
+++ b/maps/DayOfWeekSiblingsHouse.asm
@@ -2,11 +2,9 @@
const DAYOFWEEKSIBLINGSHOUSE_POKEDEX
DayOfWeekSiblingsHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
PokedexScript_0x7b1e4:
opentext
@@ -71,20 +69,15 @@
done
DayOfWeekSiblingsHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 3, ROUTE_26
warp_event 3, 7, 3, ROUTE_26
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1
--- a/maps/DiglettsCave.asm
+++ b/maps/DiglettsCave.asm
@@ -2,11 +2,9 @@
const DIGLETTSCAVE_POKEFAN_M
DiglettsCave_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
DiglettsCavePokefanMScript:
jumptextfaceplayer DiglettsCavePokefanMText
@@ -23,11 +21,9 @@
done
DiglettsCave_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 6
+ db 6 ; warp events
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 @@
warp_event 17, 33, 2, DIGLETTS_CAVE
warp_event 3, 3, 4, DIGLETTS_CAVE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 6, 11, BGEVENT_ITEM, DiglettsCaveHiddenMaxRevive
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 3, 31, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -5,13 +5,11 @@
const DRAGONSHRINE_CLAIR
DragonShrine_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DragonShrineTest
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DragonShrineTest:
priorityjump .DragonShrineTestScript
@@ -658,22 +656,17 @@
done
DragonShrine_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 9, 2, DRAGONS_DEN_B1F
warp_event 5, 9, 2, DRAGONS_DEN_B1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
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
--- a/maps/DragonsDen1F.asm
+++ b/maps/DragonsDen1F.asm
@@ -1,26 +1,19 @@
DragonsDen1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
DragonsDen1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
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
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -10,13 +10,11 @@
const DRAGONSDENB1F_POKE_BALL3
DragonsDenB1F_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .CheckSilver
.DummyScene0:
@@ -407,27 +405,22 @@
done
DragonsDenB1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 20, 3, 3, DRAGONS_DEN_1F
warp_event 19, 29, 1, DRAGON_SHRINE
-.CoordEvents:
- db 1
+ db 1 ; coord events
coord_event 19, 30, 1, DragonsDenB1F_ClairScene
-.BGEvents:
- db 4
+ db 4 ; bg events
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
+ db 9 ; object events
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
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -7,11 +7,9 @@
const EARLSPOKEMONACADEMY_POKEDEX
EarlsPokemonAcademy_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
AcademyEarl:
applymovement EARLSPOKEMONACADEMY_EARL, MovementData_0x68b2d
@@ -412,26 +410,21 @@
done
EarlsPokemonAcademy_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 3, 15, 3, VIOLET_CITY
warp_event 4, 15, 3, VIOLET_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 4
+ db 4 ; bg events
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
+ db 6 ; object events
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
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -8,11 +8,9 @@
const ECRUTEAKCITY_GRAMPS3
EcruteakCity_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -260,11 +258,9 @@
done
EcruteakCity_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 15
+ db 15 ; warp events
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 @@
warp_event 0, 18, 3, ROUTE_38_ECRUTEAK_GATE
warp_event 0, 19, 4, ROUTE_38_ECRUTEAK_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 8
+ db 8 ; bg events
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 @@
bg_event 30, 21, BGEVENT_READ, EcruteakCityMartSign
bg_event 23, 14, BGEVENT_ITEM, EcruteakCityHiddenHyperPotion
-.ObjectEvents:
- db 7
+ db 7 ; object events
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
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -8,13 +8,11 @@
const ECRUTEAKGYM_GRAMPS
EcruteakGym_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .ForcedToLeave
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.ForcedToLeave:
priorityjump EcruteakGymClosed
@@ -387,11 +385,9 @@
done
EcruteakGym_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 33
+ db 33 ; warp events
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 @@
warp_event 7, 12, 3, ECRUTEAK_GYM
warp_event 7, 13, 3, ECRUTEAK_GYM
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 3, 15, BGEVENT_READ, EcruteakGymStatue
bg_event 6, 15, BGEVENT_READ, EcruteakGymStatue
-.ObjectEvents:
- db 7
+ db 7 ; object events
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
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -3,11 +3,9 @@
const ECRUTEAKITEMFINDERHOUSE_POKEDEX
EcruteakItemfinderHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
EcruteakItemfinderGuy:
faceplayer
@@ -163,22 +161,17 @@
done
EcruteakItemfinderHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 3, 7, 11, ECRUTEAK_CITY
warp_event 4, 7, 11, ECRUTEAK_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 2, 1, BGEVENT_READ, ItemFinderHouseRadio
-.ObjectEvents:
- db 2
+ db 2 ; object events
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
--- a/maps/EcruteakLugiaSpeechHouse.asm
+++ b/maps/EcruteakLugiaSpeechHouse.asm
@@ -3,11 +3,9 @@
const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER
EcruteakLugiaSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
EcruteakLugiaSpeechHouseGrampsScript:
jumptextfaceplayer EcruteakLugiaSpeechHouseGrampsText
@@ -45,22 +43,17 @@
done
EcruteakLugiaSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 3, 7, 7, ECRUTEAK_CITY
warp_event 4, 7, 7, ECRUTEAK_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 2, 1, BGEVENT_READ, LugiaSpeechHouseRadio
-.ObjectEvents:
- db 2
+ db 2 ; object events
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
--- a/maps/EcruteakMart.asm
+++ b/maps/EcruteakMart.asm
@@ -4,11 +4,9 @@
const ECRUTEAKMART_GRANNY
EcruteakMart_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x99c3b:
opentext
@@ -46,22 +44,17 @@
done
EcruteakMart_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 9, ECRUTEAK_CITY
warp_event 3, 7, 9, ECRUTEAK_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
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
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -6,13 +6,11 @@
const ECRUTEAKPOKECENTER1F_BILL
EcruteakPokecenter1F_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .MeetBill
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.MeetBill:
priorityjump .BillActivatesTimeCapsule
@@ -207,23 +205,18 @@
done
EcruteakPokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 6, ECRUTEAK_CITY
warp_event 4, 7, 6, ECRUTEAK_CITY
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 5
+ db 5 ; object events
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
--- a/maps/EcruteakTinTowerEntrance.asm
+++ b/maps/EcruteakTinTowerEntrance.asm
@@ -5,13 +5,11 @@
const ECRUTEAKTINTOWERENTRANCE_GRAMPS
EcruteakTinTowerEntrance_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .InitializeSages
.DummyScene0:
@@ -278,11 +276,9 @@
done
EcruteakTinTowerEntrance_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 4, 17, 3, ECRUTEAK_CITY
warp_event 5, 17, 3, ECRUTEAK_CITY
warp_event 5, 3, 4, ECRUTEAK_TIN_TOWER_ENTRANCE
@@ -289,16 +285,13 @@
warp_event 17, 15, 3, ECRUTEAK_TIN_TOWER_ENTRANCE
warp_event 17, 3, 3, WISE_TRIOS_ROOM
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 4, 7, 0, EcruteakTinTowerEntrance_CoordEvent1
coord_event 5, 7, 0, EcruteakTinTowerEntrance_CoordEvent2
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
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
--- a/maps/ElmsHouse.asm
+++ b/maps/ElmsHouse.asm
@@ -3,11 +3,9 @@
const ELMSHOUSE_ELMS_SON
ElmsHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ElmsWife:
jumptextfaceplayer ElmsWifeText
@@ -84,24 +82,19 @@
done
ElmsHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 4, NEW_BARK_TOWN
warp_event 3, 7, 4, NEW_BARK_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 0, 1, BGEVENT_READ, ElmsHousePC
bg_event 6, 1, BGEVENT_READ, ElmsHouseBookshelf
bg_event 7, 1, BGEVENT_READ, ElmsHouseBookshelf
-.ObjectEvents:
- db 2
+ db 2 ; object events
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
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -7,8 +7,7 @@
const ELMSLAB_OFFICER
ElmsLab_MapScripts:
-.SceneScripts:
- db 6
+ db 6 ; scene scripts
scene_script .MeetElm
scene_script .DummyScene1
scene_script .DummyScene2
@@ -16,8 +15,7 @@
scene_script .DummyScene4
scene_script .DummyScene5
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .MoveElmCallback
.MeetElm:
@@ -1371,16 +1369,13 @@
done
ElmsLab_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 11, 1, NEW_BARK_TOWN
warp_event 5, 11, 1, NEW_BARK_TOWN
-.CoordEvents:
- db 8
+ db 8 ; coord events
coord_event 4, 6, 1, LabTryToLeaveScript
coord_event 5, 6, 1, LabTryToLeaveScript
coord_event 4, 5, 3, MeetCopScript
@@ -1390,8 +1385,7 @@
coord_event 4, 8, 6, AideScript_WalkBalls1
coord_event 5, 8, 6, AideScript_WalkBalls2
-.BGEvents:
- db 16
+ db 16 ; bg events
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 @@
bg_event 5, 0, BGEVENT_READ, ElmsLabWindow
bg_event 3, 5, BGEVENT_DOWN, ElmsLabPC
-.ObjectEvents:
- db 6
+ db 6 ; object events
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
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -5,14 +5,12 @@
const FASTSHIP1F_GENTLEMAN
FastShip1F_MapScripts:
-.SceneScripts:
- db 3
+ db 3 ; scene scripts
scene_script .DummyScene0
scene_script .EnterFastShip
scene_script .DummyScene2
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene0:
end
@@ -286,11 +284,9 @@
done
FastShip1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 12
+ db 12 ; warp events
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 @@
warp_event 6, 12, 1, FAST_SHIP_B1F
warp_event 30, 14, 2, FAST_SHIP_B1F
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 24, 6, 2, WorriedGrandpaSceneLeft
coord_event 25, 6, 2, WorriedGrandpaSceneRight
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
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
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -13,13 +13,11 @@
const FASTSHIPB1F_YOUNGSTER2
FastShipB1F_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene0:
end
@@ -449,25 +447,20 @@
done
FastShipB1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 5, 11, 11, FAST_SHIP_1F
warp_event 31, 13, 12, FAST_SHIP_1F
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 30, 7, 0, UnknownScript_0x7673c
coord_event 31, 7, 0, UnknownScript_0x76751
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan
-.ObjectEvents:
- db 12
+ db 12 ; object events
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
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -8,11 +8,9 @@
const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST
FastShipCabins_NNW_NNE_NE_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerCooltrainermSean:
trainer COOLTRAINERM, SEAN, EVENT_BEAT_COOLTRAINERM_SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script
@@ -267,26 +265,21 @@
done
FastShipCabins_NNW_NNE_NE_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
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
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
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
+ db 7 ; object events
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
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -12,11 +12,9 @@
const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2
FastShipCabins_SE_SSE_CaptainsCabin_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Unreferenced_0x75ea6:
end
@@ -463,11 +461,9 @@
done
FastShipCabins_SE_SSE_CaptainsCabin_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 6
+ db 6 ; warp events
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 @@
warp_event 2, 33, 10, FAST_SHIP_1F
warp_event 3, 33, 10, FAST_SHIP_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 4, 25, BGEVENT_READ, FastShipCaptainsCabinTrashcan
-.ObjectEvents:
- db 11
+ db 11 ; object events
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
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -5,11 +5,9 @@
const FASTSHIPCABINS_SW_SSW_NW_ROCKER
FastShipCabins_SW_SSW_NW_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerFirebreatherLyle:
trainer FIREBREATHER, LYLE, EVENT_BEAT_FIREBREATHER_LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script
@@ -223,11 +221,9 @@
done
FastShipCabins_SW_SSW_NW_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 2, 0, 5, FAST_SHIP_1F
warp_event 2, 19, 6, FAST_SHIP_1F
warp_event 3, 19, 6, FAST_SHIP_1F
@@ -234,17 +230,14 @@
warp_event 2, 31, 7, FAST_SHIP_1F
warp_event 3, 31, 7, FAST_SHIP_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 7, 1, BGEVENT_READ, FastShipBed
bg_event 7, 2, BGEVENT_READ, FastShipBed
bg_event 7, 7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan
-.ObjectEvents:
- db 4
+ db 4 ; object events
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
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -3,11 +3,9 @@
const FIGHTINGDOJO_POKE_BALL
FightingDojo_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
FightingDojoBlackBelt:
jumptextfaceplayer FightingDojoBlackBeltText
@@ -43,23 +41,18 @@
done
FightingDojo_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 11, 1, SAFFRON_CITY
warp_event 5, 11, 1, SAFFRON_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 4, 0, BGEVENT_READ, MapFightingDojoSignpost0Script
bg_event 5, 0, BGEVENT_READ, MapFightingDojoSignpost1Script
-.ObjectEvents:
- db 2
+ db 2 ; object events
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
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -5,11 +5,9 @@
const FUCHSIACITY_FRUIT_TREE
FuchsiaCity_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -125,11 +123,9 @@
done
FuchsiaCity_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 11
+ db 11 ; warp events
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 @@
warp_event 7, 35, 1, ROUTE_19_FUCHSIA_GATE
warp_event 8, 35, 2, ROUTE_19_FUCHSIA_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 8
+ db 8 ; bg events
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 @@
bg_event 20, 27, BGEVENT_READ, FuchsiaCityPokecenterSign
bg_event 6, 13, BGEVENT_READ, FuchsiaCityMartSign
-.ObjectEvents:
- db 4
+ db 4 ; object events
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
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -7,11 +7,9 @@
const FUCHSIAGYM_GYM_GUY
FuchsiaGym_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
FuchsiaGymJanineScript:
checkflag ENGINE_SOULBADGE
@@ -381,24 +379,19 @@
done
FuchsiaGym_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 17, 3, FUCHSIA_CITY
warp_event 5, 17, 3, FUCHSIA_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 3, 15, BGEVENT_READ, FuchsiaGymStatue
bg_event 6, 15, BGEVENT_READ, FuchsiaGymStatue
-.ObjectEvents:
- db 6
+ db 6 ; object events
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
--- a/maps/FuchsiaMart.asm
+++ b/maps/FuchsiaMart.asm
@@ -4,11 +4,9 @@
const FUCHSIAMART_COOLTRAINER_F
FuchsiaMart_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x195ce8:
opentext
@@ -38,22 +36,17 @@
done
FuchsiaMart_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 1, FUCHSIA_CITY
warp_event 3, 7, 1, FUCHSIA_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
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
--- a/maps/FuchsiaPokecenter1F.asm
+++ b/maps/FuchsiaPokecenter1F.asm
@@ -5,12 +5,10 @@
const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR
FuchsiaPokecenter1F_MapScripts:
-.SceneScripts:
- db 1
+ db 1 ; scene scripts
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene:
end
@@ -89,23 +87,18 @@
done
FuchsiaPokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 5, FUCHSIA_CITY
warp_event 4, 7, 5, FUCHSIA_CITY
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
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
--- a/maps/FuchsiaPokecenter2FBeta.asm
+++ b/maps/FuchsiaPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
FuchsiaPokecenter2FBeta_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
FuchsiaPokecenter2FBeta_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 0, 7, 3, FUCHSIA_POKECENTER_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -2,11 +2,9 @@
const GOLDENRODBIKESHOP_CLERK
GoldenrodBikeShop_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
UnknownScript_0x5474f:
end
@@ -103,19 +101,15 @@
done
GoldenrodBikeShop_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 2, GOLDENROD_CITY
warp_event 3, 7, 2, GOLDENROD_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 9
+ db 9 ; bg events
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 @@
bg_event 6, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
bg_event 7, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 7, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x54750, -1
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -16,11 +16,9 @@
const GOLDENRODCITY_POKEFAN_M2
GoldenrodCity_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 2
+ db 2 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPointAndFloria
callback MAPCALLBACK_OBJECTS, .MoveTutor
@@ -552,11 +550,9 @@
done
GoldenrodCity_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 15
+ db 15 ; warp events
warp_event 24, 7, 1, GOLDENROD_GYM
warp_event 29, 29, 1, GOLDENROD_BIKE_SHOP
warp_event 31, 21, 1, GOLDENROD_HAPPINESS_RATER
@@ -573,11 +569,9 @@
warp_event 11, 29, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
warp_event 15, 27, 1, GOLDENROD_POKECENTER_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 12
+ db 12 ; bg events
bg_event 10, 14, BGEVENT_READ, GoldenrodCityStationSign
bg_event 4, 17, BGEVENT_READ, GoldenrodCityRadioTowerSign
bg_event 26, 27, BGEVENT_READ, GoldenrodDeptStoreSign
@@ -591,8 +585,7 @@
bg_event 16, 27, BGEVENT_UP, GoldenrodCityPokecenterSign
bg_event 30, 6, BGEVENT_READ, GoldenrodCityFlowerShopSign
-.ObjectEvents:
- db 15
+ db 15 ; object events
object_event 7, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS
object_event 30, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS
object_event 12, 16, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS
--- a/maps/GoldenrodDeptStore1F.asm
+++ b/maps/GoldenrodDeptStore1F.asm
@@ -5,11 +5,9 @@
const GOLDENRODDEPTSTORE1F_GENTLEMAN
GoldenrodDeptStore1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
GoldenrodDeptStore1FReceptionistScript:
jumptextfaceplayer GoldenrodDeptStore1FReceptionistText
@@ -79,26 +77,21 @@
done
GoldenrodDeptStore1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 7, 7, 9, GOLDENROD_CITY
warp_event 8, 7, 9, GOLDENROD_CITY
warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_2F
warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore1FDirectory
bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1
object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1
object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1
--- a/maps/GoldenrodDeptStore2F.asm
+++ b/maps/GoldenrodDeptStore2F.asm
@@ -6,11 +6,9 @@
const GOLDENRODDEPTSTORE2F_GENTLEMAN
GoldenrodDeptStore2F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x55b5d:
faceplayer
@@ -101,25 +99,20 @@
done
GoldenrodDeptStore2F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_3F
warp_event 15, 0, 3, GOLDENROD_DEPT_STORE_1F
warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore2FDirectory
bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1
object_event 13, 6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1
object_event 9, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1
--- a/maps/GoldenrodDeptStore3F.asm
+++ b/maps/GoldenrodDeptStore3F.asm
@@ -4,11 +4,9 @@
const GOLDENRODDEPTSTORE3F_ROCKER
GoldenrodDeptStore3F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x55db8:
faceplayer
@@ -57,25 +55,20 @@
done
GoldenrodDeptStore3F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_2F
warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_4F
warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore3FDirectory
bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 6, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1
object_event 12, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1
object_event 2, 5, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -5,11 +5,9 @@
const GOLDENRODDEPTSTORE4F_GAMEBOY_KID
GoldenrodDeptStore4F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x55ee9:
faceplayer
@@ -78,25 +76,20 @@
done
GoldenrodDeptStore4F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_5F
warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_3F
warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore4FDirectory
bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1
object_event 11, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1
object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -7,11 +7,9 @@
const GOLDENRODDEPTSTORE5F_RECEPTIONIST
GoldenrodDeptStore5F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .CheckIfSunday
.CheckIfSunday:
@@ -218,25 +216,20 @@
done
GoldenrodDeptStore5F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_4F
warp_event 15, 0, 1, GOLDENROD_DEPT_STORE_6F
warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore5FDirectory
bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1
object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1
object_event 6, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -3,11 +3,9 @@
const GOLDENRODDEPTSTORE6F_SUPER_NERD
GoldenrodDeptStore6F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
GoldenrodVendingMachine:
opentext
@@ -148,20 +146,16 @@
done
GoldenrodDeptStore6F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_5F
warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
warp_event 13, 0, 1, GOLDENROD_DEPT_STORE_ROOF
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 6
+ db 6 ; bg events
bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore6FDirectory
bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore6FElevatorButton
bg_event 8, 1, BGEVENT_UP, GoldenrodVendingMachine
@@ -169,7 +163,6 @@
bg_event 10, 1, BGEVENT_UP, GoldenrodVendingMachine
bg_event 11, 1, BGEVENT_UP, GoldenrodVendingMachine
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 10, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1
object_event 8, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -9,11 +9,9 @@
const GOLDENRODDEPTSTOREB1F_MACHOP
GoldenrodDeptStoreB1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 2
+ db 2 ; callbacks
callback MAPCALLBACK_TILES, UnknownScript_0x7d781
callback MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac
@@ -110,23 +108,18 @@
done
GoldenrodDeptStoreB1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 17, 2, 3, GOLDENROD_UNDERGROUND_WAREHOUSE
warp_event 9, 4, 1, GOLDENROD_DEPT_STORE_ELEVATOR
warp_event 10, 4, 2, GOLDENROD_DEPT_STORE_ELEVATOR
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 8
+ db 8 ; object events
object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -1,9 +1,7 @@
GoldenrodDeptStoreElevator_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
MapGoldenrodDeptStoreElevatorSignpost0Script:
opentext
@@ -55,20 +53,15 @@
db -1 ; end
GoldenrodDeptStoreElevator_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 1, 3, -1, GOLDENROD_DEPT_STORE_1F
warp_event 2, 3, -1, GOLDENROD_DEPT_STORE_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 3, 0, BGEVENT_READ, MapGoldenrodDeptStoreElevatorSignpost0Script
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -9,11 +9,9 @@
const GOLDENRODDEPTSTOREROOF_BUG_CATCHER
GoldenrodDeptStoreRoof_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 2
+ db 2 ; callbacks
callback MAPCALLBACK_TILES, .CheckSaleChangeBlock
callback MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk
@@ -212,25 +210,20 @@
done
GoldenrodDeptStoreRoof_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 13, 1, 3, GOLDENROD_DEPT_STORE_6F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 4
+ db 4 ; bg events
bg_event 15, 3, BGEVENT_RIGHT, Binoculars1
bg_event 15, 5, BGEVENT_RIGHT, Binoculars2
bg_event 15, 6, BGEVENT_RIGHT, Binoculars3
bg_event 3, 0, BGEVENT_UP, PokeDollVendingMachine
-.ObjectEvents:
- db 8
+ db 8 ; object events
object_event 1, 4, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF
object_event 10, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1
object_event 2, 1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x56749, -1
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -3,11 +3,9 @@
const GOLDENRODFLOWERSHOP_FLORIA
GoldenrodFlowerShop_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
FlowerShopTeacherScript:
checkevent EVENT_FOUGHT_SUDOWOODO
@@ -160,21 +158,16 @@
done
GoldenrodFlowerShop_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 6, GOLDENROD_CITY
warp_event 3, 7, 6, GOLDENROD_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1
object_event 5, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -13,11 +13,9 @@
const GOLDENRODGAMECORNER_POKEFAN_M3
GoldenrodGameCorner_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .Callback
.Callback:
@@ -437,19 +435,15 @@
done
GoldenrodGameCorner_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 13, 10, GOLDENROD_CITY
warp_event 3, 13, 10, GOLDENROD_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 31
+ db 31 ; bg events
bg_event 6, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
bg_event 6, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
bg_event 6, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
@@ -482,8 +476,7 @@
bg_event 18, 11, BGEVENT_RIGHT, GoldenrodGameCornerCardFlipMachineScript
bg_event 12, 1, BGEVENT_LEFT, GoldenrodGameCornerLeftTheirDrinkScript
-.ObjectEvents:
- db 12
+ db 12 ; object events
object_event 3, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1
object_event 16, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1
object_event 18, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -7,13 +7,11 @@
const GOLDENRODGYM_GYM_GUY
GoldenrodGym_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene0:
end
@@ -380,25 +378,20 @@
done
GoldenrodGym_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 17, 1, GOLDENROD_CITY
warp_event 3, 17, 1, GOLDENROD_CITY
-.CoordEvents:
- db 1
+ db 1 ; coord events
coord_event 8, 5, 1, WhitneyCriesScript
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 1, 15, BGEVENT_READ, GoldenrodGymStatue
bg_event 4, 15, BGEVENT_READ, GoldenrodGymStatue
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1
object_event 9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1
object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -4,11 +4,9 @@
const GOLDENRODHAPPINESSRATER_TWIN
GoldenrodHappinessRater_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TeacherScript_0x54953:
faceplayer
@@ -137,25 +135,20 @@
done
GoldenrodHappinessRater_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 3, GOLDENROD_CITY
warp_event 3, 7, 3, GOLDENROD_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 0, 1, BGEVENT_READ, HappinessRatersHouseBookshelf
bg_event 1, 1, BGEVENT_READ, HappinessRatersHouseBookshelf
bg_event 7, 1, BGEVENT_READ, HappinessRatersHouseRadio
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x54953, -1
object_event 5, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1
object_event 5, 6, SPRITE_TWIN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -3,12 +3,10 @@
const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN
GoldenrodMagnetTrainStation_MapScripts:
-.SceneScripts:
- db 1
+ db 1 ; scene scripts
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene:
end
@@ -165,24 +163,19 @@
done
GoldenrodMagnetTrainStation_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 8, 17, 5, GOLDENROD_CITY
warp_event 9, 17, 5, GOLDENROD_CITY
warp_event 6, 5, 4, SAFFRON_MAGNET_TRAIN_STATION
warp_event 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION
-.CoordEvents:
- db 1
+ db 1 ; coord events
coord_event 11, 6, 0, Script_ArriveFromSaffron
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1
object_event 11, 14, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationGentlemanScript, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
--- a/maps/GoldenrodNameRater.asm
+++ b/maps/GoldenrodNameRater.asm
@@ -2,11 +2,9 @@
const GOLDENRODNAMERATER_NAME_RATER
GoldenrodNameRater_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
GoldenrodNameRater:
faceplayer
@@ -25,23 +23,18 @@
INCLUDE "data/text/unused_sweet_honey.asm"
GoldenrodNameRater_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 8, GOLDENROD_CITY
warp_event 3, 7, 8, GOLDENROD_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 0, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf
bg_event 1, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf
bg_event 7, 1, BGEVENT_READ, GoldenrodNameRaterRadio
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1
--- a/maps/GoldenrodPPSpeechHouse.asm
+++ b/maps/GoldenrodPPSpeechHouse.asm
@@ -3,11 +3,9 @@
const GOLDENRODPPSPEECHHOUSE_LASS
GoldenrodPPSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
GoldenrodPPSpeechHouseFisherScript:
jumptextfaceplayer GoldenrodPPSpeechHouseFisherText
@@ -52,24 +50,19 @@
done
GoldenrodPPSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 7, GOLDENROD_CITY
warp_event 3, 7, 7, GOLDENROD_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 0, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1
bg_event 1, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf2
bg_event 7, 1, BGEVENT_READ, GoldenrodPPSpeechHouseRadio
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1
object_event 5, 3, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -6,11 +6,9 @@
const GOLDENRODPOKECENTER1F_POKEFAN_F
GoldenrodPokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
NurseScript_0x60f91:
jumpstd pokecenternurse
@@ -805,26 +803,21 @@
done
GoldenrodPokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 3, 7, 15, GOLDENROD_CITY
warp_event 4, 7, 15, GOLDENROD_CITY
warp_event 0, 6, 1, POKECOM_CENTER_ADMIN_ROOM_MOBILE
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 3, 7, 0, GoldenrodPokecenter1F_GSBallSceneLeft
coord_event 4, 7, 0, GoldenrodPokecenter1F_GSBallSceneRight
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x60f91, -1
object_event 16, 8, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
object_event 6, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -10,11 +10,9 @@
const GOLDENRODUNDERGROUND_GRANNY
GoldenrodUnderground_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 3
+ db 3 ; callbacks
callback MAPCALLBACK_NEWMAP, .ResetSwitches
callback MAPCALLBACK_TILES, .CheckBasementKey
callback MAPCALLBACK_OBJECTS, .CheckDayOfWeek
@@ -647,11 +645,9 @@
done
GoldenrodUnderground_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 6
+ db 6 ; warp events
warp_event 3, 2, 7, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
warp_event 3, 34, 4, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
warp_event 18, 6, 4, GOLDENROD_UNDERGROUND
@@ -659,11 +655,9 @@
warp_event 22, 31, 3, GOLDENROD_UNDERGROUND
warp_event 22, 27, 1, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 5
+ db 5 ; bg events
bg_event 18, 6, BGEVENT_READ, BasementDoorScript
bg_event 19, 6, BGEVENT_READ, MapGoldenrodUndergroundSignpost1Script
bg_event 6, 13, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal
@@ -670,8 +664,7 @@
bg_event 4, 18, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion
bg_event 17, 8, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote
-.ObjectEvents:
- db 9
+ db 9 ; object events
object_event 5, 31, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdEric, -1
object_event 6, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1
object_event 3, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -45,13 +45,11 @@
const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
GoldenrodUndergroundSwitchRoomEntrances_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .UpdateDoorPositions
.DummyScene0:
@@ -931,11 +929,9 @@
done
GoldenrodUndergroundSwitchRoomEntrances_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 9
+ db 9 ; warp events
warp_event 23, 3, 6, GOLDENROD_UNDERGROUND
warp_event 22, 10, 1, GOLDENROD_UNDERGROUND_WAREHOUSE
warp_event 23, 10, 2, GOLDENROD_UNDERGROUND_WAREHOUSE
@@ -946,13 +942,11 @@
warp_event 20, 29, 13, GOLDENROD_CITY
warp_event 21, 29, 13, GOLDENROD_CITY
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 19, 4, 0, UndergroundSilverScene1
coord_event 19, 5, 0, UndergroundSilverScene2
-.BGEvents:
- db 6
+ db 6 ; bg events
bg_event 16, 1, BGEVENT_READ, Switch1Script
bg_event 10, 1, BGEVENT_READ, Switch2Script
bg_event 2, 1, BGEVENT_READ, Switch3Script
@@ -960,8 +954,7 @@
bg_event 8, 9, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion
bg_event 1, 8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive
-.ObjectEvents:
- db 11
+ db 11 ; object events
object_event 9, 12, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 4, 8, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 17, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -8,11 +8,9 @@
const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL3
GoldenrodUndergroundWarehouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .ResetSwitches
.ResetSwitches:
@@ -211,23 +209,18 @@
done
GoldenrodUndergroundWarehouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 2, 12, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
warp_event 3, 12, 3, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
warp_event 17, 2, 1, GOLDENROD_DEPT_STORE_B1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 7
+ db 7 ; object events
object_event 9, 8, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 14, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
--- a/maps/GuideGentsHouse.asm
+++ b/maps/GuideGentsHouse.asm
@@ -2,11 +2,9 @@
const GUIDEGENTSHOUSE_GRAMPS
GuideGentsHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
GuideGentsHouseGuideGent:
jumptextfaceplayer GuideGentsHouseGuideGentText
@@ -28,22 +26,17 @@
done
GuideGentsHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 4, CHERRYGROVE_CITY
warp_event 3, 7, 4, CHERRYGROVE_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, GuideGentsHouseBookshelf
bg_event 1, 1, BGEVENT_READ, GuideGentsHouseBookshelf
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -2,13 +2,11 @@
const HALLOFFAME_LANCE
HallOfFame_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .EnterHallOfFame
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.EnterHallOfFame:
priorityjump .EnterHallOfFameScript
@@ -111,20 +109,15 @@
done
HallOfFame_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 13, 3, LANCES_ROOM
warp_event 5, 13, 4, LANCES_ROOM
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 4, 12, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -4,11 +4,9 @@
const ICEPATH1F_POKE_BALL3
IcePath1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
IcePath1FHMWaterfall:
itemball HM_WATERFALL
@@ -20,24 +18,19 @@
itemball PROTEIN
IcePath1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 4, 19, 1, ROUTE_44
warp_event 36, 27, 7, BLACKTHORN_CITY
warp_event 37, 5, 1, ICE_PATH_B1F
warp_event 37, 13, 7, ICE_PATH_B1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 31, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL
object_event 32, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP
object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -6,11 +6,9 @@
const ICEPATHB1F_POKE_BALL
IcePathB1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable
.SetUpStoneTable:
@@ -76,11 +74,9 @@
done
IcePathB1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 8
+ db 8 ; warp events
warp_event 3, 15, 3, ICE_PATH_1F
warp_event 17, 3, 1, ICE_PATH_B2F_MAHOGANY_SIDE
warp_event 11, 2, 3, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
@@ -90,15 +86,12 @@
warp_event 5, 25, 4, ICE_PATH_1F
warp_event 11, 27, 1, ICE_PATH_B2F_BLACKTHORN_SIDE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 17, 30, BGEVENT_ITEM, IcePathB1FHiddenMaxPotion
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 11, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1
object_event 7, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2
object_event 8, 9, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -2,11 +2,9 @@
const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL
IcePathB2FBlackthornSide_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
IcePathB2FBlackthornSideTMRest:
itemball TM_REST
@@ -15,21 +13,16 @@
hiddenitem ICE_HEAL, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL
IcePathB2FBlackthornSide_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 3, 15, 8, ICE_PATH_B1F
warp_event 3, 3, 2, ICE_PATH_B3F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 2, 10, BGEVENT_ITEM, IcePathB2FBlackthornSideHiddenIceHeal
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -7,11 +7,9 @@
const ICEPATHB2FMAHOGANYSIDE_POKE_BALL2
IcePathB2FMahoganySide_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
IcePathB2FMahoganySideBoulder:
jumptext IcePathB2FMahoganySideBoulderText
@@ -31,11 +29,9 @@
done
IcePathB2FMahoganySide_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 6
+ db 6 ; warp events
warp_event 17, 1, 2, ICE_PATH_B1F
warp_event 9, 11, 1, ICE_PATH_B3F
warp_event 11, 4, 3, ICE_PATH_B1F
@@ -43,15 +39,12 @@
warp_event 4, 12, 5, ICE_PATH_B1F
warp_event 12, 12, 6, ICE_PATH_B1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 0, 17, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A
object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A
object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -3,11 +3,9 @@
const ICEPATHB3F_ROCK
IcePathB3F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
IcePathB3FNevermeltice:
itemball NEVERMELTICE
@@ -16,21 +14,16 @@
jumpstd smashrock
IcePathB3F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 3, 5, 2, ICE_PATH_B2F_MAHOGANY_SIDE
warp_event 15, 5, 2, ICE_PATH_B2F_BLACKTHORN_SIDE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 5, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE
object_event 6, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -12,11 +12,9 @@
const ILEXFOREST_POKE_BALL4
IlexForest_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .FarfetchdCallback
.FarfetchdCallback:
@@ -938,20 +936,16 @@
done
IlexForest_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 1, 5, 3, ROUTE_34_ILEX_FOREST_GATE
warp_event 3, 42, 1, ILEX_FOREST_AZALEA_GATE
warp_event 3, 43, 2, ILEX_FOREST_AZALEA_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 5
+ db 5 ; bg events
bg_event 3, 17, BGEVENT_READ, MapIlexForestSignpost0Script
bg_event 11, 7, BGEVENT_ITEM, IlexForestHiddenEther
bg_event 22, 14, BGEVENT_ITEM, IlexForestHiddenSuperPotion
@@ -958,8 +952,7 @@
bg_event 1, 17, BGEVENT_ITEM, IlexForestHiddenFullHeal
bg_event 8, 22, BGEVENT_UP, MapIlexForestSignpost4Script
-.ObjectEvents:
- db 11
+ db 11 ; object events
object_event 14, 31, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD
object_event 7, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE
object_event 5, 28, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER
--- a/maps/IlexForestAzaleaGate.asm
+++ b/maps/IlexForestAzaleaGate.asm
@@ -3,11 +3,9 @@
const ILEXFORESTAZALEAGATE_GRANNY
IlexForestAzaleaGate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
IlexForestAzaleaGateOfficerScript:
jumptextfaceplayer IlexForestAzaleaGateOfficerText
@@ -31,23 +29,18 @@
done
IlexForestAzaleaGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 0, 4, 2, ILEX_FOREST
warp_event 0, 5, 3, ILEX_FOREST
warp_event 9, 4, 7, AZALEA_TOWN
warp_event 9, 5, 8, AZALEA_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1
object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -7,12 +7,10 @@
const INDIGOPLATEAUPOKECENTER1F_ABRA
IndigoPlateauPokecenter1F_MapScripts:
-.SceneScripts:
- db 1
+ db 1 ; scene scripts
scene_script .DummyScene
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .PrepareElite4
.DummyScene:
@@ -303,26 +301,21 @@
done
IndigoPlateauPokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 5, 13, 1, ROUTE_23
warp_event 6, 13, 2, ROUTE_23
warp_event 0, 13, 1, POKECENTER_2F
warp_event 14, 3, 1, WILLS_ROOM
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 16, 4, 0, PlateauRivalBattle1
coord_event 17, 4, 0, PlateauRivalBattle2
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 3, 7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18012c, -1
object_event 11, 7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1
object_event 11, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -2,13 +2,11 @@
const KARENSROOM_KAREN
KarensRoom_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .LockDoor
scene_script .DummyScene
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .KarensRoomDoors
.LockDoor:
@@ -133,22 +131,17 @@
done
KarensRoom_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 4, 17, 3, BRUNOS_ROOM
warp_event 5, 17, 4, BRUNOS_ROOM
warp_event 4, 2, 1, LANCES_ROOM
warp_event 5, 2, 2, LANCES_ROOM
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 5, 7, SPRITE_KAREN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KarenScript_Battle, -1
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -2,13 +2,11 @@
const KOGASROOM_KOGA
KogasRoom_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .LockDoor
scene_script .DummyScene
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .KogasRoomDoors
.LockDoor:
@@ -130,22 +128,17 @@
done
KogasRoom_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 4, 17, 2, WILLS_ROOM
warp_event 5, 17, 3, WILLS_ROOM
warp_event 4, 2, 1, BRUNOS_ROOM
warp_event 5, 2, 2, BRUNOS_ROOM
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 5, 7, SPRITE_KOGA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, KogaScript_Battle, -1
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -6,11 +6,9 @@
const KURTSHOUSE_TWIN2
KurtsHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .KurtCallback
.KurtCallback:
@@ -677,19 +675,15 @@
done
KurtsHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 3, 7, 4, AZALEA_TOWN
warp_event 4, 7, 4, AZALEA_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 7
+ db 7 ; bg events
bg_event 6, 1, BGEVENT_READ, KurtsHouseRadio
bg_event 8, 0, BGEVENT_READ, KurtsHouseOakPhoto
bg_event 9, 0, BGEVENT_READ, KurtsHouseOakPhoto
@@ -698,8 +692,7 @@
bg_event 3, 1, BGEVENT_READ, KurtsHouseBookshelf
bg_event 4, 1, BGEVENT_READ, KurtsHouseCelebiStatue
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 3, 2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1
object_event 5, 3, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1
object_event 6, 3, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -13,13 +13,11 @@
const LAKEOFRAGE_POKE_BALL2
LakeOfRage_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 2
+ db 2 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_OBJECTS, .Wesley
@@ -494,19 +492,15 @@
done
LakeOfRage_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 7, 3, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE
warp_event 27, 31, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 5
+ db 5 ; bg events
bg_event 21, 27, BGEVENT_READ, MapLakeOfRageSignpost0Script
bg_event 25, 31, BGEVENT_READ, MapLakeOfRageSignpost1Script
bg_event 11, 28, BGEVENT_ITEM, LakeOfRageHiddenFullRestore
@@ -513,8 +507,7 @@
bg_event 4, 4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy
bg_event 35, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion
-.ObjectEvents:
- db 12
+ db 12 ; object events
object_event 21, 28, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE
object_event 20, 26, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7008e, -1
object_event 36, 13, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1
--- a/maps/LakeOfRageHiddenPowerHouse.asm
+++ b/maps/LakeOfRageHiddenPowerHouse.asm
@@ -2,11 +2,9 @@
const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER
LakeOfRageHiddenPowerHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
HiddenPowerGuy:
faceplayer
@@ -68,22 +66,17 @@
done
LakeOfRageHiddenPowerHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 1, LAKE_OF_RAGE
warp_event 3, 7, 1, LAKE_OF_RAGE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, HiddenPowerHouseBookshelf
bg_event 1, 1, BGEVENT_READ, HiddenPowerHouseBookshelf
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HiddenPowerGuy, -1
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -2,11 +2,9 @@
const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU
LakeOfRageMagikarpHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
FishingGuruScript_0x19a6ae:
faceplayer
@@ -207,22 +205,17 @@
db "@@"
LakeOfRageMagikarpHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 2, LAKE_OF_RAGE
warp_event 3, 7, 2, LAKE_OF_RAGE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, MagikarpHouseBookshelf
bg_event 1, 1, BGEVENT_READ, MagikarpHouseBookshelf
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -4,13 +4,11 @@
const LANCESROOM_OAK
LancesRoom_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .LockDoor
scene_script .DummyScene
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .LancesRoomDoors
.LockDoor:
@@ -338,26 +336,21 @@
done
LancesRoom_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 4, 23, 3, KARENS_ROOM
warp_event 5, 23, 4, KARENS_ROOM
warp_event 4, 1, 1, HALL_OF_FAME
warp_event 5, 1, 2, HALL_OF_FAME
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 4, 5, 1, Script_ApproachLanceFromLeft
coord_event 5, 5, 1, Script_ApproachLanceFromRight
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1
object_event 4, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
object_event 4, 7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -6,11 +6,9 @@
const LAVRADIOTOWER1F_SUPER_NERD2
LavRadioTower1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
LavRadioTower1FReceptionistScript:
jumptextfaceplayer LavRadioTower1FReceptionistText
@@ -222,24 +220,19 @@
done
LavRadioTower1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 7, LAVENDER_TOWN
warp_event 3, 7, 7, LAVENDER_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 11, 0, BGEVENT_READ, MapLavRadioTower1FSignpost0Script
bg_event 5, 0, BGEVENT_READ, MapLavRadioTower1FSignpost1Script
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 6, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1
object_event 15, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1
object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1
--- a/maps/LavenderMart.asm
+++ b/maps/LavenderMart.asm
@@ -4,11 +4,9 @@
const LAVENDERMART_ROCKER
LavenderMart_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x7eb1c:
opentext
@@ -48,22 +46,17 @@
done
LavenderMart_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 5, LAVENDER_TOWN
warp_event 3, 7, 5, LAVENDER_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1
object_event 6, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1
object_event 9, 2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1
--- a/maps/LavenderNameRater.asm
+++ b/maps/LavenderNameRater.asm
@@ -2,12 +2,10 @@
const LAVENDERNAMERATER_NAME_RATER
LavenderNameRater_MapScripts:
-.SceneScripts:
- db 1
+ db 1 ; scene scripts
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene:
end
@@ -24,20 +22,15 @@
jumpstd difficultbookshelf
LavenderNameRater_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 4, LAVENDER_TOWN
warp_event 3, 7, 4, LAVENDER_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderNameRater, -1
--- a/maps/LavenderPokecenter1F.asm
+++ b/maps/LavenderPokecenter1F.asm
@@ -5,11 +5,9 @@
const LAVENDERPOKECENTER1F_YOUNGSTER
LavenderPokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
NurseScript_0x7e6a0:
jumpstd pokecenternurse
@@ -81,23 +79,18 @@
done
LavenderPokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 1, LAVENDER_TOWN
warp_event 4, 7, 1, LAVENDER_TOWN
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1
object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1
object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1
--- a/maps/LavenderPokecenter2FBeta.asm
+++ b/maps/LavenderPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
LavenderPokecenter2FBeta_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
LavenderPokecenter2FBeta_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 0, 7, 3, LAVENDER_POKECENTER_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/LavenderSpeechHouse.asm
+++ b/maps/LavenderSpeechHouse.asm
@@ -2,11 +2,9 @@
const LAVENDERSPEECHHOUSE_POKEFAN_F
LavenderSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
LavenderSpeechHousePokefanFScript:
jumptextfaceplayer LavenderSpeechHousePokefanFText
@@ -29,22 +27,17 @@
done
LavenderSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 3, LAVENDER_TOWN
warp_event 3, 7, 3, LAVENDER_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf
bg_event 1, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderSpeechHousePokefanFScript, -1
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -5,11 +5,9 @@
const LAVENDERTOWN_YOUNGSTER
LavenderTown_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -106,11 +104,9 @@
done
LavenderTown_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 7
+ db 7 ; warp events
warp_event 5, 5, 1, LAVENDER_POKECENTER_1F
warp_event 5, 9, 1, MR_FUJIS_HOUSE
warp_event 3, 13, 1, LAVENDER_SPEECH_HOUSE
@@ -119,11 +115,9 @@
warp_event 13, 11, 1, SOUL_HOUSE
warp_event 14, 5, 1, LAV_RADIO_TOWER_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 6
+ db 6 ; bg events
bg_event 11, 3, BGEVENT_READ, LavenderTownSign
bg_event 15, 7, BGEVENT_READ, KantoRadioStationSign
bg_event 3, 9, BGEVENT_READ, VolunteerPokemonHouseSign
@@ -131,8 +125,7 @@
bg_event 6, 5, BGEVENT_READ, LavenderPokecenterSignText
bg_event 2, 5, BGEVENT_READ, LavenderMartSignText
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 12, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1
object_event 2, 15, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1
object_event 14, 12, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderTownGrampsScript, -1
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -8,11 +8,9 @@
const MAHOGANYGYM_GYM_GUY
MahoganyGym_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
PryceScript_0x199a9e:
faceplayer
@@ -373,24 +371,19 @@
done
MahoganyGym_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 17, 3, MAHOGANY_TOWN
warp_event 5, 17, 3, MAHOGANY_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 3, 15, BGEVENT_READ, MahoganyGymStatue
bg_event 6, 15, BGEVENT_READ, MahoganyGymStatue
-.ObjectEvents:
- db 7
+ db 7 ; object events
object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1
object_event 4, 6, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1
object_event 0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -6,13 +6,11 @@
const MAHOGANYMART1F_GRANNY
MahoganyMart1F_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .LanceUncoversStaircase
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase
.DummyScene0:
@@ -221,23 +219,18 @@
done
MahoganyMart1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 1, MAHOGANY_TOWN
warp_event 4, 7, 1, MAHOGANY_TOWN
warp_event 7, 3, 1, TEAM_ROCKET_BASE_B1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION
object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION
object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
--- a/maps/MahoganyPokecenter1F.asm
+++ b/maps/MahoganyPokecenter1F.asm
@@ -5,11 +5,9 @@
const MAHOGANYPOKECENTER1F_COOLTRAINER_F
MahoganyPokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
NurseScript_0x19a356:
jumpstd pokecenternurse
@@ -54,23 +52,18 @@
done
MahoganyPokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 4, MAHOGANY_TOWN
warp_event 4, 7, 4, MAHOGANY_TOWN
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19a356, -1
object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1
object_event 1, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -3,11 +3,9 @@
const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER
MahoganyRedGyaradosSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
MahoganyRedGyaradosSpeechHouseBlackBeltScript:
jumptextfaceplayer MahoganyRedGyaradosSpeechHouseBlackBeltText
@@ -61,21 +59,16 @@
done
MahoganyRedGyaradosSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 2, MAHOGANY_TOWN
warp_event 3, 7, 2, MAHOGANY_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1
object_event 6, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x199982, -1
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -5,13 +5,11 @@
const MAHOGANYTOWN_LASS
MahoganyTown_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.DummyScene0:
@@ -245,11 +243,9 @@
done
MahoganyTown_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 11, 7, 1, MAHOGANY_MART_1F
warp_event 17, 7, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE
warp_event 6, 13, 1, MAHOGANY_GYM
@@ -256,20 +252,17 @@
warp_event 15, 13, 1, MAHOGANY_POKECENTER_1F
warp_event 9, 1, 3, ROUTE_43_MAHOGANY_GATE
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 19, 8, 0, UnknownScript_0x190013
coord_event 19, 9, 0, UnknownScript_0x190013
-.BGEvents:
- db 4
+ db 4 ; bg events
bg_event 1, 5, BGEVENT_READ, MahoganyTownSign
bg_event 9, 7, BGEVENT_READ, MahoganyTownRagecandybarSign
bg_event 3, 13, BGEVENT_READ, MahoganyGymSign
bg_event 16, 13, BGEVENT_READ, MahoganyTownPokecenterSign
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 19, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
object_event 6, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1
object_event 6, 14, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -2,11 +2,9 @@
const MANIASHOUSE_ROCKER
ManiasHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ManiaScript:
faceplayer
@@ -200,20 +198,15 @@
done
ManiasHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 1, CIANWOOD_CITY
warp_event 3, 7, 1, CIANWOOD_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ManiaScript, -1
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -1,11 +1,9 @@
MobileBattleRoom_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .InitializeMobileBattleRoom
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.InitializeMobileBattleRoom:
priorityjump .InitializeAndPreparePokecenter2F
@@ -67,20 +65,15 @@
done
MobileBattleRoom_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 7, 6, POKECENTER_2F
warp_event 5, 7, 6, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 4, 2, BGEVENT_UP, MapMobileBattleRoomSignpost0Script
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoomMobile.asm
@@ -1,11 +1,9 @@
MobileTradeRoomMobile_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .InitializeMobileTradeRoomMobile
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.InitializeMobileTradeRoomMobile:
priorityjump .InitializeAndPreparePokecenter2F
@@ -35,20 +33,15 @@
done
MobileTradeRoomMobile_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 7, 5, POKECENTER_2F
warp_event 5, 7, 5, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 4, 2, BGEVENT_UP, MapMobileTradeRoomMobileSignpost0Script
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -2,13 +2,11 @@
const MOUNTMOON_SILVER
MountMoon_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .RivalEncounter
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.RivalEncounter:
priorityjump .RivalBattle
@@ -161,11 +159,9 @@
done
MountMoon_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 8
+ db 8 ; warp events
warp_event 3, 3, 1, ROUTE_3
warp_event 15, 15, 1, ROUTE_4
warp_event 13, 3, 7, MOUNT_MOON
@@ -175,12 +171,9 @@
warp_event 25, 3, 3, MOUNT_MOON
warp_event 25, 13, 4, MOUNT_MOON
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 7, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL
--- a/maps/MountMoonGiftShop.asm
+++ b/maps/MountMoonGiftShop.asm
@@ -5,11 +5,9 @@
const MOUNTMOONGIFTSHOP_LASS2 ; day only
MountMoonGiftShop_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
MountMoonGiftShopClerkScript:
faceplayer
@@ -28,22 +26,17 @@
done
MountMoonGiftShop_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 3, 7, 3, MOUNT_MOON_SQUARE
warp_event 4, 7, 3, MOUNT_MOON_SQUARE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 4, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -4,12 +4,10 @@
const MOUNTMOONSQUARE_ROCK
MountMoonSquare_MapScripts:
-.SceneScripts:
- db 1
+ db 1 ; scene scripts
scene_script .DummyScene
-.MapCallbacks:
- db 2
+ db 2 ; callbacks
callback MAPCALLBACK_NEWMAP, .DisappearMoonStone
callback MAPCALLBACK_OBJECTS, .DisappearRock
@@ -133,26 +131,21 @@
done
MountMoonSquare_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 20, 5, 5, MOUNT_MOON
warp_event 22, 11, 6, MOUNT_MOON
warp_event 13, 7, 1, MOUNT_MOON_GIFT_SHOP
-.CoordEvents:
- db 1
+ db 1 ; coord events
coord_event 7, 11, 0, ClefairyDance
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone
bg_event 17, 7, BGEVENT_READ, DontLitterSign
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 6, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
object_event 7, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
object_event 7, 7, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -11,11 +11,9 @@
const MOUNTMORTAR1FINSIDE_POKE_BALL7
MountMortar1FInside_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerPokemaniacMiller:
trainer POKEMANIAC, MILLER, EVENT_BEAT_POKEMANIAC_MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, .Script
@@ -117,11 +115,9 @@
done
MountMortar1FInside_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 6
+ db 6 ; warp events
warp_event 11, 47, 5, MOUNT_MORTAR_1F_OUTSIDE
warp_event 29, 47, 6, MOUNT_MORTAR_1F_OUTSIDE
warp_event 5, 39, 8, MOUNT_MORTAR_1F_OUTSIDE
@@ -129,15 +125,12 @@
warp_event 3, 19, 1, MOUNT_MORTAR_B1F
warp_event 9, 9, 2, MOUNT_MORTAR_2F_INSIDE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 30, 11, BGEVENT_ITEM, MountMortar1FInsideHiddenMaxRepel
-.ObjectEvents:
- db 10
+ db 10 ; object events
object_event 21, 43, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortar1FBoulder, -1
object_event 35, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE
object_event 16, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -3,11 +3,9 @@
const MOUNTMORTAR1FOUTSIDE_POKE_BALL2
MountMortar1FOutside_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
MountMortar1FOutsideEther:
itemball ETHER
@@ -19,11 +17,9 @@
hiddenitem HYPER_POTION, EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION
MountMortar1FOutside_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 9
+ db 9 ; warp events
warp_event 3, 33, 3, ROUTE_42
warp_event 17, 33, 4, ROUTE_42
warp_event 37, 33, 5, ROUTE_42
@@ -34,14 +30,11 @@
warp_event 7, 13, 3, MOUNT_MORTAR_1F_INSIDE
warp_event 33, 13, 4, MOUNT_MORTAR_1F_INSIDE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 25, 22, BGEVENT_ITEM, MountMortar1FOutsideHiddenHyperPotion
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 13, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER
object_event 31, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -8,11 +8,9 @@
const MOUNTMORTAR2FINSIDE_SUPER_NERD
MountMortar2FInside_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerSupernerdHugh:
trainer SUPER_NERD, HUGH, EVENT_BEAT_SUPER_NERD_HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, .Script
@@ -67,23 +65,18 @@
done
MountMortar2FInside_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 17, 33, 4, MOUNT_MORTAR_1F_OUTSIDE
warp_event 3, 5, 6, MOUNT_MORTAR_1F_INSIDE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 24, 8, BGEVENT_ITEM, MountMortar2FInsideHiddenFullRestore
-.ObjectEvents:
- db 7
+ db 7 ; object events
object_event 28, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION
object_event 2, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY
object_event 19, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -8,11 +8,9 @@
const MOUNTMORTARB1F_POKE_BALL5
MountMortarB1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
BlackBeltScript_0x7e1f6:
faceplayer
@@ -135,23 +133,18 @@
done
MountMortarB1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 3, 3, 5, MOUNT_MORTAR_1F_INSIDE
warp_event 19, 29, 7, MOUNT_MORTAR_1F_OUTSIDE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 4, 6, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive
-.ObjectEvents:
- db 7
+ db 7 ; object events
object_event 29, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
object_event 4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS
object_event 9, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1
--- a/maps/MoveDeletersHouse.asm
+++ b/maps/MoveDeletersHouse.asm
@@ -2,11 +2,9 @@
const MOVEDELETERSHOUSE_SUPER_NERD
MoveDeletersHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
MoveDeleter:
faceplayer
@@ -20,22 +18,17 @@
jumpstd difficultbookshelf
MoveDeletersHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 6, BLACKTHORN_CITY
warp_event 3, 7, 6, BLACKTHORN_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, MoveDeletersHouseBookshelf
bg_event 1, 1, BGEVENT_READ, MoveDeletersHouseBookshelf
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoveDeleter, -1
--- a/maps/MrFujisHouse.asm
+++ b/maps/MrFujisHouse.asm
@@ -6,11 +6,9 @@
const MRFUJISHOUSE_PIDGEY
MrFujisHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
MrFujisHouseSuperNerdScript:
jumptextfaceplayer MrFujisHouseSuperNerdText
@@ -80,24 +78,19 @@
done
MrFujisHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 2, LAVENDER_TOWN
warp_event 3, 7, 2, LAVENDER_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, MrFujisHouseBookshelf
bg_event 1, 1, BGEVENT_READ, MrFujisHouseBookshelf
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 4, 1, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1
object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1
object_event 7, 4, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisPsyduck, -1
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -3,13 +3,11 @@
const MRPOKEMONSHOUSE_OAK
MrPokemonsHouse_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .MeetMrPokemon
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.MeetMrPokemon:
priorityjump .MrPokemonEvent
@@ -373,19 +371,15 @@
done
MrPokemonsHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 2, ROUTE_30
warp_event 3, 7, 2, ROUTE_30
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 5
+ db 5 ; bg events
bg_event 0, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script
bg_event 1, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script
bg_event 6, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script
@@ -392,7 +386,6 @@
bg_event 7, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script
bg_event 6, 4, BGEVENT_READ, MapMrPokemonsHouseSignpost4Script
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 3, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1
object_event 6, 5, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK
--- a/maps/MrPsychicsHouse.asm
+++ b/maps/MrPsychicsHouse.asm
@@ -2,11 +2,9 @@
const MRPSYCHICSHOUSE_FISHING_GURU
MrPsychicsHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
MrPsychic:
faceplayer
@@ -48,22 +46,17 @@
done
MrPsychicsHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 5, SAFFRON_CITY
warp_event 3, 7, 5, SAFFRON_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, MrPsychicsHouseBookshelf
bg_event 1, 1, BGEVENT_READ, MrPsychicsHouseBookshelf
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrPsychic, -1
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -15,11 +15,9 @@
const NATIONALPARK_POKE_BALL2
NationalPark_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
NationalParkLassScript:
jumptextfaceplayer NationalParkLassText
@@ -514,28 +512,23 @@
done
NationalPark_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE
warp_event 33, 19, 2, ROUTE_36_NATIONAL_PARK_GATE
warp_event 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
warp_event 11, 47, 2, ROUTE_35_NATIONAL_PARK_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 4
+ db 4 ; bg events
bg_event 14, 44, BGEVENT_READ, MapNationalParkSignpost0Script
bg_event 27, 31, BGEVENT_READ, MapNationalParkSignpost1Script
bg_event 6, 47, BGEVENT_ITEM, NationalParkHiddenFullHeal
bg_event 12, 4, BGEVENT_READ, MapNationalParkSignpost3Script
-.ObjectEvents:
- db 14
+ db 14 ; object events
object_event 15, 24, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkLassScript, -1
object_event 14, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1
object_event 27, 40, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -13,11 +13,9 @@
const NATIONALPARKBUGCONTEST_POKE_BALL2
NationalParkBugContest_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
YoungsterScript_0x5c8ec:
faceplayer
@@ -221,28 +219,23 @@
done
NationalParkBugContest_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE
warp_event 33, 19, 1, ROUTE_36_NATIONAL_PARK_GATE
warp_event 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
warp_event 11, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 4
+ db 4 ; bg events
bg_event 14, 44, BGEVENT_READ, MapNationalParkBugContestSignpost0Script
bg_event 27, 31, BGEVENT_READ, MapNationalParkBugContestSignpost1Script
bg_event 6, 47, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal
bg_event 12, 4, BGEVENT_READ, MapNationalParkBugContestSignpost3Script
-.ObjectEvents:
- db 12
+ db 12 ; object events
object_event 19, 29, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A
object_event 28, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A
object_event 9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -4,13 +4,11 @@
const NEWBARKTOWN_SILVER
NewBarkTown_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.DummyScene0:
@@ -282,30 +280,25 @@
done
NewBarkTown_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 6, 3, 1, ELMS_LAB
warp_event 13, 5, 1, PLAYERS_HOUSE_1F
warp_event 3, 11, 1, PLAYERS_NEIGHBORS_HOUSE
warp_event 11, 13, 1, ELMS_HOUSE
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 1, 8, 0, NewBarkTown_TeacherStopsYouScene1
coord_event 1, 9, 0, NewBarkTown_TeacherStopsYouScene2
-.BGEvents:
- db 4
+ db 4 ; bg events
bg_event 8, 8, BGEVENT_READ, NewBarkTownSign
bg_event 11, 5, BGEVENT_READ, MapNewBarkTownSignpost1Script
bg_event 3, 3, BGEVENT_READ, MapNewBarkTownSignpost2Script
bg_event 9, 13, BGEVENT_READ, MapNewBarkTownSignpost3Script
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 6, 8, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1
object_event 12, 9, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1
object_event 3, 2, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -5,11 +5,9 @@
const OAKSLAB_SCIENTIST3
OaksLab_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene:
end
@@ -257,19 +255,15 @@
done
OaksLab_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 11, 3, PALLET_TOWN
warp_event 5, 11, 3, PALLET_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 16
+ db 16 ; bg events
bg_event 6, 1, BGEVENT_READ, OaksLabBookshelf
bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf
bg_event 8, 1, BGEVENT_READ, OaksLabBookshelf
@@ -287,8 +281,7 @@
bg_event 9, 3, BGEVENT_READ, OaksLabTrashcan
bg_event 0, 1, BGEVENT_READ, OaksLabPC
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 4, 2, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1
object_event 1, 8, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1
object_event 8, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1
--- a/maps/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -4,11 +4,9 @@
const OLIVINECAFE_SAILOR2
OlivineCafe_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
SailorScript_0x9c8c1:
faceplayer
@@ -79,22 +77,17 @@
done
OlivineCafe_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 7, OLIVINE_CITY
warp_event 3, 7, 7, OLIVINE_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1
object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1
object_event 6, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -5,13 +5,11 @@
const OLIVINECITY_OLIVINE_RIVAL
OlivineCity_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.DummyScene0:
@@ -288,11 +286,9 @@
done
OlivineCity_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 11
+ db 11 ; warp events
warp_event 13, 21, 1, OLIVINE_POKECENTER_1F
warp_event 10, 11, 1, OLIVINE_GYM
warp_event 25, 11, 1, OLIVINE_TIMS_HOUSE
@@ -305,13 +301,11 @@
warp_event 19, 27, 1, OLIVINE_PORT_PASSAGE
warp_event 20, 27, 2, OLIVINE_PORT_PASSAGE
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 13, 12, 0, UnknownScript_0x1a8833
coord_event 13, 13, 0, UnknownScript_0x1a886b
-.BGEvents:
- db 7
+ db 7 ; bg events
bg_event 17, 11, BGEVENT_READ, OlivineCitySign
bg_event 20, 24, BGEVENT_READ, OlivineCityPortSign
bg_event 7, 11, BGEVENT_READ, OlivineGymSign
@@ -320,8 +314,7 @@
bg_event 14, 21, BGEVENT_READ, OlivineCityPokecenterSign
bg_event 20, 17, BGEVENT_READ, OlivineCityMartSign
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 26, 27, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor1Script, -1
object_event 20, 13, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a88a6, -1
object_event 17, 21, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor2Script, -1
--- a/maps/OlivineGoodRodHouse.asm
+++ b/maps/OlivineGoodRodHouse.asm
@@ -2,11 +2,9 @@
const OLIVINEGOODRODHOUSE_FISHING_GURU
OlivineGoodRodHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
GoodRodGuru:
faceplayer
@@ -83,20 +81,15 @@
done
OlivineGoodRodHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 6, OLIVINE_CITY
warp_event 3, 7, 6, OLIVINE_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -3,11 +3,9 @@
const OLIVINEGYM_GYM_GUY
OlivineGym_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
JasmineScript_0x9c12f:
faceplayer
@@ -198,23 +196,18 @@
done
OlivineGym_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 15, 2, OLIVINE_CITY
warp_event 5, 15, 2, OLIVINE_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 3, 13, BGEVENT_READ, OlivineGymStatue
bg_event 6, 13, BGEVENT_READ, OlivineGymStatue
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE
object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1
--- a/maps/OlivineHouseBeta.asm
+++ b/maps/OlivineHouseBeta.asm
@@ -3,11 +3,9 @@
const OLIVINEHOUSEBETA_RHYDON
OlivineHouseBeta_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
OlivineHouseBetaTeacherScript:
jumptextfaceplayer OlivineHouseBetaTeacherText
@@ -40,23 +38,18 @@
done
OlivineHouseBeta_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 4, OLIVINE_CITY
warp_event 3, 7, 4, OLIVINE_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, OlivineHouseBetaBookshelf1
bg_event 1, 1, BGEVENT_READ, OlivineHouseBetaBookshelf2
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1
object_event 6, 4, SPRITE_RHYDON, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1
--- a/maps/OlivineLighthouse1F.asm
+++ b/maps/OlivineLighthouse1F.asm
@@ -3,11 +3,9 @@
const OLIVINELIGHTHOUSE1F_POKEFAN_F
OlivineLighthouse1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
OlivineLighthouse1FSailorScript:
jumptextfaceplayer OlivineLighthouse1FSailorText
@@ -37,11 +35,9 @@
done
OlivineLighthouse1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 10, 17, 9, OLIVINE_CITY
warp_event 11, 17, 9, OLIVINE_CITY
warp_event 3, 11, 1, OLIVINE_LIGHTHOUSE_2F
@@ -48,13 +44,10 @@
warp_event 16, 13, 3, OLIVINE_LIGHTHOUSE_2F
warp_event 17, 13, 4, OLIVINE_LIGHTHOUSE_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 8, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1
object_event 16, 9, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -3,11 +3,9 @@
const OLIVINELIGHTHOUSE2F_GENTLEMAN
OlivineLighthouse2F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerGentlemanAlfred:
trainer GENTLEMAN, ALFRED, EVENT_BEAT_GENTLEMAN_ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, .Script
@@ -205,11 +203,9 @@
done
OlivineLighthouse2F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 6
+ db 6 ; warp events
warp_event 3, 11, 3, OLIVINE_LIGHTHOUSE_1F
warp_event 5, 3, 2, OLIVINE_LIGHTHOUSE_3F
warp_event 16, 13, 4, OLIVINE_LIGHTHOUSE_1F
@@ -217,13 +213,10 @@
warp_event 16, 11, 4, OLIVINE_LIGHTHOUSE_3F
warp_event 17, 11, 5, OLIVINE_LIGHTHOUSE_3F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 9, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey1, -1
object_event 17, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -5,11 +5,9 @@
const OLIVINELIGHTHOUSE3F_POKE_BALL
OlivineLighthouse3F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerBirdKeeperTheo:
trainer BIRD_KEEPER, THEO, EVENT_BEAT_BIRD_KEEPER_THEO, BirdKeeperTheoSeenText, BirdKeeperTheoBeatenText, 0, .Script
@@ -113,11 +111,9 @@
done
OlivineLighthouse3F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 9
+ db 9 ; warp events
warp_event 13, 3, 1, OLIVINE_LIGHTHOUSE_4F
warp_event 5, 3, 2, OLIVINE_LIGHTHOUSE_2F
warp_event 9, 5, 4, OLIVINE_LIGHTHOUSE_4F
@@ -128,14 +124,11 @@
warp_event 8, 3, 7, OLIVINE_LIGHTHOUSE_4F
warp_event 9, 3, 8, OLIVINE_LIGHTHOUSE_4F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 9, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1
object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1
object_event 3, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1
--- a/maps/OlivineLighthouse4F.asm
+++ b/maps/OlivineLighthouse4F.asm
@@ -3,11 +3,9 @@
const OLIVINELIGHTHOUSE4F_LASS
OlivineLighthouse4F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerLassConnie:
trainer LASS, CONNIE1, EVENT_BEAT_LASS_CONNIE, LassConnie1SeenText, LassConnie1BeatenText, 0, .Script
@@ -82,11 +80,9 @@
done
OlivineLighthouse4F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 10
+ db 10 ; warp events
warp_event 13, 3, 1, OLIVINE_LIGHTHOUSE_3F
warp_event 3, 5, 2, OLIVINE_LIGHTHOUSE_5F
warp_event 9, 7, 3, OLIVINE_LIGHTHOUSE_5F
@@ -98,13 +94,10 @@
warp_event 16, 7, 4, OLIVINE_LIGHTHOUSE_5F
warp_event 17, 7, 5, OLIVINE_LIGHTHOUSE_5F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 7, 14, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorKent, -1
object_event 11, 2, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassConnie, -1
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -6,11 +6,9 @@
const OLIVINELIGHTHOUSE5F_POKE_BALL3
OlivineLighthouse5F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerBirdKeeperDenis:
trainer BIRD_KEEPER, DENIS, EVENT_BEAT_BIRD_KEEPER_DENIS, BirdKeeperDenisSeenText, BirdKeeperDenisBeatenText, 0, .Script
@@ -91,11 +89,9 @@
done
OlivineLighthouse5F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 7
+ db 7 ; warp events
warp_event 9, 15, 1, OLIVINE_LIGHTHOUSE_6F
warp_event 3, 5, 2, OLIVINE_LIGHTHOUSE_4F
warp_event 9, 7, 3, OLIVINE_LIGHTHOUSE_4F
@@ -104,15 +100,12 @@
warp_event 16, 5, 2, OLIVINE_LIGHTHOUSE_6F
warp_event 17, 5, 3, OLIVINE_LIGHTHOUSE_6F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 3, 13, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 8, 11, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1
object_event 8, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1
object_event 15, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -4,11 +4,9 @@
const OLIVINELIGHTHOUSE6F_POKE_BALL
OlivineLighthouse6F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
JasmineScript_0x60b91:
faceplayer
@@ -258,23 +256,18 @@
done
OlivineLighthouse6F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 9, 15, 1, OLIVINE_LIGHTHOUSE_5F
warp_event 16, 5, 6, OLIVINE_LIGHTHOUSE_5F
warp_event 17, 5, 7, OLIVINE_LIGHTHOUSE_5F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 8, 8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE
object_event 9, 8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1
object_event 3, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION
--- a/maps/OlivineMart.asm
+++ b/maps/OlivineMart.asm
@@ -4,11 +4,9 @@
const OLIVINEMART_LASS
OlivineMart_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x9cac7:
opentext
@@ -46,22 +44,17 @@
done
OlivineMart_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 8, OLIVINE_CITY
warp_event 3, 7, 8, OLIVINE_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1
object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1
object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1
--- a/maps/OlivinePokecenter1F.asm
+++ b/maps/OlivinePokecenter1F.asm
@@ -5,11 +5,9 @@
const OLIVINEPOKECENTER1F_TEACHER
OlivinePokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
NurseScript_0x9c002:
jumpstd pokecenternurse
@@ -48,23 +46,18 @@
done
OlivinePokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 1, OLIVINE_CITY
warp_event 4, 7, 1, OLIVINE_CITY
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9c002, -1
object_event 8, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1
object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -8,13 +8,11 @@
const OLIVINEPORT_COOLTRAINER_F
OlivinePort_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .LeaveFastShip
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene0:
end
@@ -385,24 +383,19 @@
done
OlivinePort_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 11, 7, 5, OLIVINE_PORT_PASSAGE
warp_event 7, 23, 1, FAST_SHIP_1F
-.CoordEvents:
- db 1
+ db 1 ; coord events
coord_event 7, 15, 0, UnknownScript_0x7491f
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein
-.ObjectEvents:
- db 7
+ db 7 ; object events
object_event 7, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
object_event 7, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
object_event 6, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
--- a/maps/OlivinePortPassage.asm
+++ b/maps/OlivinePortPassage.asm
@@ -2,11 +2,9 @@
const OLIVINEPORTPASSAGE_POKEFAN_M
OlivinePortPassage_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
OlivinePortPassagePokefanMScript:
jumptextfaceplayer OlivinePortPassagePokefanMText
@@ -20,11 +18,9 @@
done
OlivinePortPassage_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 15, 0, 10, OLIVINE_CITY
warp_event 16, 0, 11, OLIVINE_CITY
warp_event 15, 4, 4, OLIVINE_PORT_PASSAGE
@@ -31,12 +27,9 @@
warp_event 3, 2, 3, OLIVINE_PORT_PASSAGE
warp_event 3, 14, 1, OLIVINE_PORT
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 17, 1, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
--- a/maps/OlivinePunishmentSpeechHouse.asm
+++ b/maps/OlivinePunishmentSpeechHouse.asm
@@ -3,11 +3,9 @@
const OLIVINEPUNISHMENTSPEECHHOUSE_LASS
OlivinePunishmentSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
OlivinePunishmentSpeechHouseDad:
jumptextfaceplayer OlivinePunishmentSpeechHouseDadText
@@ -40,23 +38,18 @@
done
OlivinePunishmentSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 5, OLIVINE_CITY
warp_event 3, 7, 5, OLIVINE_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf1
bg_event 1, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf2
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 1, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1
object_event 5, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1
--- a/maps/OlivineTimsHouse.asm
+++ b/maps/OlivineTimsHouse.asm
@@ -2,11 +2,9 @@
const OLIVINETIMSHOUSE_TIM
OlivineTimsHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Tim:
faceplayer
@@ -20,22 +18,17 @@
jumpstd magazinebookshelf
OlivineTimsHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 3, OLIVINE_CITY
warp_event 3, 7, 3, OLIVINE_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, TimsHouseBookshelf
bg_event 1, 1, BGEVENT_READ, TimsHouseBookshelf
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1
--- a/maps/PalletTown.asm
+++ b/maps/PalletTown.asm
@@ -3,11 +3,9 @@
const PALLETTOWN_FISHER
PalletTown_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -70,26 +68,21 @@
done
PalletTown_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 5, 5, 1, REDS_HOUSE_1F
warp_event 13, 5, 1, BLUES_HOUSE
warp_event 12, 11, 1, OAKS_LAB
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 4
+ db 4 ; bg events
bg_event 7, 9, BGEVENT_READ, PalletTownSign
bg_event 3, 5, BGEVENT_READ, RedsHouseSign
bg_event 13, 13, BGEVENT_READ, OaksLabSign
bg_event 11, 5, BGEVENT_READ, BluesHouseSign
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 3, 8, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1
object_event 12, 14, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PalletTownFisherScript, -1
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -6,11 +6,9 @@
const PEWTERCITY_FRUIT_TREE2
PewterCity_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -153,11 +151,9 @@
done
PewterCity_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 29, 13, 1, PEWTER_NIDORAN_SPEECH_HOUSE
warp_event 16, 17, 1, PEWTER_GYM
warp_event 23, 17, 2, PEWTER_MART
@@ -164,11 +160,9 @@
warp_event 13, 25, 1, PEWTER_POKECENTER_1F
warp_event 7, 29, 1, PEWTER_SNOOZE_SPEECH_HOUSE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 7
+ db 7 ; bg events
bg_event 25, 23, BGEVENT_READ, PewterCitySign
bg_event 11, 17, BGEVENT_READ, PewterGymSign
bg_event 15, 9, BGEVENT_READ, PewterMuseumSign
@@ -177,8 +171,7 @@
bg_event 14, 25, BGEVENT_READ, PewterCityPokecenterSign
bg_event 24, 17, BGEVENT_READ, PewterCityMartSign
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 19, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1
object_event 14, 29, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1
object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -4,11 +4,9 @@
const PEWTERGYM_GYM_GUY
PewterGym_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
BrockScript_0x1a2864:
faceplayer
@@ -209,24 +207,19 @@
done
PewterGym_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 13, 2, PEWTER_CITY
warp_event 5, 13, 2, PEWTER_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 2, 11, BGEVENT_READ, PewterGymStatue
bg_event 7, 11, BGEVENT_READ, PewterGymStatue
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1
object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1
object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -4,11 +4,9 @@
const PEWTERMART_SUPER_NERD
PewterMart_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x1a2dcb:
opentext
@@ -46,22 +44,17 @@
done
PewterMart_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 3, PEWTER_CITY
warp_event 3, 7, 3, PEWTER_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1
object_event 9, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1
object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1
--- a/maps/PewterNidoranSpeechHouse.asm
+++ b/maps/PewterNidoranSpeechHouse.asm
@@ -3,11 +3,9 @@
const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M
PewterNidoranSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
PewterNidoranSpeechHouseSuperNerdScript:
jumptextfaceplayer PewterNidoranSpeechHouseSuperNerdText
@@ -29,21 +27,16 @@
done
PewterNidoranSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 1, PEWTER_CITY
warp_event 3, 7, 1, PEWTER_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 3, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1
object_event 4, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterNidoran, -1
--- a/maps/PewterPokecenter1F.asm
+++ b/maps/PewterPokecenter1F.asm
@@ -6,11 +6,9 @@
const PEWTERPOKECENTER1F_CHRIS
PewterPokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
NurseScript_0x1a2ee7:
jumpstd pokecenternurse
@@ -68,23 +66,18 @@
done
PewterPokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 4, PEWTER_CITY
warp_event 4, 7, 4, PEWTER_CITY
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1
object_event 8, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1
object_event 1, 3, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1
--- a/maps/PewterPokecenter2FBeta.asm
+++ b/maps/PewterPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
PewterPokecenter2FBeta_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
PewterPokecenter2FBeta_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 0, 7, 3, PEWTER_POKECENTER_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/PewterSnoozeSpeechHouse.asm
+++ b/maps/PewterSnoozeSpeechHouse.asm
@@ -2,11 +2,9 @@
const PEWTERSNOOZESPEECHHOUSE_GRAMPS
PewterSnoozeSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
PewterSnoozeSpeechHouseGrampsScript:
jumptextfaceplayer PewterSnoozeSpeechHouseGrampsText
@@ -21,22 +19,17 @@
done
PewterSnoozeSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 5, PEWTER_CITY
warp_event 3, 7, 5, PEWTER_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf
bg_event 1, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 5, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -6,13 +6,11 @@
const PLAYERSHOUSE1F_POKEFAN_F
PlayersHouse1F_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene0:
end
@@ -386,29 +384,24 @@
done
PlayersHouse1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 6, 7, 2, NEW_BARK_TOWN
warp_event 7, 7, 2, NEW_BARK_TOWN
warp_event 9, 0, 1, PLAYERS_HOUSE_2F
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 8, 4, 0, UnknownScript_0x7a4d8
coord_event 9, 4, 0, UnknownScript_0x7a4db
-.BGEvents:
- db 4
+ db 4 ; bg events
bg_event 0, 1, BGEVENT_READ, StoveScript
bg_event 1, 1, BGEVENT_READ, SinkScript
bg_event 2, 1, BGEVENT_READ, FridgeScript
bg_event 4, 1, BGEVENT_READ, TVScript
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_1
object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
--- a/maps/PlayersHouse2F.asm
+++ b/maps/PlayersHouse2F.asm
@@ -5,11 +5,9 @@
const PLAYERSHOUSE2F_BIG_DOLL
PlayersHouse2F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 2
+ db 2 ; callbacks
callback MAPCALLBACK_NEWMAP, .InitializeRoom
callback MAPCALLBACK_TILES, .SetSpawn
@@ -116,25 +114,20 @@
done
PlayersHouse2F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 7, 0, 3, PLAYERS_HOUSE_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 4
+ db 4 ; bg events
bg_event 2, 1, BGEVENT_UP, PlayersHousePCScript
bg_event 3, 1, BGEVENT_READ, PlayersHouseRadioScript
bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelfScript
bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE
object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1
object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2
--- a/maps/PlayersNeighborsHouse.asm
+++ b/maps/PlayersNeighborsHouse.asm
@@ -3,11 +3,9 @@
const PLAYERSNEIGHBORSHOUSE_POKEFAN_F
PlayersNeighborsHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
PlayersNeighborsDaughterScript:
jumptextfaceplayer PlayersNeighborsDaughterText
@@ -99,24 +97,19 @@
done
PlayersNeighborsHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 3, NEW_BARK_TOWN
warp_event 3, 7, 3, NEW_BARK_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 0, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript
bg_event 1, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript
bg_event 7, 1, BGEVENT_READ, PlayersNeighborsHouseRadioScript
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughterScript, -1
object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborScript, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
--- a/maps/PokeSeersHouse.asm
+++ b/maps/PokeSeersHouse.asm
@@ -2,11 +2,9 @@
const POKESEERSHOUSE_GRANNY
PokeSeersHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
SeerScript:
faceplayer
@@ -17,20 +15,15 @@
end
PokeSeersHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 7, CIANWOOD_CITY
warp_event 3, 7, 7, CIANWOOD_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SeerScript, -1
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -5,8 +5,7 @@
const POKECENTER2F_OFFICER
Pokecenter2F_MapScripts:
-.SceneScripts:
- db 6
+ db 6 ; scene scripts
scene_script .Scene0
scene_script .Scene1
scene_script .Scene2
@@ -14,8 +13,7 @@
scene_script .Scene4
scene_script .Scene5
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.Scene0:
special CheckMysteryGift
@@ -1023,11 +1021,9 @@
done
Pokecenter2F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 6
+ db 6 ; warp events
warp_event 0, 7, -1, POKECENTER_2F
warp_event 5, 0, 1, TRADE_CENTER
warp_event 9, 0, 1, COLOSSEUM
@@ -1035,15 +1031,12 @@
warp_event 6, 0, 1, MOBILE_TRADE_ROOM_MOBILE
warp_event 10, 0, 1, MOBILE_BATTLE_ROOM
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 7, 3, BGEVENT_READ, MapPokecenter2FSignpost0Script
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1
object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1
object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1
--- a/maps/PokecomCenterAdminRoomMobile.asm
+++ b/maps/PokecomCenterAdminRoomMobile.asm
@@ -4,11 +4,9 @@
const POKECOMCENTERADMINROOMMOBILE_SCIENTIST3
PokecomCenterAdminRoomMobile_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
PokecomCenterAdminRoomMobileScientist1Script:
jumptextfaceplayer PokecomCenterAdminRoomMobileScientist1Text
@@ -263,25 +261,20 @@
done
PokecomCenterAdminRoomMobile_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 0, 31, 3, GOLDENROD_POKECENTER_1F
warp_event 1, 31, 3, GOLDENROD_POKECENTER_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost0Script
bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost1Script
bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost2Script
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist1Script, -1
object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist2Script, -1
object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist3Script, -1
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -7,11 +7,9 @@
const POKEMONFANCLUB_ODDISH
PokemonFanClub_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
GentlemanScript_0x1917e9:
faceplayer
@@ -297,24 +295,19 @@
done
PokemonFanClub_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 3, VERMILION_CITY
warp_event 3, 7, 3, VERMILION_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 7, 0, BGEVENT_READ, MapPokemonFanClubSignpost0Script
bg_event 9, 0, BGEVENT_READ, MapPokemonFanClubSignpost1Script
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1
object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1
object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FisherScript_0x191824, -1
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -8,13 +8,11 @@
const POWERPLANT_FOREST
PowerPlant_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene0:
end
@@ -389,25 +387,20 @@
done
PowerPlant_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 17, 2, ROUTE_10_NORTH
warp_event 3, 17, 2, ROUTE_10_NORTH
-.CoordEvents:
- db 1
+ db 1 ; coord events
coord_event 5, 12, 1, PowerPlantGuardPhoneScript
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, PowerPlantBookshelf
bg_event 1, 1, BGEVENT_READ, PowerPlantBookshelf
-.ObjectEvents:
- db 7
+ db 7 ; object events
object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1
object_event 2, 9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1
object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -7,11 +7,9 @@
const RADIOTOWER1F_COOLTRAINER_F
RadioTower1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ReceptionistScript_0x5cd29:
faceplayer
@@ -473,25 +471,20 @@
done
RadioTower1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 2, 7, 11, GOLDENROD_CITY
warp_event 3, 7, 11, GOLDENROD_CITY
warp_event 15, 0, 2, RADIO_TOWER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 3, 0, BGEVENT_READ, MapRadioTower1FSignpost0Script
bg_event 13, 0, BGEVENT_READ, MapRadioTower1FSignpost1Script
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 5, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1
object_event 16, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
object_event 15, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -12,11 +12,9 @@
const RADIOTOWER2F_RECEPTIONIST
RadioTower2F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
UnknownScript_0x5d6fd:
end
@@ -711,19 +709,15 @@
done
RadioTower2F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 0, 0, 1, RADIO_TOWER_3F
warp_event 15, 0, 3, RADIO_TOWER_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 6
+ db 6 ; bg events
bg_event 3, 0, BGEVENT_READ, MapRadioTower2FSignpost0Script
bg_event 5, 0, BGEVENT_READ, MapRadioTower2FSignpost1Script
bg_event 9, 1, BGEVENT_READ, RadioTower2FBookshelf
@@ -731,8 +725,7 @@
bg_event 11, 1, BGEVENT_READ, RadioTower2FBookshelf
bg_event 13, 0, BGEVENT_READ, MapRadioTower2FSignpost5Script
-.ObjectEvents:
- db 11
+ db 11 ; object events
object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS
object_event 17, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1
object_event 1, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -8,11 +8,9 @@
const RADIOTOWER3F_SCIENTIST
RadioTower3F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .CardKeyShutterCallback
.CardKeyShutterCallback:
@@ -329,26 +327,21 @@
done
RadioTower3F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 0, 0, 1, RADIO_TOWER_2F
warp_event 7, 0, 2, RADIO_TOWER_4F
warp_event 17, 0, 4, RADIO_TOWER_4F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 3, 0, BGEVENT_READ, MapRadioTower3FSignpost0Script
bg_event 9, 0, BGEVENT_READ, MapRadioTower3FSignpost1Script
bg_event 14, 2, BGEVENT_UP, MapRadioTower3FSignpost2Script
-.ObjectEvents:
- db 7
+ db 7 ; object events
object_event 7, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1
object_event 11, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -8,11 +8,9 @@
const RADIOTOWER4F_SCIENTIST
RadioTower4F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
RadioTower4FFisherScript:
jumptextfaceplayer RadioTower4FFisherText
@@ -246,26 +244,21 @@
done
RadioTower4F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 0, 0, 1, RADIO_TOWER_5F
warp_event 9, 0, 2, RADIO_TOWER_3F
warp_event 12, 0, 2, RADIO_TOWER_5F
warp_event 17, 0, 3, RADIO_TOWER_3F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 7, 0, BGEVENT_READ, MapRadioTower4FSignpost0Script
bg_event 15, 0, BGEVENT_READ, MapRadioTower4FSignpost1Script
-.ObjectEvents:
- db 7
+ db 7 ; object events
object_event 6, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
object_event 14, 6, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1
object_event 12, 7, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -6,14 +6,12 @@
const RADIOTOWER5F_POKE_BALL
RadioTower5F_MapScripts:
-.SceneScripts:
- db 3
+ db 3 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
scene_script .DummyScene2
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene0:
end
@@ -421,21 +419,17 @@
done
RadioTower5F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 0, 0, 1, RADIO_TOWER_4F
warp_event 12, 0, 3, RADIO_TOWER_4F
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 0, 3, 0, FakeDirectorScript
coord_event 16, 5, 1, RadioTower5FRocketBossScene
-.BGEvents:
- db 5
+ db 5 ; bg events
bg_event 3, 0, BGEVENT_READ, MapRadioTower5FSignpost0Script
bg_event 11, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script
bg_event 15, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script
@@ -442,8 +436,7 @@
bg_event 16, 1, BGEVENT_READ, RadioTower5FBookshelf
bg_event 17, 1, BGEVENT_READ, RadioTower5FBookshelf
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 3, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Director, -1
object_event 13, 5, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 17, 2, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
--- a/maps/RedsHouse1F.asm
+++ b/maps/RedsHouse1F.asm
@@ -2,12 +2,10 @@
const REDSHOUSE1F_REDS_MOM
RedsHouse1F_MapScripts:
-.SceneScripts:
- db 1
+ db 1 ; scene scripts
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene:
end
@@ -75,24 +73,19 @@
done
RedsHouse1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 2, 7, 1, PALLET_TOWN
warp_event 3, 7, 1, PALLET_TOWN
warp_event 7, 0, 1, REDS_HOUSE_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 0, 1, BGEVENT_READ, RedsHouse1FBookshelf
bg_event 1, 1, BGEVENT_READ, RedsHouse1FBookshelf
bg_event 2, 1, BGEVENT_READ, RedsHouse1FTV
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 5, 3, SPRITE_REDS_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RedsMom, -1
--- a/maps/RedsHouse2F.asm
+++ b/maps/RedsHouse2F.asm
@@ -1,9 +1,7 @@
RedsHouse2F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
RedsHouse2FN64Script:
jumptext RedsHouse2FN64Text
@@ -26,20 +24,15 @@
done
RedsHouse2F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 7, 0, 3, REDS_HOUSE_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 3, 5, BGEVENT_READ, RedsHouse2FN64Script
bg_event 0, 1, BGEVENT_READ, RedsHouse2FPCScript
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -3,11 +3,9 @@
const ROCKTUNNEL1F_POKE_BALL2
RockTunnel1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
RockTunnel1FElixer:
itemball ELIXER
@@ -22,11 +20,9 @@
hiddenitem X_DEFEND, EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND
RockTunnel1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 6
+ db 6 ; warp events
warp_event 15, 3, 1, ROUTE_9
warp_event 11, 25, 1, ROUTE_10_SOUTH
warp_event 5, 3, 3, ROCK_TUNNEL_B1F
@@ -34,15 +30,12 @@
warp_event 27, 3, 4, ROCK_TUNNEL_B1F
warp_event 27, 13, 1, ROCK_TUNNEL_B1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 24, 4, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy
bg_event 21, 15, BGEVENT_ITEM, RockTunnel1FHiddenXDefend
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER
object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -4,11 +4,9 @@
const ROCKTUNNELB1F_POKE_BALL3
RockTunnelB1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
RockTunnelB1FIron:
itemball IRON
@@ -23,25 +21,20 @@
hiddenitem MAX_POTION, EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION
RockTunnelB1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 3, 3, 6, ROCK_TUNNEL_1F
warp_event 17, 9, 4, ROCK_TUNNEL_1F
warp_event 23, 3, 3, ROCK_TUNNEL_1F
warp_event 25, 23, 5, ROCK_TUNNEL_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 4, 14, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON
object_event 6, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP
object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE
--- a/maps/Route1.asm
+++ b/maps/Route1.asm
@@ -4,11 +4,9 @@
const ROUTE1_FRUIT_TREE
Route1_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerSchoolboyDanny:
trainer SCHOOLBOY, DANNY, EVENT_BEAT_SCHOOLBOY_DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script
@@ -81,21 +79,16 @@
done
Route1_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 0
+ db 0 ; warp events
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 7, 27, BGEVENT_READ, Route1Sign
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 4, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1
object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1
object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1
--- a/maps/Route10North.asm
+++ b/maps/Route10North.asm
@@ -1,9 +1,7 @@
Route10North_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
PowerPlantSign:
jumptext PowerPlantSignText
@@ -16,21 +14,16 @@
done
Route10North_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 11, 1, 1, ROUTE_10_POKECENTER_1F
warp_event 3, 9, 1, POWER_PLANT
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 5, 11, BGEVENT_READ, PowerPlantSign
bg_event 12, 1, BGEVENT_READ, Route10PokecenterSign
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/Route10Pokecenter1F.asm
+++ b/maps/Route10Pokecenter1F.asm
@@ -5,11 +5,9 @@
const ROUTE10POKECENTER1F_COOLTRAINER_F
Route10Pokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
NurseScript_0x188bd4:
jumpstd pokecenternurse
@@ -81,23 +79,18 @@
done
Route10Pokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 1, ROUTE_10_NORTH
warp_event 4, 7, 1, ROUTE_10_NORTH
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1
object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1
object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1
--- a/maps/Route10Pokecenter2FBeta.asm
+++ b/maps/Route10Pokecenter2FBeta.asm
@@ -1,23 +1,16 @@
Route10Pokecenter2FBeta_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route10Pokecenter2FBeta_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 0, 7, 3, ROUTE_10_POKECENTER_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -3,11 +3,9 @@
const ROUTE10SOUTH_POKEFAN_M2
Route10South_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerHikerJim:
trainer HIKER, JIM, EVENT_BEAT_HIKER_JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script
@@ -76,21 +74,16 @@
done
Route10South_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 6, 1, 2, ROCK_TUNNEL_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 5, 3, BGEVENT_READ, Route10Sign
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 17, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1
object_event 8, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -6,11 +6,9 @@
const ROUTE11_FRUIT_TREE
Route11_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerYoungsterOwen:
trainer YOUNGSTER, OWEN, EVENT_BEAT_YOUNGSTER_OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script
@@ -146,22 +144,17 @@
done
Route11_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 0
+ db 0 ; warp events
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 3, 7, BGEVENT_READ, Route11Sign
bg_event 32, 5, BGEVENT_ITEM, Route11HiddenRevive
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 22, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterOwen, -1
object_event 20, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1
object_event 28, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -7,11 +7,9 @@
const ROUTE12_POKE_BALL2
Route12_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerFisherKyle:
trainer FISHER, KYLE, EVENT_BEAT_FISHER_KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script
@@ -167,24 +165,19 @@
done
Route12_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 11, 33, 1, ROUTE_12_SUPER_ROD_HOUSE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 11, 27, BGEVENT_READ, Route12Sign
bg_event 13, 9, BGEVENT_READ, FishingSpotSign
bg_event 14, 13, BGEVENT_ITEM, Route12HiddenElixer
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 5, 13, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherMartin, -1
object_event 14, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherStephen, -1
object_event 10, 38, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerFisherBarney, -1
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -2,11 +2,9 @@
const ROUTE12SUPERRODHOUSE_FISHING_GURU
Route12SuperRodHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
FishingGuruScript_0x7f484:
faceplayer
@@ -80,20 +78,15 @@
done
Route12SuperRodHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 1, ROUTE_12
warp_event 3, 7, 1, ROUTE_12
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -6,11 +6,9 @@
const ROUTE13_POKEFAN_M3
Route13_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerPokefanmAlex:
trainer POKEFANM, ALEX, EVENT_BEAT_POKEFANM_ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script
@@ -192,24 +190,19 @@
done
Route13_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 0
+ db 0 ; warp events
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 4
+ db 4 ; bg events
bg_event 29, 13, BGEVENT_READ, Route13TrainerTips
bg_event 41, 11, BGEVENT_READ, Route13Sign
bg_event 17, 13, BGEVENT_READ, Route13DirectionsSign
bg_event 30, 13, BGEVENT_ITEM, Route13HiddenCalcium
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 42, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1
object_event 43, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1
object_event 32, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -5,11 +5,9 @@
const ROUTE14_KIM
Route14_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Kim:
faceplayer
@@ -116,20 +114,15 @@
done
Route14_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 0
+ db 0 ; warp events
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 11, 15, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmCarter, -1
object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRoy, -1
object_event 6, 11, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -8,11 +8,9 @@
const ROUTE15_POKE_BALL
Route15_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerTeacherColette:
trainer TEACHER, COLETTE, EVENT_BEAT_TEACHER_COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script
@@ -202,23 +200,18 @@
done
Route15_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 4, 3, ROUTE_15_FUCHSIA_GATE
warp_event 2, 5, 4, ROUTE_15_FUCHSIA_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 19, 9, BGEVENT_READ, Route15Sign
-.ObjectEvents:
- db 7
+ db 7 ; object events
object_event 10, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyKipp, -1
object_event 15, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyTommy, -1
object_event 33, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJohnny, -1
--- a/maps/Route15FuchsiaGate.asm
+++ b/maps/Route15FuchsiaGate.asm
@@ -2,11 +2,9 @@
const ROUTE15FUCHSIAGATE_OFFICER
Route15FuchsiaGate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route15FuchsiaGateOfficerScript:
jumptextfaceplayer Route15FuchsiaGateOfficerText
@@ -20,22 +18,17 @@
done
Route15FuchsiaGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 0, 4, 8, FUCHSIA_CITY
warp_event 0, 5, 9, FUCHSIA_CITY
warp_event 9, 4, 1, ROUTE_15
warp_event 9, 5, 2, ROUTE_15
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -1,9 +1,7 @@
Route16_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .AlwaysOnBike
.AlwaysOnBike:
@@ -29,11 +27,9 @@
done
Route16_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 3, 1, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE
warp_event 14, 6, 3, ROUTE_16_GATE
warp_event 14, 7, 4, ROUTE_16_GATE
@@ -40,12 +36,9 @@
warp_event 9, 6, 1, ROUTE_16_GATE
warp_event 9, 7, 2, ROUTE_16_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 5, 5, BGEVENT_READ, CyclingRoadSign
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/Route16FuchsiaSpeechHouse.asm
+++ b/maps/Route16FuchsiaSpeechHouse.asm
@@ -2,11 +2,9 @@
const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD
Route16FuchsiaSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route16FuchsiaSpeechHouseSuperNerdScript:
jumptextfaceplayer Route16FuchsiaSpeechHouseSuperNerdText
@@ -23,22 +21,17 @@
done
Route16FuchsiaSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 1, ROUTE_16
warp_event 3, 7, 1, ROUTE_16
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
bg_event 1, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -2,12 +2,10 @@
const ROUTE16GATE_OFFICER
Route16Gate_MapScripts:
-.SceneScripts:
- db 1
+ db 1 ; scene scripts
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene:
end
@@ -61,24 +59,19 @@
done
Route16Gate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 0, 4, 4, ROUTE_16
warp_event 0, 5, 5, ROUTE_16
warp_event 9, 4, 2, ROUTE_16
warp_event 9, 5, 3, ROUTE_16
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 5, 4, 0, UnknownScript_0x733ed
coord_event 5, 5, 0, UnknownScript_0x733ed
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -5,11 +5,9 @@
const ROUTE17_BIKER4
Route17_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .AlwaysOnBike
.AlwaysOnBike:
@@ -133,24 +131,19 @@
done
Route17_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 17, 82, 1, ROUTE_17_ROUTE_18_GATE
warp_event 17, 83, 2, ROUTE_17_ROUTE_18_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 9, 54, BGEVENT_ITEM, Route17HiddenMaxEther
bg_event 8, 77, BGEVENT_ITEM, Route17HiddenMaxElixer
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 4, 17, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerRiley, -1
object_event 9, 68, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBikerJoel, -1
object_event 3, 53, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBikerGlenn, -1
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -2,12 +2,10 @@
const ROUTE17ROUTE18GATE_OFFICER
Route17Route18Gate_MapScripts:
-.SceneScripts:
- db 1
+ db 1 ; scene scripts
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene:
end
@@ -52,24 +50,19 @@
done
Route17Route18Gate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 0, 4, 1, ROUTE_17
warp_event 0, 5, 2, ROUTE_17
warp_event 9, 4, 1, ROUTE_18
warp_event 9, 5, 2, ROUTE_18
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 5, 4, 0, UnknownScript_0x73611
coord_event 5, 5, 0, UnknownScript_0x73611
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route17Route18GateOfficerScript, -1
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -3,11 +3,9 @@
const ROUTE18_YOUNGSTER2
Route18_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerBirdKeeperBoris:
trainer BIRD_KEEPER, BORIS, EVENT_BEAT_BIRD_KEEPER_BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script
@@ -78,22 +76,17 @@
done
Route18_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 6, 3, ROUTE_17_ROUTE_18_GATE
warp_event 2, 7, 4, ROUTE_17_ROUTE_18_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 9, 5, BGEVENT_READ, Route18Sign
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 9, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1
object_event 13, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -7,11 +7,9 @@
const ROUTE19_FISHER2
Route19_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .ClearRocks
.ClearRocks:
@@ -235,23 +233,18 @@
done
Route19_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 7, 3, 3, ROUTE_19_FUCHSIA_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 11, 13, BGEVENT_READ, Route19Sign
bg_event 11, 1, BGEVENT_READ, CarefulSwimmingSign
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 9, 23, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1
object_event 13, 28, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermHarold, -1
object_event 11, 17, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermJerome, -1
--- a/maps/Route19FuchsiaGate.asm
+++ b/maps/Route19FuchsiaGate.asm
@@ -2,11 +2,9 @@
const ROUTE19FUCHSIAGATE_OFFICER
Route19FuchsiaGate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
OfficerScript_0x1ab3f6:
faceplayer
@@ -46,22 +44,17 @@
done
Route19FuchsiaGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 4, 0, 10, FUCHSIA_CITY
warp_event 5, 0, 11, FUCHSIA_CITY
warp_event 4, 7, 1, ROUTE_19
warp_event 5, 7, 1, ROUTE_19
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -9,11 +9,9 @@
const ROUTE2_FRUIT_TREE
Route2_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerBugCatcherRob:
trainer BUG_CATCHER, ROB, EVENT_BEAT_BUG_CATCHER_ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script
@@ -147,11 +145,9 @@
done
Route2_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 15, 15, 1, ROUTE_2_NUGGET_HOUSE
warp_event 15, 31, 3, ROUTE_2_GATE
warp_event 16, 27, 1, ROUTE_2_GATE
@@ -158,11 +154,9 @@
warp_event 17, 27, 2, ROUTE_2_GATE
warp_event 12, 7, 3, DIGLETTS_CAVE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 6
+ db 6 ; bg events
bg_event 7, 51, BGEVENT_READ, Route2Sign
bg_event 11, 9, BGEVENT_READ, MapRoute2Signpost1Script
bg_event 7, 23, BGEVENT_ITEM, Route2HiddenMaxEther
@@ -170,8 +164,7 @@
bg_event 4, 27, BGEVENT_ITEM, Route2HiddenFullRestore
bg_event 11, 30, BGEVENT_ITEM, Route2HiddenRevive
-.ObjectEvents:
- db 8
+ db 8 ; object events
object_event 10, 45, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1
object_event 6, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1
object_event 0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -4,11 +4,9 @@
const ROUTE20_SWIMMER_GUY
Route20_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .ClearRocks
.ClearRocks:
@@ -113,22 +111,17 @@
done
Route20_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 38, 7, 1, SEAFOAM_GYM
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 37, 11, BGEVENT_READ, CinnabarGymSign
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 52, 8, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1
object_event 45, 13, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfLori, -1
object_event 12, 13, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCameron, -1
--- a/maps/Route21.asm
+++ b/maps/Route21.asm
@@ -4,11 +4,9 @@
const ROUTE21_FISHER
Route21_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerSwimmermSeth:
trainer SWIMMERM, SETH, EVENT_BEAT_SWIMMERM_SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script
@@ -90,20 +88,15 @@
done
Route21_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 0
+ db 0 ; warp events
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 11, 16, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNikki, -1
object_event 2, 30, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSeth, -1
object_event 14, 22, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherArnold, -1
--- a/maps/Route22.asm
+++ b/maps/Route22.asm
@@ -1,9 +1,7 @@
Route22_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
VictoryRoadEntranceSign:
jumptext VictoryRoadEntranceSignText
@@ -16,19 +14,14 @@
done
Route22_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 13, 5, 1, VICTORY_ROAD_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 15, 7, BGEVENT_READ, VictoryRoadEntranceSign
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/Route23.asm
+++ b/maps/Route23.asm
@@ -1,9 +1,7 @@
Route23_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -23,22 +21,17 @@
done
Route23_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 9, 5, 1, INDIGO_PLATEAU_POKECENTER_1F
warp_event 10, 5, 2, INDIGO_PLATEAU_POKECENTER_1F
warp_event 9, 13, 10, VICTORY_ROAD
warp_event 10, 13, 10, VICTORY_ROAD
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 11, 7, BGEVENT_READ, IndigoPlateauSign
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -2,11 +2,9 @@
const ROUTE24_ROCKET
Route24_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
RocketScript_0x1adbfa:
faceplayer
@@ -119,18 +117,13 @@
done
Route24_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 0
+ db 0 ; warp events
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 8, 7, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -12,13 +12,11 @@
const ROUTE25_POKE_BALL
Route25_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene0:
end
@@ -430,25 +428,20 @@
done
Route25_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 47, 5, 1, BILLS_HOUSE
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 42, 6, 1, UnknownScript_0x19eea0
coord_event 42, 7, 1, UnknownScript_0x19eee0
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 45, 5, BGEVENT_READ, BillsHouseSign
bg_event 4, 5, BGEVENT_ITEM, Route25HiddenPotion
-.ObjectEvents:
- db 11
+ db 11 ; object events
object_event 46, 9, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
object_event 46, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -9,11 +9,9 @@
const ROUTE26_POKE_BALL
Route26_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerCooltrainermJake:
trainer COOLTRAINERM, JAKE, EVENT_BEAT_COOLTRAINERM_JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script
@@ -413,24 +411,19 @@
done
Route26_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 7, 5, 3, VICTORY_ROAD_GATE
warp_event 15, 57, 1, ROUTE_26_HEAL_HOUSE
warp_event 5, 71, 1, DAY_OF_WEEK_SIBLINGS_HOUSE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 8, 6, BGEVENT_READ, Route26Sign
-.ObjectEvents:
- db 8
+ db 8 ; object events
object_event 14, 24, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermJake, -1
object_event 9, 38, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1
object_event 10, 56, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1
--- a/maps/Route26HealHouse.asm
+++ b/maps/Route26HealHouse.asm
@@ -2,11 +2,9 @@
const ROUTE26HEALHOUSE_TEACHER
Route26HealHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TeacherScript_0x7b125:
faceplayer
@@ -49,22 +47,17 @@
done
Route26HealHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 2, ROUTE_26
warp_event 3, 7, 2, ROUTE_26
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, Route26HealHouseBookshelf
bg_event 1, 1, BGEVENT_READ, Route26HealHouseBookshelf
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -10,13 +10,11 @@
const ROUTE27_FISHER
Route27_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene0:
end
@@ -468,26 +466,21 @@
done
Route27_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 33, 7, 1, ROUTE_27_SANDSTORM_HOUSE
warp_event 26, 5, 1, TOHJO_FALLS
warp_event 36, 5, 2, TOHJO_FALLS
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 18, 10, 0, UnknownScript_0x1a0873
coord_event 19, 10, 0, UnknownScript_0x1a0881
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 25, 7, BGEVENT_READ, TohjoFallsSign
-.ObjectEvents:
- db 9
+ db 9 ; object events
object_event 48, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1
object_event 58, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1
object_event 72, 10, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -2,11 +2,9 @@
const ROUTE27SANDSTORMHOUSE_GRANNY
Route27SandstormHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
SandstormHouseWoman:
faceplayer
@@ -94,22 +92,17 @@
done
Route27SandstormHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 1, ROUTE_27
warp_event 3, 7, 1, ROUTE_27
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, SandstormHouseBookshelf
bg_event 1, 1, BGEVENT_READ, SandstormHouseBookshelf
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1
--- a/maps/Route28.asm
+++ b/maps/Route28.asm
@@ -1,9 +1,7 @@
Route28_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route28Sign:
jumptext Route28SignText
@@ -16,21 +14,16 @@
done
Route28_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 7, 3, 1, ROUTE_28_STEEL_WING_HOUSE
warp_event 33, 5, 7, VICTORY_ROAD_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 31, 5, BGEVENT_READ, Route28Sign
bg_event 25, 2, BGEVENT_ITEM, Route28HiddenRareCandy
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/Route28SteelWingHouse.asm
+++ b/maps/Route28SteelWingHouse.asm
@@ -3,12 +3,10 @@
const ROUTE28STEELWINGHOUSE_FEAROW
Route28SteelWingHouse_MapScripts:
-.SceneScripts:
- db 1
+ db 1 ; scene scripts
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene:
end
@@ -71,23 +69,18 @@
done
Route28SteelWingHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 1, ROUTE_28
warp_event 3, 7, 1, ROUTE_28
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, CelebrityHouseBookshelf
bg_event 1, 1, BGEVENT_READ, CelebrityHouseBookshelf
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1
object_event 6, 5, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -9,13 +9,11 @@
const ROUTE29_POKE_BALL
Route29_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .Tuscany
.DummyScene0:
@@ -416,25 +414,20 @@
done
Route29_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 27, 1, 3, ROUTE_29_ROUTE_46_GATE
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 53, 8, 1, Route29Tutorial1
coord_event 53, 9, 1, Route29Tutorial2
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 51, 7, BGEVENT_READ, Route29Sign1
bg_event 3, 5, BGEVENT_READ, Route29Sign2
-.ObjectEvents:
- db 8
+ db 8 ; object events
object_event 50, 12, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1
object_event 27, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29YoungsterScript, -1
object_event 15, 11, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29TeacherScript, -1
--- a/maps/Route29Route46Gate.asm
+++ b/maps/Route29Route46Gate.asm
@@ -3,11 +3,9 @@
const ROUTE29ROUTE46GATE_YOUNGSTER
Route29Route46Gate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route29Route46GateOfficerScript:
jumptextfaceplayer Route29Route46GateOfficerText
@@ -37,23 +35,18 @@
done
Route29Route46Gate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 4, 0, 1, ROUTE_46
warp_event 5, 0, 2, ROUTE_46
warp_event 4, 7, 1, ROUTE_29
warp_event 5, 7, 1, ROUTE_29
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29Route46GateOfficerScript, -1
object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29Route46GateYoungsterScript, -1
--- a/maps/Route2Gate.asm
+++ b/maps/Route2Gate.asm
@@ -2,11 +2,9 @@
const ROUTE2GATE_SCIENTIST
Route2Gate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route2GateScientistScript:
jumptextfaceplayer Route2GateScientistText
@@ -26,22 +24,17 @@
done
Route2Gate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 4, 0, 3, ROUTE_2
warp_event 5, 0, 4, ROUTE_2
warp_event 4, 7, 2, ROUTE_2
warp_event 5, 7, 2, ROUTE_2
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 6, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1
--- a/maps/Route2NuggetHouse.asm
+++ b/maps/Route2NuggetHouse.asm
@@ -2,11 +2,9 @@
const ROUTE2NUGGETHOUSE_FISHER
Route2NuggetHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
FisherScript_0x9b847:
faceplayer
@@ -53,20 +51,15 @@
done
Route2NuggetHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 1, ROUTE_2
warp_event 3, 7, 1, ROUTE_2
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -5,11 +5,9 @@
const ROUTE3_FISHER2
Route3_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerFirebreatherOtis:
trainer FIREBREATHER, OTIS, EVENT_BEAT_FIREBREATHER_OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script
@@ -133,22 +131,17 @@
done
Route3_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 52, 1, 1, MOUNT_MOON
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 49, 13, BGEVENT_READ, MapRoute3Signpost0Script
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 26, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1
object_event 10, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1
object_event 16, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -12,11 +12,9 @@
const ROUTE30_POKE_BALL
Route30_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
YoungsterJoey_ImportantBattleScript:
waitsfx
@@ -407,19 +405,15 @@
done
Route30_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 7, 39, 1, ROUTE_30_BERRY_HOUSE
warp_event 17, 5, 1, MR_POKEMONS_HOUSE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 5
+ db 5 ; bg events
bg_event 9, 43, BGEVENT_READ, Route30Sign
bg_event 13, 29, BGEVENT_READ, MrPokemonsHouseDirectionsSign
bg_event 15, 5, BGEVENT_READ, MrPokemonsHouseSign
@@ -426,8 +420,7 @@
bg_event 3, 21, BGEVENT_READ, Route30TrainerTips
bg_event 14, 9, BGEVENT_ITEM, Route30HiddenPotion
-.ObjectEvents:
- db 11
+ db 11 ; object events
object_event 5, 26, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE
object_event 2, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY
object_event 5, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1
--- a/maps/Route30BerryHouse.asm
+++ b/maps/Route30BerryHouse.asm
@@ -2,11 +2,9 @@
const ROUTE30BERRYHOUSE_POKEFAN_M
Route30BerryHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
PokefanMScript_0x196d64:
faceplayer
@@ -47,22 +45,17 @@
done
Route30BerryHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 1, ROUTE_30
warp_event 3, 7, 1, ROUTE_30
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, Route30BerryHouseBookshelf
bg_event 1, 1, BGEVENT_READ, Route30BerryHouseBookshelf
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -8,11 +8,9 @@
const ROUTE31_POKE_BALL2
Route31_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .CheckMomCall
.CheckMomCall:
@@ -418,25 +416,20 @@
done
Route31_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 4, 6, 3, ROUTE_31_VIOLET_GATE
warp_event 4, 7, 4, ROUTE_31_VIOLET_GATE
warp_event 34, 5, 1, DARK_CAVE_VIOLET_ENTRANCE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 7, 5, BGEVENT_READ, Route31Sign
bg_event 31, 5, BGEVENT_READ, DarkCaveSign
-.ObjectEvents:
- db 7
+ db 7 ; object events
object_event 17, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1
object_event 9, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1
object_event 21, 13, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherWade1, -1
--- a/maps/Route31VioletGate.asm
+++ b/maps/Route31VioletGate.asm
@@ -3,11 +3,9 @@
const ROUTE31VIOLETGATE_COOLTRAINER_F
Route31VioletGate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route31VioletGateOfficerScript:
jumptextfaceplayer Route31VioletGateOfficerText
@@ -28,23 +26,18 @@
done
Route31VioletGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 0, 4, 8, VIOLET_CITY
warp_event 0, 5, 9, VIOLET_CITY
warp_event 9, 4, 1, ROUTE_31
warp_event 9, 5, 2, ROUTE_31
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1
object_event 1, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -15,14 +15,12 @@
const ROUTE32_POKE_BALL2
Route32_MapScripts:
-.SceneScripts:
- db 3
+ db 3 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
scene_script .DummyScene2
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .Frieda
.DummyScene0:
@@ -929,23 +927,19 @@
done
Route32_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 11, 73, 1, ROUTE_32_POKECENTER_1F
warp_event 4, 2, 3, ROUTE_32_RUINS_OF_ALPH_GATE
warp_event 4, 3, 4, ROUTE_32_RUINS_OF_ALPH_GATE
warp_event 6, 79, 4, UNION_CAVE_1F
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 18, 8, 0, Route32CooltrainerMStopsYouScene
coord_event 7, 71, 1, Route32WannaBuyASlowpokeTailScript
-.BGEvents:
- db 6
+ db 6 ; bg events
bg_event 13, 5, BGEVENT_READ, Route32Sign
bg_event 9, 1, BGEVENT_READ, Route32RuinsSign
bg_event 10, 84, BGEVENT_READ, Route32UnionCaveSign
@@ -953,8 +947,7 @@
bg_event 12, 67, BGEVENT_ITEM, Route32HiddenGreatBall
bg_event 11, 40, BGEVENT_ITEM, Route32HiddenSuperPotion
-.ObjectEvents:
- db 14
+ db 14 ; object events
object_event 8, 49, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1
object_event 12, 56, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherRalph1, -1
object_event 6, 48, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1
--- a/maps/Route32Pokecenter1F.asm
+++ b/maps/Route32Pokecenter1F.asm
@@ -4,11 +4,9 @@
const ROUTE32POKECENTER1F_COOLTRAINER_F
Route32Pokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
NurseScript_0x69b52:
jumpstd pokecenternurse
@@ -95,23 +93,18 @@
done
Route32Pokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 1, ROUTE_32
warp_event 4, 7, 1, ROUTE_32
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1
object_event 1, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1
object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1
--- a/maps/Route32RuinsOfAlphGate.asm
+++ b/maps/Route32RuinsOfAlphGate.asm
@@ -4,11 +4,9 @@
const ROUTE32RUINSOFALPHGATE_YOUNGSTER
Route32RuinsOfAlphGate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route32RuinsOfAlphGateOfficerScript:
jumptextfaceplayer Route32RuinsOfAlphGateOfficerText
@@ -47,24 +45,19 @@
done
Route32RuinsOfAlphGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 0, 4, 10, RUINS_OF_ALPH_OUTSIDE
warp_event 0, 5, 11, RUINS_OF_ALPH_OUTSIDE
warp_event 9, 4, 2, ROUTE_32
warp_event 9, 5, 3, ROUTE_32
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1
object_event 8, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1
object_event 1, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -4,11 +4,9 @@
const ROUTE33_FRUIT_TREE
Route33_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route33LassScript:
jumptextfaceplayer Route33LassText
@@ -195,22 +193,17 @@
done
Route33_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 11, 9, 3, UNION_CAVE_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 11, 11, BGEVENT_READ, Route33Sign
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1
object_event 13, 16, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1
object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -14,11 +14,9 @@
const ROUTE34_POKE_BALL
Route34_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .EggCheckCallback
.EggCheckCallback:
@@ -761,11 +759,9 @@
done
Route34_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 13, 37, 1, ROUTE_34_ILEX_FOREST_GATE
warp_event 14, 37, 2, ROUTE_34_ILEX_FOREST_GATE
warp_event 11, 14, 1, DAY_CARE
@@ -772,11 +768,9 @@
warp_event 11, 15, 2, DAY_CARE
warp_event 13, 15, 3, DAY_CARE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 5
+ db 5 ; bg events
bg_event 12, 6, BGEVENT_READ, Route34Sign
bg_event 13, 33, BGEVENT_READ, Route34TrainerTips
bg_event 10, 13, BGEVENT_READ, DayCareSign
@@ -783,8 +777,7 @@
bg_event 8, 32, BGEVENT_ITEM, Route34HiddenRareCandy
bg_event 17, 19, BGEVENT_ITEM, Route34HiddenSuperPotion
-.ObjectEvents:
- db 13
+ db 13 ; object events
object_event 13, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1
object_event 15, 32, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1
object_event 11, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterIan, -1
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -5,11 +5,9 @@
const ROUTE34ILEXFORESTGATE_TEACHER2
Route34IlexForestGate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .IsForestRestless
.IsForestRestless:
@@ -136,25 +134,20 @@
done
Route34IlexForestGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 4, 0, 1, ROUTE_34
warp_event 5, 0, 2, ROUTE_34
warp_event 4, 7, 1, ILEX_FOREST
warp_event 5, 7, 1, ILEX_FOREST
-.CoordEvents:
- db 1
+ db 1 ; coord events
coord_event 4, 7, 0, UnknownScript_0x62d3d
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 9, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER
object_event 9, 4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexGateButterfree, -1
object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -12,11 +12,9 @@
const ROUTE35_POKE_BALL
Route35_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerBirdKeeperBryan:
trainer BIRD_KEEPER, BRYAN, EVENT_BEAT_BIRD_KEEPER_BRYAN, BirdKeeperBryanSeenText, BirdKeeperBryanBeatenText, 0, .Script
@@ -463,25 +461,20 @@
done
Route35_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 9, 33, 1, ROUTE_35_GOLDENROD_GATE
warp_event 10, 33, 2, ROUTE_35_GOLDENROD_GATE
warp_event 3, 5, 3, ROUTE_35_NATIONAL_PARK_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 1, 7, BGEVENT_READ, Route35Sign
bg_event 11, 31, BGEVENT_READ, Route35Sign
-.ObjectEvents:
- db 11
+ db 11 ; object events
object_event 4, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperIvan, -1
object_event 8, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1
object_event 7, 20, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1
--- a/maps/Route35GoldenrodGate.asm
+++ b/maps/Route35GoldenrodGate.asm
@@ -4,11 +4,9 @@
const ROUTE35GOLDENRODGATE_FISHER
Route35GoldenrodGate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
OfficerScript_0x69d37:
faceplayer
@@ -196,24 +194,19 @@
done
Route35GoldenrodGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 4, 0, 1, ROUTE_35
warp_event 5, 0, 2, ROUTE_35
warp_event 4, 7, 12, GOLDENROD_CITY
warp_event 5, 7, 12, GOLDENROD_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1
object_event 6, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1
object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -4,14 +4,12 @@
const ROUTE35NATIONALPARKGATE_OFFICER2
Route35NationalParkGate_MapScripts:
-.SceneScripts:
- db 3
+ db 3 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
scene_script .LeaveContestEarly
-.MapCallbacks:
- db 2
+ db 2 ; callbacks
callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable
@@ -438,25 +436,20 @@
done
Route35NationalParkGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 3, 0, 3, NATIONAL_PARK
warp_event 4, 0, 4, NATIONAL_PARK
warp_event 3, 7, 3, ROUTE_35
warp_event 4, 7, 3, ROUTE_35
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 5, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 2, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER
object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -10,13 +10,11 @@
const ROUTE36_SUICUNE
Route36_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .ArthurCallback
.DummyScene0:
@@ -660,30 +658,25 @@
done
Route36_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 18, 8, 3, ROUTE_36_NATIONAL_PARK_GATE
warp_event 18, 9, 4, ROUTE_36_NATIONAL_PARK_GATE
warp_event 47, 13, 1, ROUTE_36_RUINS_OF_ALPH_GATE
warp_event 48, 13, 2, ROUTE_36_RUINS_OF_ALPH_GATE
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 20, 7, 1, Route36SuicuneScript
coord_event 22, 7, 1, Route36SuicuneScript
-.BGEvents:
- db 4
+ db 4 ; bg events
bg_event 29, 1, BGEVENT_READ, Route36TrainerTips2
bg_event 45, 11, BGEVENT_READ, RuinsOfAlphNorthSign
bg_event 55, 7, BGEVENT_READ, Route36Sign
bg_event 21, 7, BGEVENT_READ, Route36TrainerTips1
-.ObjectEvents:
- db 9
+ db 9 ; object events
object_event 20, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicMark, -1
object_event 31, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1
object_event 35, 9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -13,14 +13,12 @@
const ROUTE36NATIONALPARKGATE_OFFICER2
Route36NationalParkGate_MapScripts:
-.SceneScripts:
- db 3
+ db 3 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
scene_script .LeaveContestEarly
-.MapCallbacks:
- db 2
+ db 2 ; callbacks
callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable
@@ -850,25 +848,20 @@
done
Route36NationalParkGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 0, 4, 1, NATIONAL_PARK
warp_event 0, 5, 2, NATIONAL_PARK
warp_event 9, 4, 1, ROUTE_36
warp_event 9, 5, 2, ROUTE_36
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 6, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script
-.ObjectEvents:
- db 12
+ db 12 ; object events
object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B
object_event 4, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B
--- a/maps/Route36RuinsOfAlphGate.asm
+++ b/maps/Route36RuinsOfAlphGate.asm
@@ -3,11 +3,9 @@
const ROUTE36RUINSOFALPHGATE_GRAMPS
Route36RuinsOfAlphGate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route36RuinsOfAlphGateOfficerScript:
jumptextfaceplayer Route36RuinsOfAlphGateOfficerText
@@ -35,23 +33,18 @@
done
Route36RuinsOfAlphGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 4, 0, 3, ROUTE_36
warp_event 5, 0, 4, ROUTE_36
warp_event 4, 7, 9, RUINS_OF_ALPH_OUTSIDE
warp_event 5, 7, 9, RUINS_OF_ALPH_OUTSIDE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1
object_event 7, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -8,11 +8,9 @@
const ROUTE37_FRUIT_TREE3
Route37_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .Sunny
.Sunny:
@@ -238,22 +236,17 @@
done
Route37_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 0
+ db 0 ; warp events
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 5, 3, BGEVENT_READ, Route37Sign
bg_event 4, 2, BGEVENT_ITEM, Route37HiddenEther
-.ObjectEvents:
- db 7
+ db 7 ; object events
object_event 6, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1
object_event 7, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1
object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -8,11 +8,9 @@
const ROUTE38_BUENA2
Route38_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerBirdKeeperToby:
trainer BIRD_KEEPER, TOBY, EVENT_BEAT_BIRD_KEEPER_TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script
@@ -473,24 +471,19 @@
done
Route38_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 35, 8, 1, ROUTE_38_ECRUTEAK_GATE
warp_event 35, 9, 2, ROUTE_38_ECRUTEAK_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 33, 7, BGEVENT_READ, Route38Sign
bg_event 5, 13, BGEVENT_READ, Route38TrainerTips
-.ObjectEvents:
- db 7
+ db 7 ; object events
object_event 4, 1, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1
object_event 15, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1
object_event 12, 15, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1
--- a/maps/Route38EcruteakGate.asm
+++ b/maps/Route38EcruteakGate.asm
@@ -2,11 +2,9 @@
const ROUTE38ECRUTEAKGATE_OFFICER
Route38EcruteakGate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route38EcruteakGateOfficerScript:
jumptextfaceplayer Route38EcruteakGateOfficerText
@@ -25,22 +23,17 @@
done
Route38EcruteakGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 0, 4, 1, ROUTE_38
warp_event 0, 5, 2, ROUTE_38
warp_event 9, 4, 14, ECRUTEAK_CITY
warp_event 9, 5, 15, ECRUTEAK_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -11,11 +11,9 @@
const ROUTE39_POKEFAN_F2
Route39_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route39Miltank:
opentext
@@ -344,26 +342,21 @@
done
Route39_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 1, 3, 1, ROUTE_39_BARN
warp_event 5, 3, 1, ROUTE_39_FARMHOUSE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 4
+ db 4 ; bg events
bg_event 5, 31, BGEVENT_READ, Route39TrainerTips
bg_event 9, 5, BGEVENT_READ, MoomooFarmSign
bg_event 15, 7, BGEVENT_READ, Route39Sign
bg_event 5, 13, BGEVENT_ITEM, Route39HiddenNugget
-.ObjectEvents:
- db 10
+ db 10 ; object events
object_event 13, 29, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSailorEugene, -1
object_event 10, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek1, -1
object_event 11, 19, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanfRuth, -1
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -4,11 +4,9 @@
const ROUTE39BARN_MOOMOO
Route39Barn_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TwinScript_0x9cc76:
faceplayer
@@ -189,22 +187,17 @@
done
Route39Barn_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 3, 7, 1, ROUTE_39
warp_event 4, 7, 1, ROUTE_39
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 2, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1
object_event 4, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1
object_event 3, 3, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -3,11 +3,9 @@
const ROUTE39FARMHOUSE_POKEFAN_F
Route39Farmhouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
PokefanM_DairyFarmer:
faceplayer
@@ -193,23 +191,18 @@
done
Route39Farmhouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 2, ROUTE_39
warp_event 3, 7, 2, ROUTE_39
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, FarmhouseBookshelf
bg_event 1, 1, BGEVENT_READ, FarmhouseBookshelf
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 3, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1
object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -5,11 +5,9 @@
const ROUTE4_POKE_BALL
Route4_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerBirdKeeperHank:
trainer BIRD_KEEPER, HANK, EVENT_BEAT_BIRD_KEEPER_HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script
@@ -121,23 +119,18 @@
done
Route4_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 2, 5, 2, MOUNT_MOON
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 3, 7, BGEVENT_READ, MtMoonSquareSign
bg_event 10, 3, BGEVENT_ITEM, Route4HiddenUltraBall
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 17, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1
object_event 9, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1
object_event 21, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -13,11 +13,9 @@
const ROUTE40_STANDING_YOUNGSTER
Route40_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .MonicaCallback
.MonicaCallback:
@@ -338,23 +336,18 @@
done
Route40_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 9, 5, 1, ROUTE_40_BATTLE_TOWER_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 14, 10, BGEVENT_READ, Route40Sign
bg_event 7, 8, BGEVENT_ITEM, Route40HiddenHyperPotion
-.ObjectEvents:
- db 12
+ db 12 ; object events
object_event 14, 15, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSimon, -1
object_event 18, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerSwimmermRandall, -1
object_event 3, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -3,11 +3,9 @@
const ROUTE40BATTLETOWERGATE_TWIN
Route40BattleTowerGate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .ShowSailor
.ShowSailor:
@@ -71,23 +69,18 @@
done
Route40BattleTowerGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 4, 7, 1, ROUTE_40
warp_event 5, 7, 1, ROUTE_40
warp_event 4, 0, 1, BATTLE_TOWER_OUTSIDE
warp_event 5, 0, 2, BATTLE_TOWER_OUTSIDE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 3, 3, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
object_event 7, 5, SPRITE_TWIN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -11,11 +11,9 @@
const ROUTE41_SWIMMER_GIRL5
Route41_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerSwimmerfKaylee:
trainer SWIMMERF, KAYLEE, EVENT_BEAT_SWIMMERF_KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script
@@ -342,25 +340,20 @@
done
Route41_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 12, 17, 1, WHIRL_ISLAND_NW
warp_event 36, 19, 1, WHIRL_ISLAND_NE
warp_event 12, 37, 1, WHIRL_ISLAND_SW
warp_event 36, 45, 1, WHIRL_ISLAND_SE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 9, 35, BGEVENT_ITEM, Route41HiddenMaxEther
-.ObjectEvents:
- db 10
+ db 10 ; object events
object_event 32, 6, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1
object_event 46, 8, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1
object_event 20, 26, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermBerke, -1
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -10,13 +10,11 @@
const ROUTE42_SUICUNE
Route42_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene0:
end
@@ -319,11 +317,9 @@
done
Route42_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 0, 8, 3, ROUTE_42_ECRUTEAK_GATE
warp_event 0, 9, 4, ROUTE_42_ECRUTEAK_GATE
warp_event 10, 5, 1, MOUNT_MORTAR_1F_OUTSIDE
@@ -330,12 +326,10 @@
warp_event 28, 9, 2, MOUNT_MORTAR_1F_OUTSIDE
warp_event 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE
-.CoordEvents:
- db 1
+ db 1 ; coord events
coord_event 24, 14, 1, Route42SuicuneScript
-.BGEvents:
- db 5
+ db 5 ; bg events
bg_event 4, 10, BGEVENT_READ, Route42Sign1
bg_event 7, 5, BGEVENT_READ, MtMortarSign1
bg_event 45, 9, BGEVENT_READ, MtMortarSign2
@@ -342,8 +336,7 @@
bg_event 54, 8, BGEVENT_READ, Route42Sign2
bg_event 16, 11, BGEVENT_ITEM, Route42HiddenMaxPotion
-.ObjectEvents:
- db 9
+ db 9 ; object events
object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully1, -1
object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1
object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1
--- a/maps/Route42EcruteakGate.asm
+++ b/maps/Route42EcruteakGate.asm
@@ -2,11 +2,9 @@
const ROUTE42ECRUTEAKGATE_OFFICER
Route42EcruteakGate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route42EcruteakGateOfficerScript:
jumptextfaceplayer Route42EcruteakGateOfficerText
@@ -20,22 +18,17 @@
done
Route42EcruteakGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 0, 4, 1, ECRUTEAK_CITY
warp_event 0, 5, 2, ECRUTEAK_CITY
warp_event 9, 4, 1, ROUTE_42
warp_event 9, 5, 2, ROUTE_42
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -9,11 +9,9 @@
const ROUTE43_POKE_BALL
Route43_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .CheckIfRockets
.CheckIfRockets:
@@ -501,11 +499,9 @@
done
Route43_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 9, 51, 1, ROUTE_43_MAHOGANY_GATE
warp_event 10, 51, 2, ROUTE_43_MAHOGANY_GATE
warp_event 17, 35, 3, ROUTE_43_GATE
@@ -512,17 +508,14 @@
warp_event 17, 31, 1, ROUTE_43_GATE
warp_event 18, 31, 2, ROUTE_43_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 13, 3, BGEVENT_READ, Route43Sign1
bg_event 11, 49, BGEVENT_READ, Route43Sign2
bg_event 16, 38, BGEVENT_READ, Route43TrainerTips
-.ObjectEvents:
- db 8
+ db 8 ; object events
object_event 13, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1
object_event 13, 20, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacBrent1, -1
object_event 14, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -6,13 +6,11 @@
const ROUTE43GATE_ROCKET2
Route43Gate_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .RocketShakedown
scene_script .DummyScene
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .CheckIfRockets
.RocketShakedown:
@@ -248,24 +246,19 @@
done
Route43Gate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 4, 0, 4, ROUTE_43
warp_event 5, 0, 5, ROUTE_43
warp_event 4, 7, 3, ROUTE_43
warp_event 5, 7, 3, ROUTE_43
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS
object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS
object_event 7, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS
--- a/maps/Route43MahoganyGate.asm
+++ b/maps/Route43MahoganyGate.asm
@@ -2,11 +2,9 @@
const ROUTE43MAHOGANYGATE_OFFICER
Route43MahoganyGate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
OfficerScript_0x19ab0b:
faceplayer
@@ -39,22 +37,17 @@
done
Route43MahoganyGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 4, 0, 1, ROUTE_43
warp_event 5, 0, 2, ROUTE_43
warp_event 4, 7, 5, MAHOGANY_TOWN
warp_event 5, 7, 5, MAHOGANY_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ab0b, -1
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -12,11 +12,9 @@
const ROUTE44_POKE_BALL3
Route44_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerBirdKeeperVance1:
trainer BIRD_KEEPER, VANCE1, EVENT_BEAT_BIRD_KEEPER_VANCE, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script
@@ -507,24 +505,19 @@
done
Route44_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 56, 7, 1, ICE_PATH_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 53, 7, BGEVENT_READ, Route44Sign1
bg_event 6, 10, BGEVENT_READ, Route44Sign2
bg_event 32, 9, BGEVENT_ITEM, Route44HiddenElixer
-.ObjectEvents:
- db 11
+ db 11 ; object events
object_event 35, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1
object_event 19, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherEdgar, -1
object_event 10, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -14,11 +14,9 @@
const ROUTE45_YOUNGSTER
Route45_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerBlackbeltKenji:
trainer BLACKBELT_T, KENJI3, EVENT_BEAT_BLACKBELT_KENJI, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script
@@ -532,23 +530,18 @@
done
Route45_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 2, 5, 1, DARK_CAVE_BLACKTHORN_ENTRANCE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 10, 4, BGEVENT_READ, Route45Sign
bg_event 13, 80, BGEVENT_ITEM, Route45HiddenPpUp
-.ObjectEvents:
- db 13
+ db 13 ; object events
object_event 10, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerErik, -1
object_event 15, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerMichael, -1
object_event 5, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerParry, -1
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -7,11 +7,9 @@
const ROUTE46_POKE_BALL
Route46_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerCamperTed:
trainer CAMPER, TED, EVENT_BEAT_CAMPER_TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script
@@ -251,24 +249,19 @@
done
Route46_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 7, 33, 1, ROUTE_29_ROUTE_46_GATE
warp_event 8, 33, 2, ROUTE_29_ROUTE_46_GATE
warp_event 14, 5, 3, DARK_CAVE_VIOLET_ENTRANCE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 9, 27, BGEVENT_READ, Route46Sign
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 12, 19, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1
object_event 4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1
object_event 2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -2,11 +2,9 @@
const ROUTE5_POKEFAN_M
Route5_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route5PokefanMScript:
jumptextfaceplayer Route5PokefanMText
@@ -40,24 +38,19 @@
done
Route5_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
warp_event 8, 17, 1, ROUTE_5_SAFFRON_GATE
warp_event 9, 17, 2, ROUTE_5_SAFFRON_GATE
warp_event 10, 11, 1, ROUTE_5_CLEANSE_TAG_HOUSE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 17, 17, BGEVENT_READ, Route5UndergroundPathSign
bg_event 10, 11, BGEVENT_READ, HouseForSaleSign
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 17, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
--- a/maps/Route5CleanseTagHouse.asm
+++ b/maps/Route5CleanseTagHouse.asm
@@ -3,11 +3,9 @@
const ROUTE5CLEANSETAGHOUSE_TEACHER
Route5CleanseTagHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
GrannyScript_0x18b634:
faceplayer
@@ -61,23 +59,18 @@
done
Route5CleanseTagHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 4, ROUTE_5
warp_event 3, 7, 4, ROUTE_5
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, HouseForSaleBookshelf
bg_event 1, 1, BGEVENT_READ, HouseForSaleBookshelf
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1
object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseTeacherScript, -1
--- a/maps/Route5SaffronGate.asm
+++ b/maps/Route5SaffronGate.asm
@@ -2,11 +2,9 @@
const ROUTE5SAFFRONGATE_OFFICER
Route5SaffronGate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route5SaffronGateOfficerScript:
jumptextfaceplayer Route5SaffronGateOfficerText
@@ -21,22 +19,17 @@
done
Route5SaffronGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 4, 0, 2, ROUTE_5
warp_event 5, 0, 3, ROUTE_5
warp_event 4, 7, 9, SAFFRON_CITY
warp_event 5, 7, 9, SAFFRON_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronGateOfficerScript, -1
--- a/maps/Route5UndergroundPathEntrance.asm
+++ b/maps/Route5UndergroundPathEntrance.asm
@@ -2,11 +2,9 @@
const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER
Route5UndergroundPathEntrance_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route5UndergroundPathEntranceTeacherScript:
jumptextfaceplayer Route5UndergroundPathEntranceTeacherText
@@ -20,21 +18,16 @@
done
Route5UndergroundPathEntrance_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 1, ROUTE_5
warp_event 4, 7, 1, ROUTE_5
warp_event 4, 3, 1, UNDERGROUND_PATH
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundPathEntranceTeacherScript, -1
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -4,11 +4,9 @@
const ROUTE6_POKEFAN_M3
Route6_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerPokefanmRex:
trainer POKEFANM, REX, EVENT_BEAT_POKEFANM_REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script
@@ -92,23 +90,18 @@
done
Route6_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 17, 3, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
warp_event 6, 1, 3, ROUTE_6_SAFFRON_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 19, 5, BGEVENT_READ, Route6UndergroundPathSign
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 17, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
object_event 9, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1
object_event 10, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmAllan, -1
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -2,12 +2,10 @@
const ROUTE6SAFFRONGATE_OFFICER
Route6SaffronGate_MapScripts:
-.SceneScripts:
- db 1
+ db 1 ; scene scripts
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene:
end
@@ -58,22 +56,17 @@
done
Route6SaffronGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 4, 0, 12, SAFFRON_CITY
warp_event 5, 0, 13, SAFFRON_CITY
warp_event 4, 7, 2, ROUTE_6
warp_event 5, 7, 2, ROUTE_6
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1926ea, -1
--- a/maps/Route6UndergroundPathEntrance.asm
+++ b/maps/Route6UndergroundPathEntrance.asm
@@ -1,25 +1,18 @@
Route6UndergroundPathEntrance_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route6UndergroundPathEntrance_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 1, ROUTE_6
warp_event 4, 7, 1, ROUTE_6
warp_event 4, 3, 2, UNDERGROUND_PATH
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/Route7.asm
+++ b/maps/Route7.asm
@@ -1,9 +1,7 @@
Route7_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route7UndergroundPathSign:
jumptext Route7UndergroundPathSignText
@@ -35,21 +33,16 @@
done
Route7_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 15, 6, 1, ROUTE_7_SAFFRON_GATE
warp_event 15, 7, 2, ROUTE_7_SAFFRON_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 5, 11, BGEVENT_READ, Route7UndergroundPathSign
bg_event 6, 9, BGEVENT_READ, Route7LockedDoor
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/Route7SaffronGate.asm
+++ b/maps/Route7SaffronGate.asm
@@ -2,11 +2,9 @@
const ROUTE7SAFFRONGATE_OFFICER
Route7SaffronGate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
OfficerScript_0x73518:
faceplayer
@@ -46,22 +44,17 @@
done
Route7SaffronGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 0, 4, 1, ROUTE_7
warp_event 0, 5, 2, ROUTE_7
warp_event 9, 4, 10, SAFFRON_CITY
warp_event 9, 5, 11, SAFFRON_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x73518, -1
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -7,11 +7,9 @@
const ROUTE8_FRUIT_TREE
Route8_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerBikerDwayne:
trainer BIKER, DWAYNE, EVENT_BEAT_BIKER_DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script
@@ -173,24 +171,19 @@
done
Route8_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 4, 3, ROUTE_8_SAFFRON_GATE
warp_event 4, 5, 4, ROUTE_8_SAFFRON_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 11, 7, BGEVENT_READ, Route8UndergroundPathSign
bg_event 10, 5, BGEVENT_READ, Route8LockedDoor
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 10, 8, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1
object_event 10, 9, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1
object_event 10, 10, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1
--- a/maps/Route8SaffronGate.asm
+++ b/maps/Route8SaffronGate.asm
@@ -2,11 +2,9 @@
const ROUTE8SAFFRONGATE_OFFICER
Route8SaffronGate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route8SaffronGateOfficerScript:
jumptextfaceplayer Route8SaffronGateOfficerText
@@ -20,22 +18,17 @@
done
Route8SaffronGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 0, 4, 14, SAFFRON_CITY
warp_event 0, 5, 15, SAFFRON_CITY
warp_event 9, 4, 1, ROUTE_8
warp_event 9, 5, 2, ROUTE_8
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -7,11 +7,9 @@
const ROUTE9_POKEFAN_M2
Route9_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerCamperDean:
trainer CAMPER, DEAN, EVENT_BEAT_CAMPER_DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script
@@ -206,23 +204,18 @@
done
Route9_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 48, 15, 1, ROCK_TUNNEL_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 15, 7, BGEVENT_READ, Route9Sign
bg_event 41, 15, BGEVENT_ITEM, Route9HiddenEther
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 23, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperDean, -1
object_event 39, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1
object_event 11, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -1,11 +1,9 @@
RuinsOfAlphAerodactylChamber_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .CheckWall
scene_script .DummyScene
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .HiddenDoors
.CheckWall:
@@ -144,11 +142,9 @@
done
RuinsOfAlphAerodactylChamber_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 3, 9, 4, RUINS_OF_ALPH_OUTSIDE
warp_event 4, 9, 4, RUINS_OF_ALPH_OUTSIDE
warp_event 3, 3, 8, RUINS_OF_ALPH_INNER_CHAMBER
@@ -155,11 +151,9 @@
warp_event 4, 3, 9, RUINS_OF_ALPH_INNER_CHAMBER
warp_event 4, 0, 1, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 6
+ db 6 ; bg events
bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script
@@ -167,5 +161,4 @@
bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script
bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/RuinsOfAlphAerodactylItemRoom.asm
+++ b/maps/RuinsOfAlphAerodactylItemRoom.asm
@@ -5,11 +5,9 @@
const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL4
RuinsOfAlphAerodactylItemRoom_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
RuinsOfAlphAerodactylItemRoomGoldBerry:
itemball GOLD_BERRY
@@ -33,26 +31,21 @@
done
RuinsOfAlphAerodactylItemRoom_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 3, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER
warp_event 4, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER
warp_event 3, 1, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM
warp_event 4, 1, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
--- a/maps/RuinsOfAlphAerodactylWordRoom.asm
+++ b/maps/RuinsOfAlphAerodactylWordRoom.asm
@@ -1,25 +1,18 @@
RuinsOfAlphAerodactylWordRoom_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
RuinsOfAlphAerodactylWordRoom_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 9, 5, 3, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
warp_event 10, 5, 4, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
warp_event 17, 11, 8, RUINS_OF_ALPH_INNER_CHAMBER
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -1,11 +1,9 @@
RuinsOfAlphHoOhChamber_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .CheckWall
scene_script .DummyScene
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .HiddenDoors
.CheckWall:
@@ -145,11 +143,9 @@
done
RuinsOfAlphHoOhChamber_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 3, 9, 1, RUINS_OF_ALPH_OUTSIDE
warp_event 4, 9, 1, RUINS_OF_ALPH_OUTSIDE
warp_event 3, 3, 2, RUINS_OF_ALPH_INNER_CHAMBER
@@ -156,11 +152,9 @@
warp_event 4, 3, 3, RUINS_OF_ALPH_INNER_CHAMBER
warp_event 4, 0, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 6
+ db 6 ; bg events
bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost2Script
@@ -168,5 +162,4 @@
bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script
bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/RuinsOfAlphHoOhItemRoom.asm
+++ b/maps/RuinsOfAlphHoOhItemRoom.asm
@@ -5,11 +5,9 @@
const RUINSOFALPHHOOHITEMROOM_POKE_BALL4
RuinsOfAlphHoOhItemRoom_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
RuinsOfAlphHoOhItemRoomGoldBerry:
itemball GOLD_BERRY
@@ -33,26 +31,21 @@
done
RuinsOfAlphHoOhItemRoom_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 3, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER
warp_event 4, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER
warp_event 3, 1, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM
warp_event 4, 1, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
--- a/maps/RuinsOfAlphHoOhWordRoom.asm
+++ b/maps/RuinsOfAlphHoOhWordRoom.asm
@@ -1,25 +1,18 @@
RuinsOfAlphHoOhWordRoom_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
RuinsOfAlphHoOhWordRoom_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 9, 9, 3, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
warp_event 10, 9, 4, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
warp_event 17, 21, 2, RUINS_OF_ALPH_INNER_CHAMBER
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/RuinsOfAlphInnerChamber.asm
+++ b/maps/RuinsOfAlphInnerChamber.asm
@@ -4,13 +4,11 @@
const RUINSOFALPHINNERCHAMBER_GRAMPS
RuinsOfAlphInnerChamber_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .UnownAppear
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene0:
end
@@ -77,11 +75,9 @@
done
RuinsOfAlphInnerChamber_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 9
+ db 9 ; warp events
warp_event 10, 13, 5, RUINS_OF_ALPH_OUTSIDE
warp_event 3, 15, 3, RUINS_OF_ALPH_HO_OH_CHAMBER
warp_event 4, 15, 4, RUINS_OF_ALPH_HO_OH_CHAMBER
@@ -92,11 +88,9 @@
warp_event 15, 24, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER
warp_event 16, 24, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 26
+ db 26 ; bg events
bg_event 2, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
bg_event 5, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
bg_event 8, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
@@ -124,8 +118,7 @@
bg_event 14, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
bg_event 17, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 3, 7, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
object_event 14, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
object_event 11, 19, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -3,13 +3,11 @@
const RUINSOFALPHKABUTOCHAMBER_SCIENTIST
RuinsOfAlphKabutoChamber_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .CheckWall
scene_script .DummyScene
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .HiddenDoors
.CheckWall:
@@ -256,11 +254,9 @@
done
RuinsOfAlphKabutoChamber_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 3, 9, 2, RUINS_OF_ALPH_OUTSIDE
warp_event 4, 9, 2, RUINS_OF_ALPH_OUTSIDE
warp_event 3, 3, 4, RUINS_OF_ALPH_INNER_CHAMBER
@@ -267,11 +263,9 @@
warp_event 4, 3, 5, RUINS_OF_ALPH_INNER_CHAMBER
warp_event 4, 0, 1, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 6
+ db 6 ; bg events
bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script
bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script
bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost2Script
@@ -279,7 +273,6 @@
bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost4Script
bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost5Script
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 5, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
object_event 3, 1, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1
--- a/maps/RuinsOfAlphKabutoItemRoom.asm
+++ b/maps/RuinsOfAlphKabutoItemRoom.asm
@@ -5,11 +5,9 @@
const RUINSOFALPHKABUTOITEMROOM_POKE_BALL4
RuinsOfAlphKabutoItemRoom_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
RuinsOfAlphKabutoItemRoomBerry:
itemball BERRY
@@ -33,26 +31,21 @@
done
RuinsOfAlphKabutoItemRoom_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 3, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER
warp_event 4, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER
warp_event 3, 1, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM
warp_event 4, 1, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script
bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM
object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM
object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM
--- a/maps/RuinsOfAlphKabutoWordRoom.asm
+++ b/maps/RuinsOfAlphKabutoWordRoom.asm
@@ -1,25 +1,18 @@
RuinsOfAlphKabutoWordRoom_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
RuinsOfAlphKabutoWordRoom_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 9, 5, 3, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
warp_event 10, 5, 4, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
warp_event 17, 11, 4, RUINS_OF_ALPH_INNER_CHAMBER
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -1,11 +1,9 @@
RuinsOfAlphOmanyteChamber_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .CheckWall
scene_script .DummyScene
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .HiddenDoors
.CheckWall:
@@ -145,11 +143,9 @@
done
RuinsOfAlphOmanyteChamber_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 3, 9, 3, RUINS_OF_ALPH_OUTSIDE
warp_event 4, 9, 3, RUINS_OF_ALPH_OUTSIDE
warp_event 3, 3, 6, RUINS_OF_ALPH_INNER_CHAMBER
@@ -156,11 +152,9 @@
warp_event 4, 3, 7, RUINS_OF_ALPH_INNER_CHAMBER
warp_event 4, 0, 1, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 6
+ db 6 ; bg events
bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script
bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script
bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost2Script
@@ -168,5 +162,4 @@
bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script
bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/RuinsOfAlphOmanyteItemRoom.asm
+++ b/maps/RuinsOfAlphOmanyteItemRoom.asm
@@ -5,11 +5,9 @@
const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4
RuinsOfAlphOmanyteItemRoom_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
RuinsOfAlphOmanyteItemRoomMysteryberry:
itemball MYSTERYBERRY
@@ -33,26 +31,21 @@
done
RuinsOfAlphOmanyteItemRoom_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 3, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER
warp_event 4, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER
warp_event 3, 1, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM
warp_event 4, 1, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script
bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM
object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM
object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM
--- a/maps/RuinsOfAlphOmanyteWordRoom.asm
+++ b/maps/RuinsOfAlphOmanyteWordRoom.asm
@@ -1,25 +1,18 @@
RuinsOfAlphOmanyteWordRoom_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
RuinsOfAlphOmanyteWordRoom_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 9, 7, 3, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
warp_event 10, 7, 4, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
warp_event 17, 13, 6, RUINS_OF_ALPH_INNER_CHAMBER
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -6,13 +6,11 @@
const RUINSOFALPHOUTSIDE_YOUNGSTER3
RuinsOfAlphOutside_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .ScientistCallback
.DummyScene0:
@@ -281,11 +279,9 @@
done
RuinsOfAlphOutside_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 11
+ db 11 ; warp events
warp_event 2, 17, 1, RUINS_OF_ALPH_HO_OH_CHAMBER
warp_event 14, 7, 1, RUINS_OF_ALPH_KABUTO_CHAMBER
warp_event 2, 29, 1, RUINS_OF_ALPH_OMANYTE_CHAMBER
@@ -298,19 +294,16 @@
warp_event 13, 20, 1, ROUTE_32_RUINS_OF_ALPH_GATE
warp_event 13, 21, 2, ROUTE_32_RUINS_OF_ALPH_GATE
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 11, 14, 1, RuinsOfAlphOutsideScientistScene1
coord_event 10, 15, 1, RuinsOfAlphOutsideScientistScene2
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script
bg_event 12, 16, BGEVENT_READ, RuinsOfAlphOutsideSignpost1Script
bg_event 18, 12, BGEVENT_READ, RuinsOfAlphOutsideSignpost2Script
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 4, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1
object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST
object_event 13, 17, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -4,13 +4,11 @@
const RUINSOFALPHRESEARCHCENTER_SCIENTIST3
RuinsOfAlphResearchCenter_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .GetUnownDex
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .ScientistCallback
.DummyScene0:
@@ -393,25 +391,20 @@
done
RuinsOfAlphResearchCenter_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 6, RUINS_OF_ALPH_OUTSIDE
warp_event 3, 7, 6, RUINS_OF_ALPH_OUTSIDE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 6, 5, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost0Script
bg_event 3, 4, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost1Script
bg_event 7, 1, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost2Script
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1
object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1
object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
--- a/maps/SafariZoneBeta.asm
+++ b/maps/SafariZoneBeta.asm
@@ -1,24 +1,17 @@
SafariZoneBeta_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
SafariZoneBeta_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 9, 23, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA
warp_event 10, 23, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/SafariZoneFuchsiaGateBeta.asm
+++ b/maps/SafariZoneFuchsiaGateBeta.asm
@@ -1,26 +1,19 @@
SafariZoneFuchsiaGateBeta_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
SafariZoneFuchsiaGateBeta_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 4, 0, 1, SAFARI_ZONE_BETA
warp_event 5, 0, 2, SAFARI_ZONE_BETA
warp_event 4, 7, 7, FUCHSIA_CITY
warp_event 5, 7, 7, FUCHSIA_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/SafariZoneMainOffice.asm
+++ b/maps/SafariZoneMainOffice.asm
@@ -1,24 +1,17 @@
SafariZoneMainOffice_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
SafariZoneMainOffice_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 2, FUCHSIA_CITY
warp_event 3, 7, 2, FUCHSIA_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/SafariZoneWardensHome.asm
+++ b/maps/SafariZoneWardensHome.asm
@@ -2,11 +2,9 @@
const SAFARIZONEWARDENSHOME_LASS
SafariZoneWardensHome_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
WardensGranddaughter:
faceplayer
@@ -77,24 +75,19 @@
done
SafariZoneWardensHome_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 6, FUCHSIA_CITY
warp_event 3, 7, 6, FUCHSIA_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 4
+ db 4 ; bg events
bg_event 0, 1, BGEVENT_READ, WardensHomeBookshelf
bg_event 1, 1, BGEVENT_READ, WardensHomeBookshelf
bg_event 7, 0, BGEVENT_READ, WardenPhoto
bg_event 9, 0, BGEVENT_READ, SafariZonePhoto
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -9,11 +9,9 @@
const SAFFRONCITY_LASS2
SaffronCity_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -266,11 +264,9 @@
done
SaffronCity_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 15
+ db 15 ; warp events
warp_event 26, 3, 1, FIGHTING_DOJO
warp_event 34, 3, 1, SAFFRON_GYM
warp_event 25, 11, 2, SAFFRON_MART
@@ -287,11 +283,9 @@
warp_event 39, 22, 1, ROUTE_8_SAFFRON_GATE
warp_event 39, 23, 2, ROUTE_8_SAFFRON_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 8
+ db 8 ; bg events
bg_event 21, 5, BGEVENT_READ, SaffronCitySign
bg_event 33, 5, BGEVENT_READ, SaffronGymSign
bg_event 25, 5, BGEVENT_READ, FightingDojoSign
@@ -301,8 +295,7 @@
bg_event 10, 29, BGEVENT_READ, SaffronCityPokecenterSign
bg_event 26, 11, BGEVENT_READ, SaffronCityMartSign
-.ObjectEvents:
- db 8
+ db 8 ; object events
object_event 7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LassScript_0x19932a, -1
object_event 19, 30, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1
object_event 32, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -7,11 +7,9 @@
const SAFFRONGYM_GYM_GUY
SaffronGym_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
SabrinaScript_0x189c2e:
faceplayer
@@ -291,11 +289,9 @@
done
SaffronGym_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 32
+ db 32 ; warp events
warp_event 8, 17, 2, SAFFRON_CITY
warp_event 9, 17, 2, SAFFRON_CITY
warp_event 11, 15, 18, SAFFRON_GYM
@@ -329,15 +325,12 @@
warp_event 1, 3, 16, SAFFRON_GYM
warp_event 11, 9, 17, SAFFRON_GYM
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 8, 15, BGEVENT_READ, SaffronGymStatue
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1
object_event 17, 16, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1
object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -5,12 +5,10 @@
const SAFFRONMAGNETTRAINSTATION_LASS
SaffronMagnetTrainStation_MapScripts:
-.SceneScripts:
- db 1
+ db 1 ; scene scripts
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene:
end
@@ -216,25 +214,20 @@
done
SaffronMagnetTrainStation_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 8, 17, 6, SAFFRON_CITY
warp_event 9, 17, 6, SAFFRON_CITY
warp_event 6, 5, 4, GOLDENROD_MAGNET_TRAIN_STATION
warp_event 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION
-.CoordEvents:
- db 1
+ db 1 ; coord events
coord_event 11, 6, 0, Script_ArriveFromGoldenrod
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1
object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1
object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -4,11 +4,9 @@
const SAFFRONMART_COOLTRAINER_F
SaffronMart_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x18a3bf:
opentext
@@ -38,22 +36,17 @@
done
SaffronMart_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 3, SAFFRON_CITY
warp_event 3, 7, 3, SAFFRON_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1
object_event 7, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1
object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1
--- a/maps/SaffronPokecenter1F.asm
+++ b/maps/SaffronPokecenter1F.asm
@@ -5,11 +5,9 @@
const SAFFRONPOKECENTER1F_YOUNGSTER
SaffronPokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
NurseScript_0x18a47d:
jumpstd pokecenternurse
@@ -112,23 +110,18 @@
done
SaffronPokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 4, SAFFRON_CITY
warp_event 4, 7, 4, SAFFRON_CITY
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1
object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1
object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1
--- a/maps/SaffronPokecenter2FBeta.asm
+++ b/maps/SaffronPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
SaffronPokecenter2FBeta_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
SaffronPokecenter2FBeta_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 0, 7, 3, SAFFRON_POKECENTER_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -3,12 +3,10 @@
const SEAFOAMGYM_GYM_GUY
SeafoamGym_MapScripts:
-.SceneScripts:
- db 1
+ db 1 ; scene scripts
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene:
end
@@ -158,20 +156,15 @@
done
SeafoamGym_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 5, 5, 1, ROUTE_20
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 5, 2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1
object_event 6, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY
--- a/maps/SilphCo1F.asm
+++ b/maps/SilphCo1F.asm
@@ -3,11 +3,9 @@
const SILPHCO1F_OFFICER
SilphCo1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
SilphCoReceptionist:
jumptextfaceplayer SilphCoReceptionistText
@@ -56,21 +54,16 @@
done
SilphCo1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 7, SAFFRON_CITY
warp_event 3, 7, 7, SAFFRON_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 4, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionist, -1
object_event 13, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1
--- a/maps/SilverCaveItemRooms.asm
+++ b/maps/SilverCaveItemRooms.asm
@@ -3,11 +3,9 @@
const SILVERCAVEITEMROOMS_POKE_BALL2
SilverCaveItemRooms_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
SilverCaveItemRoomsMaxRevive:
itemball MAX_REVIVE
@@ -16,21 +14,16 @@
itemball FULL_RESTORE
SilverCaveItemRooms_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 13, 3, 3, SILVER_CAVE_ROOM_2
warp_event 7, 15, 4, SILVER_CAVE_ROOM_2
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE
object_event 15, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -1,9 +1,7 @@
SilverCaveOutside_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -24,22 +22,17 @@
done
SilverCaveOutside_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 23, 19, 1, SILVER_CAVE_POKECENTER_1F
warp_event 18, 11, 1, SILVER_CAVE_ROOM_1
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 24, 19, BGEVENT_READ, MtSilverPokecenterSign
bg_event 17, 13, BGEVENT_READ, MtSilverSign
bg_event 9, 25, BGEVENT_ITEM, SilverCaveOutsideHiddenFullRestore
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/SilverCavePokecenter1F.asm
+++ b/maps/SilverCavePokecenter1F.asm
@@ -3,11 +3,9 @@
const SILVERCAVEPOKECENTER1F_GRANNY
SilverCavePokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
NurseScript_0x1ae59a:
jumpstd pokecenternurse
@@ -30,22 +28,17 @@
done
SilverCavePokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 1, SILVER_CAVE_OUTSIDE
warp_event 4, 7, 1, SILVER_CAVE_OUTSIDE
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1
object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -5,11 +5,9 @@
const SILVERCAVEROOM1_POKE_BALL4
SilverCaveRoom1_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
SilverCaveRoom1MaxElixer:
itemball MAX_ELIXER
@@ -30,24 +28,19 @@
hiddenitem ULTRA_BALL, EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL
SilverCaveRoom1_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 9, 33, 2, SILVER_CAVE_OUTSIDE
warp_event 15, 1, 1, SILVER_CAVE_ROOM_2
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 16, 23, BGEVENT_ITEM, SilverCaveRoom1HiddenDireHit
bg_event 17, 12, BGEVENT_ITEM, SilverCaveRoom1HiddenUltraBall
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 4, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER
object_event 15, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN
object_event 5, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -4,11 +4,9 @@
const SILVERCAVEROOM2_POKE_BALL3
SilverCaveRoom2_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
SilverCaveRoom2Calcium:
itemball CALCIUM
@@ -23,25 +21,20 @@
hiddenitem MAX_POTION, EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION
SilverCaveRoom2_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 17, 31, 2, SILVER_CAVE_ROOM_1
warp_event 11, 5, 1, SILVER_CAVE_ROOM_3
warp_event 13, 21, 1, SILVER_CAVE_ITEM_ROOMS
warp_event 23, 3, 2, SILVER_CAVE_ITEM_ROOMS
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 14, 31, BGEVENT_ITEM, SilverCaveRoom2HiddenMaxPotion
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 24, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM
object_event 22, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL
object_event 4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -2,11 +2,9 @@
const SILVERCAVEROOM3_RED
SilverCaveRoom3_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Red:
special FadeOutMusic
@@ -51,19 +49,14 @@
done
SilverCaveRoom3_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 9, 33, 2, SILVER_CAVE_ROOM_2
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 9, 10, SPRITE_RED, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -10,11 +10,9 @@
const SLOWPOKEWELLB1F_POKE_BALL
SlowpokeWellB1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
SlowpokeWellB1FKurtScript:
jumptextfaceplayer SlowpokeWellB1FKurtText
@@ -321,22 +319,17 @@
done
SlowpokeWellB1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 17, 15, 6, AZALEA_TOWN
warp_event 7, 11, 1, SLOWPOKE_WELL_B2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 9
+ db 9 ; object events
object_event 15, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS
object_event 5, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS
object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -3,11 +3,9 @@
const SLOWPOKEWELLB2F_POKE_BALL
SlowpokeWellB2F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
GymGuyScript_0x5ad0b:
faceplayer
@@ -62,20 +60,15 @@
done
SlowpokeWellB2F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 9, 11, 2, SLOWPOKE_WELL_B1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1
object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE
--- a/maps/SoulHouse.asm
+++ b/maps/SoulHouse.asm
@@ -5,11 +5,9 @@
const SOULHOUSE_GRANNY
SoulHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
MrFuji:
jumptextfaceplayer MrFujiText
@@ -73,22 +71,17 @@
done
SoulHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 7, 6, LAVENDER_TOWN
warp_event 5, 7, 6, LAVENDER_TOWN
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 4, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1
object_event 7, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1
object_event 2, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -7,11 +7,9 @@
const SPROUTTOWER1F_POKE_BALL
SproutTower1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
SproutTower1FSage1Script:
jumptextfaceplayer SproutTower1FSage1Text
@@ -103,11 +101,9 @@
done
SproutTower1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 9, 15, 7, VIOLET_CITY
warp_event 10, 15, 7, VIOLET_CITY
warp_event 6, 4, 1, SPROUT_TOWER_2F
@@ -114,16 +110,13 @@
warp_event 2, 6, 2, SPROUT_TOWER_2F
warp_event 17, 3, 3, SPROUT_TOWER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 7, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script
bg_event 12, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 7, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1
object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1
object_event 11, 12, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FGrannyScript, -1
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -4,11 +4,9 @@
const SPROUTTOWER2F_POKE_BALL
SproutTower2F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerSageNico:
trainer SAGE, NICO, EVENT_BEAT_SAGE_NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script
@@ -85,25 +83,20 @@
done
SproutTower2F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 6, 4, 3, SPROUT_TOWER_1F
warp_event 2, 6, 4, SPROUT_TOWER_1F
warp_event 17, 3, 5, SPROUT_TOWER_1F
warp_event 10, 14, 1, SPROUT_TOWER_3F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 12, 15, BGEVENT_READ, MapSproutTower2FSignpost0Script
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 12, 3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1
object_event 9, 14, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1
object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -8,13 +8,11 @@
const SPROUTTOWER3F_SILVER
SproutTower3F_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene0:
end
@@ -330,19 +328,15 @@
done
SproutTower3F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 10, 14, 4, SPROUT_TOWER_2F
-.CoordEvents:
- db 1
+ db 1 ; coord events
coord_event 11, 9, 0, UnknownScript_0x184947
-.BGEvents:
- db 6
+ db 6 ; bg events
bg_event 8, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script
bg_event 11, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script
bg_event 9, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script
@@ -350,8 +344,7 @@
bg_event 5, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script
bg_event 14, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script
-.ObjectEvents:
- db 7
+ db 7 ; object events
object_event 8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1
object_event 8, 8, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1
object_event 10, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -7,12 +7,10 @@
const TEAMROCKETBASEB1F_POKE_BALL3
TeamRocketBaseB1F_MapScripts:
-.SceneScripts:
- db 1
+ db 1 ; scene scripts
scene_script .DummyScene
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .HideSecurityGrunt
.DummyScene:
@@ -727,18 +725,15 @@
done
TeamRocketBaseB1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 27, 2, 3, MAHOGANY_MART_1F
warp_event 3, 14, 1, TEAM_ROCKET_BASE_B2F
warp_event 5, 15, 4, TEAM_ROCKET_BASE_B1F
warp_event 25, 2, 3, TEAM_ROCKET_BASE_B1F
-.CoordEvents:
- db 30
+ db 30 ; coord events
; There are five security cameras in the base.
; Walking in front of one triggers two Rocket Grunts.
coord_event 24, 2, 0, SecurityCamera1a
@@ -774,8 +769,7 @@
coord_event 4, 13, 0, ExplodingTrap21
coord_event 5, 13, 0, ExplodingTrap22
-.BGEvents:
- db 9
+ db 9 ; bg events
bg_event 19, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script
bg_event 24, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
bg_event 6, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
@@ -786,8 +780,7 @@
bg_event 21, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script
bg_event 3, 11, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 0, 0, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS
object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION
object_event 18, 12, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -15,15 +15,13 @@
const TEAMROCKETBASEB2F_POKE_BALL
TeamRocketBaseB2F_MapScripts:
-.SceneScripts:
- db 4
+ db 4 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
scene_script .DummyScene2
scene_script .DummyScene3
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .TransmitterDoorCallback
.DummyScene0:
@@ -909,11 +907,9 @@
done
TeamRocketBaseB2F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 3, 14, 2, TEAM_ROCKET_BASE_B1F
warp_event 3, 2, 1, TEAM_ROCKET_BASE_B3F
warp_event 27, 2, 2, TEAM_ROCKET_BASE_B3F
@@ -920,8 +916,7 @@
warp_event 3, 6, 3, TEAM_ROCKET_BASE_B3F
warp_event 27, 14, 4, TEAM_ROCKET_BASE_B3F
-.CoordEvents:
- db 9
+ db 9 ; coord events
coord_event 5, 14, 0, LanceHealsScript1
coord_event 4, 13, 0, LanceHealsScript2
coord_event 14, 11, 1, UnknownScript_0x6cf95
@@ -932,8 +927,7 @@
coord_event 12, 10, 2, UnknownScript_0x6d07a
coord_event 12, 11, 2, UnknownScript_0x6d07a
-.BGEvents:
- db 23
+ db 23 ; bg events
bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
bg_event 15, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
bg_event 17, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
@@ -958,8 +952,7 @@
bg_event 17, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
bg_event 26, 7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal
-.ObjectEvents:
- db 14
+ db 14 ; object events
object_event 20, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
object_event 20, 16, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE
object_event 5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -15,15 +15,13 @@
const TEAMROCKETBASEB3F_POKE_BALL5
TeamRocketBaseB3F_MapScripts:
-.SceneScripts:
- db 4
+ db 4 ; scene scripts
scene_script .LanceGetsPassword
scene_script .DummyScene1
scene_script .DummyScene2
scene_script .DummyScene3
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .CheckGiovanniDoor
.LanceGetsPassword:
@@ -566,24 +564,20 @@
done
TeamRocketBaseB3F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 3, 2, 2, TEAM_ROCKET_BASE_B2F
warp_event 27, 2, 3, TEAM_ROCKET_BASE_B2F
warp_event 3, 6, 4, TEAM_ROCKET_BASE_B2F
warp_event 27, 14, 5, TEAM_ROCKET_BASE_B2F
-.CoordEvents:
- db 3
+ db 3 ; coord events
coord_event 10, 8, 2, UnknownScript_0x6e04b
coord_event 11, 8, 2, UnknownScript_0x6e052
coord_event 8, 10, 1, RocketBaseRival
-.BGEvents:
- db 10
+ db 10 ; bg events
bg_event 10, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
bg_event 11, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
bg_event 10, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript
@@ -595,8 +589,7 @@
bg_event 6, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
bg_event 7, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
-.ObjectEvents:
- db 14
+ db 14 ; object events
object_event 25, 14, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceGetPasswordScript, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS
object_event 8, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE
object_event 7, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -3,13 +3,11 @@
const TIMECAPSULE_CHRIS2
TimeCapsule_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .InitializeTimeCapsule
scene_script .DummyScene
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .SetWhichChris
.InitializeTimeCapsule:
@@ -54,23 +52,18 @@
done
TimeCapsule_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 7, 4, POKECENTER_2F
warp_event 5, 7, 4, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 4, 4, BGEVENT_RIGHT, MapTimeCapsuleSignpost1Script
bg_event 5, 4, BGEVENT_LEFT, MapTimeCapsuleSignpost1Script
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -11,13 +11,11 @@
const TINTOWER1F_SAGE6
TinTower1F_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .FaceSuicune
scene_script .DummyScene
-.MapCallbacks:
- db 2
+ db 2 ; callbacks
callback MAPCALLBACK_OBJECTS, .NPCsCallback
callback MAPCALLBACK_TILES, .StairsCallback
@@ -523,23 +521,18 @@
done
TinTower1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 9, 15, 12, ECRUTEAK_CITY
warp_event 10, 15, 12, ECRUTEAK_CITY
warp_event 10, 2, 2, TIN_TOWER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 10
+ db 10 ; object events
object_event 9, 9, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE
object_event 7, 9, SPRITE_RAIKOU, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU
object_event 12, 9, SPRITE_ENTEI, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI
--- a/maps/TinTower2F.asm
+++ b/maps/TinTower2F.asm
@@ -1,24 +1,17 @@
TinTower2F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TinTower2F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 10, 14, 1, TIN_TOWER_3F
warp_event 10, 2, 3, TIN_TOWER_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/TinTower3F.asm
+++ b/maps/TinTower3F.asm
@@ -2,30 +2,23 @@
const TINTOWER3F_POKE_BALL
TinTower3F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TinTower3FFullHeal:
itemball FULL_HEAL
TinTower3F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 10, 14, 1, TIN_TOWER_2F
warp_event 16, 2, 2, TIN_TOWER_4F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 3, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -4,11 +4,9 @@
const TINTOWER4F_POKE_BALL3
TinTower4F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TinTower4FUltraBall:
itemball ULTRA_BALL
@@ -23,25 +21,20 @@
hiddenitem MAX_POTION, EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION
TinTower4F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 2, 4, 2, TIN_TOWER_5F
warp_event 16, 2, 2, TIN_TOWER_3F
warp_event 2, 14, 3, TIN_TOWER_5F
warp_event 17, 15, 4, TIN_TOWER_5F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 11, 6, BGEVENT_ITEM, TinTower4FHiddenMaxPotion
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL
object_event 17, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP
object_event 2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -2,11 +2,9 @@
const TINTOWER5F_POKE_BALL
TinTower5F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TinTower5FRareCandy:
itemball RARE_CANDY
@@ -18,24 +16,19 @@
hiddenitem CARBOS, EVENT_TIN_TOWER_5F_HIDDEN_CARBOS
TinTower5F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 11, 15, 2, TIN_TOWER_6F
warp_event 2, 4, 1, TIN_TOWER_4F
warp_event 2, 14, 3, TIN_TOWER_4F
warp_event 17, 15, 4, TIN_TOWER_4F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 16, 14, BGEVENT_ITEM, TinTower5FHiddenFullRestore
bg_event 3, 15, BGEVENT_ITEM, TinTower5FHiddenCarbos
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 9, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY
--- a/maps/TinTower6F.asm
+++ b/maps/TinTower6F.asm
@@ -2,30 +2,23 @@
const TINTOWER6F_POKE_BALL
TinTower6F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TinTower6FMaxPotion:
itemball MAX_POTION
TinTower6F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 3, 9, 1, TIN_TOWER_7F
warp_event 11, 15, 1, TIN_TOWER_5F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 8, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -2,21 +2,17 @@
const TINTOWER7F_POKE_BALL
TinTower7F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TinTower7FMaxRevive:
itemball MAX_REVIVE
TinTower7F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 3, 9, 1, TIN_TOWER_6F
warp_event 10, 15, 1, TIN_TOWER_8F
warp_event 12, 7, 4, TIN_TOWER_7F
@@ -23,12 +19,9 @@
warp_event 8, 3, 3, TIN_TOWER_7F
warp_event 6, 9, 5, TIN_TOWER_9F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 16, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE
--- a/maps/TinTower8F.asm
+++ b/maps/TinTower8F.asm
@@ -4,11 +4,9 @@
const TINTOWER8F_POKE_BALL3
TinTower8F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TinTower8FNugget:
itemball NUGGET
@@ -20,11 +18,9 @@
itemball FULL_RESTORE
TinTower8F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 6
+ db 6 ; warp events
warp_event 2, 5, 2, TIN_TOWER_7F
warp_event 2, 11, 1, TIN_TOWER_9F
warp_event 16, 7, 2, TIN_TOWER_9F
@@ -32,14 +28,11 @@
warp_event 14, 15, 6, TIN_TOWER_9F
warp_event 6, 9, 7, TIN_TOWER_9F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET
object_event 11, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER
object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -2,11 +2,9 @@
const TINTOWER9F_POKE_BALL
TinTower9F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TinTower9FHPUp:
itemball HP_UP
@@ -22,11 +20,9 @@
done
TinTower9F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 7
+ db 7 ; warp events
warp_event 12, 3, 2, TIN_TOWER_8F
warp_event 2, 5, 3, TIN_TOWER_8F
warp_event 12, 7, 4, TIN_TOWER_8F
@@ -35,12 +31,9 @@
warp_event 6, 13, 5, TIN_TOWER_8F
warp_event 8, 13, 6, TIN_TOWER_8F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 9, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -2,11 +2,9 @@
const TINTOWERROOF_HO_OH
TinTowerRoof_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .HoOh
.HoOh:
@@ -45,19 +43,14 @@
done
TinTowerRoof_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 9, 13, 4, TIN_TOWER_9F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 9, 5, SPRITE_HO_OH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH
--- a/maps/TohjoFalls.asm
+++ b/maps/TohjoFalls.asm
@@ -2,30 +2,23 @@
const TOHJOFALLS_POKE_BALL
TohjoFalls_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TohjoFallsMoonStone:
itemball MOON_STONE
TohjoFalls_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 13, 15, 2, ROUTE_27
warp_event 25, 15, 3, ROUTE_27
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -3,13 +3,11 @@
const TRADECENTER_CHRIS2
TradeCenter_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .InitializeTradeCenter
scene_script .DummyScene
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .SetWhichChris
.InitializeTradeCenter:
@@ -54,23 +52,18 @@
done
TradeCenter_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 7, 2, POKECENTER_2F
warp_event 5, 7, 2, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script
bg_event 5, 4, BGEVENT_LEFT, MapTradeCenterSignpost1Script
-.ObjectEvents:
- db 2
+ db 2 ; object events
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
--- a/maps/TrainerHouse1F.asm
+++ b/maps/TrainerHouse1F.asm
@@ -6,11 +6,9 @@
const TRAINERHOUSE1F_GENTLEMAN
TrainerHouse1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerHouse1FReceptionistScript:
jumptextfaceplayer TrainerHouse1FReceptionistText
@@ -138,26 +136,21 @@
done
TrainerHouse1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 2, 13, 3, VIRIDIAN_CITY
warp_event 3, 13, 3, VIRIDIAN_CITY
warp_event 8, 2, 1, TRAINER_HOUSE_B1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 5, 0, BGEVENT_READ, MapTrainerHouse1FSignpost0Script
bg_event 7, 0, BGEVENT_READ, MapTrainerHouse1FSignpost1Script
bg_event 7, 10, BGEVENT_READ, MapTrainerHouse1FSignpost2Script
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 0, 11, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1
object_event 7, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1
object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -3,12 +3,10 @@
const TRAINERHOUSEB1F_CHRIS
TrainerHouseB1F_MapScripts:
-.SceneScripts:
- db 1
+ db 1 ; scene scripts
scene_script .DummyScene
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene:
end
@@ -170,21 +168,16 @@
done
TrainerHouseB1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 9, 4, 3, TRAINER_HOUSE_1F
-.CoordEvents:
- db 1
+ db 1 ; coord events
coord_event 7, 3, 0, TrainerHouseReceptionistScript
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 7, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
object_event 6, 11, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
--- a/maps/UndergroundPath.asm
+++ b/maps/UndergroundPath.asm
@@ -1,9 +1,7 @@
UndergroundPath_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
UndergroundPathHiddenFullRestore:
hiddenitem FULL_RESTORE, EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE
@@ -12,21 +10,16 @@
hiddenitem X_SPECIAL, EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL
UndergroundPath_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 3, 2, 3, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
warp_event 3, 24, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 3, 9, BGEVENT_ITEM, UndergroundPathHiddenFullRestore
bg_event 1, 19, BGEVENT_ITEM, UndergroundPathHiddenXSpecial
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -10,11 +10,9 @@
const UNIONCAVE1F_POKE_BALL4
UnionCave1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerPokemaniacLarry:
trainer POKEMANIAC, LARRY, EVENT_BEAT_POKEMANIAC_LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, .Script
@@ -200,24 +198,19 @@
done
UnionCave1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 5, 19, 3, UNION_CAVE_B1F
warp_event 3, 33, 4, UNION_CAVE_B1F
warp_event 17, 31, 1, ROUTE_33
warp_event 17, 3, 4, ROUTE_32
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 9
+ db 9 ; object events
object_event 3, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerDaniel, -1
object_event 4, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1
object_event 11, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerRussell, -1
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -8,11 +8,9 @@
const UNIONCAVEB1F_POKE_BALL2
UnionCaveB1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
TrainerPokemaniacAndrew:
trainer POKEMANIAC, ANDREW, EVENT_BEAT_POKEMANIAC_ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, .Script
@@ -153,11 +151,9 @@
done
UnionCaveB1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 3, 3, 7, RUINS_OF_ALPH_OUTSIDE
warp_event 3, 11, 8, RUINS_OF_ALPH_OUTSIDE
warp_event 7, 19, 1, UNION_CAVE_1F
@@ -164,14 +160,11 @@
warp_event 3, 33, 2, UNION_CAVE_1F
warp_event 17, 31, 1, UNION_CAVE_B2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 7
+ db 7 ; object events
object_event 9, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerPhillip, -1
object_event 16, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerLeonard, -1
object_event 5, 32, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -7,11 +7,9 @@
const UNIONCAVEB2F_LAPRAS
UnionCaveB2F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .Lapras
.Lapras:
@@ -142,21 +140,16 @@
done
UnionCaveB2F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 5, 3, 5, UNION_CAVE_B1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 15, 19, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermNick, -1
object_event 5, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1
object_event 3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -7,11 +7,9 @@
const VERMILIONCITY_POKEFAN_M
VermilionCity_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -268,11 +266,9 @@
done
VermilionCity_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 10
+ db 10 ; warp events
warp_event 5, 5, 1, VERMILION_FISHING_SPEECH_HOUSE
warp_event 9, 5, 1, VERMILION_POKECENTER_1F
warp_event 7, 13, 1, POKEMON_FAN_CLUB
@@ -284,11 +280,9 @@
warp_event 20, 31, 2, VERMILION_PORT_PASSAGE
warp_event 34, 7, 1, DIGLETTS_CAVE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 8
+ db 8 ; bg events
bg_event 25, 3, BGEVENT_READ, VermilionCitySign
bg_event 5, 19, BGEVENT_READ, VermilionGymSign
bg_event 5, 13, BGEVENT_READ, PokemonFanClubSign
@@ -298,8 +292,7 @@
bg_event 22, 13, BGEVENT_READ, VermilionCityMartSign
bg_event 12, 19, BGEVENT_ITEM, VermilionCityHiddenFullHeal
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 18, 9, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1
object_event 23, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1
object_event 26, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1
--- a/maps/VermilionDiglettsCaveSpeechHouse.asm
+++ b/maps/VermilionDiglettsCaveSpeechHouse.asm
@@ -2,11 +2,9 @@
const VERMILIONDIGLETTSCAVESPEECHHOUSE_GENTLEMAN
VermilionDiglettsCaveSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
VermilionDiglettsCaveSpeechHouseGentlemanScript:
jumptextfaceplayer VermilionDiglettsCaveSpeechHouseGentlemanText
@@ -21,20 +19,15 @@
done
VermilionDiglettsCaveSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 6, VERMILION_CITY
warp_event 3, 7, 6, VERMILION_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionDiglettsCaveSpeechHouseGentlemanScript, -1
--- a/maps/VermilionFishingSpeechHouse.asm
+++ b/maps/VermilionFishingSpeechHouse.asm
@@ -2,11 +2,9 @@
const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU
VermilionFishingSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
FishingDude:
jumptextfaceplayer FishingDudeText
@@ -51,21 +49,16 @@
done
VermilionFishingSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 1, VERMILION_CITY
warp_event 3, 7, 1, VERMILION_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 3, 0, BGEVENT_READ, FishingDudesHousePhoto
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 2, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -6,11 +6,9 @@
const VERMILIONGYM_GYM_GUY
VermilionGym_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
SurgeScript_0x1920a5:
faceplayer
@@ -261,19 +259,15 @@
done
VermilionGym_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 17, 7, VERMILION_CITY
warp_event 5, 17, 7, VERMILION_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 17
+ db 17 ; bg events
bg_event 1, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
bg_event 3, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
bg_event 5, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
@@ -292,8 +286,7 @@
bg_event 3, 15, BGEVENT_READ, VermilionGymStatue
bg_event 6, 15, BGEVENT_READ, VermilionGymStatue
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1
object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1
object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1
--- a/maps/VermilionMagnetTrainSpeechHouse.asm
+++ b/maps/VermilionMagnetTrainSpeechHouse.asm
@@ -3,11 +3,9 @@
const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER
VermilionMagnetTrainSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
VermilionMagnetTrainSpeechHousePokefanFScript:
jumptextfaceplayer VermilionMagnetTrainSpeechHousePokefanFText
@@ -34,23 +32,18 @@
done
VermilionMagnetTrainSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 4, VERMILION_CITY
warp_event 3, 7, 4, VERMILION_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf
bg_event 1, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1
object_event 0, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -4,11 +4,9 @@
const VERMILIONMART_BUENA
VermilionMart_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x191f7e:
opentext
@@ -37,22 +35,17 @@
done
VermilionMart_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 5, VERMILION_CITY
warp_event 3, 7, 5, VERMILION_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1
object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1
object_event 8, 6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1
--- a/maps/VermilionPokecenter1F.asm
+++ b/maps/VermilionPokecenter1F.asm
@@ -5,11 +5,9 @@
const VERMILIONPOKECENTER1F_BUG_CATCHER
VermilionPokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
NurseScript_0x191603:
jumpstd pokecenternurse
@@ -77,23 +75,18 @@
done
VermilionPokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 2, VERMILION_CITY
warp_event 4, 7, 2, VERMILION_CITY
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x191603, -1
object_event 7, 2, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1
object_event 6, 5, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1
--- a/maps/VermilionPokecenter2FBeta.asm
+++ b/maps/VermilionPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
VermilionPokecenter2FBeta_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
VermilionPokecenter2FBeta_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 0, 7, 3, VERMILION_POKECENTER_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -4,13 +4,11 @@
const VERMILIONPORT_SUPER_NERD
VermilionPort_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .LeaveFastShip
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.DummyScene0:
@@ -299,24 +297,19 @@
done
VermilionPort_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 9, 5, 5, VERMILION_PORT_PASSAGE
warp_event 7, 17, 1, FAST_SHIP_1F
-.CoordEvents:
- db 1
+ db 1 ; coord events
coord_event 7, 11, 0, UnknownScript_0x74e20
-.BGEvents:
- db 1
+ db 1 ; bg events
bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1
object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1
--- a/maps/VermilionPortPassage.asm
+++ b/maps/VermilionPortPassage.asm
@@ -2,11 +2,9 @@
const VERMILIONPORTPASSAGE_TEACHER
VermilionPortPassage_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
VermilionPortPassageTeacherScript:
jumptextfaceplayer VermilionPortPassageTeacherText
@@ -19,11 +17,9 @@
done
VermilionPortPassage_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 15, 0, 8, VERMILION_CITY
warp_event 16, 0, 9, VERMILION_CITY
warp_event 15, 4, 4, VERMILION_PORT_PASSAGE
@@ -30,12 +26,9 @@
warp_event 3, 2, 3, VERMILION_PORT_PASSAGE
warp_event 3, 14, 1, VERMILION_PORT
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 17, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -7,13 +7,11 @@
const VICTORYROAD_POKE_BALL5
VictoryRoad_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene0:
end
@@ -239,11 +237,9 @@
done
VictoryRoad_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 10
+ db 10 ; warp events
warp_event 9, 67, 5, VICTORY_ROAD_GATE
warp_event 1, 49, 3, VICTORY_ROAD
warp_event 1, 35, 2, VICTORY_ROAD
@@ -255,18 +251,15 @@
warp_event 0, 27, 8, VICTORY_ROAD
warp_event 13, 5, 3, ROUTE_23
-.CoordEvents:
- db 2
+ db 2 ; coord events
coord_event 12, 8, 0, UnknownScript_0x74492
coord_event 13, 8, 0, UnknownScript_0x744b5
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion
bg_event 3, 65, BGEVENT_ITEM, VictoryRoadHiddenFullHeal
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 18, 13, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD
object_event 3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE
object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -4,13 +4,11 @@
const VICTORYROADGATE_BLACK_BELT2
VictoryRoadGate_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
.DummyScene0:
end
@@ -98,11 +96,9 @@
done
VictoryRoadGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 8
+ db 8 ; warp events
warp_event 17, 7, 1, ROUTE_22
warp_event 18, 7, 1, ROUTE_22
warp_event 9, 17, 1, ROUTE_26
@@ -112,15 +108,12 @@
warp_event 1, 7, 2, ROUTE_28
warp_event 2, 7, 2, ROUTE_28
-.CoordEvents:
- db 1
+ db 1 ; coord events
coord_event 10, 11, 0, VictoryRoadGateBadgeCheckScene
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 8, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1
object_event 7, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER
object_event 12, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -9,11 +9,9 @@
const VIOLETCITY_POKE_BALL2
VioletCity_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -279,11 +277,9 @@
done
VioletCity_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 9
+ db 9 ; warp events
warp_event 9, 17, 2, VIOLET_MART
warp_event 18, 17, 1, VIOLET_GYM
warp_event 30, 17, 1, EARLS_POKEMON_ACADEMY
@@ -294,11 +290,9 @@
warp_event 39, 24, 1, ROUTE_31_VIOLET_GATE
warp_event 39, 25, 2, ROUTE_31_VIOLET_GATE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 7
+ db 7 ; bg events
bg_event 24, 20, BGEVENT_READ, VioletCitySign
bg_event 15, 17, BGEVENT_READ, VioletGymSign
bg_event 24, 8, BGEVENT_READ, SproutTowerSign
@@ -307,8 +301,7 @@
bg_event 10, 17, BGEVENT_READ, VioletCityMartSign
bg_event 37, 14, BGEVENT_ITEM, VioletCityHiddenHyperPotion
-.ObjectEvents:
- db 8
+ db 8 ; object events
object_event 13, 16, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL
object_event 28, 28, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityLassScript, -1
object_event 24, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -5,11 +5,9 @@
const VIOLETGYM_GYM_GUY
VioletGym_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
FalknerScript_0x683c2:
faceplayer
@@ -282,24 +280,19 @@
done
VioletGym_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 15, 2, VIOLET_CITY
warp_event 5, 15, 2, VIOLET_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 3, 13, BGEVENT_READ, VioletGymStatue
bg_event 6, 13, BGEVENT_READ, VioletGymStatue
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1
object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1
object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1
--- a/maps/VioletKylesHouse.asm
+++ b/maps/VioletKylesHouse.asm
@@ -3,11 +3,9 @@
const VIOLETKYLESHOUSE_KYLE
VioletKylesHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
VioletKylesHousePokefanMScript:
jumptextfaceplayer VioletKylesHousePokefanMText
@@ -33,21 +31,16 @@
done
VioletKylesHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 3, 7, 6, VIOLET_CITY
warp_event 4, 7, 6, VIOLET_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1
object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1
--- a/maps/VioletMart.asm
+++ b/maps/VioletMart.asm
@@ -4,11 +4,9 @@
const VIOLETMART_COOLTRAINER_M
VioletMart_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x68295:
opentext
@@ -49,22 +47,17 @@
done
VioletMart_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 1, VIOLET_CITY
warp_event 3, 7, 1, VIOLET_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x68295, -1
object_event 7, 6, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1
object_event 5, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1
--- a/maps/VioletNicknameSpeechHouse.asm
+++ b/maps/VioletNicknameSpeechHouse.asm
@@ -4,11 +4,9 @@
const VIOLETNICKNAMESPEECHHOUSE_BIRD
VioletNicknameSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
VioletNicknameSpeechHouseTeacherScript:
jumptextfaceplayer VioletNicknameSpeechHouseTeacherText
@@ -45,22 +43,17 @@
done
VioletNicknameSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 3, 7, 4, VIOLET_CITY
warp_event 4, 7, 4, VIOLET_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1
object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1
object_event 5, 2, SPRITE_BIRD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BirdScript_0x693ef, -1
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -6,11 +6,9 @@
const VIOLETPOKECENTER1F_SCIENTIST
VioletPokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
VioletPokecenterNurse:
jumpstd pokecenternurse
@@ -216,23 +214,18 @@
done
VioletPokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 5, VIOLET_CITY
warp_event 4, 7, 5, VIOLET_CITY
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 5
+ db 5 ; object events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1
object_event 7, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1
object_event 1, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -5,11 +5,9 @@
const VIRIDIANCITY_YOUNGSTER
ViridianCity_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -216,11 +214,9 @@
done
ViridianCity_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 32, 7, 1, VIRIDIAN_GYM
warp_event 21, 9, 1, VIRIDIAN_NICKNAME_SPEECH_HOUSE
warp_event 23, 15, 1, TRAINER_HOUSE_1F
@@ -227,11 +223,9 @@
warp_event 29, 19, 2, VIRIDIAN_MART
warp_event 23, 25, 1, VIRIDIAN_POKECENTER_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 6
+ db 6 ; bg events
bg_event 17, 17, BGEVENT_READ, ViridianCitySign
bg_event 27, 7, BGEVENT_READ, ViridianGymSign
bg_event 19, 1, BGEVENT_READ, ViridianCityWelcomeSign
@@ -239,8 +233,7 @@
bg_event 24, 25, BGEVENT_READ, ViridianCityPokecenterSign
bg_event 30, 19, BGEVENT_READ, ViridianCityMartSign
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a4c, -1
object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a61, -1
object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a9a75, -1
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -3,11 +3,9 @@
const VIRIDIANGYM_GYM_GUY
ViridianGym_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ViridianGymBlueScript:
faceplayer
@@ -170,23 +168,18 @@
done
ViridianGym_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 4, 17, 1, VIRIDIAN_CITY
warp_event 5, 17, 1, VIRIDIAN_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
+ db 2 ; bg events
bg_event 3, 13, BGEVENT_READ, ViridianGymStatue
bg_event 6, 13, BGEVENT_READ, ViridianGymStatue
-.ObjectEvents:
- db 2
+ db 2 ; object events
object_event 5, 3, SPRITE_BLUE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE
object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -4,11 +4,9 @@
const VIRIDIANMART_COOLTRAINER_M
ViridianMart_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ClerkScript_0x9b5e7:
opentext
@@ -37,22 +35,17 @@
done
ViridianMart_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 4, VIRIDIAN_CITY
warp_event 3, 7, 4, VIRIDIAN_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1
object_event 7, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1
object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1
--- a/maps/ViridianNicknameSpeechHouse.asm
+++ b/maps/ViridianNicknameSpeechHouse.asm
@@ -5,11 +5,9 @@
const VIRIDIANNICKNAMESPEECHHOUSE_RATTEY
ViridianNicknameSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ViridianNicknameSpeechHousePokefanMScript:
jumptextfaceplayer ViridianNicknameSpeechHousePokefanMText
@@ -62,22 +60,17 @@
done
ViridianNicknameSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 2, 7, 2, VIRIDIAN_CITY
warp_event 3, 7, 2, VIRIDIAN_CITY
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 2, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1
object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1
object_event 5, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1
--- a/maps/ViridianPokecenter1F.asm
+++ b/maps/ViridianPokecenter1F.asm
@@ -5,11 +5,9 @@
const VIRIDIANPOKECENTER1F_BUG_CATCHER
ViridianPokecenter1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
NurseScript_0x9b690:
jumpstd pokecenternurse
@@ -72,23 +70,18 @@
done
ViridianPokecenter1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 7, 5, VIRIDIAN_CITY
warp_event 4, 7, 5, VIRIDIAN_CITY
warp_event 0, 7, 1, POKECENTER_2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 4
+ db 4 ; object events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9b690, -1
object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1
object_event 5, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1
--- a/maps/ViridianPokecenter2FBeta.asm
+++ b/maps/ViridianPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
ViridianPokecenter2FBeta_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
ViridianPokecenter2FBeta_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 0, 7, 3, VIRIDIAN_POKECENTER_1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -7,11 +7,9 @@
const WHIRLISLANDB1F_BOULDER
WhirlIslandB1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
WhirlIslandB1FFullRestore:
itemball FULL_RESTORE
@@ -41,11 +39,9 @@
hiddenitem FULL_RESTORE, EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE
WhirlIslandB1F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 9
+ db 9 ; warp events
warp_event 5, 5, 2, WHIRL_ISLAND_NW
warp_event 35, 3, 2, WHIRL_ISLAND_NE
warp_event 29, 9, 3, WHIRL_ISLAND_NE
@@ -56,17 +52,14 @@
warp_event 13, 27, 2, WHIRL_ISLAND_B2F
warp_event 17, 21, 1, WHIRL_ISLAND_CAVE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 3
+ db 3 ; bg events
bg_event 30, 4, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy
bg_event 36, 18, BGEVENT_ITEM, WhirlIslandB1FHiddenUltraBall
bg_event 2, 23, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE
object_event 2, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS
object_event 33, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -4,11 +4,9 @@
const WHIRLISLANDB2F_POKE_BALL3
WhirlIslandB2F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
WhirlIslandB2FFullRestore:
itemball FULL_RESTORE
@@ -20,24 +18,19 @@
itemball MAX_ELIXER
WhirlIslandB2F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 11, 5, 7, WHIRL_ISLAND_B1F
warp_event 7, 11, 8, WHIRL_ISLAND_B1F
warp_event 7, 25, 1, WHIRL_ISLAND_LUGIA_CHAMBER
warp_event 13, 31, 5, WHIRL_ISLAND_SW
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 3
+ db 3 ; object events
object_event 10, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE
object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
object_event 5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER
--- a/maps/WhirlIslandCave.asm
+++ b/maps/WhirlIslandCave.asm
@@ -1,24 +1,17 @@
WhirlIslandCave_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
WhirlIslandCave_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 7, 5, 9, WHIRL_ISLAND_B1F
warp_event 3, 13, 4, WHIRL_ISLAND_NW
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -2,11 +2,9 @@
const WHIRLISLANDLUGIACHAMBER_LUGIA
WhirlIslandLugiaChamber_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .Lugia
.Lugia:
@@ -44,19 +42,14 @@
done
WhirlIslandLugiaChamber_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
+ db 1 ; warp events
warp_event 9, 13, 3, WHIRL_ISLAND_B2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 9, 5, SPRITE_LUGIA, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -2,31 +2,24 @@
const WHIRLISLANDNE_POKE_BALL
WhirlIslandNE_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
WhirlIslandNEUltraBall:
itemball ULTRA_BALL
WhirlIslandNE_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 3, 13, 2, ROUTE_41
warp_event 17, 3, 2, WHIRL_ISLAND_B1F
warp_event 13, 11, 3, WHIRL_ISLAND_B1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 11, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL
--- a/maps/WhirlIslandNW.asm
+++ b/maps/WhirlIslandNW.asm
@@ -1,26 +1,19 @@
WhirlIslandNW_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
WhirlIslandNW_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
+ db 4 ; warp events
warp_event 5, 7, 1, ROUTE_41
warp_event 5, 3, 1, WHIRL_ISLAND_B1F
warp_event 3, 15, 4, WHIRL_ISLAND_SW
warp_event 7, 15, 2, WHIRL_ISLAND_CAVE
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/WhirlIslandSE.asm
+++ b/maps/WhirlIslandSE.asm
@@ -1,24 +1,17 @@
WhirlIslandSE_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
WhirlIslandSE_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
+ db 2 ; warp events
warp_event 5, 13, 4, ROUTE_41
warp_event 5, 3, 6, WHIRL_ISLAND_B1F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 0
+ db 0 ; object events
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -2,21 +2,17 @@
const WHIRLISLANDSW_POKE_BALL
WhirlIslandSW_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
WhirlIslandSWUltraBall:
itemball ULTRA_BALL
WhirlIslandSW_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 5
+ db 5 ; warp events
warp_event 5, 7, 3, ROUTE_41
warp_event 17, 3, 5, WHIRL_ISLAND_B1F
warp_event 3, 3, 4, WHIRL_ISLAND_B1F
@@ -23,12 +19,9 @@
warp_event 3, 15, 3, WHIRL_ISLAND_NW
warp_event 17, 15, 4, WHIRL_ISLAND_B2F
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -2,13 +2,11 @@
const WILLSROOM_WILL
WillsRoom_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .LockDoor
scene_script .DummyScene
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_TILES, .WillsRoomDoors
.LockDoor:
@@ -129,21 +127,16 @@
done
WillsRoom_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 5, 17, 4, INDIGO_PLATEAU_POKECENTER_1F
warp_event 4, 2, 1, KOGAS_ROOM
warp_event 5, 2, 2, KOGAS_ROOM
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 5, 7, SPRITE_WILL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -7,13 +7,11 @@
const WISETRIOSROOM_SAGE6
WiseTriosRoom_MapScripts:
-.SceneScripts:
- db 2
+ db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
-.MapCallbacks:
- db 1
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .WiseTrioCallback
.DummyScene0:
@@ -345,24 +343,19 @@
done
WiseTriosRoom_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
+ db 3 ; warp events
warp_event 7, 4, 4, ECRUTEAK_CITY
warp_event 7, 5, 5, ECRUTEAK_CITY
warp_event 1, 4, 5, ECRUTEAK_TIN_TOWER_ENTRANCE
-.CoordEvents:
- db 1
+ db 1 ; coord events
coord_event 7, 4, 0, UnknownScript_0x985a3
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 6
+ db 6 ; object events
object_event 6, 2, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
object_event 7, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1