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/WhirlIslandSW.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/WhirlIslandSW.asm')
| -rw-r--r-- | maps/WhirlIslandSW.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index c66f05245..e1c212d75 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -17,11 +17,11 @@ WhirlIslandSW_MapEventHeader: .Warps: db 5 - warp_def $7, $5, 3, ROUTE_41 - warp_def $3, $11, 5, WHIRL_ISLAND_B1F - warp_def $3, $3, 4, WHIRL_ISLAND_B1F - warp_def $f, $3, 3, WHIRL_ISLAND_NW - warp_def $f, $11, 4, WHIRL_ISLAND_B2F + warp_def 5, 7, 3, ROUTE_41 + warp_def 17, 3, 5, WHIRL_ISLAND_B1F + warp_def 3, 3, 4, WHIRL_ISLAND_B1F + warp_def 3, 15, 3, WHIRL_ISLAND_NW + warp_def 17, 15, 4, WHIRL_ISLAND_B2F .CoordEvents: db 0 @@ -31,4 +31,4 @@ WhirlIslandSW_MapEventHeader: .ObjectEvents: db 1 - object_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL + object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL |