From 3a9930b9d4348cf0a67861438d7af32fbb60d812 Mon Sep 17 00:00:00 2001 From: entrpntr Date: Thu, 28 May 2020 21:56:43 -0400 Subject: Remove unnecessary 2bpp files, plus some minor fixes. --- .gitignore | 1 + data/credits_script.asm | 2 +- data/credits_strings.asm | 12 ++++++------ gfx/battle_anims/aeroblast.2bpp | Bin 384 -> 0 bytes gfx/battle_anims/angels.2bpp | Bin 560 -> 0 bytes gfx/battle_anims/beam.2bpp | Bin 176 -> 0 bytes gfx/battle_anims/bubble.2bpp | Bin 208 -> 0 bytes gfx/battle_anims/charge.2bpp | Bin 144 -> 0 bytes gfx/battle_anims/cut.2bpp | Bin 96 -> 0 bytes gfx/battle_anims/egg.2bpp | Bin 192 -> 0 bytes gfx/battle_anims/explosion.2bpp | Bin 144 -> 0 bytes gfx/battle_anims/fire.2bpp | Bin 96 -> 0 bytes gfx/battle_anims/flower.2bpp | Bin 128 -> 0 bytes gfx/battle_anims/globe.2bpp | Bin 256 -> 0 bytes gfx/battle_anims/haze.2bpp | Bin 256 -> 0 bytes gfx/battle_anims/hit.2bpp | Bin 336 -> 0 bytes gfx/battle_anims/horn.2bpp | Bin 112 -> 0 bytes gfx/battle_anims/ice.2bpp | Bin 96 -> 0 bytes gfx/battle_anims/lightning.2bpp | Bin 416 -> 0 bytes gfx/battle_anims/misc.2bpp | Bin 640 -> 0 bytes gfx/battle_anims/noise.2bpp | Bin 256 -> 0 bytes gfx/battle_anims/objects.2bpp | Bin 288 -> 0 bytes gfx/battle_anims/plant.2bpp | Bin 288 -> 0 bytes gfx/battle_anims/poison.2bpp | Bin 144 -> 0 bytes gfx/battle_anims/pokeball.2bpp | Bin 160 -> 0 bytes gfx/battle_anims/powder.2bpp | Bin 32 -> 0 bytes gfx/battle_anims/psychic.2bpp | Bin 208 -> 0 bytes gfx/battle_anims/reflect.2bpp | Bin 160 -> 0 bytes gfx/battle_anims/rocks.2bpp | Bin 272 -> 0 bytes gfx/battle_anims/rope.2bpp | Bin 288 -> 0 bytes gfx/battle_anims/sand.2bpp | Bin 192 -> 0 bytes gfx/battle_anims/shapes.2bpp | Bin 768 -> 0 bytes gfx/battle_anims/shine.2bpp | Bin 608 -> 0 bytes gfx/battle_anims/skyattack.2bpp | Bin 576 -> 0 bytes gfx/battle_anims/smoke.2bpp | Bin 192 -> 0 bytes gfx/battle_anims/speed.2bpp | Bin 144 -> 0 bytes gfx/battle_anims/status.2bpp | Bin 432 -> 0 bytes gfx/battle_anims/water.2bpp | Bin 320 -> 0 bytes gfx/battle_anims/wave.2bpp | Bin 288 -> 0 bytes gfx/battle_anims/web.2bpp | Bin 224 -> 0 bytes gfx/battle_anims/whip.2bpp | Bin 160 -> 0 bytes gfx/battle_anims/wind.2bpp | Bin 304 -> 0 bytes main.asm | 2 +- tools/unused_sources.sh | 3 ++- 44 files changed, 11 insertions(+), 9 deletions(-) delete mode 100755 gfx/battle_anims/aeroblast.2bpp delete mode 100755 gfx/battle_anims/angels.2bpp delete mode 100755 gfx/battle_anims/beam.2bpp delete mode 100755 gfx/battle_anims/bubble.2bpp delete mode 100755 gfx/battle_anims/charge.2bpp delete mode 100755 gfx/battle_anims/cut.2bpp delete mode 100755 gfx/battle_anims/egg.2bpp delete mode 100755 gfx/battle_anims/explosion.2bpp delete mode 100755 gfx/battle_anims/fire.2bpp delete mode 100755 gfx/battle_anims/flower.2bpp delete mode 100755 gfx/battle_anims/globe.2bpp delete mode 100755 gfx/battle_anims/haze.2bpp delete mode 100755 gfx/battle_anims/hit.2bpp delete mode 100755 gfx/battle_anims/horn.2bpp delete mode 100755 gfx/battle_anims/ice.2bpp delete mode 100755 gfx/battle_anims/lightning.2bpp delete mode 100755 gfx/battle_anims/misc.2bpp delete mode 100755 gfx/battle_anims/noise.2bpp delete mode 100755 gfx/battle_anims/objects.2bpp delete mode 100755 gfx/battle_anims/plant.2bpp delete mode 100755 gfx/battle_anims/poison.2bpp delete mode 100755 gfx/battle_anims/pokeball.2bpp delete mode 100755 gfx/battle_anims/powder.2bpp delete mode 100755 gfx/battle_anims/psychic.2bpp delete mode 100755 gfx/battle_anims/reflect.2bpp delete mode 100755 gfx/battle_anims/rocks.2bpp delete mode 100755 gfx/battle_anims/rope.2bpp delete mode 100755 gfx/battle_anims/sand.2bpp delete mode 100755 gfx/battle_anims/shapes.2bpp delete mode 100755 gfx/battle_anims/shine.2bpp delete mode 100755 gfx/battle_anims/skyattack.2bpp delete mode 100755 gfx/battle_anims/smoke.2bpp delete mode 100755 gfx/battle_anims/speed.2bpp delete mode 100755 gfx/battle_anims/status.2bpp delete mode 100755 gfx/battle_anims/water.2bpp delete mode 100755 gfx/battle_anims/wave.2bpp delete mode 100755 gfx/battle_anims/web.2bpp delete mode 100755 gfx/battle_anims/whip.2bpp delete mode 100755 gfx/battle_anims/wind.2bpp diff --git a/.gitignore b/.gitignore index f72107ae..437ae042 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ gfx/pokedex/slowpoke.2bpp gfx/pokedex/pokedex_sgb.2bpp gfx/pokedex/question_mark.2bpp gfx/tilesets/*.2bpp +gfx/battle_anims/*.2bpp diff --git a/data/credits_script.asm b/data/credits_script.asm index ccf84020..5c1dc40d 100755 --- a/data/credits_script.asm +++ b/data/credits_script.asm @@ -64,7 +64,7 @@ CreditsScript: db CREDITS_WAIT, 12 db CREDITS_WAIT, 0 - ; Clear the banner. +; Clear the banner. db CREDITS_CLEAR db CREDITS_WAIT, 1 diff --git a/data/credits_strings.asm b/data/credits_strings.asm index 09c0dcd7..53baa850 100644 --- a/data/credits_strings.asm +++ b/data/credits_strings.asm @@ -52,12 +52,12 @@ Credits_KazuyoshiOsawa:: db " KAZUYOSHI OSAWA@" Credits_KimikoNakamichi:: db " KIMIKO NAKAMICHI@" Credits_End:: db "END@" ; "おしまい@" Credits_Staff:: db " #MON" ; "ポケットモンスター" - IF DEF(_GOLD) - next " GOLD VERSION" - ELIF DEF(_SILVER) - next " SILVER VERSION" - ENDC - next " STAFF@" + IF DEF(_GOLD) + next " GOLD VERSION" + ELIF DEF(_SILVER) + next " SILVER VERSION" + ENDC + next " STAFF@" Credits_Director:: db " DIRECTOR@" ; "エグゼクティブ　ディレクター@" Credits_SubDirector:: db " SUB DIRECTOR@" Credits_Programmers:: db " PROGRAMMERS@" ; "プログラム@" diff --git a/gfx/battle_anims/aeroblast.2bpp b/gfx/battle_anims/aeroblast.2bpp deleted file mode 100755 index b7944713..00000000 Binary files a/gfx/battle_anims/aeroblast.2bpp and /dev/null differ diff --git a/gfx/battle_anims/angels.2bpp b/gfx/battle_anims/angels.2bpp deleted file mode 100755 index e8893f9b..00000000 Binary files a/gfx/battle_anims/angels.2bpp and /dev/null differ diff --git a/gfx/battle_anims/beam.2bpp b/gfx/battle_anims/beam.2bpp deleted file mode 100755 index 1a895b05..00000000 Binary files a/gfx/battle_anims/beam.2bpp and /dev/null differ diff --git a/gfx/battle_anims/bubble.2bpp b/gfx/battle_anims/bubble.2bpp deleted file mode 100755 index a9daa48e..00000000 Binary files a/gfx/battle_anims/bubble.2bpp and /dev/null differ diff --git a/gfx/battle_anims/charge.2bpp b/gfx/battle_anims/charge.2bpp deleted file mode 100755 index 43d33813..00000000 Binary files a/gfx/battle_anims/charge.2bpp and /dev/null differ diff --git a/gfx/battle_anims/cut.2bpp b/gfx/battle_anims/cut.2bpp deleted file mode 100755 index c17a4bd7..00000000 Binary files a/gfx/battle_anims/cut.2bpp and /dev/null differ diff --git a/gfx/battle_anims/egg.2bpp b/gfx/battle_anims/egg.2bpp deleted file mode 100755 index 37382633..00000000 Binary files a/gfx/battle_anims/egg.2bpp and /dev/null differ diff --git a/gfx/battle_anims/explosion.2bpp b/gfx/battle_anims/explosion.2bpp deleted file mode 100755 index dabe60c9..00000000 Binary files a/gfx/battle_anims/explosion.2bpp and /dev/null differ diff --git a/gfx/battle_anims/fire.2bpp b/gfx/battle_anims/fire.2bpp deleted file mode 100755 index 0a6c9a1b..00000000 Binary files a/gfx/battle_anims/fire.2bpp and /dev/null differ diff --git a/gfx/battle_anims/flower.2bpp b/gfx/battle_anims/flower.2bpp deleted file mode 100755 index 6aa8a2c5..00000000 Binary files a/gfx/battle_anims/flower.2bpp and /dev/null differ diff --git a/gfx/battle_anims/globe.2bpp b/gfx/battle_anims/globe.2bpp deleted file mode 100755 index a279ba54..00000000 Binary files a/gfx/battle_anims/globe.2bpp and /dev/null differ diff --git a/gfx/battle_anims/haze.2bpp b/gfx/battle_anims/haze.2bpp deleted file mode 100755 index 8b180810..00000000 Binary files a/gfx/battle_anims/haze.2bpp and /dev/null differ diff --git a/gfx/battle_anims/hit.2bpp b/gfx/battle_anims/hit.2bpp deleted file mode 100755 index 1d797a8f..00000000 Binary files a/gfx/battle_anims/hit.2bpp and /dev/null differ diff --git a/gfx/battle_anims/horn.2bpp b/gfx/battle_anims/horn.2bpp deleted file mode 100755 index 98a91d85..00000000 Binary files a/gfx/battle_anims/horn.2bpp and /dev/null differ diff --git a/gfx/battle_anims/ice.2bpp b/gfx/battle_anims/ice.2bpp deleted file mode 100755 index 72b6bab2..00000000 Binary files a/gfx/battle_anims/ice.2bpp and /dev/null differ diff --git a/gfx/battle_anims/lightning.2bpp b/gfx/battle_anims/lightning.2bpp deleted file mode 100755 index 12beaae7..00000000 Binary files a/gfx/battle_anims/lightning.2bpp and /dev/null differ diff --git a/gfx/battle_anims/misc.2bpp b/gfx/battle_anims/misc.2bpp deleted file mode 100755 index e95740f6..00000000 Binary files a/gfx/battle_anims/misc.2bpp and /dev/null differ diff --git a/gfx/battle_anims/noise.2bpp b/gfx/battle_anims/noise.2bpp deleted file mode 100755 index d86e291b..00000000 Binary files a/gfx/battle_anims/noise.2bpp and /dev/null differ diff --git a/gfx/battle_anims/objects.2bpp b/gfx/battle_anims/objects.2bpp deleted file mode 100755 index 95620254..00000000 Binary files a/gfx/battle_anims/objects.2bpp and /dev/null differ diff --git a/gfx/battle_anims/plant.2bpp b/gfx/battle_anims/plant.2bpp deleted file mode 100755 index 2463fa9b..00000000 Binary files a/gfx/battle_anims/plant.2bpp and /dev/null differ diff --git a/gfx/battle_anims/poison.2bpp b/gfx/battle_anims/poison.2bpp deleted file mode 100755 index 09ad7f10..00000000 Binary files a/gfx/battle_anims/poison.2bpp and /dev/null differ diff --git a/gfx/battle_anims/pokeball.2bpp b/gfx/battle_anims/pokeball.2bpp deleted file mode 100755 index 39f67043..00000000 Binary files a/gfx/battle_anims/pokeball.2bpp and /dev/null differ diff --git a/gfx/battle_anims/powder.2bpp b/gfx/battle_anims/powder.2bpp deleted file mode 100755 index d6b89e5c..00000000 Binary files a/gfx/battle_anims/powder.2bpp and /dev/null differ diff --git a/gfx/battle_anims/psychic.2bpp b/gfx/battle_anims/psychic.2bpp deleted file mode 100755 index cf0653bc..00000000 Binary files a/gfx/battle_anims/psychic.2bpp and /dev/null differ diff --git a/gfx/battle_anims/reflect.2bpp b/gfx/battle_anims/reflect.2bpp deleted file mode 100755 index cee63431..00000000 Binary files a/gfx/battle_anims/reflect.2bpp and /dev/null differ diff --git a/gfx/battle_anims/rocks.2bpp b/gfx/battle_anims/rocks.2bpp deleted file mode 100755 index c1d5622e..00000000 Binary files a/gfx/battle_anims/rocks.2bpp and /dev/null differ diff --git a/gfx/battle_anims/rope.2bpp b/gfx/battle_anims/rope.2bpp deleted file mode 100755 index 137dba7a..00000000 Binary files a/gfx/battle_anims/rope.2bpp and /dev/null differ diff --git a/gfx/battle_anims/sand.2bpp b/gfx/battle_anims/sand.2bpp deleted file mode 100755 index fc991bfb..00000000 Binary files a/gfx/battle_anims/sand.2bpp and /dev/null differ diff --git a/gfx/battle_anims/shapes.2bpp b/gfx/battle_anims/shapes.2bpp deleted file mode 100755 index 858b2120..00000000 Binary files a/gfx/battle_anims/shapes.2bpp and /dev/null differ diff --git a/gfx/battle_anims/shine.2bpp b/gfx/battle_anims/shine.2bpp deleted file mode 100755 index a09807f0..00000000 Binary files a/gfx/battle_anims/shine.2bpp and /dev/null differ diff --git a/gfx/battle_anims/skyattack.2bpp b/gfx/battle_anims/skyattack.2bpp deleted file mode 100755 index 2e57f99e..00000000 Binary files a/gfx/battle_anims/skyattack.2bpp and /dev/null differ diff --git a/gfx/battle_anims/smoke.2bpp b/gfx/battle_anims/smoke.2bpp deleted file mode 100755 index c50e69e6..00000000 Binary files a/gfx/battle_anims/smoke.2bpp and /dev/null differ diff --git a/gfx/battle_anims/speed.2bpp b/gfx/battle_anims/speed.2bpp deleted file mode 100755 index 1a2b886d..00000000 Binary files a/gfx/battle_anims/speed.2bpp and /dev/null differ diff --git a/gfx/battle_anims/status.2bpp b/gfx/battle_anims/status.2bpp deleted file mode 100755 index b8878b4a..00000000 Binary files a/gfx/battle_anims/status.2bpp and /dev/null differ diff --git a/gfx/battle_anims/water.2bpp b/gfx/battle_anims/water.2bpp deleted file mode 100755 index 75fd6b46..00000000 Binary files a/gfx/battle_anims/water.2bpp and /dev/null differ diff --git a/gfx/battle_anims/wave.2bpp b/gfx/battle_anims/wave.2bpp deleted file mode 100755 index e8eb076f..00000000 Binary files a/gfx/battle_anims/wave.2bpp and /dev/null differ diff --git a/gfx/battle_anims/web.2bpp b/gfx/battle_anims/web.2bpp deleted file mode 100755 index 439c2d01..00000000 Binary files a/gfx/battle_anims/web.2bpp and /dev/null differ diff --git a/gfx/battle_anims/whip.2bpp b/gfx/battle_anims/whip.2bpp deleted file mode 100755 index 5096e932..00000000 Binary files a/gfx/battle_anims/whip.2bpp and /dev/null differ diff --git a/gfx/battle_anims/wind.2bpp b/gfx/battle_anims/wind.2bpp deleted file mode 100755 index 21124992..00000000 Binary files a/gfx/battle_anims/wind.2bpp and /dev/null differ diff --git a/main.asm b/main.asm index a766f118..e0d0f00d 100644 --- a/main.asm +++ b/main.asm @@ -396,7 +396,7 @@ INCLUDE "data/moves/animations.asm" LoadPoisonBGPals:: dr $cbc76, $cbcbd TheEndGFX:: - dr $cbcbd, $cbdba +INCBIN "gfx/credits/theend.2bpp" SECTION "Move Animations", ROMX diff --git a/tools/unused_sources.sh b/tools/unused_sources.sh index 68ae5a96..b0b9e368 100755 --- a/tools/unused_sources.sh +++ b/tools/unused_sources.sh @@ -5,7 +5,8 @@ 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 gfx/tilesets.asm' +data/pokemon/egg_moves.asm data/pokemon/evos_attacks.asm gfx/tilesets.asm +engine/movie/credits.asm' for asm in $toplevel; do echo "$asm" -- cgit v1.2.3