summaryrefslogtreecommitdiff
path: root/maps/HallOfFame.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/HallOfFame.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/HallOfFame.asm')
-rw-r--r--maps/HallOfFame.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index e795feea8..c9bfdac9d 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -116,8 +116,8 @@ HallOfFame_MapEventHeader:
.Warps:
db 2
- warp_def $d, $4, 3, LANCES_ROOM
- warp_def $d, $5, 4, LANCES_ROOM
+ warp_def 4, 13, 3, LANCES_ROOM
+ warp_def 5, 13, 4, LANCES_ROOM
.CoordEvents:
db 0
@@ -127,4 +127,4 @@ HallOfFame_MapEventHeader:
.ObjectEvents:
db 1
- object_event SPRITE_LANCE, 12, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+ object_event 4, 12, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1