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/IcePathB3F.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/IcePathB3F.asm')
| -rw-r--r-- | maps/IcePathB3F.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index 64d448956..cfdf2387b 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -21,8 +21,8 @@ IcePathB3F_MapEventHeader: .Warps: db 2 - warp_def $5, $3, 2, ICE_PATH_B2F_MAHOGANY_SIDE - warp_def $5, $f, 2, ICE_PATH_B2F_BLACKTHORN_SIDE + warp_def 3, 5, 2, ICE_PATH_B2F_MAHOGANY_SIDE + warp_def 15, 5, 2, ICE_PATH_B2F_BLACKTHORN_SIDE .CoordEvents: db 0 @@ -32,5 +32,5 @@ IcePathB3F_MapEventHeader: .ObjectEvents: db 2 - object_event SPRITE_POKE_BALL, 7, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE - object_event SPRITE_ROCK, 6, 6, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1 + object_event 5, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE + object_event 6, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1 |