diff options
| -rwxr-xr-x | constants/collision_constants.asm | 2 | ||||
| -rw-r--r-- | gfx/tilesets/dark_cave_palette_map.asm | 29 | ||||
| -rw-r--r-- | main.asm | 3 | ||||
| -rwxr-xr-x | tools/unused_sources.sh | 2 |
4 files changed, 3 insertions, 33 deletions
diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm index 29e0442b..420122ac 100755 --- a/constants/collision_constants.asm +++ b/constants/collision_constants.asm @@ -26,7 +26,7 @@ COLL_WATER_21 EQU $21 ; unused COLL_ICE EQU $23 COLL_WHIRLPOOL EQU $24 COLL_BUOY EQU $27 -COLL_CUT_28 EQU $28 +COLL_CUT_28 EQU $28 ; garbage COLL_WATER EQU $29 COLL_ICE_2B EQU $2b ; unused COLL_WHIRLPOOL_2C EQU $2c ; unused diff --git a/gfx/tilesets/dark_cave_palette_map.asm b/gfx/tilesets/dark_cave_palette_map.asm deleted file mode 100644 index 73c09ebe..00000000 --- a/gfx/tilesets/dark_cave_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN - tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN - tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY @@ -584,8 +584,7 @@ Footprints:: UnownFont:: dr $fb30e, $fb4be -TileCollisionTable:: - dr $fb4be, $fb5be +INCLUDE "data/collision_permissions.asm" Shrink1Pic:: dr $fb5be, $fb64e Shrink2Pic:: diff --git a/tools/unused_sources.sh b/tools/unused_sources.sh index 24fbc27d..68ae5a96 100755 --- a/tools/unused_sources.sh +++ b/tools/unused_sources.sh @@ -5,7 +5,7 @@ toplevel='audio.asm data/text/common.asm data/pokemon/dex_entries.asm wram.asm main.asm home.asm gfx/sprites.asm gfx/pics_gold.asm gfx/pics_silver.asm data/maps/map_data.asm engine/overworld/events.asm rgbdscheck.asm -data/pokemon/egg_moves.asm data/pokemon/evos_attacks.asm' +data/pokemon/egg_moves.asm data/pokemon/evos_attacks.asm gfx/tilesets.asm' for asm in $toplevel; do echo "$asm" |