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/BattleTowerHallway.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/BattleTowerHallway.asm')
| -rw-r--r-- | maps/BattleTowerHallway.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index dc60a0440..41a3beb83 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -84,12 +84,12 @@ BattleTowerHallway_MapEventHeader: .Warps: db 6 - warp_def $1, $b, 1, BATTLE_TOWER_ELEVATOR - warp_def $0, $5, 1, BATTLE_TOWER_BATTLE_ROOM - warp_def $0, $7, 1, BATTLE_TOWER_BATTLE_ROOM - warp_def $0, $9, 1, BATTLE_TOWER_BATTLE_ROOM - warp_def $0, $d, 1, BATTLE_TOWER_BATTLE_ROOM - warp_def $0, $f, 1, BATTLE_TOWER_BATTLE_ROOM + warp_def 11, 1, 1, BATTLE_TOWER_ELEVATOR + warp_def 5, 0, 1, BATTLE_TOWER_BATTLE_ROOM + warp_def 7, 0, 1, BATTLE_TOWER_BATTLE_ROOM + warp_def 9, 0, 1, BATTLE_TOWER_BATTLE_ROOM + warp_def 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM + warp_def 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM .CoordEvents: db 0 @@ -99,4 +99,4 @@ BattleTowerHallway_MapEventHeader: .ObjectEvents: db 1 - object_event SPRITE_RECEPTIONIST, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1 + object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1 |