From 3499ff51b50ec90ac87ff61430a89a578c01092d Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 23 Dec 2017 01:45:04 -0500 Subject: second wave of graphics.s dumps (battle_anim part 1) --- data/battle_anims.s | 2 +- data/graphics.s | 394 ++++++++++++++++++++++- graphics/battle_anims/sprites/000.png | Bin 0 -> 223 bytes graphics/battle_anims/sprites/003.png | Bin 0 -> 197 bytes graphics/battle_anims/sprites/004.png | Bin 0 -> 233 bytes graphics/battle_anims/sprites/005.png | Bin 0 -> 200 bytes graphics/battle_anims/sprites/006.png | Bin 0 -> 275 bytes graphics/battle_anims/sprites/007.png | Bin 0 -> 334 bytes graphics/battle_anims/sprites/008.png | Bin 0 -> 147 bytes graphics/battle_anims/sprites/009.png | Bin 0 -> 635 bytes graphics/battle_anims/sprites/010.pal | 19 ++ graphics/battle_anims/sprites/010_0.png | Bin 0 -> 346 bytes graphics/battle_anims/sprites/010_1.png | Bin 0 -> 272 bytes graphics/battle_anims/sprites/010_2.png | Bin 0 -> 257 bytes graphics/battle_anims/sprites/010_3.png | Bin 0 -> 222 bytes graphics/battle_anims/sprites/011.png | Bin 0 -> 212 bytes graphics/battle_anims/sprites/012.png | Bin 0 -> 199 bytes graphics/battle_anims/sprites/013.png | Bin 0 -> 161 bytes graphics/battle_anims/sprites/015.png | Bin 0 -> 199 bytes graphics/battle_anims/sprites/016.png | Bin 0 -> 198 bytes graphics/battle_anims/sprites/017.png | Bin 0 -> 149 bytes graphics/battle_anims/sprites/019.png | Bin 0 -> 255 bytes graphics/battle_anims/sprites/020.png | Bin 0 -> 260 bytes graphics/battle_anims/sprites/021.png | Bin 0 -> 671 bytes graphics/battle_anims/sprites/022.pal | 19 ++ graphics/battle_anims/sprites/023.png | Bin 0 -> 312 bytes graphics/battle_anims/sprites/024.png | Bin 0 -> 231 bytes graphics/battle_anims/sprites/025.png | Bin 0 -> 274 bytes graphics/battle_anims/sprites/026.png | Bin 0 -> 671 bytes graphics/battle_anims/sprites/027.png | Bin 0 -> 619 bytes graphics/battle_anims/sprites/028.png | Bin 0 -> 707 bytes graphics/battle_anims/sprites/029.png | Bin 0 -> 537 bytes graphics/battle_anims/sprites/030.png | Bin 0 -> 761 bytes graphics/battle_anims/sprites/031.png | Bin 0 -> 736 bytes graphics/battle_anims/sprites/032.png | Bin 0 -> 283 bytes graphics/battle_anims/sprites/033.png | Bin 0 -> 1916 bytes graphics/battle_anims/sprites/034.png | Bin 0 -> 850 bytes graphics/battle_anims/sprites/035.png | Bin 0 -> 721 bytes graphics/battle_anims/sprites/036.png | Bin 0 -> 783 bytes graphics/battle_anims/sprites/037.png | Bin 0 -> 645 bytes graphics/battle_anims/sprites/038.png | Bin 0 -> 386 bytes graphics/battle_anims/sprites/039.png | Bin 0 -> 590 bytes graphics/battle_anims/sprites/040.png | Bin 0 -> 362 bytes graphics/battle_anims/sprites/041.png | Bin 0 -> 249 bytes graphics/battle_anims/sprites/042.png | Bin 0 -> 633 bytes graphics/battle_anims/sprites/043.png | Bin 0 -> 864 bytes graphics/battle_anims/sprites/044.png | Bin 0 -> 500 bytes graphics/battle_anims/sprites/045.png | Bin 0 -> 422 bytes graphics/battle_anims/sprites/115.png | Bin 0 -> 267 bytes graphics/battle_anims/sprites/146.png | Bin 0 -> 253 bytes graphics/battle_anims/sprites/152.png | Bin 0 -> 175 bytes graphics/battle_anims/sprites/161.png | Bin 0 -> 143 bytes graphics/battle_interface/unused_window.pal | 19 ++ graphics/battle_interface/unused_window.png | Bin 0 -> 608 bytes graphics/interface/ball_open.png | Bin 0 -> 215 bytes graphics/interface/hpbar_anim.png | Bin 0 -> 192 bytes graphics/interface/numbers1.png | Bin 0 -> 201 bytes graphics/interface/numbers2.png | Bin 0 -> 215 bytes graphics/interface/party_menu_hpbar.png | Bin 0 -> 136 bytes graphics/unknown/unknown_C035B8.png | Bin 0 -> 156 bytes graphics/unknown/unknown_C06D98.png | Bin 0 -> 181 bytes graphics/unknown/unknown_C06D98_2.pal | 35 ++ graphics/unused/battle_anim_023.pal | 19 ++ graphics/unused/music_notes.png | Bin 0 -> 310 bytes graphics/unused/old_battle_interface_1.png | Bin 0 -> 524 bytes graphics/unused/old_battle_interface_2.png | Bin 0 -> 198 bytes graphics/unused/old_battle_interface_3.png | Bin 0 -> 226 bytes graphics/unused/old_battle_interface_tilemap.bin | Bin 0 -> 2048 bytes graphics/unused/old_bulbasaur.png | Bin 0 -> 490 bytes graphics/unused/old_bulbasaur2.png | Bin 0 -> 520 bytes graphics/unused/old_charizard.png | Bin 0 -> 335 bytes graphics/unused/old_pal1.pal | 19 ++ graphics/unused/old_pal2.pal | 19 ++ graphics/unused/old_pal3.pal | 19 ++ graphics/unused/old_pal4.pal | 19 ++ graphics/unused/old_pal5.pal | 19 ++ graphics/unused/old_pal6.pal | 19 ++ graphics/unused/old_pal7.pal | 19 ++ graphics_file_rules.mk | 19 ++ src/battle_gfx_sfx_util.c | 10 +- 80 files changed, 660 insertions(+), 9 deletions(-) create mode 100755 graphics/battle_anims/sprites/000.png create mode 100755 graphics/battle_anims/sprites/003.png create mode 100755 graphics/battle_anims/sprites/004.png create mode 100755 graphics/battle_anims/sprites/005.png create mode 100755 graphics/battle_anims/sprites/006.png create mode 100755 graphics/battle_anims/sprites/007.png create mode 100755 graphics/battle_anims/sprites/008.png create mode 100755 graphics/battle_anims/sprites/009.png create mode 100755 graphics/battle_anims/sprites/010.pal create mode 100755 graphics/battle_anims/sprites/010_0.png create mode 100755 graphics/battle_anims/sprites/010_1.png create mode 100755 graphics/battle_anims/sprites/010_2.png create mode 100755 graphics/battle_anims/sprites/010_3.png create mode 100755 graphics/battle_anims/sprites/011.png create mode 100755 graphics/battle_anims/sprites/012.png create mode 100755 graphics/battle_anims/sprites/013.png create mode 100755 graphics/battle_anims/sprites/015.png create mode 100755 graphics/battle_anims/sprites/016.png create mode 100755 graphics/battle_anims/sprites/017.png create mode 100755 graphics/battle_anims/sprites/019.png create mode 100755 graphics/battle_anims/sprites/020.png create mode 100755 graphics/battle_anims/sprites/021.png create mode 100755 graphics/battle_anims/sprites/022.pal create mode 100755 graphics/battle_anims/sprites/023.png create mode 100755 graphics/battle_anims/sprites/024.png create mode 100755 graphics/battle_anims/sprites/025.png create mode 100755 graphics/battle_anims/sprites/026.png create mode 100755 graphics/battle_anims/sprites/027.png create mode 100755 graphics/battle_anims/sprites/028.png create mode 100755 graphics/battle_anims/sprites/029.png create mode 100755 graphics/battle_anims/sprites/030.png create mode 100755 graphics/battle_anims/sprites/031.png create mode 100755 graphics/battle_anims/sprites/032.png create mode 100755 graphics/battle_anims/sprites/033.png create mode 100755 graphics/battle_anims/sprites/034.png create mode 100755 graphics/battle_anims/sprites/035.png create mode 100755 graphics/battle_anims/sprites/036.png create mode 100755 graphics/battle_anims/sprites/037.png create mode 100755 graphics/battle_anims/sprites/038.png create mode 100755 graphics/battle_anims/sprites/039.png create mode 100755 graphics/battle_anims/sprites/040.png create mode 100755 graphics/battle_anims/sprites/041.png create mode 100755 graphics/battle_anims/sprites/042.png create mode 100755 graphics/battle_anims/sprites/043.png create mode 100755 graphics/battle_anims/sprites/044.png create mode 100755 graphics/battle_anims/sprites/045.png create mode 100755 graphics/battle_anims/sprites/115.png create mode 100755 graphics/battle_anims/sprites/146.png create mode 100755 graphics/battle_anims/sprites/152.png create mode 100755 graphics/battle_anims/sprites/161.png create mode 100755 graphics/battle_interface/unused_window.pal create mode 100755 graphics/battle_interface/unused_window.png create mode 100755 graphics/interface/ball_open.png create mode 100755 graphics/interface/hpbar_anim.png create mode 100755 graphics/interface/numbers1.png create mode 100755 graphics/interface/numbers2.png create mode 100755 graphics/interface/party_menu_hpbar.png create mode 100755 graphics/unknown/unknown_C035B8.png create mode 100755 graphics/unknown/unknown_C06D98.png create mode 100755 graphics/unknown/unknown_C06D98_2.pal create mode 100755 graphics/unused/battle_anim_023.pal create mode 100755 graphics/unused/music_notes.png create mode 100755 graphics/unused/old_battle_interface_1.png create mode 100755 graphics/unused/old_battle_interface_2.png create mode 100755 graphics/unused/old_battle_interface_3.png create mode 100755 graphics/unused/old_battle_interface_tilemap.bin create mode 100755 graphics/unused/old_bulbasaur.png create mode 100755 graphics/unused/old_bulbasaur2.png create mode 100755 graphics/unused/old_charizard.png create mode 100755 graphics/unused/old_pal1.pal create mode 100755 graphics/unused/old_pal2.pal create mode 100755 graphics/unused/old_pal3.pal create mode 100755 graphics/unused/old_pal4.pal create mode 100755 graphics/unused/old_pal5.pal create mode 100755 graphics/unused/old_pal6.pal create mode 100755 graphics/unused/old_pal7.pal diff --git a/data/battle_anims.s b/data/battle_anims.s index 082a86fa1..4cceadafa 100644 --- a/data/battle_anims.s +++ b/data/battle_anims.s @@ -441,7 +441,7 @@ gBattleAnimPicTable:: @ 8524B44 obj_tiles 0x08c2cbac, 0x0800, 0x279f obj_tiles 0x08c1bc64, 0x0200, 0x27a0 obj_tiles 0x08c1a9a0, 0x0800, 0x27a1 - obj_tiles 0x08c02478, 0x0180, 0x27a2 + obj_tiles gBattleAnimSpriteSheet_146, 0x0180, 0x27a2 obj_tiles 0x08c1af6c, 0x0180, 0x27a3 obj_tiles 0x08c1b178, 0x0200, 0x27a4 obj_tiles 0x08c1b0a8, 0x0200, 0x27a5 diff --git a/data/graphics.s b/data/graphics.s index 8726c102f..c1b825751 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -124,11 +124,399 @@ gInterfaceGfx_PremierBall:: gInterfacePal_PremierBall:: .incbin "graphics/interface/ball/premier.gbapal.lz" + .align 2 gOpenPokeballGfx:: @ 8C02300 - .incbin "baserom.gba", 0xc02300, 0x7c + .incbin "graphics/interface/ball_open.4bpp.lz" + + .align 2 +gBlankGfxCompressed:: @ 8C0237C + .incbin "graphics/interface/blank.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_146:: + .incbin "graphics/battle_anims/sprites/146.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_000:: + .incbin "graphics/battle_anims/sprites/000.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_003:: + .incbin "graphics/battle_anims/sprites/003.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_004:: + .incbin "graphics/battle_anims/sprites/004.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_005:: + .incbin "graphics/battle_anims/sprites/005.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_006:: + .incbin "graphics/battle_anims/sprites/006.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_115:: + .incbin "graphics/battle_anims/sprites/115.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_000:: + .incbin "graphics/battle_anims/sprites/000.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_003:: + .incbin "graphics/battle_anims/sprites/003.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_004:: + .incbin "graphics/battle_anims/sprites/004.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_005:: + .incbin "graphics/battle_anims/sprites/005.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_006:: + .incbin "graphics/battle_anims/sprites/006.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_161:: + .incbin "graphics/battle_anims/sprites/161.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_161:: + .incbin "graphics/battle_anims/sprites/161.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_007:: + .incbin "graphics/battle_anims/sprites/007.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_007:: + .incbin "graphics/battle_anims/sprites/007.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_008:: + .incbin "graphics/battle_anims/sprites/008.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_008:: + .incbin "graphics/battle_anims/sprites/008.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_010:: + .incbin "graphics/battle_anims/sprites/010.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_010:: + .incbin "graphics/battle_anims/sprites/010.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_009:: + .incbin "graphics/battle_anims/sprites/009.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_009:: + .incbin "graphics/battle_anims/sprites/009.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_011:: + .incbin "graphics/battle_anims/sprites/011.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_011:: + .incbin "graphics/battle_anims/sprites/011.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_012:: + .incbin "graphics/battle_anims/sprites/012.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_012:: + .incbin "graphics/battle_anims/sprites/012.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_152:: + .incbin "graphics/battle_anims/sprites/152.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_152:: + .incbin "graphics/battle_anims/sprites/152.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_013:: + .incbin "graphics/battle_anims/sprites/013.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_013:: + .incbin "graphics/battle_anims/sprites/013.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_015:: + .incbin "graphics/battle_anims/sprites/015.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_015:: + .incbin "graphics/battle_anims/sprites/015.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_016:: + .incbin "graphics/battle_anims/sprites/016.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_016:: + .incbin "graphics/battle_anims/sprites/016.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_017:: + .incbin "graphics/battle_anims/sprites/017.4bpp.lz" + + .align 2 + .incbin "graphics/unknown/unknown_C035B8.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_019:: + .incbin "graphics/battle_anims/sprites/019.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_019:: + .incbin "graphics/battle_anims/sprites/019.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_020:: + .incbin "graphics/battle_anims/sprites/020.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_020:: + .incbin "graphics/battle_anims/sprites/020.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_023:: + .incbin "graphics/battle_anims/sprites/023.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_023:: + .incbin "graphics/battle_anims/sprites/023.4bpp.lz" + + .align 2 + .incbin "graphics/unused/battle_anim_023.gbapal.lz" + + .align 2 + .incbin "graphics/unused/music_notes.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_021:: + .incbin "graphics/battle_anims/sprites/021.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_021:: + .incbin "graphics/battle_anims/sprites/021.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_022:: + .incbin "graphics/battle_anims/sprites/022.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_025:: + .incbin "graphics/battle_anims/sprites/025.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_025:: + .incbin "graphics/battle_anims/sprites/025.4bpp.lz" -gUnknown_08C0237C:: @ 8C0237C - .incbin "baserom.gba", 0xc0237c, 0x7074 + .align 2 +gBattleAnimSpriteSheet_024:: + .incbin "graphics/battle_anims/sprites/024.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_024:: + .incbin "graphics/battle_anims/sprites/024.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_031:: + .incbin "graphics/battle_anims/sprites/031.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_031:: + .incbin "graphics/battle_anims/sprites/031.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_032:: + .incbin "graphics/battle_anims/sprites/032.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_032:: + .incbin "graphics/battle_anims/sprites/032.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_026:: + .incbin "graphics/battle_anims/sprites/026.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_026:: + .incbin "graphics/battle_anims/sprites/026.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_027:: + .incbin "graphics/battle_anims/sprites/027.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_027:: + .incbin "graphics/battle_anims/sprites/027.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_028:: + .incbin "graphics/battle_anims/sprites/028.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_028:: + .incbin "graphics/battle_anims/sprites/028.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_029:: + .incbin "graphics/battle_anims/sprites/029.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_029:: + .incbin "graphics/battle_anims/sprites/029.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_030:: + .incbin "graphics/battle_anims/sprites/030.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_030:: + .incbin "graphics/battle_anims/sprites/030.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_033:: + .incbin "graphics/battle_anims/sprites/033.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_033:: + .incbin "graphics/battle_anims/sprites/033.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_034:: + .incbin "graphics/battle_anims/sprites/034.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_035:: + .incbin "graphics/battle_anims/sprites/035.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_036:: + .incbin "graphics/battle_anims/sprites/036.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_036:: + .incbin "graphics/battle_anims/sprites/036.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_037:: + .incbin "graphics/battle_anims/sprites/037.4bpp.lz" + + .align 2 + .incbin "graphics/unknown/unknown_C06D98.4bpp.lz" + + .align 2 + .incbin "graphics/unknown/unknown_C06D98.gbapal.lz" + + .align 2 + .incbin "graphics/unknown/unknown_C06D98_2.gbapal.lz" + +@ old battle interface data, unused + + .align 2 + .incbin "graphics/unused/obi1.4bpp.lz" + + .align 2 + .incbin "graphics/unused/obi_palpak1.gbapal.lz" @ palettes 1-3 + + .align 2 + .incbin "graphics/unused/old_pal4.gbapal.lz" @ 4 is by itself + + .align 2 + .incbin "graphics/unused/obi_palpak3.gbapal.lz" @ palettes 5-7 + + .align 2 + .incbin "graphics/unused/obi2.4bpp.lz" + + .align 2 + .incbin "graphics/unused/old_battle_interface_tilemap.bin.lz" + + .align 2 +gBattleAnimSpritePalette_038:: + .incbin "graphics/battle_anims/sprites/038.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_039:: + .incbin "graphics/battle_anims/sprites/039.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_038:: + .incbin "graphics/battle_anims/sprites/038.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_039:: + .incbin "graphics/battle_anims/sprites/039.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_040:: + .incbin "graphics/battle_anims/sprites/040.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_041:: + .incbin "graphics/battle_anims/sprites/041.4bpp.lz" + + @ why is this way up here? + + .align 2 +gPartyMenuHpBar_Gfx:: + .incbin "graphics/interface/party_menu_hpbar.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_042:: + .incbin "graphics/battle_anims/sprites/042.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_042:: + .incbin "graphics/battle_anims/sprites/042.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_043:: + .incbin "graphics/battle_anims/sprites/043.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_043:: + .incbin "graphics/battle_anims/sprites/043.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_044:: + .incbin "graphics/battle_anims/sprites/044.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_044:: + .incbin "graphics/battle_anims/sprites/044.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_045:: + .incbin "graphics/battle_anims/sprites/045.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_045:: + .incbin "graphics/battle_anims/sprites/045.4bpp.lz" + + @ two unused window frames. + + .align 2 +gUnknown_08C08F0C:: + .incbin "graphics/battle_interface/unused_window.4bpp.lz" + + .align 2 +gUnknown_08C093C8:: + .incbin "graphics/battle_interface/unused_window.gbapal.lz" gUnknown_08C093F0:: @ 8C093F0 .incbin "baserom.gba", 0xc093f0, 0x87ac diff --git a/graphics/battle_anims/sprites/000.png b/graphics/battle_anims/sprites/000.png new file mode 100755 index 000000000..3d8662a86 Binary files /dev/null and b/graphics/battle_anims/sprites/000.png differ diff --git a/graphics/battle_anims/sprites/003.png b/graphics/battle_anims/sprites/003.png new file mode 100755 index 000000000..b3164ff01 Binary files /dev/null and b/graphics/battle_anims/sprites/003.png differ diff --git a/graphics/battle_anims/sprites/004.png b/graphics/battle_anims/sprites/004.png new file mode 100755 index 000000000..c7cad5ef9 Binary files /dev/null and b/graphics/battle_anims/sprites/004.png differ diff --git a/graphics/battle_anims/sprites/005.png b/graphics/battle_anims/sprites/005.png new file mode 100755 index 000000000..8bd4ac426 Binary files /dev/null and b/graphics/battle_anims/sprites/005.png differ diff --git a/graphics/battle_anims/sprites/006.png b/graphics/battle_anims/sprites/006.png new file mode 100755 index 000000000..30e2dffc1 Binary files /dev/null and b/graphics/battle_anims/sprites/006.png differ diff --git a/graphics/battle_anims/sprites/007.png b/graphics/battle_anims/sprites/007.png new file mode 100755 index 000000000..5a2369dad Binary files /dev/null and b/graphics/battle_anims/sprites/007.png differ diff --git a/graphics/battle_anims/sprites/008.png b/graphics/battle_anims/sprites/008.png new file mode 100755 index 000000000..634c4d2bb Binary files /dev/null and b/graphics/battle_anims/sprites/008.png differ diff --git a/graphics/battle_anims/sprites/009.png b/graphics/battle_anims/sprites/009.png new file mode 100755 index 000000000..5818ae41d Binary files /dev/null and b/graphics/battle_anims/sprites/009.png differ diff --git a/graphics/battle_anims/sprites/010.pal b/graphics/battle_anims/sprites/010.pal new file mode 100755 index 000000000..c5f241feb --- /dev/null +++ b/graphics/battle_anims/sprites/010.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 148 139 +98 90 255 +115 106 255 +139 131 255 +164 156 255 +180 180 255 +205 205 255 +230 230 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 180 255 +205 205 255 +230 230 255 diff --git a/graphics/battle_anims/sprites/010_0.png b/graphics/battle_anims/sprites/010_0.png new file mode 100755 index 000000000..8eea99de0 Binary files /dev/null and b/graphics/battle_anims/sprites/010_0.png differ diff --git a/graphics/battle_anims/sprites/010_1.png b/graphics/battle_anims/sprites/010_1.png new file mode 100755 index 000000000..ba3ca6192 Binary files /dev/null and b/graphics/battle_anims/sprites/010_1.png differ diff --git a/graphics/battle_anims/sprites/010_2.png b/graphics/battle_anims/sprites/010_2.png new file mode 100755 index 000000000..b71a875e7 Binary files /dev/null and b/graphics/battle_anims/sprites/010_2.png differ diff --git a/graphics/battle_anims/sprites/010_3.png b/graphics/battle_anims/sprites/010_3.png new file mode 100755 index 000000000..e310ca5df Binary files /dev/null and b/graphics/battle_anims/sprites/010_3.png differ diff --git a/graphics/battle_anims/sprites/011.png b/graphics/battle_anims/sprites/011.png new file mode 100755 index 000000000..23ce049b0 Binary files /dev/null and b/graphics/battle_anims/sprites/011.png differ diff --git a/graphics/battle_anims/sprites/012.png b/graphics/battle_anims/sprites/012.png new file mode 100755 index 000000000..1a9e4c870 Binary files /dev/null and b/graphics/battle_anims/sprites/012.png differ diff --git a/graphics/battle_anims/sprites/013.png b/graphics/battle_anims/sprites/013.png new file mode 100755 index 000000000..407671ff6 Binary files /dev/null and b/graphics/battle_anims/sprites/013.png differ diff --git a/graphics/battle_anims/sprites/015.png b/graphics/battle_anims/sprites/015.png new file mode 100755 index 000000000..48895d36a Binary files /dev/null and b/graphics/battle_anims/sprites/015.png differ diff --git a/graphics/battle_anims/sprites/016.png b/graphics/battle_anims/sprites/016.png new file mode 100755 index 000000000..df9651411 Binary files /dev/null and b/graphics/battle_anims/sprites/016.png differ diff --git a/graphics/battle_anims/sprites/017.png b/graphics/battle_anims/sprites/017.png new file mode 100755 index 000000000..e287698b4 Binary files /dev/null and b/graphics/battle_anims/sprites/017.png differ diff --git a/graphics/battle_anims/sprites/019.png b/graphics/battle_anims/sprites/019.png new file mode 100755 index 000000000..af29ec730 Binary files /dev/null and b/graphics/battle_anims/sprites/019.png differ diff --git a/graphics/battle_anims/sprites/020.png b/graphics/battle_anims/sprites/020.png new file mode 100755 index 000000000..73c7f1344 Binary files /dev/null and b/graphics/battle_anims/sprites/020.png differ diff --git a/graphics/battle_anims/sprites/021.png b/graphics/battle_anims/sprites/021.png new file mode 100755 index 000000000..c531b820c Binary files /dev/null and b/graphics/battle_anims/sprites/021.png differ diff --git a/graphics/battle_anims/sprites/022.pal b/graphics/battle_anims/sprites/022.pal new file mode 100755 index 000000000..35cbf0096 --- /dev/null +++ b/graphics/battle_anims/sprites/022.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +205 255 255 +156 255 255 +106 255 255 +57 255 255 +8 255 255 +8 205 255 +8 156 255 +8 106 255 +8 57 255 +8 8 255 +8 8 106 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/023.png b/graphics/battle_anims/sprites/023.png new file mode 100755 index 000000000..a1dbc20c2 Binary files /dev/null and b/graphics/battle_anims/sprites/023.png differ diff --git a/graphics/battle_anims/sprites/024.png b/graphics/battle_anims/sprites/024.png new file mode 100755 index 000000000..7c5d0f382 Binary files /dev/null and b/graphics/battle_anims/sprites/024.png differ diff --git a/graphics/battle_anims/sprites/025.png b/graphics/battle_anims/sprites/025.png new file mode 100755 index 000000000..864f71065 Binary files /dev/null and b/graphics/battle_anims/sprites/025.png differ diff --git a/graphics/battle_anims/sprites/026.png b/graphics/battle_anims/sprites/026.png new file mode 100755 index 000000000..c531b820c Binary files /dev/null and b/graphics/battle_anims/sprites/026.png differ diff --git a/graphics/battle_anims/sprites/027.png b/graphics/battle_anims/sprites/027.png new file mode 100755 index 000000000..28b3876b7 Binary files /dev/null and b/graphics/battle_anims/sprites/027.png differ diff --git a/graphics/battle_anims/sprites/028.png b/graphics/battle_anims/sprites/028.png new file mode 100755 index 000000000..b3a096996 Binary files /dev/null and b/graphics/battle_anims/sprites/028.png differ diff --git a/graphics/battle_anims/sprites/029.png b/graphics/battle_anims/sprites/029.png new file mode 100755 index 000000000..b04a8dc65 Binary files /dev/null and b/graphics/battle_anims/sprites/029.png differ diff --git a/graphics/battle_anims/sprites/030.png b/graphics/battle_anims/sprites/030.png new file mode 100755 index 000000000..ba7161fa1 Binary files /dev/null and b/graphics/battle_anims/sprites/030.png differ diff --git a/graphics/battle_anims/sprites/031.png b/graphics/battle_anims/sprites/031.png new file mode 100755 index 000000000..c6727ad1c Binary files /dev/null and b/graphics/battle_anims/sprites/031.png differ diff --git a/graphics/battle_anims/sprites/032.png b/graphics/battle_anims/sprites/032.png new file mode 100755 index 000000000..80ffb7b72 Binary files /dev/null and b/graphics/battle_anims/sprites/032.png differ diff --git a/graphics/battle_anims/sprites/033.png b/graphics/battle_anims/sprites/033.png new file mode 100755 index 000000000..eb1ed3473 Binary files /dev/null and b/graphics/battle_anims/sprites/033.png differ diff --git a/graphics/battle_anims/sprites/034.png b/graphics/battle_anims/sprites/034.png new file mode 100755 index 000000000..22f836d1e Binary files /dev/null and b/graphics/battle_anims/sprites/034.png differ diff --git a/graphics/battle_anims/sprites/035.png b/graphics/battle_anims/sprites/035.png new file mode 100755 index 000000000..cde2105dd Binary files /dev/null and b/graphics/battle_anims/sprites/035.png differ diff --git a/graphics/battle_anims/sprites/036.png b/graphics/battle_anims/sprites/036.png new file mode 100755 index 000000000..bddf4a25a Binary files /dev/null and b/graphics/battle_anims/sprites/036.png differ diff --git a/graphics/battle_anims/sprites/037.png b/graphics/battle_anims/sprites/037.png new file mode 100755 index 000000000..62a692036 Binary files /dev/null and b/graphics/battle_anims/sprites/037.png differ diff --git a/graphics/battle_anims/sprites/038.png b/graphics/battle_anims/sprites/038.png new file mode 100755 index 000000000..2dfa037c1 Binary files /dev/null and b/graphics/battle_anims/sprites/038.png differ diff --git a/graphics/battle_anims/sprites/039.png b/graphics/battle_anims/sprites/039.png new file mode 100755 index 000000000..bc61b20d7 Binary files /dev/null and b/graphics/battle_anims/sprites/039.png differ diff --git a/graphics/battle_anims/sprites/040.png b/graphics/battle_anims/sprites/040.png new file mode 100755 index 000000000..c7d493d92 Binary files /dev/null and b/graphics/battle_anims/sprites/040.png differ diff --git a/graphics/battle_anims/sprites/041.png b/graphics/battle_anims/sprites/041.png new file mode 100755 index 000000000..e088c1f86 Binary files /dev/null and b/graphics/battle_anims/sprites/041.png differ diff --git a/graphics/battle_anims/sprites/042.png b/graphics/battle_anims/sprites/042.png new file mode 100755 index 000000000..cf8909080 Binary files /dev/null and b/graphics/battle_anims/sprites/042.png differ diff --git a/graphics/battle_anims/sprites/043.png b/graphics/battle_anims/sprites/043.png new file mode 100755 index 000000000..e5e929ede Binary files /dev/null and b/graphics/battle_anims/sprites/043.png differ diff --git a/graphics/battle_anims/sprites/044.png b/graphics/battle_anims/sprites/044.png new file mode 100755 index 000000000..7baf82357 Binary files /dev/null and b/graphics/battle_anims/sprites/044.png differ diff --git a/graphics/battle_anims/sprites/045.png b/graphics/battle_anims/sprites/045.png new file mode 100755 index 000000000..45aeae356 Binary files /dev/null and b/graphics/battle_anims/sprites/045.png differ diff --git a/graphics/battle_anims/sprites/115.png b/graphics/battle_anims/sprites/115.png new file mode 100755 index 000000000..51c909134 Binary files /dev/null and b/graphics/battle_anims/sprites/115.png differ diff --git a/graphics/battle_anims/sprites/146.png b/graphics/battle_anims/sprites/146.png new file mode 100755 index 000000000..e7b0360a6 Binary files /dev/null and b/graphics/battle_anims/sprites/146.png differ diff --git a/graphics/battle_anims/sprites/152.png b/graphics/battle_anims/sprites/152.png new file mode 100755 index 000000000..1b5e8e904 Binary files /dev/null and b/graphics/battle_anims/sprites/152.png differ diff --git a/graphics/battle_anims/sprites/161.png b/graphics/battle_anims/sprites/161.png new file mode 100755 index 000000000..5976b2b8c Binary files /dev/null and b/graphics/battle_anims/sprites/161.png differ diff --git a/graphics/battle_interface/unused_window.pal b/graphics/battle_interface/unused_window.pal new file mode 100755 index 000000000..a5c40e694 --- /dev/null +++ b/graphics/battle_interface/unused_window.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 106 98 +180 197 213 +148 139 139 +106 98 90 +255 189 57 +230 148 65 +255 255 255 +115 255 172 +74 205 123 +32 164 82 +0 123 41 +255 255 213 +131 205 238 +213 230 230 +82 139 189 diff --git a/graphics/battle_interface/unused_window.png b/graphics/battle_interface/unused_window.png new file mode 100755 index 000000000..73086d4d2 Binary files /dev/null and b/graphics/battle_interface/unused_window.png differ diff --git a/graphics/interface/ball_open.png b/graphics/interface/ball_open.png new file mode 100755 index 000000000..1030f4942 Binary files /dev/null and b/graphics/interface/ball_open.png differ diff --git a/graphics/interface/hpbar_anim.png b/graphics/interface/hpbar_anim.png new file mode 100755 index 000000000..d4e79fdae Binary files /dev/null and b/graphics/interface/hpbar_anim.png differ diff --git a/graphics/interface/numbers1.png b/graphics/interface/numbers1.png new file mode 100755 index 000000000..f15757958 Binary files /dev/null and b/graphics/interface/numbers1.png differ diff --git a/graphics/interface/numbers2.png b/graphics/interface/numbers2.png new file mode 100755 index 000000000..4ddf364bf Binary files /dev/null and b/graphics/interface/numbers2.png differ diff --git a/graphics/interface/party_menu_hpbar.png b/graphics/interface/party_menu_hpbar.png new file mode 100755 index 000000000..763b91210 Binary files /dev/null and b/graphics/interface/party_menu_hpbar.png differ diff --git a/graphics/unknown/unknown_C035B8.png b/graphics/unknown/unknown_C035B8.png new file mode 100755 index 000000000..0b2ae80f9 Binary files /dev/null and b/graphics/unknown/unknown_C035B8.png differ diff --git a/graphics/unknown/unknown_C06D98.png b/graphics/unknown/unknown_C06D98.png new file mode 100755 index 000000000..d36afa64d Binary files /dev/null and b/graphics/unknown/unknown_C06D98.png differ diff --git a/graphics/unknown/unknown_C06D98_2.pal b/graphics/unknown/unknown_C06D98_2.pal new file mode 100755 index 000000000..44f4b55d6 --- /dev/null +++ b/graphics/unknown/unknown_C06D98_2.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +98 156 131 +57 57 57 +156 156 156 +255 255 255 +255 205 0 +255 255 98 +213 98 24 +255 123 32 +106 65 172 +65 24 172 +255 205 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 156 131 +57 57 57 +156 156 156 +255 255 255 +57 123 0 +90 189 0 +123 255 8 +230 106 148 +255 139 255 +255 205 0 +255 255 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unused/battle_anim_023.pal b/graphics/unused/battle_anim_023.pal new file mode 100755 index 000000000..8e6e6e902 --- /dev/null +++ b/graphics/unused/battle_anim_023.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 230 255 +115 230 255 +213 230 255 +0 0 0 +255 255 172 +255 255 115 +0 0 0 +98 139 98 +0 0 0 +0 0 0 +131 131 131 +164 164 164 +213 205 205 +255 255 255 diff --git a/graphics/unused/music_notes.png b/graphics/unused/music_notes.png new file mode 100755 index 000000000..af89e55a0 Binary files /dev/null and b/graphics/unused/music_notes.png differ diff --git a/graphics/unused/old_battle_interface_1.png b/graphics/unused/old_battle_interface_1.png new file mode 100755 index 000000000..0b2fe5eb7 Binary files /dev/null and b/graphics/unused/old_battle_interface_1.png differ diff --git a/graphics/unused/old_battle_interface_2.png b/graphics/unused/old_battle_interface_2.png new file mode 100755 index 000000000..04229ccda Binary files /dev/null and b/graphics/unused/old_battle_interface_2.png differ diff --git a/graphics/unused/old_battle_interface_3.png b/graphics/unused/old_battle_interface_3.png new file mode 100755 index 000000000..428c7765d Binary files /dev/null and b/graphics/unused/old_battle_interface_3.png differ diff --git a/graphics/unused/old_battle_interface_tilemap.bin b/graphics/unused/old_battle_interface_tilemap.bin new file mode 100755 index 000000000..aae3307e7 Binary files /dev/null and b/graphics/unused/old_battle_interface_tilemap.bin differ diff --git a/graphics/unused/old_bulbasaur.png b/graphics/unused/old_bulbasaur.png new file mode 100755 index 000000000..729ebe789 Binary files /dev/null and b/graphics/unused/old_bulbasaur.png differ diff --git a/graphics/unused/old_bulbasaur2.png b/graphics/unused/old_bulbasaur2.png new file mode 100755 index 000000000..f374e5a9f Binary files /dev/null and b/graphics/unused/old_bulbasaur2.png differ diff --git a/graphics/unused/old_charizard.png b/graphics/unused/old_charizard.png new file mode 100755 index 000000000..e1470aada Binary files /dev/null and b/graphics/unused/old_charizard.png differ diff --git a/graphics/unused/old_pal1.pal b/graphics/unused/old_pal1.pal new file mode 100755 index 000000000..1e2ef9083 --- /dev/null +++ b/graphics/unused/old_pal1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +16 139 0 +0 0 0 +148 65 65 +0 0 0 +148 65 32 +16 0 0 +148 65 32 +8 8 0 +148 65 32 +148 8 8 +148 65 65 +24 16 0 +16 139 98 +32 0 0 +0 16 139 +0 0 0 diff --git a/graphics/unused/old_pal2.pal b/graphics/unused/old_pal2.pal new file mode 100755 index 000000000..3c5e6ad7f --- /dev/null +++ b/graphics/unused/old_pal2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +16 139 0 +0 0 0 +148 65 65 +0 0 0 +148 65 32 +16 0 0 +148 65 32 +8 8 0 +148 65 32 +16 0 0 +148 65 65 +0 0 0 +16 139 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unused/old_pal3.pal b/graphics/unused/old_pal3.pal new file mode 100755 index 000000000..d07e21019 --- /dev/null +++ b/graphics/unused/old_pal3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 16 139 +0 0 0 +0 213 98 +32 0 0 +0 213 98 +24 16 0 +0 213 98 +156 8 8 +0 213 98 +24 16 0 +0 213 98 +32 0 0 +0 16 139 +0 0 0 diff --git a/graphics/unused/old_pal4.pal b/graphics/unused/old_pal4.pal new file mode 100755 index 000000000..60b814f75 --- /dev/null +++ b/graphics/unused/old_pal4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +41 41 57 +90 90 106 +172 172 180 +197 197 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unused/old_pal5.pal b/graphics/unused/old_pal5.pal new file mode 100755 index 000000000..b6f481d46 --- /dev/null +++ b/graphics/unused/old_pal5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 156 131 +115 115 115 +189 189 189 +255 255 255 +189 164 41 +246 246 41 +222 106 32 +246 131 41 +115 98 246 +98 74 205 +238 115 156 +246 148 246 +115 172 246 +8 8 8 +90 90 90 +65 65 65 diff --git a/graphics/unused/old_pal6.pal b/graphics/unused/old_pal6.pal new file mode 100755 index 000000000..6d91e9918 --- /dev/null +++ b/graphics/unused/old_pal6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 156 131 +115 115 115 +189 189 189 +255 255 255 +115 148 74 +156 205 74 +148 246 74 +238 115 156 +246 148 246 +189 164 41 +246 246 41 +8 8 8 +8 8 8 +8 8 8 +90 90 90 +65 65 65 diff --git a/graphics/unused/old_pal7.pal b/graphics/unused/old_pal7.pal new file mode 100755 index 000000000..d380bc65d --- /dev/null +++ b/graphics/unused/old_pal7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 156 131 +115 115 115 +156 156 156 +255 255 255 +98 115 246 +115 172 246 +164 98 41 +230 172 139 +189 164 41 +246 246 41 +246 98 82 +148 123 205 +197 164 205 +213 41 156 +90 90 90 +65 65 65 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 3f506b11e..718f62c8e 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -5,6 +5,8 @@ monpaldir := graphics/pokemon/palettes tilesetdir := data/tilesets fontdir := data/graphics/fonts menudir := graphics/interface +btanimgfxdir := graphics/battle_anims/sprites +unusedgfxdir := graphics/unused $(monstillfrontdir)/castform_still_front_pic.4bpp: $(monstillfrontdir)/castform_normal_form_still_front_pic.4bpp \ $(monstillfrontdir)/castform_sunny_form_still_front_pic.4bpp \ @@ -297,3 +299,20 @@ graphics/misc/japanese_hof.4bpp: %.4bpp: %.png $(menudir)/menu.gbapal: $(menudir)/menu_0.gbapal $(menudir)/menu_1.gbapal @cat $(menudir)/menu_0.gbapal $(menudir)/menu_1.gbapal >$@ +$(btanimgfxdir)/010.4bpp: $(btanimgfxdir)/010_0.4bpp $(btanimgfxdir)/010_1.4bpp $(btanimgfxdir)/010_2.4bpp $(btanimgfxdir)/010_3.4bpp + @cat $(btanimgfxdir)/010_0.4bpp $(btanimgfxdir)/010_1.4bpp $(btanimgfxdir)/010_2.4bpp $(btanimgfxdir)/010_3.4bpp >$@ + +$(unusedgfxdir)/obi_palpak1.gbapal: $(unusedgfxdir)/old_pal1.gbapal $(unusedgfxdir)/old_pal2.gbapal $(unusedgfxdir)/old_pal3.gbapal + @cat $(unusedgfxdir)/old_pal1.gbapal $(unusedgfxdir)/old_pal2.gbapal $(unusedgfxdir)/old_pal3.gbapal >$@ + +$(unusedgfxdir)/obi_palpak3.gbapal: $(unusedgfxdir)/old_pal5.gbapal $(unusedgfxdir)/old_pal6.gbapal $(unusedgfxdir)/old_pal7.gbapal + @cat $(unusedgfxdir)/old_pal5.gbapal $(unusedgfxdir)/old_pal6.gbapal $(unusedgfxdir)/old_pal7.gbapal >$@ + +$(unusedgfxdir)/obi1.4bpp: $(unusedgfxdir)/old_bulbasaur.4bpp $(unusedgfxdir)/old_charizard.4bpp + @cat $(unusedgfxdir)/old_bulbasaur.4bpp $(unusedgfxdir)/old_charizard.4bpp >$@ + +$(unusedgfxdir)/obi2.4bpp: $(unusedgfxdir)/old_bulbasaur2.4bpp $(unusedgfxdir)/old_battle_interface_1.4bpp $(unusedgfxdir)/old_battle_interface_2.4bpp $(unusedgfxdir)/old_battle_interface_3.4bpp + @cat $(unusedgfxdir)/old_bulbasaur2.4bpp $(unusedgfxdir)/old_battle_interface_1.4bpp $(unusedgfxdir)/old_battle_interface_2.4bpp $(unusedgfxdir)/old_battle_interface_3.4bpp >$@ + +$(menudir)/hp_numbers.4bpp: $(menudir)/hpbar_anim.4bpp $(menudir)/numbers1.4bpp $(menudir)/numbers2.4bpp + @cat $(menudir)/hpbar_anim.4bpp $(menudir)/numbers1.4bpp $(menudir)/numbers2.4bpp >$@ diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 22be086f0..70b4d7d31 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -63,7 +63,7 @@ extern const u8 gUnknown_08C1F46C[]; extern const u8 gUnknown_08C1F5E8[]; extern const u8 gUnknown_08C1F76C[]; extern const u8 gUnknown_08C1F8E8[]; -extern const u8 gUnknown_08C0237C[]; +extern const u8 gBlankGfxCompressed[]; extern const u16 gBattleInterface_BallStatusBarPal[]; extern const u16 gBattleInterface_BallDisplayPal[]; @@ -110,10 +110,10 @@ static const struct CompressedSpriteSheet gUnknown_0832C100 = static const struct CompressedSpriteSheet gUnknown_0832C108[BATTLE_BANKS_COUNT] = { - {gUnknown_08C0237C, 0x0100, 0xd704}, - {gUnknown_08C0237C, 0x0120, 0xd705}, - {gUnknown_08C0237C, 0x0100, 0xd706}, - {gUnknown_08C0237C, 0x0120, 0xd707} + {gBlankGfxCompressed, 0x0100, 0xd704}, + {gBlankGfxCompressed, 0x0120, 0xd705}, + {gBlankGfxCompressed, 0x0100, 0xd706}, + {gBlankGfxCompressed, 0x0120, 0xd707} }; static const struct SpritePalette gUnknown_0832C128[2] = -- cgit v1.2.3