diff options
author | yenatch <yenatch@gmail.com> | 2017-12-28 22:17:13 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-28 22:17:13 -0500 |
commit | b97a1acf3d676ca1c776e37ff4cfa48164ffc92b (patch) | |
tree | 59b5db70690a9f9041e4964adae1722b4d178a1b /maps/BattleTowerElevator.asm | |
parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
parent | b9a68fec2589eb6969be63e6ed1eb3fca312c307 (diff) |
Merge pull request #445 from roukaour/master
Rename Pokémon animation files; consistent (x, y) coords; document design flaws
Diffstat (limited to 'maps/BattleTowerElevator.asm')
-rw-r--r-- | maps/BattleTowerElevator.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index c2d51f5fc..2327b31fa 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -50,8 +50,8 @@ BattleTowerElevator_MapEventHeader: .Warps: db 2 - warp_def $3, $1, 1, BATTLE_TOWER_HALLWAY - warp_def $3, $2, 1, BATTLE_TOWER_HALLWAY + warp_def 1, 3, 1, BATTLE_TOWER_HALLWAY + warp_def 2, 3, 1, BATTLE_TOWER_HALLWAY .CoordEvents: db 0 @@ -61,4 +61,4 @@ BattleTowerElevator_MapEventHeader: .ObjectEvents: db 1 - object_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 + object_event 1, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 |