diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-30 14:15:47 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-30 14:15:47 -0500 |
| commit | 65480605e9f2ca576e3086907ee7163413117b78 (patch) | |
| tree | dabf36bb4db2a866fa9c24d429a527fc5369fe69 | |
| parent | 4c4fca1028c2d0906dc101d89ca6e0be4664c342 (diff) | |
Remove unreferenced map script heading labels
389 files changed, 2723 insertions, 5440 deletions
diff --git a/docs/map_scripts.md b/docs/map_scripts.md index 0939f5bfa..fa864ac37 100644 --- a/docs/map_scripts.md +++ b/docs/map_scripts.md @@ -11,14 +11,14 @@ ## <code>MapName_MapScripts:</code> -### <code>.SceneScripts: db <i>N</i></code> +### <code>db <i>N</i> ; scene scripts</code> <pre> scene_script <i>script</i> </pre> -### <code>.MapCallbacks: db <i>N</i></code> +### <code>db <i>N</i> ; callbacks</code> <pre> callback <i>type</i>, <i>script</i> @@ -70,26 +70,25 @@ Callback types: ## <code>MapName_MapEvents:</code> ```asm - ; filler - db 0, 0 + 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> </pre> -### <code>.CoordEvents: db <i>N</i></code> +### <code>db <i>N</i> ; coord events</code> <pre> coord_event <i>x</i>, <i>y</i>, <i>scene_id</i>, <i>script</i> </pre> -### <code>.BGEvents: db <i>N</i></code> +### <code>db <i>N</i> ; bg events</code> <pre> bg_event <i>x</i>, <i>y</i>, <i>type</i>, <i>script</i> @@ -115,7 +114,7 @@ BG event types: - `BGEVENT_COPY` -### <code>.ObjectEvents: db <i>N</i></code> +### <code>db <i>N</i> ; object events</code> <pre> object_event <i>x</i>, <i>y</i>, <i>sprite</i>, <i>movement</i>, <i>rx</i>, <i>ry</i>, <i>h1</i>, <i>h2</i>, <i>palette</i>, <i>type</i>, <i>range</i>, <i>script</i>, <i>event_flag</i> diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index e9e4a526c..b23523a47 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -8,11 +8,9 @@ const_value set 2 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 @@ AzaleaGymGuyWinText: 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 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 13c68e7dd..4d8b4997a 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ AzaleaMartBugCatcherText: 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 diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm index 8d7809d5b..e644e99f1 100644 --- a/maps/AzaleaPokecenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -5,12 +5,10 @@ const_value set 2 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 @@ AzaleaPokecenter1FPokefanFText: 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 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index f60b35efc..e7940c638 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -13,14 +13,12 @@ const_value set 2 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 @@ AzaleaTownIlexForestSignText: 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 @@ AzaleaTown_MapEvents: 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 @@ AzaleaTown_MapEvents: 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 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 1b81d1baf..42242bd8c 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -6,13 +6,11 @@ const_value set 2 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 @@ Text_BattleTowerBugCatcher: ; 0x9f35b 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 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 58f3484b9..24011c144 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -3,13 +3,11 @@ const_value set 2 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 @@ Text_ReturnedAfterSave_Mobile: 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 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index ff3781404..1704c3601 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -2,13 +2,11 @@ const_value set 2 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 @@ MovementData_BattleTowerElevatorPlayerWalksIn: 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 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index a12059c33..3cfc923e0 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -2,13 +2,11 @@ const_value set 2 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 @@ BattleTowerHallway_MapScripts: 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 @@ BattleTowerHallway_MapEvents: 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 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index b7dc6f4db..f9b58af82 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ BattleTowerOutsideText_DoorsOpen: 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 diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm index b0cc14a65..ff951b05c 100644 --- a/maps/BillsBrothersHouse.asm +++ b/maps/BillsBrothersHouse.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ BillsBrothersHouseYoungsterText: 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 diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index 16504edd1..05c757e71 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -4,11 +4,9 @@ const_value set 2 const BILLSFAMILYSHOUSE_TWIN BillsFamilysHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks BillScript: faceplayer @@ -243,25 +241,20 @@ UnknownText_0x55069: 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 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index ed3e8d460..f27b4a5a3 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const BILLSHOUSE_GRAMPS BillsHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks BillsGrandpa: faceplayer @@ -354,20 +352,15 @@ BillsGrandpaPichuText: 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 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 2897346e7..edc4e2f66 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -10,11 +10,9 @@ const_value set 2 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 @@ BlackthornCityTrainerTipsText: 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 @@ BlackthornCity_MapEvents: 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 @@ BlackthornCity_MapEvents: 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 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 69110c5a7..3ee16fefc 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ BlackthornDragonSpeechHouseDratiniText: 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 diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index 63d12d8d9..21599704c 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const BLACKTHORNEMYSHOUSE_EMY BlackthornEmysHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Emy: faceplayer @@ -20,22 +18,17 @@ EmysHouseBookshelf: 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 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 937abca02..2f3f22971 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -6,11 +6,9 @@ const_value set 2 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 @@ BlackthornGymGuyWinText: 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 @@ BlackthornGym1F_MapEvents: 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 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 5e0eca4bc..2417a14b1 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -9,11 +9,9 @@ const_value set 2 const BLACKTHORNGYM2F_BOULDER6 BlackthornGym2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable .SetUpStoneTable: @@ -126,25 +124,20 @@ BlackthornGym2FBoulderFellText: 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 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 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 638a04425..0272436fd 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ BlackthornMartBlackBeltText: 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 diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index 0a1774eb0..e7baf90d9 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ BlackthornPokecenter1FTwinText: 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 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 5dfc15c79..e6283bd40 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const BLUESHOUSE_DAISY BluesHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks DaisyScript: faceplayer @@ -145,20 +143,15 @@ DaisyCantGroomEggText: 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 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 55ae4b3b2..ef1557c03 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -2,13 +2,11 @@ const_value set 2 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 @@ BrunoScript_BrunoDefeatText: 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 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index fdf02f76e..8d276a634 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -6,14 +6,12 @@ const_value set 2 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 @@ BurnedTower1FMortyText: 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 @@ BurnedTower1F_MapEvents: 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 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 1d8ef9635..7c0b4d7f3 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -10,13 +10,11 @@ const_value set 2 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 @@ BurnedTowerB1FEusineText: 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 @@ BurnedTowerB1F_MapEvents: 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 diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 6044f5a44..8d2d04824 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -6,11 +6,9 @@ const_value set 2 const CELADONCAFE_TEACHER CeladonCafe_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonCafeChef: faceplayer @@ -208,24 +206,19 @@ NoRoomForLeftoversText: 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 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index befcb1cd4..e7e62ac4e 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -10,11 +10,9 @@ const_value set 2 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 @@ CeladonCityTrainerTipsText: 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 @@ CeladonCity_MapEvents: 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 @@ CeladonCity_MapEvents: 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 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index be1193715..5eede6743 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ CeladonDeptStore1FDirectoryText: 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 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index f14c8822a..4ec78cb6f 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ CeladonDeptStore2FDirectoryText: 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 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 5ad0d1404..4950dee28 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -6,11 +6,9 @@ const_value set 2 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 @@ CeladonDeptStore3FDirectoryText: 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 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 1d5c109a3..1d8e8e7fc 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ CeladonDeptStore4FDirectoryText: 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 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index fe73776c1..63c65acab 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -6,11 +6,9 @@ const_value set 2 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 @@ CeladonDeptStore5FDirectoryText: 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 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 624e564e7..f70a7d725 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ CeladonDeptStore6FDirectoryText: 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 @@ CeladonDeptStore6F_MapEvents: 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 diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index 1fef9a82c..cbf8f1efa 100644 --- 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 @@ CeladonDeptStoreElevatorData: 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 diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 060f9ae7c..1c213bacf 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -10,11 +10,9 @@ const_value set 2 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 @@ UnknownText_0x72567: 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 @@ CeladonGameCorner_MapEvents: 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 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 5c8653084..cc64e736e 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ CeladonPrizeRoom_NoCoinCaseText: 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 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 4b2d037dc..1c6e1169c 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ TwinsJoandzoe2AfterBattleText: 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 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index defbfa758..5d14663a9 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -5,11 +5,9 @@ const_value set 2 const CELADONMANSION1F_GROWLITHE2 CeladonMansion1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonMansionManager: jumptextfaceplayer CeladonMansionManagerText @@ -75,28 +73,23 @@ CeladonMansionManagersSuiteSignText: 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 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 diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index 55dea8af3..231e824c8 100644 --- 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 @@ CeladonMansion2FSignText: 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 diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 9372977b4..39ac12d7a 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ UnknownText_0x71996: 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 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 65178e283..254000bd1 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ UnknownText_0x71aa1: 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 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 7db64f29a..b82709b6c 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ UnknownText_0x71db3: 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 diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 9971b8a06..0590da32d 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -6,11 +6,9 @@ const_value set 2 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 @@ NoBeastsText: 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 diff --git a/maps/CeladonPokecenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm index bdfa7ad6d..836369e9a 100644 --- 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 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 0d29af242..0e649cba0 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ CeruleanLockedDoorText: 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 @@ CeruleanCity_MapEvents: 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 @@ CeruleanCity_MapEvents: 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 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 3a78fe398..f43cf4d12 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -7,13 +7,11 @@ const_value set 2 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 @@ CeruleanGymGuyWinText: 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 diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index f0afe7724..19b60dfdb 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ CeruleanGymBadgeSpeechHousePokefanMText: 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 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 8327a3519..d66986a89 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ CeruleanMart_CooltrainerFText: 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 diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 146dab83d..7988f7154 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ CeruleanPokecenter1FGymGuyText: 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 diff --git a/maps/CeruleanPokecenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm index 58a2299fd..cbfabf4bf 100644 --- 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 diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 67fd4f763..7adaba556 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ CeruleanDiglettText: 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 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 373f6ce32..785b43cc9 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ UnknownText_0x1881b5: 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 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index a768a0bef..91ee79e25 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -4,11 +4,9 @@ const_value set 2 const CHARCOALKILN_MOLTRES CharcoalKiln_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CharcoalKilnBoss: faceplayer @@ -149,25 +147,20 @@ FarfetchdText: 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 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index bee085804..4df1fd299 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -6,13 +6,11 @@ const_value set 2 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,31 +545,26 @@ GuideGentsHouseSignText: 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 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 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index e634c3981..8ecad6337 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ UnknownText_0x196cfc: 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 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 86bc4eaa4..df5c588c6 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ CherrygroveGymSpeechHouseBugCatcherText: 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 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 4684c9216..7ccc16f59 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ CherrygroveMartYoungsterText: 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 diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index 364a8443c..abc16919f 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ UnknownText_0x196a46: 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 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index c6daa18c2..11fbaf9a2 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -13,13 +13,11 @@ const_value set 2 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 @@ CianwoodPokeSeerSignText: 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 @@ CianwoodCity_MapEvents: 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 @@ CianwoodCity_MapEvents: 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 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index e0bb019e1..fd4109957 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -10,11 +10,9 @@ const_value set 2 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 @@ BlackbeltLungAfterText: 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 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index b0b20210d..1049d5280 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ CianwoodLugiaSpeechHouseTwinText: 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 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 281583a8e..8bb278e3d 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -2,12 +2,10 @@ const_value set 2 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 @@ PharmacistDescribeSecretpotionText: 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 diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index 1c86fa150..956d64948 100644 --- a/maps/CianwoodPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ UnknownText_0x9e156: 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 diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index 848688257..3b7e41f17 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ CianwoodPokecenter1FSuperNerdText: 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 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 70b1ab9c2..021da6387 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ CinnabarIslandSignText: 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 diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index b46f5023b..c5f5956e9 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ CinnabarPokecenter1FFisherText: 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 diff --git a/maps/CinnabarPokecenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm index 8cecb04c7..559a1425f 100644 --- 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 diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index dcf4be92e..7dd4083a9 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -3,14 +3,12 @@ const_value set 2 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 @@ ChrisScript_0x193499: 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 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 97240f1fe..96249fe8d 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ UnknownText_0x18ae4b: 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 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index b13529aae..722b39dcc 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ CopycatsHouse2FDollText: 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 diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index fbc3c8a19..fa3c4abca 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -10,11 +10,9 @@ const_value set 2 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 @@ FancyPanelText: 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 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 75d67ac34..9806a905e 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ DarkCaveBlackthornEntrancePharmacistText2: 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 diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index fe24989d8..c188057e8 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -9,11 +9,9 @@ const_value set 2 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 @@ DarkCaveVioletEntranceHiddenElixer: 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 diff --git a/maps/DayCare.asm b/maps/DayCare.asm index ec60bb764..e6b3ea986 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ DayCareText_PartyFull: 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 diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm index aedc3e151..a4bfcf211 100644 --- a/maps/DayOfWeekSiblingsHouse.asm +++ b/maps/DayOfWeekSiblingsHouse.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ UnknownText_0x7b2b9: 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 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 1bee76da4..74ed60bc9 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ DiglettsCavePokefanMText: 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 @@ DiglettsCave_MapEvents: 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 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index ad48875d1..7211df60a 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -5,13 +5,11 @@ const_value set 2 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 @@ DragonShrineSpeechlessText: 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 diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index d8866209b..5d6b27646 100644 --- 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 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 37f245ba7..0ce532235 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -10,13 +10,11 @@ const_value set 2 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 @@ Text_NoRoomForDragonFang: 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 diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index e3afb070b..8bbef9261 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ AcademyStickerMachineText: 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 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 8b7c02087..c23c36c0e 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -8,11 +8,9 @@ const_value set 2 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 @@ BurnedTowerSignText: 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 @@ EcruteakCity_MapEvents: 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 @@ EcruteakCity_MapEvents: 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 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index d892dc0ae..176d6a370 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -8,13 +8,11 @@ const_value set 2 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 @@ UnknownText_0x9a49c: 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 @@ EcruteakGym_MapEvents: 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 diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index aa5528e7e..c19aebb38 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -3,11 +3,9 @@ const_value set 2 const ECRUTEAKITEMFINDERHOUSE_POKEDEX EcruteakItemfinderHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks EcruteakItemfinderGuy: faceplayer @@ -163,22 +161,17 @@ EcruteakThreeMonText: 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 diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index cfe4c0fca..9149d06bc 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ EcruteakLugiaSpeechHouseYoungsterText: 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 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 788edc9f7..f8d4f10bd 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ EcruteakMartGrannyText: 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 diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index e34bcda5a..fc56b0b0d 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -6,13 +6,11 @@ const_value set 2 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 @@ EcruteakPokecenter1FGymGuyText: 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 diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm index 3ad1ea2a0..17ffc7b08 100644 --- a/maps/EcruteakTinTowerEntrance.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -5,13 +5,11 @@ const_value set 2 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,27 +276,22 @@ EcruteakTinTowerEntranceGrampsText: 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 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 diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 25243892f..28cba0a3f 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ ElmsHousePCText: 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 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 157e86a16..2f9a46217 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -7,8 +7,7 @@ const_value set 2 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 @@ ElmsLab_MapScripts: scene_script .DummyScene4 scene_script .DummyScene5 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .MoveElmCallback .MeetElm: @@ -1371,16 +1369,13 @@ ElmsLabPCText: 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 @@ ElmsLab_MapEvents: 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 @@ ElmsLab_MapEvents: 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 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 32fe441f1..19bb91a37 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -5,14 +5,12 @@ const_value set 2 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 @@ UnknownText_0x754be: 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 @@ FastShip1F_MapEvents: 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 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index eae217471..252511f93 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -13,13 +13,11 @@ const_value set 2 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 @@ SchoolboyRickyAfterBattleText: 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 diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 50b1b719e..1314070d4 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -8,11 +8,9 @@ const_value set 2 const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST FastShipCabins_NNW_NNE_NE_MapScripts: -.SceneScripts: - db 0 + 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 @@ BurglarCoreyAfterBattleText: 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 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 7a41391d9..fdb1e9a37 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -12,11 +12,9 @@ const_value set 2 const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2 FastShipCabins_SE_SSE_CaptainsCabin_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Unreferenced_0x75ea6: end @@ -463,11 +461,9 @@ SSAquaHasArrivedVermilionText: 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 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEvents: 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 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index ad46bd707..ecdf5e412 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -5,11 +5,9 @@ const_value set 2 const FASTSHIPCABINS_SW_SSW_NW_ROCKER FastShipCabins_SW_SSW_NW_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerFirebreatherLyle: trainer FIREBREATHER, LYLE, EVENT_BEAT_FIREBREATHER_LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script @@ -223,28 +221,23 @@ FastShipArrivedVermilionText: done FastShipCabins_SW_SSW_NW_MapEvents: - ; filler - db 0, 0 + 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 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 diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index c45572587..ad90b5fd6 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ FightingDojoSign1Text: 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 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 0d0061ad0..c1277cadf 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ NoLitteringSignText: 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 @@ FuchsiaCity_MapEvents: 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 @@ FuchsiaCity_MapEvents: 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 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index f701f1246..4a1d1ffe8 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ FuchsiaGymGuyWinText: 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 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index a0a4d7345..cfc7eb659 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ FuchsiaMartCooltrainerFText: 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 diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index 12e7823c5..829fab00d 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -5,12 +5,10 @@ const_value set 2 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 @@ UnknownText_0x19654e: 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 diff --git a/maps/FuchsiaPokecenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm index eae7a73c3..f37dd7e0a 100644 --- 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 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 992f0af5c..0c681f60b 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ UnknownText_0x548ed: 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 @@ GoldenrodBikeShop_MapEvents: 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 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 021158697..045dd05bc 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -16,11 +16,9 @@ const_value set 2 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 @@ UnknownText_0x1991cf: 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 @@ GoldenrodCity_MapEvents: 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 @@ GoldenrodCity_MapEvents: 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 diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index d8a77c7c0..88aebfdd1 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ GoldenrodDeptStore1FDirectoryText: 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 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index 1fbe2dce1..bb2090eb9 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -6,11 +6,9 @@ const_value set 2 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 @@ GoldenrodDeptStore2FDirectoryText: 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 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 495434787..5ddfe04c7 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ GoldenrodDeptStore3FDirectoryText: 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 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index f7e1cbc52..426996978 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ GoldenrodDeptStore4FDirectoryText: 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 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 910035c39..6f2577f15 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ GoldenrodDeptStore5FDirectoryText: 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 diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 315428b9f..295f5b6ea 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ GoldenrodDeptStore6FDirectoryText: 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 @@ GoldenrodDeptStore6F_MapEvents: 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 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 86a603fd1..098aad19b 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -9,11 +9,9 @@ const_value set 2 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 @@ UnknownText_0x7d8bb: 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 diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 60ba72ff2..f76c43b62 100644 --- 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 @@ Elevator_0x566e0: 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 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 739598b15..d83f760cb 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -9,11 +9,9 @@ const_value set 2 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 @@ PokeDollVendingMachineText: 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 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index e398a0138..c80183bb0 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ UnknownText_0x55604: 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 diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 43af60d36..a83ce3e96 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -13,11 +13,9 @@ const_value set 2 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 @@ GoldenrodGameCornerLeftTheirDrinkText: 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 @@ GoldenrodGameCorner_MapEvents: 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 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index d61dd4ea0..ccfac2120 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -7,13 +7,11 @@ const_value set 2 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 @@ GoldenrodGymGuyWinText: 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 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 9b9334f9e..aa8bbd9f4 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ GoldenrodHappinessRaterTwinText: 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 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index aec9dcd3c..a3117a355 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -3,12 +3,10 @@ const_value set 2 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 @@ GoldenrodMagnetTrainStationGentlemanText: 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 diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index 892c00984..d807b7e3e 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ GoldenrodNameRaterRadio: 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 diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index b9d9fc949..da2965def 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ GoldenrodPPSpeechHouseLassText: 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 diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index cd4149c31..3765181b2 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -6,11 +6,9 @@ const_value set 2 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 @@ UnknownText_0x62549: 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 diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index cac603e87..c55463286 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -10,11 +10,9 @@ const_value set 2 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 @@ UnknownText_0x7c91a: 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,19 +655,16 @@ GoldenrodUnderground_MapEvents: 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 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 diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 3fab6e657..6e66d3ef0 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -45,13 +45,11 @@ const_value set 2 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 @@ SwitchRoomText_Emergency: 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 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents: 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 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents: 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 diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 941a3e622..f64085b73 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -8,11 +8,9 @@ const_value set 2 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 @@ UnknownText_0x7dc8d: 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 diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 9b52fcbc6..42382ec94 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ GuideGentsHouseGuideGentText: 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 diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 537391ce5..571a5a964 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -2,13 +2,11 @@ const_value set 2 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 @@ HallOfFame_LanceText: 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 diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index d9c5a255b..5f109a654 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ IcePath1FProtein: 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 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index aa98d905c..417e71a7f 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -6,11 +6,9 @@ const_value set 2 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 @@ IcePathBoulderFellThroughText: 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 @@ IcePathB1F_MapEvents: 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 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 57aa9a061..286348a55 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ IcePathB2FBlackthornSideHiddenIceHeal: 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 diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 4c98193e9..f4cc310fa 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ IcePathB2FMahoganySideBoulderText: 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 @@ IcePathB2FMahoganySide_MapEvents: 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 diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index 0c0849493..99e96fba6 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ IcePathB3FRock: 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 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 54b350edf..37460e549 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -12,11 +12,9 @@ const_value set 2 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,28 +936,23 @@ BugCatcherWayneAfterBattleText: 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 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 diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index cc3df33af..8f64f2794 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ IlexForestAzaleaGateGrannyText: 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 diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 15ff9354d..702f9692b 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -7,12 +7,10 @@ const_value set 2 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 @@ AbraText: 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 diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 22dc3d3f7..3b9ff0d3a 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -2,13 +2,11 @@ const_value set 2 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 @@ KarenScript_KarenDefeatText: 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 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 60aeb4c31..9c88d1a2c 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -2,13 +2,11 @@ const_value set 2 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 @@ KogaScript_KogaDefeatText: 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 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index dc503d33d..edb1ebe55 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -6,11 +6,9 @@ const_value set 2 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 @@ KurtsHouseCelebiStatueText: 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 @@ KurtsHouse_MapEvents: 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 diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 5f32609a0..ecfe02e59 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -13,13 +13,11 @@ const_value set 2 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,27 +492,22 @@ UnknownText_0x70903: 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 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 diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index 0b928d0bd..4fa55dd54 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER LakeOfRageHiddenPowerHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks HiddenPowerGuy: faceplayer @@ -68,22 +66,17 @@ HiddenPowerGuyText3: 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 diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index 81844712e..c5e05a423 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ UnknownText_0x19aabc: 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 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 2a6f94705..657a45942 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -4,13 +4,11 @@ const_value set 2 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 @@ UnknownText_0x1813c5: 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 diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index bc6083ca5..1b2a302e7 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -6,11 +6,9 @@ const_value set 2 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 @@ UnknownText_0x7f36b: 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 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 490183dfd..cdbb7e8cb 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ LavenderMartRockerText: 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 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 1157ba5b1..d0fe4aff5 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -2,12 +2,10 @@ const_value set 2 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 @@ LavenderNameRaterUnusedBookshelf: 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 diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index dbf084610..250d6e98f 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ UnknownText_0x7e7ed: 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 diff --git a/maps/LavenderPokecenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm index dc4dcd7b0..7f822b3f8 100644 --- 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 diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm index c15be5b24..d020861ac 100644 --- a/maps/LavenderSpeechHouse.asm +++ b/maps/LavenderSpeechHouse.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ LavenderSpeechHousePokefanFText: 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 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 4a2b02ff1..94075b2c2 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ SoulHouseSignText: 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 @@ LavenderTown_MapEvents: 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 @@ LavenderTown_MapEvents: 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 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index ff82357ee..860e54c1c 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -8,11 +8,9 @@ const_value set 2 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 @@ MahoganyGymGuyWinText: 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 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 44aa8dd39..09748c48e 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -6,13 +6,11 @@ const_value set 2 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 @@ UnknownText_0x6c5ba: 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 diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index 3f1181ce3..4a2a32f26 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ MahoganyPokecenter1FCooltrainerFText: 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 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 7da6b9a97..fd4734de7 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ UnknownText_0x199a3d: 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 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 88fd9b473..c33ec64ba 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -5,13 +5,11 @@ const_value set 2 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,31 +243,26 @@ MahoganyGymSignText: 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 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 diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 36b5ace43..502aad783 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const MANIASHOUSE_ROCKER ManiasHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ManiaScript: faceplayer @@ -200,20 +198,15 @@ ManiaText_ShuckleIsYourLastMon: 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 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 499e443cd..65bf3a6ad 100644 --- 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 @@ MobileBattleRoom_HealText: 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 diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 00765a70b..31fd04201 100644 --- 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 @@ MobileTradeRoomMobile_EstablishingCommsText: 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 diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index c263a047f..5b978bc0e 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -2,13 +2,11 @@ const_value set 2 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 @@ MountMoonSilverTextLoss: 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 @@ MountMoon_MapEvents: 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 diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index aac063dbf..7188a7c00 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ MountMoonGiftShopLassText: 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 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index e93cffe53..b12e7b391 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -4,12 +4,10 @@ const_value set 2 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 @@ DontLitterSignText: 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 diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 756ee655c..fad3d4098 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -11,11 +11,9 @@ const_value set 2 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 @@ SupernerdMarkusAfterBattleText: 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 @@ MountMortar1FInside_MapEvents: 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 diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index b268e36e9..1656a7f41 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ MountMortar1FOutsideHiddenHyperPotion: 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 @@ MountMortar1FOutside_MapEvents: 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 diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 27cf26fce..2496eaa2c 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -8,11 +8,9 @@ const_value set 2 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 @@ SupernerdHughAfterBattleText: 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 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index eeba830da..47cea6826 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -8,11 +8,9 @@ const_value set 2 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 @@ UnknownText_0x7e3df: 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 diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index f4ca702a2..743acf816 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ MoveDeletersHouseBookshelf: 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 diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 42ea7c490..881487ff6 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -6,11 +6,9 @@ const_value set 2 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 @@ MrFujisPidgeyText: 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 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index de537d8e2..4a4249cc5 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -3,13 +3,11 @@ const_value set 2 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,26 +371,21 @@ MrPokemonsHouse_StrangeCoinsText: 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 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 diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 880df0727..b79c08b6e 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ MrPsychicText2: 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 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 4a1b81f8d..7ec334903 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -15,11 +15,9 @@ const_value set 2 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 @@ UnknownText_0x5c7c6: 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 diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index cd7a3c18e..d9a431590 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -13,11 +13,9 @@ const_value set 2 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 @@ UnknownText_0x5cc1d: 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 diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 97ff2baca..985f7e4cf 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -4,13 +4,11 @@ const_value set 2 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 @@ ElmsHouseSignText: 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 diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index f0261031a..bf505711e 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -5,11 +5,9 @@ const_value set 2 const OAKSLAB_SCIENTIST3 OaksLab_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -257,19 +255,15 @@ OaksLabPCText: 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 @@ OaksLab_MapEvents: 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 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index daebab041..f651f0e97 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ OlivineCafeSailorText: 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 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 99b60897d..8c418d99d 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -5,13 +5,11 @@ const_value set 2 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 @@ UnknownText_0x1a8cba: 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 @@ OlivineCity_MapEvents: 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 @@ OlivineCity_MapEvents: 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 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index c7c010535..8bee6f363 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ HaveGoodRodText: 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 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index e62bdb9c8..e8ab40213 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ OlivineGymGuyPreText: 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 diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 256f03df4..3297736e6 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ UnknownText_0x9c5f0: 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 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 19cd4e4a3..bc09e9ef4 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -3,11 +3,9 @@ const_value set 2 const OLIVINELIGHTHOUSE1F_POKEFAN_F OlivineLighthouse1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks OlivineLighthouse1FSailorScript: jumptextfaceplayer OlivineLighthouse1FSailorText @@ -37,24 +35,19 @@ OlivineLighthouse1FPokefanFText: 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 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 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 1d0d001d2..2bc489c57 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ UnknownText_0x5b1b6: 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 @@ OlivineLighthouse2F_MapEvents: 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 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 2b0108beb..84311e40e 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ GentlemanPrestonAfterBattleText: 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 @@ OlivineLighthouse3F_MapEvents: 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 diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index c16556cf9..21f59b17a 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ LassConnie1AfterBattleText: 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 @@ OlivineLighthouse4F_MapEvents: 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 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 8da299e76..62767ab5d 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -6,11 +6,9 @@ const_value set 2 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 @@ BirdKeeperDenisAfterBattleText: 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 @@ OlivineLighthouse5F_MapEvents: 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 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 94151b2aa..109c84cca 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ UnknownText_0x60f3d: 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 diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index b6f70cc67..ff4ed669a 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ OlivineMartLassText: 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 diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index abada1bd0..16a774912 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ OlivinePokecenter1FTeacherText: 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 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index de17f58b9..ce949a4ba 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -8,13 +8,11 @@ const_value set 2 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 @@ OlivinePortSailorText: 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 diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index d78b2b32a..2d8cf9e55 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -2,11 +2,9 @@ const_value set 2 const OLIVINEPORTPASSAGE_POKEFAN_M OlivinePortPassage_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks OlivinePortPassagePokefanMScript: jumptextfaceplayer OlivinePortPassagePokefanMText @@ -20,23 +18,18 @@ OlivinePortPassagePokefanMText: 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 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 diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index 361ab4582..6133c8f53 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ OlivinePunishmentSpeechHouseDaughterText: 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 diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 0b56332d7..0038bf6b9 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const OLIVINETIMSHOUSE_TIM OlivineTimsHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Tim: faceplayer @@ -20,22 +18,17 @@ TimsHouseBookshelf: 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 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index e1a280c86..80601f222 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ BluesHouseSignText: 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 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index af325e07f..ab10bcdee 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -6,11 +6,9 @@ const_value set 2 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,22 +151,18 @@ PewterCityWelcomeSignText: 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 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 @@ PewterCity_MapEvents: 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 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 07d52ce03..0fa0bcc13 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ PewterGymGuyWinText: 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 diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index b40cf8db0..f4aa7614e 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ PewterMartSuperNerdText: 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 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 84ded5256..4f4424e9e 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ PewterNidoranText: 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 diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index 5bb9da7da..1948928b6 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -6,11 +6,9 @@ const_value set 2 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 @@ PewterPokecenter1FBugCatcherText: 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 diff --git a/maps/PewterPokecenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm index 0a5b6f558..f01010f7a 100644 --- 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 diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index f803411d7..4e76da519 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ PewterSnoozeSpeechHouseGrampsText: 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 diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index fd0747b70..5ac942d53 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -6,13 +6,11 @@ const_value set 2 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 @@ TVText: 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 diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 6dd6e3c09..210c4af79 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ PlayersRadioText4: 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 diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm index 0b0a64419..514802636 100644 --- a/maps/PlayersNeighborsHouse.asm +++ b/maps/PlayersNeighborsHouse.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ PlayerNeighborRadioText4: 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 diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index f42b7516d..bef008511 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const POKESEERSHOUSE_GRANNY PokeSeersHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SeerScript: faceplayer @@ -17,20 +15,15 @@ SeerScript: 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 diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index c5658403d..05b3ca63a 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -5,8 +5,7 @@ const_value set 2 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 @@ Pokecenter2F_MapScripts: scene_script .Scene4 scene_script .Scene5 -.MapCallbacks: - db 0 + db 0 ; callbacks .Scene0: special CheckMysteryGift @@ -1023,11 +1021,9 @@ Text_BrokeStadiumRules: 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 @@ Pokecenter2F_MapEvents: 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 diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm index c22d6a929..5af6eed77 100644 --- a/maps/PokecomCenterAdminRoomMobile.asm +++ b/maps/PokecomCenterAdminRoomMobile.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ UnknownText_0x62b26: 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 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index ef3440ac1..78bd8607a 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ UnknownText_0x191e29: 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 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index ea7d2e646..fdc17e2a4 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -8,13 +8,11 @@ const_value set 2 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 @@ UnknownText_0x189475: 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 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index f41832430..73fee4d01 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ UnknownText_0x5d631: 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 diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 82e8972fd..aefb31799 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -12,11 +12,9 @@ const_value set 2 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 @@ UnknownText_0x5e463: 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 @@ RadioTower2F_MapEvents: 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 diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 3b83eb1a9..64d5a7ec5 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -8,11 +8,9 @@ const_value set 2 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 @@ UnknownText_0x5eae4: 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 diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 37e35f489..3167b3c7b 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -8,11 +8,9 @@ const_value set 2 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 @@ UnknownText_0x5f00d: 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 diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 67e876f45..7fe87eeb5 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -6,14 +6,12 @@ const_value set 2 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,29 +419,24 @@ SignpostRadioTower5FStudio: 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 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 diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index fb0adc06f..4c7f1addf 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -2,12 +2,10 @@ const_value set 2 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 @@ RedsHouse1FTVText: 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 diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index d26cb1642..74445fc3f 100644 --- 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 @@ RedsHouse2FPCText: 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 diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index d7ab692c6..f0073181c 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ RockTunnel1FHiddenXDefend: 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 @@ RockTunnel1F_MapEvents: 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 diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 5306d185b..d1b676c00 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ RockTunnelB1FHiddenMaxPotion: 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 diff --git a/maps/Route1.asm b/maps/Route1.asm index 09c9cc395..eb2d407a5 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ Route1SignText: 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 diff --git a/maps/Route10North.asm b/maps/Route10North.asm index 4fb0ad6f0..9e16ad2eb 100644 --- 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 @@ PowerPlantSignText: 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 diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index 696039184..6e33641a9 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ Route10Pokecenter1FCooltrainerFText: 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 diff --git a/maps/Route10Pokecenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm index c455c5ae4..7b528ba13 100644 --- 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 diff --git a/maps/Route10South.asm b/maps/Route10South.asm index e6fa2d684..f5946ea74 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ Route10SignText: 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 diff --git a/maps/Route11.asm b/maps/Route11.asm index 7febe3423..8934549fc 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -6,11 +6,9 @@ const_value set 2 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 @@ Route11SignText: 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 diff --git a/maps/Route12.asm b/maps/Route12.asm index 18ccb9c33..a4f56cf01 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ FishingSpotSignText: 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 diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 5333d6e89..0c41049e5 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ UnknownText_0x7f5ec: 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 diff --git a/maps/Route13.asm b/maps/Route13.asm index c10063908..c97a54830 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -6,11 +6,9 @@ const_value set 2 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 @@ Route13DirectionsSignText: 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 diff --git a/maps/Route14.asm b/maps/Route14.asm index 4dc203a4a..aa388dfb9 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -5,11 +5,9 @@ const_value set 2 const ROUTE14_KIM Route14_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Kim: faceplayer @@ -116,20 +114,15 @@ PokefanmTrevorAfterBattleText: 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 diff --git a/maps/Route15.asm b/maps/Route15.asm index 3d4344695..a3c0521b8 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -8,11 +8,9 @@ const_value set 2 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 @@ Route15SignText: 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 diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index ad2bcb433..3d31256f7 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ Route15FuchsiaGateOfficerText: 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 diff --git a/maps/Route16.asm b/maps/Route16.asm index d049d5cbd..a799803fd 100644 --- 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,23 +27,18 @@ CyclingRoadSignText: 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 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 diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 10a28ab4e..ffac53705 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ Route16FuchsiaSpeechHouseSuperNerdText: 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 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 558663a82..9bfbce366 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -2,12 +2,10 @@ const_value set 2 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 @@ UnknownText_0x73496: 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 diff --git a/maps/Route17.asm b/maps/Route17.asm index 7fdd81737..5fe83bd41 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ BikerCharlesAfterBattleText: 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 diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm index 7ccc3f992..5b863d524 100644 --- a/maps/Route17Route18Gate.asm +++ b/maps/Route17Route18Gate.asm @@ -2,12 +2,10 @@ const_value set 2 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 @@ UnknownText_0x7364d: 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 diff --git a/maps/Route18.asm b/maps/Route18.asm index 66e31a2e8..51dee07e9 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ Route18SignText: 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 diff --git a/maps/Route19.asm b/maps/Route19.asm index 0fb64bf70..123da8374 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ CarefulSwimmingSignText: 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 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index e4eae5fab..ea0a5fa04 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ UnknownText_0x1ab48a: 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 diff --git a/maps/Route2.asm b/maps/Route2.asm index d60c39de4..27f3e0c8b 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -9,11 +9,9 @@ const_value set 2 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,22 +145,18 @@ UnknownText_0x1ac49f: 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 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 @@ Route2_MapEvents: 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 diff --git a/maps/Route20.asm b/maps/Route20.asm index 0fd0485e2..da7900400 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ CinnabarGymSignText: 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 diff --git a/maps/Route21.asm b/maps/Route21.asm index e44d47b96..e7bee259d 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ FisherArnoldAfterBattleText: 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 diff --git a/maps/Route22.asm b/maps/Route22.asm index 7457f716f..b34daae20 100644 --- 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 @@ VictoryRoadEntranceSignText: 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 diff --git a/maps/Route23.asm b/maps/Route23.asm index 69bb7d0c0..a2149e6b9 100644 --- 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 @@ IndigoPlateauSignText: 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 diff --git a/maps/Route24.asm b/maps/Route24.asm index de6c3821a..ada8cdab1 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ UnknownText_0x1adee1: 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 diff --git a/maps/Route25.asm b/maps/Route25.asm index a088f9845..9983a2bb4 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -12,13 +12,11 @@ const_value set 2 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 @@ BillsHouseSignText: 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 diff --git a/maps/Route26.asm b/maps/Route26.asm index 9f5946774..096107e2e 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -9,11 +9,9 @@ const_value set 2 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 @@ Route26SignText: 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 diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm index 009bcc7a3..453ec4693 100644 --- a/maps/Route26HealHouse.asm +++ b/maps/Route26HealHouse.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ UnknownText_0x7b18b: 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 diff --git a/maps/Route27.asm b/maps/Route27.asm index 0a7998a53..59fa811ee 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -10,13 +10,11 @@ const_value set 2 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 @@ TohjoFallsSignText: 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 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index af0bcbba1..cd78cb62c 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const ROUTE27SANDSTORMHOUSE_GRANNY Route27SandstormHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SandstormHouseWoman: faceplayer @@ -94,22 +92,17 @@ SandstormHouseWomanDisloyalText: 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 diff --git a/maps/Route28.asm b/maps/Route28.asm index d42ef074c..ad729079d 100644 --- 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 @@ Route28SignText: 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 diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm index 5cff45ffe..b3c7856bb 100644 --- a/maps/Route28SteelWingHouse.asm +++ b/maps/Route28SteelWingHouse.asm @@ -3,12 +3,10 @@ const_value set 2 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 @@ CelebritysFearowText: 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 diff --git a/maps/Route29.asm b/maps/Route29.asm index 2ca3d5ea2..0f018ac82 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -9,13 +9,11 @@ const_value set 2 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 @@ Route29Sign2Text: 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 diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm index 813242e06..ec28965b8 100644 --- a/maps/Route29Route46Gate.asm +++ b/maps/Route29Route46Gate.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ Route29Route46GateYoungsterText: 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 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 18f41b70a..d3626f169 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ Route2GateScientistText: 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 diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm index be7895b4f..451d9d177 100644 --- a/maps/Route2NuggetHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ UnknownText_0x9b8e5: 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 diff --git a/maps/Route3.asm b/maps/Route3.asm index 82dc5fedf..65c8a35d2 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ UnknownText_0x1ae163: 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 diff --git a/maps/Route30.asm b/maps/Route30.asm index 673282d53..744846670 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -12,11 +12,9 @@ const_value set 2 const ROUTE30_POKE_BALL Route30_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks YoungsterJoey_ImportantBattleScript: waitsfx @@ -407,27 +405,22 @@ YoungsterJoeyText_GiveHPUpAfterBattle: 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 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 diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm index f220b9ef1..a6586ce6a 100644 --- a/maps/Route30BerryHouse.asm +++ b/maps/Route30BerryHouse.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ UnknownText_0x196dec: 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 diff --git a/maps/Route31.asm b/maps/Route31.asm index eb7c0b24b..3bb7f6871 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -8,11 +8,9 @@ const_value set 2 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 @@ DarkCaveSignText: 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 diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 6b8a4fb8e..a85a0bc44 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ Route31VioletGateCooltrainerFText: 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 diff --git a/maps/Route32.asm b/maps/Route32.asm index c64d2c4ac..7035fe541 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -15,14 +15,12 @@ const_value set 2 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 @@ Route32UnionCaveSignText: 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 @@ Route32_MapEvents: 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 diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 3643977df..3c852bff5 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ Route32Pokecenter1FCooltrainerFText: 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 diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index 94062ba23..b2b6af2d0 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ Route32RuinsOfAlphGateYoungsterText: 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 diff --git a/maps/Route33.asm b/maps/Route33.asm index 89d4a7f96..c728f6496 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ Route33SignText: 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 diff --git a/maps/Route34.asm b/maps/Route34.asm index 780160ce3..bd94515e3 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -14,11 +14,9 @@ const_value set 2 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,30 +759,25 @@ DayCareSignText: 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 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 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 diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 87565e381..f73e488bc 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ Route34IlexForestGateLassText: 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 diff --git a/maps/Route35.asm b/maps/Route35.asm index 2702f9b3a..3af423d8e 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -12,11 +12,9 @@ const_value set 2 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 @@ Route35SignText: 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 diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index b396f8c82..386ac66fe 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ Route35GoldenrodGateFisherText: 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 diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index abd7f27d6..8be5b768a 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -4,14 +4,12 @@ const_value set 2 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 @@ UnknownText_0x6a90e: 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 diff --git a/maps/Route36.asm b/maps/Route36.asm index 7395aa05b..cad07e31a 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -10,13 +10,11 @@ const_value set 2 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 @@ Route36TrainerTips2Text: 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 diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 61d9f917f..a635fd8a7 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -13,14 +13,12 @@ const_value set 2 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 @@ UnknownText_0x6b97f: 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 diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index 3d6130cf6..acea3628c 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ Route36RuinsOfAlphGateGrampsText: 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 diff --git a/maps/Route37.asm b/maps/Route37.asm index 09af64530..a57549911 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -8,11 +8,9 @@ const_value set 2 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 @@ Route37SignText: 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 diff --git a/maps/Route38.asm b/maps/Route38.asm index 37c64b3b0..7a3c038c1 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -8,11 +8,9 @@ const_value set 2 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 @@ Route38TrainerTipsText: 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 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index ccea75224..adf5419d3 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ Route38EcruteakGateOfficerText: 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 diff --git a/maps/Route39.asm b/maps/Route39.asm index aa1f961be..b70995e26 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -11,11 +11,9 @@ const_value set 2 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 @@ Route39TrainerTipsText: 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 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 02a168a34..103d924e6 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ Text_RefusedToGiveBerry: 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 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index ae54e507a..96a19b608 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ FarmerFText_SnoreSpeech: 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 diff --git a/maps/Route4.asm b/maps/Route4.asm index 33ee0ef84..724a57dec 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ MtMoonSquareSignText: 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 diff --git a/maps/Route40.asm b/maps/Route40.asm index b5766044a..ef6614926 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -13,11 +13,9 @@ const_value set 2 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 @@ Route40SignText: 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 diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 1a7bffc01..d30401714 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ Route40BattleTowerGateTwinText: 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 diff --git a/maps/Route41.asm b/maps/Route41.asm index 606bfb25a..4307ff3b4 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -11,11 +11,9 @@ const_value set 2 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 @@ SwimmerfWendyAfterBattleText: 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 diff --git a/maps/Route42.asm b/maps/Route42.asm index c7e2f7396..075b35dff 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -10,13 +10,11 @@ const_value set 2 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,31 +317,26 @@ Route42Sign2Text: 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 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 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 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index b42d9201b..2417cd0d8 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ Route42EcruteakGateOfficerText: 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 diff --git a/maps/Route43.asm b/maps/Route43.asm index 50401b72c..b19560edd 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -9,11 +9,9 @@ const_value set 2 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,28 +499,23 @@ Route43TrainerTipsText: 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 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 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 793c56a7f..886768431 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -6,13 +6,11 @@ const_value set 2 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 @@ OfficerText_AvoidGrass: 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 diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index 7a5e8901b..6e9431b2b 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ UnknownText_0x19ab65: 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 diff --git a/maps/Route44.asm b/maps/Route44.asm index a4126a816..faaa0c49f 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -12,11 +12,9 @@ const_value set 2 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 @@ Route44Sign2Text: 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 diff --git a/maps/Route45.asm b/maps/Route45.asm index b2f0cc35d..6a28d3d27 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -14,11 +14,9 @@ const_value set 2 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 @@ Route45SignText: 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 diff --git a/maps/Route46.asm b/maps/Route46.asm index ad42fe712..0a80bec05 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ Route46SignText: 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 diff --git a/maps/Route5.asm b/maps/Route5.asm index f9dbb8224..a53bb0f3c 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ HouseForSaleSignText: 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 diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm index c5eae7d35..53e12f430 100644 --- a/maps/Route5CleanseTagHouse.asm +++ b/maps/Route5CleanseTagHouse.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ Route5CleanseTagHouseTeacherText: 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 diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm index 113ff7ceb..c10a35d75 100644 --- a/maps/Route5SaffronGate.asm +++ b/maps/Route5SaffronGate.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ Route5SaffronGateOfficerText: 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 diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm index dae482f5b..39013b51d 100644 --- a/maps/Route5UndergroundPathEntrance.asm +++ b/maps/Route5UndergroundPathEntrance.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ Route5UndergroundPathEntranceTeacherText: 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 diff --git a/maps/Route6.asm b/maps/Route6.asm index c383dc7f5..fb00e641e 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ PokefanmAllanAfterBattleText: 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 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 202c449dd..ca5548ca0 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -2,12 +2,10 @@ const_value set 2 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 @@ UnknownText_0x1927cb: 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 diff --git a/maps/Route6UndergroundPathEntrance.asm b/maps/Route6UndergroundPathEntrance.asm index 25bc23f3c..a17861c2b 100644 --- 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 diff --git a/maps/Route7.asm b/maps/Route7.asm index 2c6defa05..cea61fd24 100644 --- 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 @@ Route7LockedDoorText: 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 diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index d2f0e11ba..9e7b785c1 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ UnknownText_0x73592: 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 diff --git a/maps/Route8.asm b/maps/Route8.asm index 4a3d1a225..a7ab2783b 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ Route8UndergroundPathSignText: 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 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index 735d4cdc2..beb0da6a5 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ Route8SaffronGateOfficerText: 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 diff --git a/maps/Route9.asm b/maps/Route9.asm index ff4c51523..d25430d27 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ Route9SignText: 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 diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 5d2ecbbc0..e1d30e461 100644 --- 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,22 +142,18 @@ UnknownText_0x58ee7: 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 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 @@ RuinsOfAlphAerodactylChamber_MapEvents: bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm index 5d5db380e..be87d0302 100644 --- a/maps/RuinsOfAlphAerodactylItemRoom.asm +++ b/maps/RuinsOfAlphAerodactylItemRoom.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ UnknownText_0x59ac1: 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 diff --git a/maps/RuinsOfAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm index e71b09e4a..2da613f1c 100644 --- 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 diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 1e1316c15..81282300b 100644 --- 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,22 +143,18 @@ UnknownText_0x586aa: 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 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 @@ RuinsOfAlphHoOhChamber_MapEvents: bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm index 917d93380..70916792b 100644 --- a/maps/RuinsOfAlphHoOhItemRoom.asm +++ b/maps/RuinsOfAlphHoOhItemRoom.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ UnknownText_0x59923: 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 diff --git a/maps/RuinsOfAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm index cfd70f7be..8f66f2f7b 100644 --- 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 diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index 6712533d9..ff9130613 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -4,13 +4,11 @@ const_value set 2 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 @@ RuinsOfAlphInnerChamberStatueText: 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 @@ RuinsOfAlphInnerChamber_MapEvents: 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 @@ RuinsOfAlphInnerChamber_MapEvents: 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 diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index 1cbe7ee20..449fdaaaf 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -3,13 +3,11 @@ const_value set 2 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,22 +254,18 @@ UnknownText_0x58b3f: 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 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 @@ RuinsOfAlphKabutoChamber_MapEvents: 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 diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm index a0b4662ea..98e471cbf 100644 --- a/maps/RuinsOfAlphKabutoItemRoom.asm +++ b/maps/RuinsOfAlphKabutoItemRoom.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ UnknownText_0x599ad: 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 diff --git a/maps/RuinsOfAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm index e5678c98c..79f8c98b6 100644 --- 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 diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 1c4a8b4fa..490215ea3 100644 --- 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,22 +143,18 @@ UnknownText_0x58d26: 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 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 @@ RuinsOfAlphOmanyteChamber_MapEvents: bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm index 510d76f2b..4ad567450 100644 --- a/maps/RuinsOfAlphOmanyteItemRoom.asm +++ b/maps/RuinsOfAlphOmanyteItemRoom.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ UnknownText_0x59a37: 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 diff --git a/maps/RuinsOfAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm index bc6d9ea99..c0bc8c777 100644 --- 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 diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index afe0b01e8..068a60a51 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -6,13 +6,11 @@ const_value set 2 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 @@ UnknownText_0x5848e: 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 @@ RuinsOfAlphOutside_MapEvents: 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 diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 9a6fbe79f..325f9dd9e 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -4,13 +4,11 @@ const_value set 2 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 @@ UnknownText_0x59886: 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 diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index fda3e6408..93c28b0e0 100644 --- 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 diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index cb618fd91..f0d39e723 100644 --- 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 diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index 2d0476d99..0c2deae10 100644 --- 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 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 8ab657803..2717a0c8d 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -2,11 +2,9 @@ const_value set 2 const SAFARIZONEWARDENSHOME_LASS SafariZoneWardensHome_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WardensGranddaughter: faceplayer @@ -77,24 +75,19 @@ SafariZonePhotoText: 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 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 30263840f..bca1d0dde 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -9,11 +9,9 @@ const_value set 2 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 @@ SaffronCityMagnetTrainStationSignText: 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 @@ SaffronCity_MapEvents: 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 @@ SaffronCity_MapEvents: 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 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index aacbda2af..9cceafe44 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ SaffronGymGuyWinText: 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 @@ SaffronGym_MapEvents: 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 diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index fa57423b1..69a7a3559 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -5,12 +5,10 @@ const_value set 2 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 @@ SaffronMagnetTrainStationLassText: 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 diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 17d791759..65fbf100e 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ SaffronMartCooltrainerFText: 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 diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index 93950a03b..b72315b15 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ SaffronPokecenter1FYoungsterText: 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 diff --git a/maps/SaffronPokecenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm index daf92a5d3..11d07cc3f 100644 --- 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 diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 01d49532c..8931fdf8a 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -3,12 +3,10 @@ const_value set 2 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 @@ SeafoamGymGuyWinText2: 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 diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index f9e03456b..eefb4d50e 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ UnknownText_0x18aca8: 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 diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index 349c7797a..e506fc8f4 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ SilverCaveItemRoomsFullRestore: 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 diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 87fec1f72..6f1487619 100644 --- 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 @@ MtSilverSignText: 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 diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index e8478e668..5ee974367 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ SilverCavePokecenter1FGrannyText: 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 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 1a1bcb500..e2ff6115b 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ SilverCaveRoom1HiddenUltraBall: 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 diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 49eb7a2d3..0fd5ceae1 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ SilverCaveRoom2HiddenMaxPotion: 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 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index f95b239df..12f5eeb87 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ Red: 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 diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 1f835b018..b64976027 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -10,11 +10,9 @@ const_value set 2 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 @@ SlowpokeWellB1FTaillessSlowpokeText: 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 diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index c4ab0d3ca..db66973de 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ UnknownText_0x5adf2: 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 diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index f11412391..ee4d394e2 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ SoulHouseGrannyText: 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 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index a646bdb18..93ac9bec8 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -7,11 +7,9 @@ const_value set 2 const SPROUTTOWER1F_POKE_BALL SproutTower1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SproutTower1FSage1Script: jumptextfaceplayer SproutTower1FSage1Text @@ -103,27 +101,22 @@ UnknownText_0x1846d6: 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 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 diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 31fbaa2c0..63b7d6d3b 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ UnknownText_0x1848c8: 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 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index e5c903f7e..6f62df3c6 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -8,13 +8,11 @@ const_value set 2 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 @@ UnknownText_0x184f61: 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 @@ SproutTower3F_MapEvents: 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 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 718612b9b..725d8738b 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -7,12 +7,10 @@ const_value set 2 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 @@ UnknownText_0x6cdd0: 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 @@ TeamRocketBaseB1F_MapEvents: 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 @@ TeamRocketBaseB1F_MapEvents: 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 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 519742983..77f96024d 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -15,15 +15,13 @@ const_value set 2 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,19 +907,16 @@ UnknownText_0x6de03: 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 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 @@ TeamRocketBaseB2F_MapEvents: 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 @@ TeamRocketBaseB2F_MapEvents: 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 diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index d09274053..42cc78777 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -15,15 +15,13 @@ const_value set 2 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 @@ UnknownText_0x6e9a3: 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 @@ TeamRocketBaseB3F_MapEvents: 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 diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index f10fd1a4b..1f34782f9 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -3,13 +3,11 @@ const_value set 2 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 @@ UnknownText_0x193521: 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 diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index b82497e7b..8689abb0b 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -11,13 +11,11 @@ const_value set 2 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 @@ TinTower1FSage6Text2: 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 diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index 3127306b6..a3a9447af 100644 --- 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 diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index f1d3a81b0..20ec2c389 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -2,30 +2,23 @@ const_value set 2 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 diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 63793d5ba..9881b6f6c 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ TinTower4FHiddenMaxPotion: 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 diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 7f0b53a5c..0ffbf5c34 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ TinTower5FHiddenCarbos: 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 diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index fcfbfc37c..162a0313e 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -2,30 +2,23 @@ const_value set 2 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 diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index b34268f9a..1f984e14b 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -2,33 +2,26 @@ const_value set 2 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 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 diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index aa9f8000a..c95d4b471 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ TinTower8FFullRestore: 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 @@ TinTower8F_MapEvents: 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 diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 492425455..b794dea52 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ TinTower9FUnusedLugiaText: 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 @@ TinTower9F_MapEvents: 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 diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 61e9cfae0..92dde683d 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ HoOhText: 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 diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 949215e65..561e7e1e2 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -2,30 +2,23 @@ const_value set 2 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 diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index db0b081d2..8bf282bbf 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -3,13 +3,11 @@ const_value set 2 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 @@ ChrisScript_0x19340b: 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 diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index 05bdfa62d..8714c17f7 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -6,11 +6,9 @@ const_value set 2 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 @@ UnknownText_0x9b2c1: 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 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 52ad25780..3fc986b3a 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -3,12 +3,10 @@ const_value set 2 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 @@ TrainerHouseB1FCalBeforeText: 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 diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm index 7b52c02b7..7ed7f76f4 100644 --- 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 @@ UndergroundPathHiddenXSpecial: 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 diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 0c9cbc06c..8aaa3bf3a 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -10,11 +10,9 @@ const_value set 2 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 @@ UnknownText_0x59f29: 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 diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 6b0ed7389..339572a07 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -8,11 +8,9 @@ const_value set 2 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,25 +151,20 @@ PokemaniacCalvinAfterBattleText: 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 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 diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 02209442d..791b6cb8c 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ CooltrainerfEmmaAfterBattleText: 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 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 9ee82253b..abdca0cba 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ VermilionCityPortSignText: 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 @@ VermilionCity_MapEvents: 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 @@ VermilionCity_MapEvents: 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 diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm index b2a4e5733..efcc6fde3 100644 --- a/maps/VermilionDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionDiglettsCaveSpeechHouse.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ VermilionDiglettsCaveSpeechHouseGentlemanText: 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 diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm index ff730d197..b55b2ca11 100644 --- a/maps/VermilionFishingSpeechHouse.asm +++ b/maps/VermilionFishingSpeechHouse.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ FishingDudesHousePhotoText: 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 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index eafaa6dde..0432ca163 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -6,11 +6,9 @@ const_value set 2 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 @@ UnknownText_0x19261e: 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 @@ VermilionGym_MapEvents: 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 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index c080e3f26..596b8407f 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ VermilionMagnetTrainSpeechHouseYoungsterText: 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 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index de422c38a..0de709e44 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ VermilionMartBuenaText: 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 diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index 80b3e02ce..0c3712b3a 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ VermilionPokecenter1FBugCatcherText: 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 diff --git a/maps/VermilionPokecenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm index 7ddb0050c..e8ed5dbd1 100644 --- 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 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index e75d2e3d4..a6ffc9ba8 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -4,13 +4,11 @@ const_value set 2 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 @@ UnknownText_0x750a6: 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 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 1c2c56c7b..1364202a4 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -2,11 +2,9 @@ const_value set 2 const VERMILIONPORTPASSAGE_TEACHER VermilionPortPassage_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks VermilionPortPassageTeacherScript: jumptextfaceplayer VermilionPortPassageTeacherText @@ -19,23 +17,18 @@ VermilionPortPassageTeacherText: 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 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 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index a8f8aa085..34aa49a5a 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -7,13 +7,11 @@ const_value set 2 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 @@ UnknownText_0x747aa: 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 @@ VictoryRoad_MapEvents: 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 diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 3c027014a..3f5054dd5 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -4,13 +4,11 @@ const_value set 2 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 @@ VictoryRoadGateRightBlackBeltText: 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 @@ VictoryRoadGate_MapEvents: 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 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 6ce23b037..cc4eba2b5 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -9,11 +9,9 @@ const_value set 2 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 @@ EarlsPokemonAcademySignText: 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 @@ VioletCity_MapEvents: 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 @@ VioletCity_MapEvents: 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 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 2a7b97197..1b8b3414a 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ VioletGymGuyWinText: 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 diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm index 3025dad5d..be3ae329b 100644 --- a/maps/VioletKylesHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ VioletKylesHousePokefanMText: 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 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index bb01ab1a9..006a28208 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ VioletMartCooltrainerMText: 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 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 192ffcc58..90d137801 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ UnknownText_0x6947c: 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 diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 3bf4f1166..39171fa21 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -6,11 +6,9 @@ const_value set 2 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 @@ VioletPokecenter1FYoungsterText: 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 diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 75a0d47ab..1ce305b21 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -5,11 +5,9 @@ const_value set 2 const VIRIDIANCITY_YOUNGSTER ViridianCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -216,22 +214,18 @@ TrainerHouseSignText: 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 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 @@ ViridianCity_MapEvents: 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 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index f77eee251..f194f434c 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -3,11 +3,9 @@ const_value set 2 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 @@ ViridianGymGuyWinText: 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 diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index e42cc70e2..be8e454b9 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ ViridianMartCooltrainerMText: 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 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 703aaf253..c7115761d 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ RatteyText: 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 diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index b795bc3de..296fee253 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 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 @@ ViridianPokecenter1FBugCatcherText: 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 diff --git a/maps/ViridianPokecenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm index 38fbd8a5a..ea714aa9e 100644 --- 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 diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index e19ae8551..f5b474fc4 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -7,11 +7,9 @@ const_value set 2 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 @@ WhirlIslandB1FHiddenFullRestore: 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 @@ WhirlIslandB1F_MapEvents: 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 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index d689744ca..2e5071631 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -4,11 +4,9 @@ const_value set 2 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 @@ WhirlIslandB2FMaxElixer: 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 diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index 4d67a37ab..98312ad5a 100644 --- 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 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index c5637b742..162cdc88f 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -2,11 +2,9 @@ const_value set 2 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 @@ LugiaText: 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 diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 490892565..9fc721d77 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -2,31 +2,24 @@ const_value set 2 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 diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index 8939c9b15..38a413e96 100644 --- 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 diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index ca03ab199..51b21821a 100644 --- 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 diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 6edd1490f..58878cb34 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -2,33 +2,26 @@ const_value set 2 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 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 diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 088364a83..e56a5777f 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -2,13 +2,11 @@ const_value set 2 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 @@ WillScript_WillDefeatText: 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 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index a047eadbe..d92e48c4a 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -7,13 +7,11 @@ const_value set 2 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 @@ UnknownText_0x98db5: 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 |