From d6f8ad69edcaae79e930ca1e33a5497d7c105ac1 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 30 Aug 2016 16:10:13 -0400 Subject: more work on orphan incbins and misc gfx --- asm/rom5.s | 6 +-- data/data2.s | 4 +- data/graphics.s | 44 +++++++++++---------- .../battle_anims/backgrounds/sandstorm_brew.bin | Bin 0 -> 2048 bytes .../battle_anims/backgrounds/sandstorm_brew.png | Bin 0 -> 997 bytes graphics/unknown/unknown_3D7D8C.png | Bin 0 -> 286 bytes graphics/unknown/unknown_3D810C.bin | Bin 0 -> 4096 bytes graphics/unknown/unknown_D04388.png | Bin 0 -> 156 bytes graphics/unknown/unknown_D0CFAC.bin | Bin 0 -> 36 bytes graphics/unknown/unknown_D0CFD0.bin | Bin 0 -> 36 bytes graphics/unknown/unknown_D0CFF4.bin | Bin 0 -> 36 bytes graphics/unknown/unknown_D0D070.bin | Bin 0 -> 32 bytes graphics/unknown/unknown_D0D2B4.bin | Bin 0 -> 32 bytes graphics/unknown/unknown_D1C060.bin | Bin 0 -> 2048 bytes graphics/unknown/unknown_D1C060.pal | 19 +++++++++ graphics/unknown/unknown_D1C060.png | Bin 0 -> 159 bytes graphics/unused/battle_anim_023.pal | 19 +++++++++ graphics/unused/line_sketch_2.bin | Bin 0 -> 1024 bytes graphics/unused/line_sketch_2.png | Bin 0 -> 154 bytes graphics/unused/unknown_3D7D8C.png | Bin 286 -> 0 bytes graphics/unused/unknown_3D810C.bin | Bin 4096 -> 0 bytes graphics/unused/unknown_D1C060.bin | Bin 2048 -> 0 bytes graphics/unused/unknown_D1C060.pal | 19 --------- graphics/unused/unknown_D1C060.png | Bin 159 -> 0 bytes 24 files changed, 66 insertions(+), 45 deletions(-) create mode 100755 graphics/battle_anims/backgrounds/sandstorm_brew.bin create mode 100755 graphics/battle_anims/backgrounds/sandstorm_brew.png create mode 100644 graphics/unknown/unknown_3D7D8C.png create mode 100644 graphics/unknown/unknown_3D810C.bin create mode 100755 graphics/unknown/unknown_D04388.png create mode 100755 graphics/unknown/unknown_D0CFAC.bin create mode 100755 graphics/unknown/unknown_D0CFD0.bin create mode 100755 graphics/unknown/unknown_D0CFF4.bin create mode 100755 graphics/unknown/unknown_D0D070.bin create mode 100755 graphics/unknown/unknown_D0D2B4.bin create mode 100755 graphics/unknown/unknown_D1C060.bin create mode 100755 graphics/unknown/unknown_D1C060.pal create mode 100755 graphics/unknown/unknown_D1C060.png create mode 100755 graphics/unused/battle_anim_023.pal create mode 100755 graphics/unused/line_sketch_2.bin create mode 100755 graphics/unused/line_sketch_2.png delete mode 100644 graphics/unused/unknown_3D7D8C.png delete mode 100644 graphics/unused/unknown_3D810C.bin delete mode 100755 graphics/unused/unknown_D1C060.bin delete mode 100755 graphics/unused/unknown_D1C060.pal delete mode 100755 graphics/unused/unknown_D1C060.png diff --git a/asm/rom5.s b/asm/rom5.s index 920ed8668..f4a7d565a 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -201714,9 +201714,9 @@ _080DD164: .4byte 0x030041b4 _080DD168: .4byte REG_BG1HOFS _080DD16C: .4byte 0x040000d4 _080DD170: .4byte 0x85000400 -_080DD174: .4byte gUnknown_08E67ED8 -_080DD178: .4byte gUnknown_08E68054 -_080DD17C: .4byte gUnknown_08E68580 +_080DD174: .4byte gBattleAnimBackgroundTilemap_SandstormBrew +_080DD178: .4byte gBattleAnimBackgroundImage_SandstormBrew +_080DD17C: .4byte gBattleAnimSpritePalette_261 _080DD180: .4byte 0x03004b00 _080DD184: .4byte 0x0202f7c8 _080DD188: .4byte 0x03004b20 diff --git a/data/data2.s b/data/data2.s index df7f91320..15eee397c 100644 --- a/data/data2.s +++ b/data/data2.s @@ -17538,8 +17538,8 @@ gBattleAnimSpriteTemplate_83D7D74:: @ 83D7D74 spr_template 10244, 10244, gOamData_837E13C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7D6C, sub_80D3014 .align 2 - .incbin "graphics/unused/unknown_3D7D8C.4bpp" - .incbin "graphics/unused/unknown_3D810C.bin" + .incbin "graphics/unknown/unknown_3D7D8C.4bpp" + .incbin "graphics/unknown/unknown_3D810C.bin" .align 2 gSpriteAnim_83D910C:: @ 83D910C diff --git a/data/graphics.s b/data/graphics.s index d6af0681b..2882de62e 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -275,7 +275,7 @@ gBattleAnimSpriteSheet_017:: @ 8D04368 .incbin "graphics/battle_anims/sprites/017.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD04388, 0x24 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unknown/unknown_D04388.4bpp.lz" .align 2 gBattleAnimSpritePalette_019:: @ 8D043AC @@ -302,7 +302,7 @@ gBattleAnimSpriteSheet_023:: @ 8D045A4 .incbin "graphics/battle_anims/sprites/023.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD046AC, 0x28 @ palette + .incbin "graphics/unused/battle_anim_023.gbapal.lz" .align 2 .incbin "graphics/unused/music_notes.4bpp.lz" @@ -717,23 +717,23 @@ gBattleAnimSpriteSheet_081:: @ 8D0CF04 gBattleAnimSpritePalette_081:: @ 8D0CF88 .incbin "graphics/battle_anims/sprites/081.gbapal.lz" - .align 2 - .incbin "baserom.gba", 0xD0CFAC, 0x24 @ LZ, uncomp. size = 0x20 + .align 2 @ 8D0CFAC + .incbin "graphics/unknown/unknown_D0CFAC.bin" - .align 2 - .incbin "baserom.gba", 0xD0CFD0, 0x24 @ LZ, uncomp. size = 0x20 + .align 2 @ 8D0CFD0 + .incbin "graphics/unknown/unknown_D0CFD0.bin" - .align 2 - .incbin "baserom.gba", 0xD0CFF4, 0x24 @ LZ, uncomp. size = 0x20 + .align 2 @ 8D0CFF4 + .incbin "graphics/unknown/unknown_D0CFF4.bin" .align 2 - .incbin "baserom.gba", 0xD0D018, 0x57 @ LZ, uncomp. size = 0x240 + .incbin "graphics/unused/line_sketch_2.8bpp.lz" - .align 2 - .incbin "baserom.gba", 0xD0D070, 0x1F @ LZ, uncomp. size = 0x20 + .align 2 @ 8D0D070 + .incbin "graphics/unknown/unknown_D0D070.bin" .align 2 - .incbin "baserom.gba", 0xD0D090, 0x8F @ LZ, uncomp. size = 0x400 + .incbin "graphics/unused/line_sketch_2.bin.lz" .align 2 gBattleAnimSpriteSheet_082:: @ 8D0D120 @@ -784,7 +784,7 @@ gBattleAnimSpritePalette_094:: @ 8D0D294 .incbin "graphics/battle_anims/sprites/094.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD0D2B4, 0x1D @ LZ, uncomp. size = 0x20 + .incbin "graphics/unknown/unknown_D0D2B4.bin.lz" .align 2 gBattleAnimSpritePalette_095:: @ 8D0D2D4 @@ -1448,13 +1448,13 @@ gBattleAnimSpritePalette_144:: @ 8D1C040 .incbin "graphics/battle_anims/sprites/144.gbapal.lz" .align 2 - .incbin "graphics/unused/unknown_D1C060.4bpp.lz" + .incbin "graphics/unknown/unknown_D1C060.4bpp.lz" .align 2 - .incbin "graphics/unused/unknown_D1C060.gbapal.lz" + .incbin "graphics/unknown/unknown_D1C060.gbapal.lz" .align 2 - .incbin "graphics/unused/unknown_D1C060.bin.lz" + .incbin "graphics/unknown/unknown_D1C060.bin.lz" .align 2 gBattleAnimSpriteSheet_162:: @ 8D1C1A4 @@ -2786,14 +2786,14 @@ gBattleAnimSpriteSheet_261:: @ 8E67D6C .incbin "graphics/battle_anims/sprites/261.4bpp.lz" .align 2 -gUnknown_08E67ED8:: @ 8E67ED8 - .incbin "baserom.gba", 0xE67ED8, 0x17C @ LZ, uncomp. size = 0x800 +gBattleAnimBackgroundTilemap_SandstormBrew:: @ 8E67ED8 + .incbin "graphics/battle_anims/backgrounds/sandstorm_brew.bin.lz" .align 2 -gUnknown_08E68054:: @ 8E68054 - .incbin "baserom.gba", 0xE68054, 0x52C @ LZ, uncomp. size = 0x800 +gBattleAnimBackgroundImage_SandstormBrew:: @ 8E68054 + .incbin "graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz" -gUnknown_08E68580:: @ 8E68580 + .align 2 gBattleAnimSpritePalette_261:: @ 8E68580 .incbin "graphics/battle_anims/sprites/261.gbapal.lz" @@ -2829,9 +2829,11 @@ gBattleAnimSpritePalette_262:: @ 8E693DC gContestNextTurnGfx:: .incbin "graphics/contest/nextturn.4bpp.lz" + .align 2 gUnknown_08E69478:: @ 8E69478 .incbin "baserom.gba", 0x00e69478, 0x100 + .align 2 gUnknown_08E69578:: @ 8E69578 .incbin "baserom.gba", 0x00e69578, 0x40 diff --git a/graphics/battle_anims/backgrounds/sandstorm_brew.bin b/graphics/battle_anims/backgrounds/sandstorm_brew.bin new file mode 100755 index 000000000..64e6d8584 Binary files /dev/null and b/graphics/battle_anims/backgrounds/sandstorm_brew.bin differ diff --git a/graphics/battle_anims/backgrounds/sandstorm_brew.png b/graphics/battle_anims/backgrounds/sandstorm_brew.png new file mode 100755 index 000000000..87d5d41ea Binary files /dev/null and b/graphics/battle_anims/backgrounds/sandstorm_brew.png differ diff --git a/graphics/unknown/unknown_3D7D8C.png b/graphics/unknown/unknown_3D7D8C.png new file mode 100644 index 000000000..c4a27b929 Binary files /dev/null and b/graphics/unknown/unknown_3D7D8C.png differ diff --git a/graphics/unknown/unknown_3D810C.bin b/graphics/unknown/unknown_3D810C.bin new file mode 100644 index 000000000..dc2990b0a Binary files /dev/null and b/graphics/unknown/unknown_3D810C.bin differ diff --git a/graphics/unknown/unknown_D04388.png b/graphics/unknown/unknown_D04388.png new file mode 100755 index 000000000..0b2ae80f9 Binary files /dev/null and b/graphics/unknown/unknown_D04388.png differ diff --git a/graphics/unknown/unknown_D0CFAC.bin b/graphics/unknown/unknown_D0CFAC.bin new file mode 100755 index 000000000..4b6b2b106 Binary files /dev/null and b/graphics/unknown/unknown_D0CFAC.bin differ diff --git a/graphics/unknown/unknown_D0CFD0.bin b/graphics/unknown/unknown_D0CFD0.bin new file mode 100755 index 000000000..25fc33a73 Binary files /dev/null and b/graphics/unknown/unknown_D0CFD0.bin differ diff --git a/graphics/unknown/unknown_D0CFF4.bin b/graphics/unknown/unknown_D0CFF4.bin new file mode 100755 index 000000000..5b81e0216 Binary files /dev/null and b/graphics/unknown/unknown_D0CFF4.bin differ diff --git a/graphics/unknown/unknown_D0D070.bin b/graphics/unknown/unknown_D0D070.bin new file mode 100755 index 000000000..15379a9ce Binary files /dev/null and b/graphics/unknown/unknown_D0D070.bin differ diff --git a/graphics/unknown/unknown_D0D2B4.bin b/graphics/unknown/unknown_D0D2B4.bin new file mode 100755 index 000000000..d42729b58 Binary files /dev/null and b/graphics/unknown/unknown_D0D2B4.bin differ diff --git a/graphics/unknown/unknown_D1C060.bin b/graphics/unknown/unknown_D1C060.bin new file mode 100755 index 000000000..e4776cba4 Binary files /dev/null and b/graphics/unknown/unknown_D1C060.bin differ diff --git a/graphics/unknown/unknown_D1C060.pal b/graphics/unknown/unknown_D1C060.pal new file mode 100755 index 000000000..0b2590f44 --- /dev/null +++ b/graphics/unknown/unknown_D1C060.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 255 255 +0 65 148 +148 65 148 +255 255 0 +255 255 255 +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/unknown/unknown_D1C060.png b/graphics/unknown/unknown_D1C060.png new file mode 100755 index 000000000..2371241d7 Binary files /dev/null and b/graphics/unknown/unknown_D1C060.png differ 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/line_sketch_2.bin b/graphics/unused/line_sketch_2.bin new file mode 100755 index 000000000..e68d116a3 Binary files /dev/null and b/graphics/unused/line_sketch_2.bin differ diff --git a/graphics/unused/line_sketch_2.png b/graphics/unused/line_sketch_2.png new file mode 100755 index 000000000..cb70b3d83 Binary files /dev/null and b/graphics/unused/line_sketch_2.png differ diff --git a/graphics/unused/unknown_3D7D8C.png b/graphics/unused/unknown_3D7D8C.png deleted file mode 100644 index c4a27b929..000000000 Binary files a/graphics/unused/unknown_3D7D8C.png and /dev/null differ diff --git a/graphics/unused/unknown_3D810C.bin b/graphics/unused/unknown_3D810C.bin deleted file mode 100644 index dc2990b0a..000000000 Binary files a/graphics/unused/unknown_3D810C.bin and /dev/null differ diff --git a/graphics/unused/unknown_D1C060.bin b/graphics/unused/unknown_D1C060.bin deleted file mode 100755 index e4776cba4..000000000 Binary files a/graphics/unused/unknown_D1C060.bin and /dev/null differ diff --git a/graphics/unused/unknown_D1C060.pal b/graphics/unused/unknown_D1C060.pal deleted file mode 100755 index 0b2590f44..000000000 --- a/graphics/unused/unknown_D1C060.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -222 255 255 -0 65 148 -148 65 148 -255 255 0 -255 255 255 -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/unknown_D1C060.png b/graphics/unused/unknown_D1C060.png deleted file mode 100755 index 2371241d7..000000000 Binary files a/graphics/unused/unknown_D1C060.png and /dev/null differ -- cgit v1.2.3