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/SilverCaveRoom2.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/SilverCaveRoom2.asm')
| -rw-r--r-- | maps/SilverCaveRoom2.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 5ee1d4bf6..ec33e2be8 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -29,20 +29,20 @@ SilverCaveRoom2_MapEventHeader: .Warps: db 4 - warp_def $1f, $11, 2, SILVER_CAVE_ROOM_1 - warp_def $5, $b, 1, SILVER_CAVE_ROOM_3 - warp_def $15, $d, 1, SILVER_CAVE_ITEM_ROOMS - warp_def $3, $17, 2, SILVER_CAVE_ITEM_ROOMS + warp_def 17, 31, 2, SILVER_CAVE_ROOM_1 + warp_def 11, 5, 1, SILVER_CAVE_ROOM_3 + warp_def 13, 21, 1, SILVER_CAVE_ITEM_ROOMS + warp_def 23, 3, 2, SILVER_CAVE_ITEM_ROOMS .CoordEvents: db 0 .BGEvents: db 1 - bg_event 31, 14, BGEVENT_ITEM, SilverCaveRoom2HiddenMaxPotion + bg_event 14, 31, BGEVENT_ITEM, SilverCaveRoom2HiddenMaxPotion .ObjectEvents: db 3 - object_event SPRITE_POKE_BALL, 10, 24, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM - object_event SPRITE_POKE_BALL, 24, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL - object_event SPRITE_POKE_BALL, 20, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP + object_event 24, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM + object_event 22, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL + object_event 4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP |