summaryrefslogtreecommitdiff
path: root/maps/MobileBattleRoom.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-12-28 22:17:13 -0500
committerGitHub <noreply@github.com>2017-12-28 22:17:13 -0500
commitb97a1acf3d676ca1c776e37ff4cfa48164ffc92b (patch)
tree59b5db70690a9f9041e4964adae1722b4d178a1b /maps/MobileBattleRoom.asm
parent82a05a1752b476caab8951fe03f539dcc1a63669 (diff)
parentb9a68fec2589eb6969be63e6ed1eb3fca312c307 (diff)
Merge pull request #445 from roukaour/master
Rename Pokémon animation files; consistent (x, y) coords; document design flaws
Diffstat (limited to 'maps/MobileBattleRoom.asm')
-rw-r--r--maps/MobileBattleRoom.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 4983c3fa4..870321f3d 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -72,15 +72,15 @@ MobileBattleRoom_MapEventHeader:
.Warps:
db 2
- warp_def $7, $4, 6, POKECENTER_2F
- warp_def $7, $5, 6, POKECENTER_2F
+ warp_def 4, 7, 6, POKECENTER_2F
+ warp_def 5, 7, 6, POKECENTER_2F
.CoordEvents:
db 0
.BGEvents:
db 1
- bg_event 2, 4, BGEVENT_UP, MapMobileBattleRoomSignpost0Script
+ bg_event 4, 2, BGEVENT_UP, MapMobileBattleRoomSignpost0Script
.ObjectEvents:
db 0