diff options
| -rw-r--r-- | constants/collision_constants.asm | 6 | ||||
| -rw-r--r-- | data/tilesets/unused_johto_collision.asm (renamed from data/tilesets/unused_dark_cave_collision.asm) | 0 | ||||
| -rw-r--r-- | data/tilesets/unused_johto_metatiles.bin (renamed from data/tilesets/unused_dark_cave_metatiles.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | gfx/tilesets.asm | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm index a03f4a0bb..c7f00861a 100644 --- a/constants/collision_constants.asm +++ b/constants/collision_constants.asm @@ -20,14 +20,14 @@ COLL_TALL_GRASS EQU $18 COLL_CUT_TREE_1A EQU $1a ; unused COLL_LONG_GRASS_1C EQU $1c ; unused COLL_HEADBUTT_TREE_1D EQU $1d ; unused -COLL_WATER_21 EQU $21 ; ??? +COLL_WATER_21 EQU $21 ; unused COLL_ICE EQU $23 COLL_WHIRLPOOL EQU $24 COLL_BUOY EQU $27 COLL_CUT_28 EQU $28 ; garbage COLL_WATER EQU $29 -COLL_ICE_2B EQU $2b ; unused -COLL_WHIRLPOOL_2C EQU $2c ; unused +COLL_ICE_2B EQU $2b ; +COLL_WHIRLPOOL_2C EQU $2c ; COLL_WATERFALL_RIGHT EQU $30 ; unused COLL_WATERFALL_LEFT EQU $31 ; unused COLL_WATERFALL_UP EQU $32 ; unused diff --git a/data/tilesets/unused_dark_cave_collision.asm b/data/tilesets/unused_johto_collision.asm index 8bbc11f2a..8bbc11f2a 100644 --- a/data/tilesets/unused_dark_cave_collision.asm +++ b/data/tilesets/unused_johto_collision.asm diff --git a/data/tilesets/unused_dark_cave_metatiles.bin b/data/tilesets/unused_johto_metatiles.bin Binary files differindex b70f1a0e6..b70f1a0e6 100644 --- a/data/tilesets/unused_dark_cave_metatiles.bin +++ b/data/tilesets/unused_johto_metatiles.bin diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index 72410ef30..ead1860e7 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -190,11 +190,11 @@ INCLUDE "data/tilesets/underground_collision.asm" TilesetDarkCaveGFX:: INCBIN "gfx/tilesets/dark_cave.2bpp.lz" -UnusedTilesetDarkCaveMeta:: -INCBIN "data/tilesets/unused_dark_cave_metatiles.bin" +UnusedTilesetJohtoMeta:: +INCBIN "data/tilesets/unused_johto_metatiles.bin" -UnusedTilesetDarkCaveColl:: -INCLUDE "data/tilesets/unused_dark_cave_collision.asm" +UnusedTilesetJohtoColl:: +INCLUDE "data/tilesets/unused_johto_collision.asm" SECTION "Tileset Data 5", ROMX |