diff options
Diffstat (limited to 'maps/Route40BattleTowerGate.asm')
| -rw-r--r-- | maps/Route40BattleTowerGate.asm | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index edd8fb7ff..9678e9aa3 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE40BATTLETOWERGATE_ROCKER 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 - -.Warps: - db 4 - warp_def 4, 7, 1, ROUTE_40 - warp_def 5, 7, 1, ROUTE_40 - warp_def 4, 0, 1, BATTLE_TOWER_OUTSIDE - warp_def 5, 0, 2, BATTLE_TOWER_OUTSIDE - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 2 - 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 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 4, 7, ROUTE_40, 1 + warp_event 5, 7, ROUTE_40, 1 + warp_event 4, 0, BATTLE_TOWER_OUTSIDE, 1 + warp_event 5, 0, BATTLE_TOWER_OUTSIDE, 2 + + db 0 ; coord events + + db 0 ; bg events + + 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 |