summaryrefslogtreecommitdiff
path: root/maps/BluesHouse.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/BluesHouse.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/BluesHouse.asm')
-rw-r--r--maps/BluesHouse.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index 367b255b8..9a40a68f6 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -150,8 +150,8 @@ BluesHouse_MapEventHeader:
.Warps:
db 2
- warp_def $7, $2, 2, PALLET_TOWN
- warp_def $7, $3, 2, PALLET_TOWN
+ warp_def 2, 7, 2, PALLET_TOWN
+ warp_def 3, 7, 2, PALLET_TOWN
.CoordEvents:
db 0
@@ -161,4 +161,4 @@ BluesHouse_MapEventHeader:
.ObjectEvents:
db 1
- object_event SPRITE_DAISY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1
+ object_event 2, 3, SPRITE_DAISY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1