Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

unused_dark_cave -> unused_johto (goes with the beta Johto town+city maps)

This commit is contained in:
Rangi 2020-02-25 19:18:24 -05:00
parent ee622d6ba1
commit a73ced3b69
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
constants/collision_constants.asm
View File

@ -20,14 +20,14 @@ COLL_TALL_GRASS EQU $18
COLL_CUT_TREE_1A EQU $1a ; unused COLL_CUT_TREE_1A EQU $1a ; unused
COLL_LONG_GRASS_1C EQU $1c ; unused COLL_LONG_GRASS_1C EQU $1c ; unused
COLL_HEADBUTT_TREE_1D EQU $1d ; unused COLL_HEADBUTT_TREE_1D EQU $1d ; unused
COLL_WATER_21 EQU $21 ; ??? COLL_WATER_21 EQU $21 ; unused
COLL_ICE EQU $23 COLL_ICE EQU $23
COLL_WHIRLPOOL EQU $24 COLL_WHIRLPOOL EQU $24
COLL_BUOY EQU $27 COLL_BUOY EQU $27
COLL_CUT_28 EQU $28 ; garbage COLL_CUT_28 EQU $28 ; garbage
COLL_WATER EQU $29 COLL_WATER EQU $29
COLL_ICE_2B EQU $2b ; unused COLL_ICE_2B EQU $2b ;
COLL_WHIRLPOOL_2C EQU $2c ; unused COLL_WHIRLPOOL_2C EQU $2c ;
COLL_WATERFALL_RIGHT EQU $30 ; unused COLL_WATERFALL_RIGHT EQU $30 ; unused
COLL_WATERFALL_LEFT EQU $31 ; unused COLL_WATERFALL_LEFT EQU $31 ; unused
COLL_WATERFALL_UP EQU $32 ; unused COLL_WATERFALL_UP EQU $32 ; unused

0
data/tilesets/unused_dark_cave_collision.asm → data/tilesets/unused_johto_collision.asm
View File

0
data/tilesets/unused_dark_cave_metatiles.bin → data/tilesets/unused_johto_metatiles.bin
View File

8
gfx/tilesets.asm
View File

@ -190,11 +190,11 @@ INCLUDE "data/tilesets/underground_collision.asm"
TilesetDarkCaveGFX:: TilesetDarkCaveGFX::
INCBIN "gfx/tilesets/dark_cave.2bpp.lz" INCBIN "gfx/tilesets/dark_cave.2bpp.lz"
UnusedTilesetDarkCaveMeta:: UnusedTilesetJohtoMeta::
INCBIN "data/tilesets/unused_dark_cave_metatiles.bin" INCBIN "data/tilesets/unused_johto_metatiles.bin"
UnusedTilesetDarkCaveColl:: UnusedTilesetJohtoColl::
INCLUDE "data/tilesets/unused_dark_cave_collision.asm" INCLUDE "data/tilesets/unused_johto_collision.asm"
SECTION "Tileset Data 5", ROMX SECTION "Tileset Data 5", ROMX