diff options
98 files changed, 1309 insertions, 83 deletions
diff --git a/asm/contest.s b/asm/contest.s index e3e4ccf86..1eb0834df 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -6652,7 +6652,7 @@ sub_80DB0C4: @ 80DB0C4 push {r4,r5,lr} ldr r0, =gUnknown_08587C00 bl LoadCompressedObjectPic - ldr r0, =gUnknown_08C1C6B8 + ldr r0, =gContest2Pal movs r1, 0x88 lsls r1, 1 movs r2, 0x20 diff --git a/data/battle_anim_8170478.s b/data/battle_anim_8170478.s index 0e0f749fe..d77be4d3b 100644 --- a/data/battle_anim_8170478.s +++ b/data/battle_anim_8170478.s @@ -10,33 +10,33 @@ gUnknown_085E5088:: @ 85E5088 .align 2 gUnknown_085E5094:: @ 85E5094 - .4byte gUnknown_08C1A490, 0xd6ec0100 - .4byte gUnknown_08C1A490, 0xd6ed0100 - .4byte gUnknown_08C1A490, 0xd6ee0100 - .4byte gUnknown_08C1A490, 0xd6ef0100 - .4byte gUnknown_08C1A490, 0xd6f00100 - .4byte gUnknown_08C1A490, 0xd6f10100 - .4byte gUnknown_08C1A490, 0xd6f20100 - .4byte gUnknown_08C1A490, 0xd6f30100 - .4byte gUnknown_08C1A490, 0xd6f40100 - .4byte gUnknown_08C1A490, 0xd6f50100 - .4byte gUnknown_08C1A490, 0xd6f60100 - .4byte gUnknown_08C1A490, 0xd6f70100 + .4byte gBattleAnimSpriteSheet_Particles, 0xd6ec0100 + .4byte gBattleAnimSpriteSheet_Particles, 0xd6ed0100 + .4byte gBattleAnimSpriteSheet_Particles, 0xd6ee0100 + .4byte gBattleAnimSpriteSheet_Particles, 0xd6ef0100 + .4byte gBattleAnimSpriteSheet_Particles, 0xd6f00100 + .4byte gBattleAnimSpriteSheet_Particles, 0xd6f10100 + .4byte gBattleAnimSpriteSheet_Particles, 0xd6f20100 + .4byte gBattleAnimSpriteSheet_Particles, 0xd6f30100 + .4byte gBattleAnimSpriteSheet_Particles, 0xd6f40100 + .4byte gBattleAnimSpriteSheet_Particles, 0xd6f50100 + .4byte gBattleAnimSpriteSheet_Particles, 0xd6f60100 + .4byte gBattleAnimSpriteSheet_Particles, 0xd6f70100 .align 2 gUnknown_085E50F4:: @ 85E50F4 - .4byte gUnknown_08C1A564, 0x0000d6ec - .4byte gUnknown_08C1A564, 0x0000d6ed - .4byte gUnknown_08C1A564, 0x0000d6ee - .4byte gUnknown_08C1A564, 0x0000d6ef - .4byte gUnknown_08C1A564, 0x0000d6f0 - .4byte gUnknown_08C1A564, 0x0000d6f1 - .4byte gUnknown_08C1A564, 0x0000d6f2 - .4byte gUnknown_08C1A564, 0x0000d6f3 - .4byte gUnknown_08C1A564, 0x0000d6f4 - .4byte gUnknown_08C1A564, 0x0000d6f5 - .4byte gUnknown_08C1A564, 0x0000d6f6 - .4byte gUnknown_08C1A564, 0x0000d6f7 + .4byte gBattleAnimSpritePalette_136, 0x0000d6ec + .4byte gBattleAnimSpritePalette_136, 0x0000d6ed + .4byte gBattleAnimSpritePalette_136, 0x0000d6ee + .4byte gBattleAnimSpritePalette_136, 0x0000d6ef + .4byte gBattleAnimSpritePalette_136, 0x0000d6f0 + .4byte gBattleAnimSpritePalette_136, 0x0000d6f1 + .4byte gBattleAnimSpritePalette_136, 0x0000d6f2 + .4byte gBattleAnimSpritePalette_136, 0x0000d6f3 + .4byte gBattleAnimSpritePalette_136, 0x0000d6f4 + .4byte gBattleAnimSpritePalette_136, 0x0000d6f5 + .4byte gBattleAnimSpritePalette_136, 0x0000d6f6 + .4byte gBattleAnimSpritePalette_136, 0x0000d6f7 .align 2 gUnknown_085E5154:: @ 85E5154 diff --git a/data/graphics.s b/data/graphics.s index 7b8b2488d..44a587447 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1053,151 +1053,151 @@ gUnknown_08C1249C:: @ 8C1249C .incbin "graphics/battle_interface/unused_window4.4bpp.lz" .align 2 -gBattleAnimSpriteSheet_116:: @ 8D1302C +gBattleAnimSpriteSheet_116:: .incbin "graphics/battle_anims/sprites/116.4bpp.lz" .align 2 -gBattleAnimSpritePalette_116:: @ 8D132D8 +gBattleAnimSpritePalette_116:: .incbin "graphics/battle_anims/sprites/116.gbapal.lz" .align 2 -gBattleAnimSpriteSheet_117:: @ 8D13300 +gBattleAnimSpriteSheet_117:: .incbin "graphics/battle_anims/sprites/117.4bpp.lz" .align 2 -gBattleAnimSpritePalette_117:: @ 8D1353C +gBattleAnimSpritePalette_117:: .incbin "graphics/battle_anims/sprites/117.gbapal.lz" .align 2 -gBattleAnimSpriteSheet_118:: @ 8D13558 +gBattleAnimSpriteSheet_118:: .incbin "graphics/battle_anims/sprites/118.4bpp.lz" .align 2 -gBattleAnimSpritePalette_118:: @ 8D136F0 +gBattleAnimSpritePalette_118:: .incbin "graphics/battle_anims/sprites/118.gbapal.lz" .align 2 -gBattleAnimSpriteSheet_119:: @ 8D1370C +gBattleAnimSpriteSheet_119:: .incbin "graphics/battle_anims/sprites/119.4bpp.lz" .align 2 -gBattleAnimSpritePalette_119:: @ 8D1399C +gBattleAnimSpritePalette_119:: .incbin "graphics/battle_anims/sprites/119.gbapal.lz" .align 2 -gBattleAnimSpriteSheet_120:: @ 8D139C4 +gBattleAnimSpriteSheet_120:: .incbin "graphics/battle_anims/sprites/120.4bpp.lz" .align 2 -gBattleAnimSpritePalette_120:: @ 8D13AB8 +gBattleAnimSpritePalette_120:: .incbin "graphics/battle_anims/sprites/120.gbapal.lz" .align 2 -gBattleAnimSpriteSheet_121:: @ 8D13AE0 +gBattleAnimSpriteSheet_121:: .incbin "graphics/battle_anims/sprites/121.4bpp.lz" .align 2 -gBattleAnimSpritePalette_121:: @ 8D13B0C +gBattleAnimSpritePalette_121:: .incbin "graphics/battle_anims/sprites/121.gbapal.lz" .align 2 -gBattleAnimSpriteSheet_122:: @ 8D13B30 +gBattleAnimSpriteSheet_122:: .incbin "graphics/battle_anims/sprites/122.4bpp.lz" .align 2 -gBattleAnimSpritePalette_122:: @ 8D13C2C +gBattleAnimSpritePalette_122:: .incbin "graphics/battle_anims/sprites/122.gbapal.lz" .align 2 -gBattleAnimSpriteSheet_123:: @ 8D13C48 +gBattleAnimSpriteSheet_123:: .incbin "graphics/battle_anims/sprites/123.4bpp.lz" .align 2 -gBattleAnimSpriteSheet_124:: @ 8D13D84 +gBattleAnimSpriteSheet_124:: .incbin "graphics/battle_anims/sprites/124.4bpp.lz" .align 2 -gBattleAnimSpritePalette_124:: @ 8D1401C +gBattleAnimSpritePalette_124:: .incbin "graphics/battle_anims/sprites/124.gbapal.lz" .align 2 -gBattleAnimSpriteSheet_125:: @ 8D14044 +gBattleAnimSpriteSheet_125:: .incbin "graphics/battle_anims/sprites/125.4bpp.lz" .align 2 -gBattleAnimSpritePalette_125:: @ 8D14130 +gBattleAnimSpritePalette_125:: .incbin "graphics/battle_anims/sprites/125.gbapal.lz" .align 2 -gBattleAnimSpriteSheet_126:: @ 8D14158 +gBattleAnimSpriteSheet_126:: .incbin "graphics/battle_anims/sprites/126.4bpp.lz" .align 2 -gBattleAnimSpritePalette_126:: @ 8D141C0 +gBattleAnimSpritePalette_126:: .incbin "graphics/battle_anims/sprites/126.gbapal.lz" .align 2 -gBattleAnimSpriteSheet_127:: @ 8D141E0 +gBattleAnimSpriteSheet_127:: .incbin "graphics/battle_anims/sprites/127.4bpp.lz" .align 2 -gBattleAnimSpritePalette_127:: @ 8D14380 +gBattleAnimSpritePalette_127:: .incbin "graphics/battle_anims/sprites/127.gbapal.lz" .align 2 -gBattleAnimSpriteSheet_128:: @ 8D143A4 +gBattleAnimSpriteSheet_128:: .incbin "graphics/battle_anims/sprites/128.4bpp.lz" .align 2 -gBattleAnimSpritePalette_128:: @ 8D14610 +gBattleAnimSpritePalette_128:: .incbin "graphics/battle_anims/sprites/128.gbapal.lz" .align 2 -gBattleAnimSpriteSheet_129:: @ 8D14630 +gBattleAnimSpriteSheet_129:: .incbin "graphics/battle_anims/sprites/129.4bpp.lz" .align 2 -gBattleAnimSpriteSheet_130:: @ 8D14694 +gBattleAnimSpriteSheet_130:: .incbin "graphics/battle_anims/sprites/130.4bpp.lz" .align 2 -gBattleAnimSpritePalette_130:: @ 8D14A64 +gBattleAnimSpritePalette_130:: .incbin "graphics/battle_anims/sprites/130.gbapal.lz" .align 2 -gBattleAnimSpriteSheet_131:: @ 8D14A8C +gBattleAnimSpriteSheet_131:: .incbin "graphics/battle_anims/sprites/131.4bpp.lz" .align 2 -gBattleAnimSpriteSheet_132:: @ 8D14BFC +gBattleAnimSpriteSheet_132:: .incbin "graphics/battle_anims/sprites/132.4bpp.lz" .align 2 -gBattleAnimSpritePalette_132:: @ 8D14CFC +gBattleAnimSpritePalette_132:: .incbin "graphics/battle_anims/sprites/132.gbapal.lz" .align 2 -gBattleAnimSpriteSheet_133:: @ 8D14D1C +gBattleAnimSpriteSheet_133:: .incbin "graphics/battle_anims/sprites/133.4bpp.lz" .align 2 -gBattleAnimSpritePalette_133:: @ 8D14D98 +gBattleAnimSpritePalette_133:: .incbin "graphics/battle_anims/sprites/133.gbapal.lz" .align 2 -gBattleAnimSpriteSheet_134:: @ 8D14DC0 +gBattleAnimSpriteSheet_134:: .incbin "graphics/battle_anims/sprites/134.4bpp.lz" .align 2 -gBattleAnimSpriteSheet_076:: @ 8D14E90 +gBattleAnimSpriteSheet_076:: .incbin "graphics/battle_anims/sprites/076.4bpp.lz" .align 2 -gBattleAnimSpritePalette_076:: @ 8D150CC +gBattleAnimSpritePalette_076:: .incbin "graphics/battle_anims/sprites/076.gbapal.lz" .align 2 -gBattleAnimSpriteSheet_077:: @ 8D150F4 +gBattleAnimSpriteSheet_077:: .incbin "graphics/battle_anims/sprites/077.4bpp.lz" .align 2 @@ -1215,56 +1215,500 @@ gBattleAnimSpriteSheet_077:: @ 8D150F4 .align 2 .incbin "graphics/unused/old_contest_2.4bpp.lz" + .align 2 gUnknown_08C16E90:: @ 8C16E90 - .incbin "baserom.gba", 0xc16e90, 0x118 + .incbin "graphics/unused/old_contest_2.gbapal.lz" + .align 2 gUnknown_08C16FA8:: @ 8C16FA8 - .incbin "baserom.gba", 0xc16fa8, 0x1c8 + .incbin "graphics/unused/old_contest_2.bin.lz" + .align 2 gUnknown_08C17170:: @ 8C17170 - .incbin "baserom.gba", 0xc17170, 0x810 + .incbin "graphics/unknown/unknown_C17170.bin.lz" + + .align 2 + .incbin "graphics/unknown/unknown_C17410.bin.lz" + + .align 2 + .incbin "graphics/unknown/unknown_C1751C.bin.lz" + .align 2 gUnknown_08C17980:: @ 8C17980 - .incbin "baserom.gba", 0xc17980, 0x130 + .incbin "graphics/unknown/unknown_C17980.bin.lz" + .align 2 gUnknown_08C17AB0:: @ 8C17AB0 - .incbin "baserom.gba", 0xc17ab0, 0xa5c + .incbin "graphics/contest/misc.4bpp.lz" + .align 2 gUnknown_08C1850C:: @ 8C1850C - .incbin "baserom.gba", 0xc1850c, 0x107c + .incbin "graphics/contest/audience.4bpp.lz" + + .align 2 + .incbin "graphics/contest/faces.4bpp.lz" + + .align 2 +gContestJudgeSymbolsGfx:: + .incbin "graphics/contest/judge_symbols.4bpp.lz" + + .align 2 +gContest3Pal:: + .incbin "graphics/contest/judge_symbols.gbapal.lz" + + .align 2 +gTiles_8C19450:: + .incbin "graphics/contest/heart.4bpp" + + .align 2 + .incbin "graphics/unknown/unknown_C19470.4bpp.lz" + + .align 2 + .incbin "graphics/unknown/unknown_C19470.gbapal.lz" + .align 2 gUnknown_08C19588:: @ 8C19588 - .incbin "baserom.gba", 0xc19588, 0x964 + .incbin "graphics/contest/misc_2.4bpp.lz" + .align 2 gUnknown_08C19EEC:: @ 8C19EEC - .incbin "baserom.gba", 0xc19eec, 0x114 + .incbin "graphics/contest/misc_2_tilemap_1.bin.lz" + .align 2 gUnknown_08C1A000:: @ 8C1A000 - .incbin "baserom.gba", 0xc1a000, 0x12c + .incbin "graphics/contest/misc_2_tilemap_2.bin.lz" + .align 2 gUnknown_08C1A12C:: @ 8C1A12C - .incbin "baserom.gba", 0xc1a12c, 0x188 + .incbin "graphics/contest/misc_2_tilemap_3.bin.lz" + .align 2 gUnknown_08C1A2B4:: @ 8C1A2B4 - .incbin "baserom.gba", 0xc1a2b4, 0x1DC + .incbin "graphics/contest/misc_2.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_135:: + .incbin "graphics/battle_anims/sprites/135.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_135:: + .incbin "graphics/battle_anims/sprites/135.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_Particles:: + .incbin "graphics/battle_anims/sprites/particles.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_136:: + .incbin "graphics/battle_anims/sprites/136.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_136:: + .incbin "graphics/battle_anims/sprites/136.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_137:: + .incbin "graphics/battle_anims/sprites/137.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_139:: + .incbin "graphics/battle_anims/sprites/139.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_139:: + .incbin "graphics/battle_anims/sprites/139.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_145:: + .incbin "graphics/battle_anims/sprites/145.4bpp.lz" -gUnknown_08C1A490:: @ 8C1A490 - .incbin "baserom.gba", 0xc1a490, 0xD4 + .align 2 +gBattleAnimSpriteSheet_138:: + .incbin "graphics/battle_anims/sprites/138.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_140:: + .incbin "graphics/battle_anims/sprites/140.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_140:: + .incbin "graphics/battle_anims/sprites/140.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_141:: + .incbin "graphics/battle_anims/sprites/141.4bpp.lz" -gUnknown_08C1A564:: @ 8C1A564 - .incbin "baserom.gba", 0xc1a564, 0x2154 + .align 2 +gBattleAnimSpritePalette_141:: + .incbin "graphics/battle_anims/sprites/141.gbapal.lz" -gUnknown_08C1C6B8:: @ 8C1C6B8 - .incbin "baserom.gba", 0xc1c6b8, 0x9f4 + .align 2 +gBattleAnimSpriteSheet_142:: + .incbin "graphics/battle_anims/sprites/142.4bpp.lz" + + .align 2 + .incbin "graphics/unused/old_beatup.4bpp.lz" + + .align 2 + .incbin "graphics/unused/old_beatup.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_147:: + .incbin "graphics/battle_anims/sprites/147.4bpp.lz" + .align 2 +gBattleAnimSpritePalette_147:: + .incbin "graphics/battle_anims/sprites/147.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_149:: + .incbin "graphics/battle_anims/sprites/149.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_148:: + .incbin "graphics/battle_anims/sprites/148.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_148:: + .incbin "graphics/battle_anims/sprites/148.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_259:: + .incbin "graphics/battle_anims/sprites/259.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_074:: + .incbin "graphics/battle_anims/sprites/074.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_074:: + .incbin "graphics/battle_anims/sprites/074.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_150:: + .incbin "graphics/battle_anims/sprites/150.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_150:: + .incbin "graphics/battle_anims/sprites/150.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_151:: + .incbin "graphics/battle_anims/sprites/151.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_153:: + .incbin "graphics/battle_anims/sprites/153.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_153:: + .incbin "graphics/battle_anims/sprites/153.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_154:: + .incbin "graphics/battle_anims/sprites/154.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_154:: + .incbin "graphics/battle_anims/sprites/154.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_155:: + .incbin "graphics/battle_anims/sprites/155.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_155:: + .incbin "graphics/battle_anims/sprites/155.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_156:: + .incbin "graphics/battle_anims/sprites/156.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_156:: + .incbin "graphics/battle_anims/sprites/156.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_157:: + .incbin "graphics/battle_anims/sprites/157.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_157:: + .incbin "graphics/battle_anims/sprites/157.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_158:: + .incbin "graphics/battle_anims/sprites/158.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_158:: + .incbin "graphics/battle_anims/sprites/158.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_159:: + .incbin "graphics/battle_anims/sprites/159.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_159:: + .incbin "graphics/battle_anims/sprites/159.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_160:: + .incbin "graphics/battle_anims/sprites/160.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_160:: + .incbin "graphics/battle_anims/sprites/160.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_144:: + .incbin "graphics/battle_anims/sprites/144.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_144:: + .incbin "graphics/battle_anims/sprites/144.gbapal.lz" + + .align 2 + .incbin "graphics/unknown/unknown_D1C060.4bpp.lz" + + .align 2 + .incbin "graphics/unknown/unknown_D1C060.gbapal.lz" + + .align 2 + .incbin "graphics/unknown/unknown_D1C060.bin.lz" + + .align 2 +gBattleAnimSpriteSheet_162:: + .incbin "graphics/battle_anims/sprites/162.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_162:: + .incbin "graphics/battle_anims/sprites/162.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_163:: + .incbin "graphics/battle_anims/sprites/163.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_163:: + .incbin "graphics/battle_anims/sprites/163.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_288:: + .incbin "graphics/battle_anims/sprites/288.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_164:: + .incbin "graphics/battle_anims/sprites/164.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_165:: + .incbin "graphics/battle_anims/sprites/165.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_166:: + .incbin "graphics/battle_anims/sprites/166.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_166:: + .incbin "graphics/battle_anims/sprites/166.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_167:: + .incbin "graphics/battle_anims/sprites/167.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_168:: + .incbin "graphics/battle_anims/sprites/168.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_169:: + .incbin "graphics/battle_anims/sprites/169.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_170:: + .incbin "graphics/battle_anims/sprites/170.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_171:: + .incbin "graphics/battle_anims/sprites/171.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_171:: + .incbin "graphics/battle_anims/sprites/171.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_172:: + .incbin "graphics/battle_anims/sprites/172.gbapal.lz" + + .align 2 +gContestJudgeGfx:: + .incbin "graphics/contest/judge.4bpp.lz" + + .align 2 +gContest2Pal:: @ 8C1C6B8 + .incbin "graphics/contest/judge.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_001:: + .incbin "graphics/battle_anims/sprites/001.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_001:: + .incbin "graphics/battle_anims/sprites/001.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_173:: + .incbin "graphics/battle_anims/sprites/173.4bpp.lz" + + .align 2 +gBattleAnimBackgroundImage_00:: + .incbin "graphics/battle_anims/backgrounds/00.4bpp.lz" + + .align 2 +gBattleAnimBackgroundPalette_00:: + .incbin "graphics/battle_anims/backgrounds/00.gbapal.lz" + + .align 2 +gBattleAnimBackgroundTilemap_00:: + .incbin "graphics/battle_anims/backgrounds/00.bin.lz" + + .align 2 gUnknown_08C1D0AC:: @ 8C1D0AC - .incbin "baserom.gba", 0xc1d0ac, 0x13c + .incbin "graphics/battle_anims/masks/metal_shine.4bpp.lz" + .align 2 gUnknown_08C1D1E8:: @ 8C1D1E8 - .incbin "baserom.gba", 0xc1d1e8, 0x28 + .incbin "graphics/battle_anims/masks/metal_shine.gbapal.lz" + .align 2 gUnknown_08C1D210:: @ 8C1D210 - .incbin "baserom.gba", 0xc1d210, 0x1fb8 + .incbin "graphics/battle_anims/masks/metal_shine.bin.lz" + + .align 2 + .incbin "graphics/unused/goosuto.4bpp.lz" @ ghost + + .align 2 + .incbin "graphics/unused/goosuto.gbapal.lz" + + .align 2 + .incbin "graphics/unused/goosuto.bin.lz" + + .align 2 +gBattleAnimSpriteSheet_174:: + .incbin "graphics/battle_anims/sprites/174.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_174:: + .incbin "graphics/battle_anims/sprites/174.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_175:: + .incbin "graphics/battle_anims/sprites/175.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_175:: + .incbin "graphics/battle_anims/sprites/175.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_176:: + .incbin "graphics/battle_anims/sprites/176.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_176:: + .incbin "graphics/battle_anims/sprites/176.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_177:: + .incbin "graphics/battle_anims/sprites/177.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_177:: + .incbin "graphics/battle_anims/sprites/177.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_178:: + .incbin "graphics/battle_anims/sprites/178.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_178:: + .incbin "graphics/battle_anims/sprites/178.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_179:: + .incbin "graphics/battle_anims/sprites/179.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_179:: + .incbin "graphics/battle_anims/sprites/179.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_180:: + .incbin "graphics/battle_anims/sprites/180.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_181:: + .incbin "graphics/battle_anims/sprites/181.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_182:: + .incbin "graphics/battle_anims/sprites/182.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_182:: + .incbin "graphics/battle_anims/sprites/182.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_183:: + .incbin "graphics/battle_anims/sprites/183.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_183:: + .incbin "graphics/battle_anims/sprites/183.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_184:: + .incbin "graphics/battle_anims/sprites/184.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_184:: + .incbin "graphics/battle_anims/sprites/184.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_185:: + .incbin "graphics/battle_anims/sprites/185.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_185:: + .incbin "graphics/battle_anims/sprites/185.gbapal.lz" + + .align 2 +gBattleAnimBackgroundImage_03:: + .incbin "graphics/battle_anims/backgrounds/03.4bpp.lz" + + .align 2 +gBattleAnimBackgroundPalette_03:: + .incbin "graphics/battle_anims/backgrounds/03.gbapal.lz" + + .align 2 +gBattleAnimBackgroundTilemap_03:: + .incbin "graphics/battle_anims/backgrounds/03.bin.lz" + + .align 2 +gBattleAnimSpriteSheet_187:: + .incbin "graphics/battle_anims/sprites/187.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_187:: + .incbin "graphics/battle_anims/sprites/187.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_186:: + .incbin "graphics/battle_anims/sprites/186.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_186:: + .incbin "graphics/battle_anims/sprites/186.gbapal.lz" gUnknown_08C1F1C8:: @ 8C1F1C8 .incbin "baserom.gba", 0xc1f1c8, 0x2a4 diff --git a/graphics/battle_anims/backgrounds/00.bin b/graphics/battle_anims/backgrounds/00.bin Binary files differnew file mode 100755 index 000000000..dc70b2cf8 --- /dev/null +++ b/graphics/battle_anims/backgrounds/00.bin diff --git a/graphics/battle_anims/backgrounds/00.png b/graphics/battle_anims/backgrounds/00.png Binary files differnew file mode 100755 index 000000000..f88de79c3 --- /dev/null +++ b/graphics/battle_anims/backgrounds/00.png diff --git a/graphics/battle_anims/backgrounds/03.bin b/graphics/battle_anims/backgrounds/03.bin Binary files differnew file mode 100755 index 000000000..f642d1c7a --- /dev/null +++ b/graphics/battle_anims/backgrounds/03.bin diff --git a/graphics/battle_anims/backgrounds/03.png b/graphics/battle_anims/backgrounds/03.png Binary files differnew file mode 100755 index 000000000..2c2f9de87 --- /dev/null +++ b/graphics/battle_anims/backgrounds/03.png diff --git a/graphics/battle_anims/masks/metal_shine.bin b/graphics/battle_anims/masks/metal_shine.bin Binary files differnew file mode 100755 index 000000000..fed60df36 --- /dev/null +++ b/graphics/battle_anims/masks/metal_shine.bin diff --git a/graphics/battle_anims/masks/metal_shine.png b/graphics/battle_anims/masks/metal_shine.png Binary files differnew file mode 100755 index 000000000..a9c5a952c --- /dev/null +++ b/graphics/battle_anims/masks/metal_shine.png diff --git a/graphics/battle_anims/sprites/001.pal b/graphics/battle_anims/sprites/001.pal new file mode 100755 index 000000000..81af310e1 --- /dev/null +++ b/graphics/battle_anims/sprites/001.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +255 139 0 +255 156 8 +255 172 24 +255 197 41 +255 213 57 +255 230 74 +255 255 90 +255 255 255 +255 74 106 +255 115 148 +255 164 197 +255 205 238 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/001_0.png b/graphics/battle_anims/sprites/001_0.png Binary files differnew file mode 100755 index 000000000..77c454dcb --- /dev/null +++ b/graphics/battle_anims/sprites/001_0.png diff --git a/graphics/battle_anims/sprites/001_1.png b/graphics/battle_anims/sprites/001_1.png Binary files differnew file mode 100755 index 000000000..2cfd6bd0b --- /dev/null +++ b/graphics/battle_anims/sprites/001_1.png diff --git a/graphics/battle_anims/sprites/074.pal b/graphics/battle_anims/sprites/074.pal new file mode 100755 index 000000000..f8976f672 --- /dev/null +++ b/graphics/battle_anims/sprites/074.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +115 106 98 +82 82 82 +164 164 164 +255 255 255 +197 180 115 +164 148 82 +131 115 57 +98 82 24 +74 57 0 +205 205 197 +131 131 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/074_0.png b/graphics/battle_anims/sprites/074_0.png Binary files differnew file mode 100755 index 000000000..81af47193 --- /dev/null +++ b/graphics/battle_anims/sprites/074_0.png diff --git a/graphics/battle_anims/sprites/074_1.png b/graphics/battle_anims/sprites/074_1.png Binary files differnew file mode 100755 index 000000000..827ec5d48 --- /dev/null +++ b/graphics/battle_anims/sprites/074_1.png diff --git a/graphics/battle_anims/sprites/135.png b/graphics/battle_anims/sprites/135.png Binary files differnew file mode 100755 index 000000000..38a04f373 --- /dev/null +++ b/graphics/battle_anims/sprites/135.png diff --git a/graphics/battle_anims/sprites/136.png b/graphics/battle_anims/sprites/136.png Binary files differnew file mode 100755 index 000000000..cc99103d5 --- /dev/null +++ b/graphics/battle_anims/sprites/136.png diff --git a/graphics/battle_anims/sprites/137.png b/graphics/battle_anims/sprites/137.png Binary files differnew file mode 100755 index 000000000..7f3d26644 --- /dev/null +++ b/graphics/battle_anims/sprites/137.png diff --git a/graphics/battle_anims/sprites/138.png b/graphics/battle_anims/sprites/138.png Binary files differnew file mode 100755 index 000000000..559244bbc --- /dev/null +++ b/graphics/battle_anims/sprites/138.png diff --git a/graphics/battle_anims/sprites/139.png b/graphics/battle_anims/sprites/139.png Binary files differnew file mode 100755 index 000000000..38b74a9e4 --- /dev/null +++ b/graphics/battle_anims/sprites/139.png diff --git a/graphics/battle_anims/sprites/140.png b/graphics/battle_anims/sprites/140.png Binary files differnew file mode 100755 index 000000000..1133f2ee8 --- /dev/null +++ b/graphics/battle_anims/sprites/140.png diff --git a/graphics/battle_anims/sprites/141.pal b/graphics/battle_anims/sprites/141.pal new file mode 100755 index 000000000..c5f241feb --- /dev/null +++ b/graphics/battle_anims/sprites/141.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/141_0.png b/graphics/battle_anims/sprites/141_0.png Binary files differnew file mode 100755 index 000000000..631d344c8 --- /dev/null +++ b/graphics/battle_anims/sprites/141_0.png diff --git a/graphics/battle_anims/sprites/141_1.png b/graphics/battle_anims/sprites/141_1.png Binary files differnew file mode 100755 index 000000000..95f24953f --- /dev/null +++ b/graphics/battle_anims/sprites/141_1.png diff --git a/graphics/battle_anims/sprites/141_2.png b/graphics/battle_anims/sprites/141_2.png Binary files differnew file mode 100755 index 000000000..ec1e4b090 --- /dev/null +++ b/graphics/battle_anims/sprites/141_2.png diff --git a/graphics/battle_anims/sprites/141_3.png b/graphics/battle_anims/sprites/141_3.png Binary files differnew file mode 100755 index 000000000..02ac9d68e --- /dev/null +++ b/graphics/battle_anims/sprites/141_3.png diff --git a/graphics/battle_anims/sprites/141_4.png b/graphics/battle_anims/sprites/141_4.png Binary files differnew file mode 100755 index 000000000..a7af91f4b --- /dev/null +++ b/graphics/battle_anims/sprites/141_4.png diff --git a/graphics/battle_anims/sprites/142.png b/graphics/battle_anims/sprites/142.png Binary files differnew file mode 100755 index 000000000..130bcf82e --- /dev/null +++ b/graphics/battle_anims/sprites/142.png diff --git a/graphics/battle_anims/sprites/144.png b/graphics/battle_anims/sprites/144.png Binary files differnew file mode 100755 index 000000000..069926395 --- /dev/null +++ b/graphics/battle_anims/sprites/144.png diff --git a/graphics/battle_anims/sprites/145.png b/graphics/battle_anims/sprites/145.png Binary files differnew file mode 100755 index 000000000..b44edaadb --- /dev/null +++ b/graphics/battle_anims/sprites/145.png diff --git a/graphics/battle_anims/sprites/147.png b/graphics/battle_anims/sprites/147.png Binary files differnew file mode 100755 index 000000000..6dcc9cdff --- /dev/null +++ b/graphics/battle_anims/sprites/147.png diff --git a/graphics/battle_anims/sprites/148.png b/graphics/battle_anims/sprites/148.png Binary files differnew file mode 100755 index 000000000..ea5738321 --- /dev/null +++ b/graphics/battle_anims/sprites/148.png diff --git a/graphics/battle_anims/sprites/149.png b/graphics/battle_anims/sprites/149.png Binary files differnew file mode 100755 index 000000000..8e52802d7 --- /dev/null +++ b/graphics/battle_anims/sprites/149.png diff --git a/graphics/battle_anims/sprites/150.png b/graphics/battle_anims/sprites/150.png Binary files differnew file mode 100755 index 000000000..e6c55b573 --- /dev/null +++ b/graphics/battle_anims/sprites/150.png diff --git a/graphics/battle_anims/sprites/151.png b/graphics/battle_anims/sprites/151.png Binary files differnew file mode 100755 index 000000000..bf7819273 --- /dev/null +++ b/graphics/battle_anims/sprites/151.png diff --git a/graphics/battle_anims/sprites/153.png b/graphics/battle_anims/sprites/153.png Binary files differnew file mode 100755 index 000000000..d3dd12ae1 --- /dev/null +++ b/graphics/battle_anims/sprites/153.png diff --git a/graphics/battle_anims/sprites/154.png b/graphics/battle_anims/sprites/154.png Binary files differnew file mode 100755 index 000000000..8b55a24a2 --- /dev/null +++ b/graphics/battle_anims/sprites/154.png diff --git a/graphics/battle_anims/sprites/155.png b/graphics/battle_anims/sprites/155.png Binary files differnew file mode 100755 index 000000000..9547b39fa --- /dev/null +++ b/graphics/battle_anims/sprites/155.png diff --git a/graphics/battle_anims/sprites/156.png b/graphics/battle_anims/sprites/156.png Binary files differnew file mode 100755 index 000000000..c0567df8c --- /dev/null +++ b/graphics/battle_anims/sprites/156.png diff --git a/graphics/battle_anims/sprites/157.png b/graphics/battle_anims/sprites/157.png Binary files differnew file mode 100755 index 000000000..7fa6a0531 --- /dev/null +++ b/graphics/battle_anims/sprites/157.png diff --git a/graphics/battle_anims/sprites/158.png b/graphics/battle_anims/sprites/158.png Binary files differnew file mode 100755 index 000000000..a91eaafdb --- /dev/null +++ b/graphics/battle_anims/sprites/158.png diff --git a/graphics/battle_anims/sprites/159.pal b/graphics/battle_anims/sprites/159.pal new file mode 100755 index 000000000..81af310e1 --- /dev/null +++ b/graphics/battle_anims/sprites/159.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +255 139 0 +255 156 8 +255 172 24 +255 197 41 +255 213 57 +255 230 74 +255 255 90 +255 255 255 +255 74 106 +255 115 148 +255 164 197 +255 205 238 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/159_0.png b/graphics/battle_anims/sprites/159_0.png Binary files differnew file mode 100755 index 000000000..4e9831863 --- /dev/null +++ b/graphics/battle_anims/sprites/159_0.png diff --git a/graphics/battle_anims/sprites/159_1.png b/graphics/battle_anims/sprites/159_1.png Binary files differnew file mode 100755 index 000000000..065ea5052 --- /dev/null +++ b/graphics/battle_anims/sprites/159_1.png diff --git a/graphics/battle_anims/sprites/160.png b/graphics/battle_anims/sprites/160.png Binary files differnew file mode 100755 index 000000000..35459b66b --- /dev/null +++ b/graphics/battle_anims/sprites/160.png diff --git a/graphics/battle_anims/sprites/162.png b/graphics/battle_anims/sprites/162.png Binary files differnew file mode 100755 index 000000000..f1fac116b --- /dev/null +++ b/graphics/battle_anims/sprites/162.png diff --git a/graphics/battle_anims/sprites/163.png b/graphics/battle_anims/sprites/163.png Binary files differnew file mode 100755 index 000000000..29c06f9b7 --- /dev/null +++ b/graphics/battle_anims/sprites/163.png diff --git a/graphics/battle_anims/sprites/164.pal b/graphics/battle_anims/sprites/164.pal new file mode 100755 index 000000000..4fdffdcdb --- /dev/null +++ b/graphics/battle_anims/sprites/164.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +0 0 0 +156 24 255 +180 49 255 +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/battle_anims/sprites/165.pal b/graphics/battle_anims/sprites/165.pal new file mode 100755 index 000000000..048980708 --- /dev/null +++ b/graphics/battle_anims/sprites/165.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +0 0 0 +49 148 255 +0 230 255 +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/battle_anims/sprites/166.png b/graphics/battle_anims/sprites/166.png Binary files differnew file mode 100755 index 000000000..b5fefee24 --- /dev/null +++ b/graphics/battle_anims/sprites/166.png diff --git a/graphics/battle_anims/sprites/167.pal b/graphics/battle_anims/sprites/167.pal new file mode 100755 index 000000000..5f4852f39 --- /dev/null +++ b/graphics/battle_anims/sprites/167.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 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 +164 156 255 +180 180 255 +205 205 255 diff --git a/graphics/battle_anims/sprites/168.pal b/graphics/battle_anims/sprites/168.pal new file mode 100755 index 000000000..a99d113d2 --- /dev/null +++ b/graphics/battle_anims/sprites/168.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +255 74 106 +255 98 123 +255 123 148 +255 148 164 +255 172 189 +255 197 205 +255 222 230 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 148 164 +255 172 189 +255 197 205 diff --git a/graphics/battle_anims/sprites/169.pal b/graphics/battle_anims/sprites/169.pal new file mode 100755 index 000000000..6d037b09f --- /dev/null +++ b/graphics/battle_anims/sprites/169.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +123 123 123 +139 139 139 +156 156 156 +172 172 172 +197 197 197 +213 213 213 +230 230 230 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +172 172 172 +197 197 197 +213 213 213 diff --git a/graphics/battle_anims/sprites/170.pal b/graphics/battle_anims/sprites/170.pal new file mode 100755 index 000000000..63ff0a239 --- /dev/null +++ b/graphics/battle_anims/sprites/170.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +255 205 32 +255 205 57 +255 213 90 +255 222 123 +255 230 156 +255 238 189 +255 246 222 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 222 123 +255 230 156 +255 238 189 diff --git a/graphics/battle_anims/sprites/171.png b/graphics/battle_anims/sprites/171.png Binary files differnew file mode 100755 index 000000000..7b60d7450 --- /dev/null +++ b/graphics/battle_anims/sprites/171.png diff --git a/graphics/battle_anims/sprites/172.pal b/graphics/battle_anims/sprites/172.pal new file mode 100755 index 000000000..4b1755b0c --- /dev/null +++ b/graphics/battle_anims/sprites/172.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 +213 0 213 +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/173.png b/graphics/battle_anims/sprites/173.png Binary files differnew file mode 100755 index 000000000..d50982122 --- /dev/null +++ b/graphics/battle_anims/sprites/173.png diff --git a/graphics/battle_anims/sprites/174.png b/graphics/battle_anims/sprites/174.png Binary files differnew file mode 100755 index 000000000..d8cf8dbe4 --- /dev/null +++ b/graphics/battle_anims/sprites/174.png diff --git a/graphics/battle_anims/sprites/175.png b/graphics/battle_anims/sprites/175.png Binary files differnew file mode 100755 index 000000000..042ef87ac --- /dev/null +++ b/graphics/battle_anims/sprites/175.png diff --git a/graphics/battle_anims/sprites/176.png b/graphics/battle_anims/sprites/176.png Binary files differnew file mode 100755 index 000000000..aaa3c2f96 --- /dev/null +++ b/graphics/battle_anims/sprites/176.png diff --git a/graphics/battle_anims/sprites/177.png b/graphics/battle_anims/sprites/177.png Binary files differnew file mode 100755 index 000000000..ec1b2246b --- /dev/null +++ b/graphics/battle_anims/sprites/177.png diff --git a/graphics/battle_anims/sprites/178.png b/graphics/battle_anims/sprites/178.png Binary files differnew file mode 100755 index 000000000..c7b68d278 --- /dev/null +++ b/graphics/battle_anims/sprites/178.png diff --git a/graphics/battle_anims/sprites/179.png b/graphics/battle_anims/sprites/179.png Binary files differnew file mode 100755 index 000000000..94f102402 --- /dev/null +++ b/graphics/battle_anims/sprites/179.png diff --git a/graphics/battle_anims/sprites/180.png b/graphics/battle_anims/sprites/180.png Binary files differnew file mode 100755 index 000000000..76eb7c9a8 --- /dev/null +++ b/graphics/battle_anims/sprites/180.png diff --git a/graphics/battle_anims/sprites/181.png b/graphics/battle_anims/sprites/181.png Binary files differnew file mode 100755 index 000000000..ea561b9db --- /dev/null +++ b/graphics/battle_anims/sprites/181.png diff --git a/graphics/battle_anims/sprites/182.png b/graphics/battle_anims/sprites/182.png Binary files differnew file mode 100755 index 000000000..e586f630b --- /dev/null +++ b/graphics/battle_anims/sprites/182.png diff --git a/graphics/battle_anims/sprites/183.png b/graphics/battle_anims/sprites/183.png Binary files differnew file mode 100755 index 000000000..55b2044b8 --- /dev/null +++ b/graphics/battle_anims/sprites/183.png diff --git a/graphics/battle_anims/sprites/184.png b/graphics/battle_anims/sprites/184.png Binary files differnew file mode 100755 index 000000000..99ba7e475 --- /dev/null +++ b/graphics/battle_anims/sprites/184.png diff --git a/graphics/battle_anims/sprites/185.png b/graphics/battle_anims/sprites/185.png Binary files differnew file mode 100755 index 000000000..f3a4305c5 --- /dev/null +++ b/graphics/battle_anims/sprites/185.png diff --git a/graphics/battle_anims/sprites/186.png b/graphics/battle_anims/sprites/186.png Binary files differnew file mode 100755 index 000000000..8fbc31367 --- /dev/null +++ b/graphics/battle_anims/sprites/186.png diff --git a/graphics/battle_anims/sprites/187.png b/graphics/battle_anims/sprites/187.png Binary files differnew file mode 100755 index 000000000..b0caeb98f --- /dev/null +++ b/graphics/battle_anims/sprites/187.png diff --git a/graphics/battle_anims/sprites/259.pal b/graphics/battle_anims/sprites/259.pal new file mode 100755 index 000000000..ead25c0c6 --- /dev/null +++ b/graphics/battle_anims/sprites/259.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +131 49 0 +148 74 32 +164 106 65 +180 131 106 +197 164 139 +213 189 180 +230 222 213 +255 255 255 +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/battle_anims/sprites/288.pal b/graphics/battle_anims/sprites/288.pal new file mode 100755 index 000000000..f8ea0ca54 --- /dev/null +++ b/graphics/battle_anims/sprites/288.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +0 0 0 +255 255 255 +230 255 230 +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/battle_anims/sprites/particles.png b/graphics/battle_anims/sprites/particles.png Binary files differnew file mode 100755 index 000000000..7edcd54ed --- /dev/null +++ b/graphics/battle_anims/sprites/particles.png diff --git a/graphics/contest/audience.png b/graphics/contest/audience.png Binary files differnew file mode 100755 index 000000000..59f8d0add --- /dev/null +++ b/graphics/contest/audience.png diff --git a/graphics/contest/faces.png b/graphics/contest/faces.png Binary files differnew file mode 100755 index 000000000..bba47a91d --- /dev/null +++ b/graphics/contest/faces.png diff --git a/graphics/contest/heart.png b/graphics/contest/heart.png Binary files differnew file mode 100755 index 000000000..bd1ede8fc --- /dev/null +++ b/graphics/contest/heart.png diff --git a/graphics/contest/judge.png b/graphics/contest/judge.png Binary files differnew file mode 100755 index 000000000..c4dcf520b --- /dev/null +++ b/graphics/contest/judge.png diff --git a/graphics/contest/judge_symbols.png b/graphics/contest/judge_symbols.png Binary files differnew file mode 100755 index 000000000..7669fb88b --- /dev/null +++ b/graphics/contest/judge_symbols.png diff --git a/graphics/contest/misc.png b/graphics/contest/misc.png Binary files differnew file mode 100755 index 000000000..5e3b40462 --- /dev/null +++ b/graphics/contest/misc.png diff --git a/graphics/contest/misc_2.pal b/graphics/contest/misc_2.pal new file mode 100755 index 000000000..869aef9e1 --- /dev/null +++ b/graphics/contest/misc_2.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 106 115 +255 57 57 +205 32 0 +246 213 0 +255 123 98 +156 180 90 +164 148 57 +90 106 139 +180 172 82 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +164 222 255 +106 148 255 +24 57 205 +246 213 0 +255 123 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 197 255 +255 139 255 +213 0 139 +246 213 0 +255 123 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +180 255 197 +148 255 164 +65 172 57 +246 213 0 +255 123 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 255 164 +246 213 0 +230 106 0 +246 213 0 +255 123 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 255 255 +255 255 255 +213 213 213 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +164 222 255 +106 148 255 +49 82 255 +180 255 197 +148 255 164 +65 172 57 +0 0 0 +0 0 0 +0 0 0 +197 255 255 +255 255 255 +213 213 213 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 139 230 +255 139 230 +255 49 156 +255 255 0 +255 255 0 +189 172 0 +41 49 90 +41 49 90 +0 0 0 +197 123 131 +255 255 255 +230 246 255 +205 238 255 +180 238 255 +156 230 255 +139 230 255 +255 205 230 +255 255 139 +255 230 255 +255 255 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 255 255 +255 255 255 +213 213 213 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 172 197 +255 172 172 +255 180 148 +255 189 123 +255 197 98 +255 205 82 +156 156 156 +156 156 156 +156 156 156 +197 255 255 +255 255 255 +213 213 213 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +164 222 255 +106 148 255 +49 82 255 +180 255 197 +148 255 164 +65 172 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +164 222 255 +106 230 222 +49 238 189 +0 255 156 +0 255 156 +82 255 98 +164 255 49 +255 255 0 +255 172 16 +255 90 32 +255 8 57 +230 57 106 +205 115 156 +180 164 205 +164 222 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 +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 +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 +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 +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 +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 +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 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/contest/misc_2.png b/graphics/contest/misc_2.png Binary files differnew file mode 100755 index 000000000..106b975cf --- /dev/null +++ b/graphics/contest/misc_2.png diff --git a/graphics/contest/misc_2_tilemap_1.bin b/graphics/contest/misc_2_tilemap_1.bin Binary files differnew file mode 100755 index 000000000..197e88cee --- /dev/null +++ b/graphics/contest/misc_2_tilemap_1.bin diff --git a/graphics/contest/misc_2_tilemap_2.bin b/graphics/contest/misc_2_tilemap_2.bin Binary files differnew file mode 100755 index 000000000..b31126836 --- /dev/null +++ b/graphics/contest/misc_2_tilemap_2.bin diff --git a/graphics/contest/misc_2_tilemap_3.bin b/graphics/contest/misc_2_tilemap_3.bin new file mode 100755 index 000000000..5055ab79e --- /dev/null +++ b/graphics/contest/misc_2_tilemap_3.bin @@ -0,0 +1 @@ +`papat`tppttbpcpctbtppttdpepetdtppttfpgpgtftppttppqpqtptppttrpspstrtpptttpuputttppttvpwpwtvtppttppttfpgpgtftpptt`papat`tppttbpcpctbtppttdpepetdtppttvpwpwtvtppttppqpqtptppttrpspstrtpptttpuputttbpcpctbtppttdpepetdtppttfpgpgtftpptt`papat`tppttrpspstrtpptttpuputttppttvpwpwtvtppttppqpqtptppttpptt`papat`tppttbpcpctbtppttdpepetdtppttfpgpgtftppttppqpqtptppttrpspstrtpptttpuputttppttvpwpwtvtdpepetdtppttfpgpgtftpptt`papat`tppttbpcpctbtpptttpuputttppttvpwpwtvtppttppqpqtptppttrpspstrtppttppttbpcpctbtppttdpepetdtppttfpgpgtftpptt`papat`tppttrpspstrtpptttpuputttppttvpwpwtvtppttppqpqtptfpgpgtftpptt`papat`tppttbpcpctbtppttdpepetdtppttvpwpwtvtppttppqpqtptppttrpspstrtpptttpuputttppttppttdpepetdtppttfpgpgtftpptt`papat`tppttbpcpctbtpptttpuputttppttvpwpwtvtppttppqpqtptppttrpspstrt`papat`tppttbpcpctbtppttdpepetdtppttfpgpgtftppttppqpqtptppttrpspstrtpptttpuputttppttvpwpwtvtppttppttfpgpgtftpptt`papat`tppttbpcpctbtppttdpepetdtppttvpwpwtvtppttppqpqtptppttrpspstrtpptttpuputttbpcpctbtppttdpepetdtppttfpgpgtftpptt`papat`tppttrpspstrtpptttpuputttppttvpwpwtvtppttppqpqtptppttpptt`papat`tppttbpcpctbtppttdpepetdtppttfpgpgtftppttppqpqtptppttrpspstrtpptttpuputttppttvpwpwtvtdpepetdtppttfpgpgtftpptt`papat`tppttbpcpctbtpptttpuputttppttvpwpwtvtppttppqpqtptppttrpspstrtppttppttbpcpctbtppttdpepetdtppttfpgpgtftpptt`papat`tppttrpspstrtpptttpuputttppttvpwpwtvtppttppqpqtptfpgpgtftpptt`papat`tppttbpcpctbtppttdpepetdtppttvpwpwtvtppttppqpqtptppttrpspstrtpptttpuputttppttppttdpepetdtppttfpgpgtftpptt`papat`tppttbpcpctbtpptttpuputttppttvpwpwtvtppttppqpqtptppttrpspstrt
\ No newline at end of file diff --git a/graphics/unknown/unknown_C17170.bin b/graphics/unknown/unknown_C17170.bin Binary files differnew file mode 100755 index 000000000..9f5141c5b --- /dev/null +++ b/graphics/unknown/unknown_C17170.bin diff --git a/graphics/unknown/unknown_C17410.bin b/graphics/unknown/unknown_C17410.bin Binary files differnew file mode 100755 index 000000000..b2567ca7c --- /dev/null +++ b/graphics/unknown/unknown_C17410.bin diff --git a/graphics/unknown/unknown_C1751C.bin b/graphics/unknown/unknown_C1751C.bin Binary files differnew file mode 100755 index 000000000..e8a506838 --- /dev/null +++ b/graphics/unknown/unknown_C1751C.bin diff --git a/graphics/unknown/unknown_C17980.bin b/graphics/unknown/unknown_C17980.bin Binary files differnew file mode 100755 index 000000000..77e35348a --- /dev/null +++ b/graphics/unknown/unknown_C17980.bin diff --git a/graphics/unknown/unknown_C19470.png b/graphics/unknown/unknown_C19470.png Binary files differnew file mode 100755 index 000000000..14cc50cf4 --- /dev/null +++ b/graphics/unknown/unknown_C19470.png diff --git a/graphics/unknown/unknown_D1C060.bin b/graphics/unknown/unknown_D1C060.bin Binary files differnew file mode 100755 index 000000000..e4776cba4 --- /dev/null +++ b/graphics/unknown/unknown_D1C060.bin diff --git a/graphics/unknown/unknown_D1C060.png b/graphics/unknown/unknown_D1C060.png Binary files differnew file mode 100755 index 000000000..2371241d7 --- /dev/null +++ b/graphics/unknown/unknown_D1C060.png diff --git a/graphics/unused/goosuto.bin b/graphics/unused/goosuto.bin Binary files differnew file mode 100755 index 000000000..8e5329157 --- /dev/null +++ b/graphics/unused/goosuto.bin diff --git a/graphics/unused/goosuto.png b/graphics/unused/goosuto.png Binary files differnew file mode 100755 index 000000000..257a25c71 --- /dev/null +++ b/graphics/unused/goosuto.png diff --git a/graphics/unused/old_beatup.png b/graphics/unused/old_beatup.png Binary files differnew file mode 100755 index 000000000..e2a0561e2 --- /dev/null +++ b/graphics/unused/old_beatup.png diff --git a/graphics/unused/old_contest_2.bin b/graphics/unused/old_contest_2.bin Binary files differnew file mode 100755 index 000000000..06836cc19 --- /dev/null +++ b/graphics/unused/old_contest_2.bin diff --git a/graphics/unused/old_contest_2.pal b/graphics/unused/old_contest_2.pal new file mode 100755 index 000000000..3fb174790 --- /dev/null +++ b/graphics/unused/old_contest_2.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +255 255 255 +230 230 230 +197 197 197 +148 148 148 +74 65 82 +0 255 0 +0 255 0 +65 74 123 +139 123 131 +82 82 197 +189 82 74 +131 74 98 +74 74 131 +131 139 222 +106 164 164 +0 0 0 +115 123 156 +90 65 57 +148 197 106 +123 98 65 +131 123 49 +222 189 148 +164 131 106 +115 164 82 +164 148 57 +90 106 139 +180 172 82 +82 139 49 +255 230 189 +222 131 41 +246 246 222 +205 148 115 +255 106 115 +255 57 57 +156 0 0 +164 222 255 +106 148 255 +49 82 255 +255 255 115 +246 222 65 +230 106 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +0 0 0 +255 255 115 +246 222 90 +238 189 65 +238 164 41 +230 131 16 +230 106 0 +255 41 0 +255 148 82 +255 255 164 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +0 0 0 +255 131 106 +197 24 16 +164 222 255 +106 148 255 +49 82 255 +255 197 255 +255 139 255 +213 0 139 +148 255 164 +65 205 57 +246 222 65 +230 106 0 +255 255 255 +65 74 106 +65 74 106 +197 255 255 +246 246 90 +205 205 65 +255 255 180 +180 180 24 +74 65 82 +255 255 255 +156 156 156 +255 156 156 +0 0 0 +255 255 255 +255 148 148 +255 123 98 +255 0 0 +148 148 148 +0 0 0 +197 255 255 +246 246 90 +205 205 65 +255 255 180 +180 180 24 +74 65 82 +255 255 255 +156 156 156 +255 156 156 +0 0 0 +255 255 255 +255 148 148 +255 123 98 +255 0 0 +148 148 148 +0 0 0 +197 255 255 +246 246 90 +205 205 65 +255 255 180 +180 180 24 +74 65 82 +255 255 255 +156 156 156 +255 156 156 +0 0 0 +255 255 255 +255 148 148 +255 123 98 +255 0 0 +148 148 148 +0 0 0 +197 255 255 +213 255 213 +156 222 148 +222 255 230 +123 189 115 +74 65 82 +255 255 255 +156 156 156 +255 156 156 +0 0 0 +255 255 255 +255 148 148 +255 123 98 +255 0 0 +148 148 148 +0 0 0 +0 172 255 +0 0 0 +255 255 255 +230 230 213 +0 0 0 +197 197 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +197 255 255 +0 0 0 +0 0 0 +0 0 0 +65 0 0 +123 0 0 +189 0 0 +255 8 0 +255 65 0 +255 123 0 +255 189 0 +255 255 0 +255 255 123 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +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 +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 +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 +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 +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 +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 +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 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index c0930959d..ea3d9ddac 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -7,7 +7,8 @@ fontdir := data/graphics/fonts menudir := graphics/interface btanimgfxdir := graphics/battle_anims/sprites unusedgfxdir := graphics/unused -btintgfxdir := graphics/battle_interface/ +unknowngfxdir := graphics/unknown +btintgfxdir := graphics/battle_interface $(monstillfrontdir)/castform_still_front_pic.4bpp: $(monstillfrontdir)/castform_normal_form_still_front_pic.4bpp \ $(monstillfrontdir)/castform_sunny_form_still_front_pic.4bpp \ @@ -332,3 +333,18 @@ $(unusedgfxdir)/old_contest.4bpp: $(unusedgfxdir)/old_contest_frame_1.4bpp $(unu $(unusedgfxdir)/old_contest_2.4bpp: $(unusedgfxdir)/old_contest_2_1.4bpp $(unusedgfxdir)/old_contest_2_2.4bpp @cat $(unusedgfxdir)/old_contest_2_1.4bpp $(unusedgfxdir)/old_contest_2_2.4bpp >$@ + +$(unknowngfxdir)/unknown_C19470.4bpp: $(unknowngfxdir)/unknown_C19470.png + $(GFX) $< $@ -num_tiles 36 + +$(btanimgfxdir)/141.4bpp: $(btanimgfxdir)/141_0.4bpp $(btanimgfxdir)/141_1.4bpp $(btanimgfxdir)/141_2.4bpp $(btanimgfxdir)/141_3.4bpp $(btanimgfxdir)/141_4.4bpp + @cat $(btanimgfxdir)/141_0.4bpp $(btanimgfxdir)/141_1.4bpp $(btanimgfxdir)/141_2.4bpp $(btanimgfxdir)/141_3.4bpp $(btanimgfxdir)/141_4.4bpp >$@ + +$(btanimgfxdir)/074.4bpp: $(btanimgfxdir)/074_0.4bpp $(btanimgfxdir)/074_1.4bpp + @cat $(btanimgfxdir)/074_0.4bpp $(btanimgfxdir)/074_1.4bpp >$@ + +$(btanimgfxdir)/159.4bpp: $(btanimgfxdir)/159_0.4bpp $(btanimgfxdir)/159_1.4bpp + @cat $(btanimgfxdir)/159_0.4bpp $(btanimgfxdir)/159_1.4bpp >$@ + +$(btanimgfxdir)/001.4bpp: $(btanimgfxdir)/001_0.4bpp $(btanimgfxdir)/001_1.4bpp + @cat $(btanimgfxdir)/001_0.4bpp $(btanimgfxdir)/001_1.4bpp >$@ |
