diff options
Diffstat (limited to 'maps/BattleTowerOutside.asm')
| -rw-r--r-- | maps/BattleTowerOutside.asm | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index a61717fd0..afc193180 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER const BATTLETOWEROUTSIDE_BUENA const BATTLETOWEROUTSIDE_SAILOR 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 @@ -107,6 +105,7 @@ BattleTowerOutsideSailorText: done BattleTowerOutsideText_BattleTower: +; unused; originally shown when the Battle Tower was closed text "BATTLE TOWER" done @@ -118,35 +117,32 @@ BattleTowerOutsideText_UltimateChallenge: done BattleTowerOutsideText_DoorsClosed: +; unused; originally shown when the Battle Tower was closed text "The BATTLE TOWER's" line "doors are closed…" done BattleTowerOutsideText_DoorsOpen: +; unused; originally shown after the Battle Tower opened text "It's open!" done BattleTowerOutside_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 8, 21, 3, ROUTE_40_BATTLE_TOWER_GATE - warp_def 9, 21, 4, ROUTE_40_BATTLE_TOWER_GATE - warp_def 8, 9, 1, BATTLE_TOWER_1F - warp_def 9, 9, 2, BATTLE_TOWER_1F + db 4 ; warp events + warp_event 8, 21, ROUTE_40_BATTLE_TOWER_GATE, 3 + warp_event 9, 21, ROUTE_40_BATTLE_TOWER_GATE, 4 + warp_event 8, 9, BATTLE_TOWER_1F, 1 + warp_event 9, 9, BATTLE_TOWER_1F, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 10, 10, BGEVENT_READ, MapBattleTowerOutsideSignpost0Script -.ObjectEvents: - db 4 - object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 + 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 object_event 12, 24, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 |