diff options
Diffstat (limited to 'maps/BattleTowerOutside.asm')
-rw-r--r-- | maps/BattleTowerOutside.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 9cf15d915..6ed01da6f 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -132,10 +132,10 @@ BattleTowerOutside_MapEventHeader: .Warps: db 4 - warp_def $15, $8, 3, ROUTE_40_BATTLE_TOWER_GATE - warp_def $15, $9, 4, ROUTE_40_BATTLE_TOWER_GATE - warp_def $9, $8, 1, BATTLE_TOWER_1F - warp_def $9, $9, 2, BATTLE_TOWER_1F + 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 .CoordEvents: db 0 @@ -146,7 +146,7 @@ BattleTowerOutside_MapEventHeader: .ObjectEvents: db 4 - object_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 - object_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1 - object_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR - object_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 + 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 |