diff --git a/data/graphics.s b/data/graphics.s index c1b825751..b87b6cd5f 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -518,8 +518,501 @@ gUnknown_08C08F0C:: gUnknown_08C093C8:: .incbin "graphics/battle_interface/unused_window.gbapal.lz" + .align 2 gUnknown_08C093F0:: @ 8C093F0 - .incbin "baserom.gba", 0xc093f0, 0x87ac + .incbin "graphics/interface/hp_numbers.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_046:: + .incbin "graphics/battle_anims/sprites/046.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_046:: + .incbin "graphics/battle_anims/sprites/046.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_047:: + .incbin "graphics/battle_anims/sprites/047.gbapal.lz" + + @ more unused windows + .incbin "graphics/battle_interface/unused_window2.4bpp.lz" + .incbin "graphics/battle_interface/unused_window2bar.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_048:: + .incbin "graphics/battle_anims/sprites/048.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_048:: + .incbin "graphics/battle_anims/sprites/048.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_049:: + .incbin "graphics/battle_anims/sprites/049.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_050:: + .incbin "graphics/battle_anims/sprites/050.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_050:: + .incbin "graphics/battle_anims/sprites/050.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_051:: + .incbin "graphics/battle_anims/sprites/051.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_052:: + .incbin "graphics/battle_anims/sprites/052.4bpp.lz" + + .align 2 + .incbin "graphics/unused/line_sketch.4bpp.lz" @ unused + + .align 2 + .incbin "graphics/unused/line_sketch.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_054:: + .incbin "graphics/battle_anims/sprites/054.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_054:: + .incbin "graphics/battle_anims/sprites/054.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_056:: + .incbin "graphics/battle_anims/sprites/056.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_056:: + .incbin "graphics/battle_anims/sprites/056.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_055:: + .incbin "graphics/battle_anims/sprites/055.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_057:: + .incbin "graphics/battle_anims/sprites/057.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_057:: + .incbin "graphics/battle_anims/sprites/057.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_058:: + .incbin "graphics/battle_anims/sprites/058.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_058:: + .incbin "graphics/battle_anims/sprites/058.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_059:: + .incbin "graphics/battle_anims/sprites/059.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_059:: + .incbin "graphics/battle_anims/sprites/059.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_060:: + .incbin "graphics/battle_anims/sprites/060.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_060:: + .incbin "graphics/battle_anims/sprites/060.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_061:: + .incbin "graphics/battle_anims/sprites/061.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_061:: + .incbin "graphics/battle_anims/sprites/061.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_062:: + .incbin "graphics/battle_anims/sprites/062.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_062:: + .incbin "graphics/battle_anims/sprites/062.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_063:: + .incbin "graphics/battle_anims/sprites/063.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_063:: + .incbin "graphics/battle_anims/sprites/063.gbapal.lz" + + .align 2 + .incbin "graphics/unused/metronome_hand_small.4bpp.lz" @ unused, was for metronome at one point + + .align 2 +gBattleAnimSpritePalette_091:: + .incbin "graphics/battle_anims/sprites/091.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_065:: + .incbin "graphics/battle_anims/sprites/065.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_065:: + .incbin "graphics/battle_anims/sprites/065.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_066:: + .incbin "graphics/battle_anims/sprites/066.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_066:: + .incbin "graphics/battle_anims/sprites/066.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_070:: + .incbin "graphics/battle_anims/sprites/070.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_070:: + .incbin "graphics/battle_anims/sprites/070.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_071:: + .incbin "graphics/battle_anims/sprites/071.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_072:: + .incbin "graphics/battle_anims/sprites/072.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_072:: + .incbin "graphics/battle_anims/sprites/072.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_073:: + .incbin "graphics/battle_anims/sprites/073.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_073:: + .incbin "graphics/battle_anims/sprites/073.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_075:: + .incbin "graphics/battle_anims/sprites/075.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_075:: + .incbin "graphics/battle_anims/sprites/075.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_078:: + .incbin "graphics/battle_anims/sprites/078.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_078:: + .incbin "graphics/battle_anims/sprites/078.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_079:: + .incbin "graphics/battle_anims/sprites/079.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_080:: + .incbin "graphics/battle_anims/sprites/080.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_080:: + .incbin "graphics/battle_anims/sprites/080.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_081:: + .incbin "graphics/battle_anims/sprites/081.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_081:: + .incbin "graphics/battle_anims/sprites/081.gbapal.lz" + + .align 2 + .incbin "graphics/unknown/unknown_C0CA1C.bin" + + .align 2 + .incbin "graphics/unknown/unknown_C0CA40.bin" + + .align 2 + .incbin "graphics/unknown/unknown_C0CA64.bin" + + .align 2 + .incbin "graphics/unused/line_sketch_2.8bpp.lz" + + .align 2 + .incbin "graphics/unknown/unknown_C0CAE0.bin" + + .align 2 + .incbin "graphics/unused/line_sketch_2.bin.lz" + + .align 2 +gBattleAnimSpriteSheet_082:: + .incbin "graphics/battle_anims/sprites/082.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_082:: + .incbin "graphics/battle_anims/sprites/082.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_083:: + .incbin "graphics/battle_anims/sprites/083.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_084:: + .incbin "graphics/battle_anims/sprites/084.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_085:: + .incbin "graphics/battle_anims/sprites/085.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_086:: + .incbin "graphics/battle_anims/sprites/086.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_088:: + .incbin "graphics/battle_anims/sprites/088.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_089:: + .incbin "graphics/battle_anims/sprites/089.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_090:: + .incbin "graphics/battle_anims/sprites/090.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_092:: + .incbin "graphics/battle_anims/sprites/092.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_093:: + .incbin "graphics/battle_anims/sprites/093.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_094:: + .incbin "graphics/battle_anims/sprites/094.gbapal.lz" + + .align 2 + .incbin "graphics/unknown/unknown_D0D2B4.bin.lz" + + .align 2 +gBattleAnimSpritePalette_095:: + .incbin "graphics/battle_anims/sprites/095.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_096:: + .incbin "graphics/battle_anims/sprites/096.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_097:: + .incbin "graphics/battle_anims/sprites/097.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_100:: + .incbin "graphics/battle_anims/sprites/100.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_101:: + .incbin "graphics/battle_anims/sprites/101.gbapal.lz" + + .align 2 +gBattleAnimSpritePalette_103:: + .incbin "graphics/battle_anims/sprites/103.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_083:: + .incbin "graphics/battle_anims/sprites/083.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_084:: + .incbin "graphics/battle_anims/sprites/084.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_085:: + .incbin "graphics/battle_anims/sprites/085.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_086:: + .incbin "graphics/battle_anims/sprites/086.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_088:: + .incbin "graphics/battle_anims/sprites/088.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_089:: + .incbin "graphics/battle_anims/sprites/089.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_090:: + .incbin "graphics/battle_anims/sprites/090.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_091:: + .incbin "graphics/battle_anims/sprites/091.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_092:: + .incbin "graphics/battle_anims/sprites/092.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_093:: + .incbin "graphics/battle_anims/sprites/093.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_094:: + .incbin "graphics/battle_anims/sprites/094.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_095:: + .incbin "graphics/battle_anims/sprites/095.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_096:: + .incbin "graphics/battle_anims/sprites/096.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_097:: + .incbin "graphics/battle_anims/sprites/097.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_098:: + .incbin "graphics/battle_anims/sprites/098.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_100:: + .incbin "graphics/battle_anims/sprites/100.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_101:: + .incbin "graphics/battle_anims/sprites/101.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_102:: + .incbin "graphics/battle_anims/sprites/102.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_103:: + .incbin "graphics/battle_anims/sprites/103.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_104:: + .incbin "graphics/battle_anims/sprites/104.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_104:: + .incbin "graphics/battle_anims/sprites/104.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_105:: + .incbin "graphics/battle_anims/sprites/105.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_105:: + .incbin "graphics/battle_anims/sprites/105.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_106:: + .incbin "graphics/battle_anims/sprites/106.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_107:: + .incbin "graphics/battle_anims/sprites/107.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_107:: + .incbin "graphics/battle_anims/sprites/107.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_108:: + .incbin "graphics/battle_anims/sprites/108.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_109:: + .incbin "graphics/battle_anims/sprites/109.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_109:: + .incbin "graphics/battle_anims/sprites/109.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_110:: + .incbin "graphics/battle_anims/sprites/110.4bpp.lz" + + .align 2 +gBattleAnimSpriteSheet_111:: + .incbin "graphics/battle_anims/sprites/111.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_111:: + .incbin "graphics/battle_anims/sprites/111.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_112:: + .incbin "graphics/battle_anims/sprites/112.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_112:: + .incbin "graphics/battle_anims/sprites/112.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_113:: + .incbin "graphics/battle_anims/sprites/113.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_113:: + .incbin "graphics/battle_anims/sprites/113.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_114:: + .incbin "graphics/battle_anims/sprites/114.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_114:: + .incbin "graphics/battle_anims/sprites/114.gbapal.lz" + + .align 2 + .incbin "graphics/unused/blue_frame.bin.lz" @ P1, P2, P3 and P4 tilemaps? + + .align 2 + .incbin "graphics/unused/redyellowgreen_frame.bin.lz" + + .align 2 + .incbin "graphics/unused/color_frames.4bpp.lz" + + .align 2 + .incbin "graphics/unused/color_frames.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_115:: + .incbin "graphics/battle_anims/sprites/115.4bpp.lz" + + .align 2 + .incbin "graphics/unused/water_splash.8bpp.lz" + + .align 2 + .incbin "graphics/unused/water_splash.bin.lz" + + .align 2 + .incbin "graphics/unused/water_splash.gbapal.lz" + + .align 2 + .incbin "graphics/unused/basic_frame.4bpp.lz" + + .align 2 + .incbin "graphics/unused/basic_frame.gbapal.lz" + + .align 2 + .incbin "graphics/unused/basic_frame.bin.lz" .align 2 gBattleInterface_BallStatusBarPal:: @ 8C11B9C diff --git a/graphics/battle_anims/sprites/046.png b/graphics/battle_anims/sprites/046.png new file mode 100755 index 000000000..85a052486 Binary files /dev/null and b/graphics/battle_anims/sprites/046.png differ diff --git a/graphics/battle_anims/sprites/047.pal b/graphics/battle_anims/sprites/047.pal new file mode 100755 index 000000000..226cf039a --- /dev/null +++ b/graphics/battle_anims/sprites/047.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 246 197 +255 255 255 +255 255 205 +238 205 164 +222 164 131 +222 115 106 +230 65 82 +180 32 90 +131 0 106 +90 0 82 +57 0 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/048.png b/graphics/battle_anims/sprites/048.png new file mode 100755 index 000000000..4a6631ab8 Binary files /dev/null and b/graphics/battle_anims/sprites/048.png differ diff --git a/graphics/battle_anims/sprites/049.pal b/graphics/battle_anims/sprites/049.pal new file mode 100755 index 000000000..268ce4f4f --- /dev/null +++ b/graphics/battle_anims/sprites/049.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +255 255 148 +255 230 74 +255 205 0 +230 156 0 +205 106 0 +189 57 0 +255 148 24 +255 98 16 +255 49 8 +255 0 0 +156 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/050.png b/graphics/battle_anims/sprites/050.png new file mode 100755 index 000000000..9f2c101e4 Binary files /dev/null and b/graphics/battle_anims/sprites/050.png differ diff --git a/graphics/battle_anims/sprites/051.png b/graphics/battle_anims/sprites/051.png new file mode 100755 index 000000000..14d7036bc Binary files /dev/null and b/graphics/battle_anims/sprites/051.png differ diff --git a/graphics/battle_anims/sprites/052.png b/graphics/battle_anims/sprites/052.png new file mode 100755 index 000000000..9928271d5 Binary files /dev/null and b/graphics/battle_anims/sprites/052.png differ diff --git a/graphics/battle_anims/sprites/054.png b/graphics/battle_anims/sprites/054.png new file mode 100755 index 000000000..afffd9e77 Binary files /dev/null and b/graphics/battle_anims/sprites/054.png differ diff --git a/graphics/battle_anims/sprites/055.png b/graphics/battle_anims/sprites/055.png new file mode 100755 index 000000000..bd6590322 Binary files /dev/null and b/graphics/battle_anims/sprites/055.png differ diff --git a/graphics/battle_anims/sprites/056.png b/graphics/battle_anims/sprites/056.png new file mode 100755 index 000000000..1a10645a4 Binary files /dev/null and b/graphics/battle_anims/sprites/056.png differ diff --git a/graphics/battle_anims/sprites/057.png b/graphics/battle_anims/sprites/057.png new file mode 100755 index 000000000..ffc3f7634 Binary files /dev/null and b/graphics/battle_anims/sprites/057.png differ diff --git a/graphics/battle_anims/sprites/058.png b/graphics/battle_anims/sprites/058.png new file mode 100755 index 000000000..89e01f78a Binary files /dev/null and b/graphics/battle_anims/sprites/058.png differ diff --git a/graphics/battle_anims/sprites/059.png b/graphics/battle_anims/sprites/059.png new file mode 100755 index 000000000..4d93be124 Binary files /dev/null and b/graphics/battle_anims/sprites/059.png differ diff --git a/graphics/battle_anims/sprites/060.png b/graphics/battle_anims/sprites/060.png new file mode 100755 index 000000000..c4c0fb53e Binary files /dev/null and b/graphics/battle_anims/sprites/060.png differ diff --git a/graphics/battle_anims/sprites/061.png b/graphics/battle_anims/sprites/061.png new file mode 100755 index 000000000..6efa4e537 Binary files /dev/null and b/graphics/battle_anims/sprites/061.png differ diff --git a/graphics/battle_anims/sprites/062.png b/graphics/battle_anims/sprites/062.png new file mode 100755 index 000000000..bdfaa78c4 Binary files /dev/null and b/graphics/battle_anims/sprites/062.png differ diff --git a/graphics/battle_anims/sprites/063.png b/graphics/battle_anims/sprites/063.png new file mode 100755 index 000000000..8828f4e8d Binary files /dev/null and b/graphics/battle_anims/sprites/063.png differ diff --git a/graphics/battle_anims/sprites/065.png b/graphics/battle_anims/sprites/065.png new file mode 100755 index 000000000..8916253e4 Binary files /dev/null and b/graphics/battle_anims/sprites/065.png differ diff --git a/graphics/battle_anims/sprites/066.png b/graphics/battle_anims/sprites/066.png new file mode 100755 index 000000000..d70924235 Binary files /dev/null and b/graphics/battle_anims/sprites/066.png differ diff --git a/graphics/battle_anims/sprites/070.png b/graphics/battle_anims/sprites/070.png new file mode 100755 index 000000000..dfb03010c Binary files /dev/null and b/graphics/battle_anims/sprites/070.png differ diff --git a/graphics/battle_anims/sprites/071.png b/graphics/battle_anims/sprites/071.png new file mode 100755 index 000000000..88d20bb5e Binary files /dev/null and b/graphics/battle_anims/sprites/071.png differ diff --git a/graphics/battle_anims/sprites/072.png b/graphics/battle_anims/sprites/072.png new file mode 100755 index 000000000..14976ded1 Binary files /dev/null and b/graphics/battle_anims/sprites/072.png differ diff --git a/graphics/battle_anims/sprites/073.png b/graphics/battle_anims/sprites/073.png new file mode 100755 index 000000000..95484d2a0 Binary files /dev/null and b/graphics/battle_anims/sprites/073.png differ diff --git a/graphics/battle_anims/sprites/075.png b/graphics/battle_anims/sprites/075.png new file mode 100755 index 000000000..9455a1962 Binary files /dev/null and b/graphics/battle_anims/sprites/075.png differ diff --git a/graphics/battle_anims/sprites/078.png b/graphics/battle_anims/sprites/078.png new file mode 100755 index 000000000..b48af4900 Binary files /dev/null and b/graphics/battle_anims/sprites/078.png differ diff --git a/graphics/battle_anims/sprites/079.png b/graphics/battle_anims/sprites/079.png new file mode 100755 index 000000000..193ba3942 Binary files /dev/null and b/graphics/battle_anims/sprites/079.png differ diff --git a/graphics/battle_anims/sprites/080.png b/graphics/battle_anims/sprites/080.png new file mode 100755 index 000000000..f4089ee01 Binary files /dev/null and b/graphics/battle_anims/sprites/080.png differ diff --git a/graphics/battle_anims/sprites/081.png b/graphics/battle_anims/sprites/081.png new file mode 100755 index 000000000..0d6783cd9 Binary files /dev/null and b/graphics/battle_anims/sprites/081.png differ diff --git a/graphics/battle_anims/sprites/082.png b/graphics/battle_anims/sprites/082.png new file mode 100755 index 000000000..a1b2d7318 Binary files /dev/null and b/graphics/battle_anims/sprites/082.png differ diff --git a/graphics/battle_anims/sprites/083.png b/graphics/battle_anims/sprites/083.png new file mode 100755 index 000000000..8e8178422 Binary files /dev/null and b/graphics/battle_anims/sprites/083.png differ diff --git a/graphics/battle_anims/sprites/084.png b/graphics/battle_anims/sprites/084.png new file mode 100755 index 000000000..306668035 Binary files /dev/null and b/graphics/battle_anims/sprites/084.png differ diff --git a/graphics/battle_anims/sprites/085.png b/graphics/battle_anims/sprites/085.png new file mode 100755 index 000000000..ab9fdce5e Binary files /dev/null and b/graphics/battle_anims/sprites/085.png differ diff --git a/graphics/battle_anims/sprites/086.png b/graphics/battle_anims/sprites/086.png new file mode 100755 index 000000000..ba93d952e Binary files /dev/null and b/graphics/battle_anims/sprites/086.png differ diff --git a/graphics/battle_anims/sprites/088.png b/graphics/battle_anims/sprites/088.png new file mode 100755 index 000000000..09fed7d85 Binary files /dev/null and b/graphics/battle_anims/sprites/088.png differ diff --git a/graphics/battle_anims/sprites/089.png b/graphics/battle_anims/sprites/089.png new file mode 100755 index 000000000..19155f2c4 Binary files /dev/null and b/graphics/battle_anims/sprites/089.png differ diff --git a/graphics/battle_anims/sprites/090.png b/graphics/battle_anims/sprites/090.png new file mode 100755 index 000000000..c90ff299d Binary files /dev/null and b/graphics/battle_anims/sprites/090.png differ diff --git a/graphics/battle_anims/sprites/091.png b/graphics/battle_anims/sprites/091.png new file mode 100755 index 000000000..7648de5aa Binary files /dev/null and b/graphics/battle_anims/sprites/091.png differ diff --git a/graphics/battle_anims/sprites/092.png b/graphics/battle_anims/sprites/092.png new file mode 100755 index 000000000..8d98d6eaa Binary files /dev/null and b/graphics/battle_anims/sprites/092.png differ diff --git a/graphics/battle_anims/sprites/093.png b/graphics/battle_anims/sprites/093.png new file mode 100755 index 000000000..29f9e6a50 Binary files /dev/null and b/graphics/battle_anims/sprites/093.png differ diff --git a/graphics/battle_anims/sprites/094.png b/graphics/battle_anims/sprites/094.png new file mode 100755 index 000000000..c29ff535d Binary files /dev/null and b/graphics/battle_anims/sprites/094.png differ diff --git a/graphics/battle_anims/sprites/095.png b/graphics/battle_anims/sprites/095.png new file mode 100755 index 000000000..616b02121 Binary files /dev/null and b/graphics/battle_anims/sprites/095.png differ diff --git a/graphics/battle_anims/sprites/096.png b/graphics/battle_anims/sprites/096.png new file mode 100755 index 000000000..99873ba10 Binary files /dev/null and b/graphics/battle_anims/sprites/096.png differ diff --git a/graphics/battle_anims/sprites/097.png b/graphics/battle_anims/sprites/097.png new file mode 100755 index 000000000..5366d02cf Binary files /dev/null and b/graphics/battle_anims/sprites/097.png differ diff --git a/graphics/battle_anims/sprites/098.png b/graphics/battle_anims/sprites/098.png new file mode 100755 index 000000000..33cfd705c Binary files /dev/null and b/graphics/battle_anims/sprites/098.png differ diff --git a/graphics/battle_anims/sprites/100.png b/graphics/battle_anims/sprites/100.png new file mode 100755 index 000000000..057655918 Binary files /dev/null and b/graphics/battle_anims/sprites/100.png differ diff --git a/graphics/battle_anims/sprites/101.png b/graphics/battle_anims/sprites/101.png new file mode 100755 index 000000000..f2fa227f2 Binary files /dev/null and b/graphics/battle_anims/sprites/101.png differ diff --git a/graphics/battle_anims/sprites/102.png b/graphics/battle_anims/sprites/102.png new file mode 100755 index 000000000..aa8842244 Binary files /dev/null and b/graphics/battle_anims/sprites/102.png differ diff --git a/graphics/battle_anims/sprites/103.png b/graphics/battle_anims/sprites/103.png new file mode 100755 index 000000000..0ad9c1b14 Binary files /dev/null and b/graphics/battle_anims/sprites/103.png differ diff --git a/graphics/battle_anims/sprites/104.png b/graphics/battle_anims/sprites/104.png new file mode 100755 index 000000000..7c4244da0 Binary files /dev/null and b/graphics/battle_anims/sprites/104.png differ diff --git a/graphics/battle_anims/sprites/105.png b/graphics/battle_anims/sprites/105.png new file mode 100755 index 000000000..5df0e7215 Binary files /dev/null and b/graphics/battle_anims/sprites/105.png differ diff --git a/graphics/battle_anims/sprites/106.png b/graphics/battle_anims/sprites/106.png new file mode 100755 index 000000000..82297fb00 Binary files /dev/null and b/graphics/battle_anims/sprites/106.png differ diff --git a/graphics/battle_anims/sprites/107.png b/graphics/battle_anims/sprites/107.png new file mode 100755 index 000000000..202152ab4 Binary files /dev/null and b/graphics/battle_anims/sprites/107.png differ diff --git a/graphics/battle_anims/sprites/108.png b/graphics/battle_anims/sprites/108.png new file mode 100755 index 000000000..f3f5871b4 Binary files /dev/null and b/graphics/battle_anims/sprites/108.png differ diff --git a/graphics/battle_anims/sprites/109.png b/graphics/battle_anims/sprites/109.png new file mode 100755 index 000000000..f848e388b Binary files /dev/null and b/graphics/battle_anims/sprites/109.png differ diff --git a/graphics/battle_anims/sprites/110.png b/graphics/battle_anims/sprites/110.png new file mode 100755 index 000000000..787cb58c3 Binary files /dev/null and b/graphics/battle_anims/sprites/110.png differ diff --git a/graphics/battle_anims/sprites/111.png b/graphics/battle_anims/sprites/111.png new file mode 100755 index 000000000..2bbbe8694 Binary files /dev/null and b/graphics/battle_anims/sprites/111.png differ diff --git a/graphics/battle_anims/sprites/112.png b/graphics/battle_anims/sprites/112.png new file mode 100755 index 000000000..4503849e9 Binary files /dev/null and b/graphics/battle_anims/sprites/112.png differ diff --git a/graphics/battle_anims/sprites/113.png b/graphics/battle_anims/sprites/113.png new file mode 100755 index 000000000..3a4a5b328 Binary files /dev/null and b/graphics/battle_anims/sprites/113.png differ diff --git a/graphics/battle_anims/sprites/114.png b/graphics/battle_anims/sprites/114.png new file mode 100755 index 000000000..b1bee0080 Binary files /dev/null and b/graphics/battle_anims/sprites/114.png differ diff --git a/graphics/battle_interface/unused_window2.png b/graphics/battle_interface/unused_window2.png new file mode 100755 index 000000000..32f3da0b0 Binary files /dev/null and b/graphics/battle_interface/unused_window2.png differ diff --git a/graphics/battle_interface/unused_window2bar.png b/graphics/battle_interface/unused_window2bar.png new file mode 100755 index 000000000..e3a2974e8 Binary files /dev/null and b/graphics/battle_interface/unused_window2bar.png differ diff --git a/graphics/unknown/unknown_C0CA1C.bin b/graphics/unknown/unknown_C0CA1C.bin new file mode 100755 index 000000000..4b6b2b106 Binary files /dev/null and b/graphics/unknown/unknown_C0CA1C.bin differ diff --git a/graphics/unknown/unknown_C0CA40.bin b/graphics/unknown/unknown_C0CA40.bin new file mode 100755 index 000000000..25fc33a73 Binary files /dev/null and b/graphics/unknown/unknown_C0CA40.bin differ diff --git a/graphics/unknown/unknown_C0CA64.bin b/graphics/unknown/unknown_C0CA64.bin new file mode 100755 index 000000000..5b81e0216 Binary files /dev/null and b/graphics/unknown/unknown_C0CA64.bin differ diff --git a/graphics/unknown/unknown_C0CAE0.bin b/graphics/unknown/unknown_C0CAE0.bin new file mode 100755 index 000000000..15379a9ce Binary files /dev/null and b/graphics/unknown/unknown_C0CAE0.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/unused/basic_frame.bin b/graphics/unused/basic_frame.bin new file mode 100755 index 000000000..8e83eb9f5 Binary files /dev/null and b/graphics/unused/basic_frame.bin differ diff --git a/graphics/unused/basic_frame.png b/graphics/unused/basic_frame.png new file mode 100755 index 000000000..132671581 Binary files /dev/null and b/graphics/unused/basic_frame.png differ diff --git a/graphics/unused/blank_frame.bin b/graphics/unused/blank_frame.bin new file mode 100755 index 000000000..e9784eb4c Binary files /dev/null and b/graphics/unused/blank_frame.bin differ diff --git a/graphics/unused/blue_frame.bin b/graphics/unused/blue_frame.bin new file mode 100755 index 000000000..d5c3b6600 Binary files /dev/null and b/graphics/unused/blue_frame.bin differ diff --git a/graphics/unused/color_frames.png b/graphics/unused/color_frames.png new file mode 100755 index 000000000..9270879eb Binary files /dev/null and b/graphics/unused/color_frames.png differ diff --git a/graphics/unused/green_frame.bin b/graphics/unused/green_frame.bin new file mode 100755 index 000000000..b381235d9 Binary files /dev/null and b/graphics/unused/green_frame.bin differ diff --git a/graphics/unused/line_sketch.png b/graphics/unused/line_sketch.png new file mode 100755 index 000000000..fdfc8d771 Binary files /dev/null and b/graphics/unused/line_sketch.png differ 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/metronome_hand_small.png b/graphics/unused/metronome_hand_small.png new file mode 100755 index 000000000..bd6cc8530 Binary files /dev/null and b/graphics/unused/metronome_hand_small.png differ diff --git a/graphics/unused/red_frame.bin b/graphics/unused/red_frame.bin new file mode 100755 index 000000000..5090b1b84 Binary files /dev/null and b/graphics/unused/red_frame.bin differ diff --git a/graphics/unused/redyellowgreen_frame.bin b/graphics/unused/redyellowgreen_frame.bin new file mode 100644 index 000000000..6852998fb Binary files /dev/null and b/graphics/unused/redyellowgreen_frame.bin differ diff --git a/graphics/unused/water_splash.bin b/graphics/unused/water_splash.bin new file mode 100755 index 000000000..059347fa7 Binary files /dev/null and b/graphics/unused/water_splash.bin differ diff --git a/graphics/unused/water_splash.png b/graphics/unused/water_splash.png new file mode 100755 index 000000000..a8439a050 Binary files /dev/null and b/graphics/unused/water_splash.png differ diff --git a/graphics/unused/yellow_frame.bin b/graphics/unused/yellow_frame.bin new file mode 100755 index 000000000..30ba3ed01 Binary files /dev/null and b/graphics/unused/yellow_frame.bin differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 718f62c8e..aa1397980 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -7,6 +7,7 @@ fontdir := data/graphics/fonts menudir := graphics/interface btanimgfxdir := graphics/battle_anims/sprites unusedgfxdir := graphics/unused +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 \ @@ -316,3 +317,12 @@ $(unusedgfxdir)/obi2.4bpp: $(unusedgfxdir)/old_bulbasaur2.4bpp $(unusedgfxdir)/o $(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 >$@ + +$(unusedgfxdir)/redyellowgreen_frame.bin: $(unusedgfxdir)/red_frame.bin $(unusedgfxdir)/yellow_frame.bin $(unusedgfxdir)/green_frame.bin $(unusedgfxdir)/blank_frame.bin + @cat $(unusedgfxdir)/red_frame.bin $(unusedgfxdir)/yellow_frame.bin $(unusedgfxdir)/green_frame.bin $(unusedgfxdir)/blank_frame.bin >$@ + +$(unusedgfxdir)/color_frames.4bpp: $(unusedgfxdir)/color_frames.png + $(GFX) $< $@ -num_tiles 353 + +$(btintgfxdir)/unused_window2bar.4bpp: $(btintgfxdir)/unused_window2bar.png + $(GFX) $< $@ -num_tiles 5