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/TinTower9F.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/TinTower9F.asm')
| -rw-r--r-- | maps/TinTower9F.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 83431425c..5b3280474 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -27,13 +27,13 @@ TinTower9F_MapEventHeader: .Warps: db 7 - warp_def $3, $c, 2, TIN_TOWER_8F - warp_def $5, $2, 3, TIN_TOWER_8F - warp_def $7, $c, 4, TIN_TOWER_8F - warp_def $9, $7, 1, TIN_TOWER_ROOF - warp_def $7, $10, 5, TIN_TOWER_7F - warp_def $d, $6, 5, TIN_TOWER_8F - warp_def $d, $8, 6, TIN_TOWER_8F + warp_def 12, 3, 2, TIN_TOWER_8F + warp_def 2, 5, 3, TIN_TOWER_8F + warp_def 12, 7, 4, TIN_TOWER_8F + warp_def 7, 9, 1, TIN_TOWER_ROOF + warp_def 16, 7, 5, TIN_TOWER_7F + warp_def 6, 13, 5, TIN_TOWER_8F + warp_def 8, 13, 6, TIN_TOWER_8F .CoordEvents: db 0 @@ -43,4 +43,4 @@ TinTower9F_MapEventHeader: .ObjectEvents: db 1 - object_event SPRITE_POKE_BALL, 1, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP + object_event 9, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP |