diff options
18 files changed, 273 insertions, 4 deletions
diff --git a/data/graphics.s b/data/graphics.s index 6e7a04fbe..2724214f2 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1017,8 +1017,16 @@ gUnknown_08D1216C:: @ 8D1216C .incbin "graphics/battle_interface/hpbar_anim.4bpp" .incbin "graphics/battle_interface/misc_frameend.4bpp" + .align 2 Tiles_D129AC:: @ 8D129AC - .incbin "baserom.gba", 0xd129ac, 0x680 + .incbin "graphics/battle_interface/ball_display.4bpp" + + .incbin "graphics/battle_interface/ball_display_unused_extra.4bpp" + .incbin "graphics/battle_interface/status2.4bpp" @ these three duplicate sets of graphics are for the opponent pokemon and are also for use in double battles. they use dynamic palettes so coloring them is an extreme headache and wont be done for now. + .incbin "graphics/battle_interface/status3.4bpp" + .incbin "graphics/battle_interface/status4.4bpp" + .incbin "graphics/unknown/unknown_D12FEC.4bpp" + .incbin "graphics/unknown/unknown_D1300C.4bpp" .align 2 gBattleAnimSpriteSheet_116:: @ 8D1302C @@ -1169,13 +1177,13 @@ gBattleAnimSpriteSheet_077:: @ 8D150F4 .incbin "graphics/battle_anims/sprites/077.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD151C8, 0x912 @ LZ, uncomp. size = 0x2000 + .incbin "graphics/unused/beta_contest.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD15ADC, 0x104 @ LZ, uncomp. size = 0x200 + .incbin "graphics/unused/beta_contest.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD15BE0, 0x183 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/beta_contest.bin.lz" .align 2 .incbin "baserom.gba", 0xD15D64, 0x2C0 @ LZ, uncomp. size = 0x1000 diff --git a/graphics/battle_interface/ball_display.png b/graphics/battle_interface/ball_display.png Binary files differnew file mode 100755 index 000000000..0c49d7ac4 --- /dev/null +++ b/graphics/battle_interface/ball_display.png diff --git a/graphics/battle_interface/ball_display_unused_extra.png b/graphics/battle_interface/ball_display_unused_extra.png Binary files differnew file mode 100755 index 000000000..5473d53df --- /dev/null +++ b/graphics/battle_interface/ball_display_unused_extra.png diff --git a/graphics/battle_interface/status2.png b/graphics/battle_interface/status2.png Binary files differnew file mode 100755 index 000000000..97a344ae3 --- /dev/null +++ b/graphics/battle_interface/status2.png diff --git a/graphics/battle_interface/status3.png b/graphics/battle_interface/status3.png Binary files differnew file mode 100755 index 000000000..3e5989d05 --- /dev/null +++ b/graphics/battle_interface/status3.png diff --git a/graphics/battle_interface/status4.png b/graphics/battle_interface/status4.png Binary files differnew file mode 100755 index 000000000..d9769ad28 --- /dev/null +++ b/graphics/battle_interface/status4.png diff --git a/graphics/unknown/unknown_D12FEC.png b/graphics/unknown/unknown_D12FEC.png Binary files differnew file mode 100755 index 000000000..96c49a992 --- /dev/null +++ b/graphics/unknown/unknown_D12FEC.png diff --git a/graphics/unknown/unknown_D1300C.png b/graphics/unknown/unknown_D1300C.png Binary files differnew file mode 100755 index 000000000..0c077dd0b --- /dev/null +++ b/graphics/unknown/unknown_D1300C.png diff --git a/graphics/unused/beta_contest.bin b/graphics/unused/beta_contest.bin Binary files differnew file mode 100755 index 000000000..da6f4652e --- /dev/null +++ b/graphics/unused/beta_contest.bin diff --git a/graphics/unused/beta_contest.pal b/graphics/unused/beta_contest.pal new file mode 100755 index 000000000..69fde2000 --- /dev/null +++ b/graphics/unused/beta_contest.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 +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 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +255 255 255 +172 172 148 +213 213 189 +230 230 213 +189 189 172 +238 238 222 +197 197 180 +0 0 0 +156 156 131 +197 197 189 +139 139 131 +98 98 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 106 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 148 156 +131 139 156 +123 131 156 +131 123 164 +123 115 164 +0 0 0 +115 106 156 +255 255 255 +205 156 255 +172 148 197 +230 222 246 +139 131 172 +213 189 238 +0 0 0 +238 238 230 +189 172 197 +222 213 213 +189 172 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 164 131 +213 131 90 +255 189 172 +197 98 74 +74 65 82 +255 255 255 +156 156 156 +0 0 0 +0 0 0 +255 255 255 +148 148 148 +255 123 98 +131 246 90 +255 246 74 +131 148 255 +0 0 0 +164 238 98 +131 205 90 +213 255 148 +98 197 49 +74 65 82 +255 255 255 +156 156 156 +0 0 0 +0 0 0 +255 255 255 +148 148 148 +255 123 98 +131 246 90 +255 246 74 +131 148 255 +0 0 0 +246 246 90 +205 205 65 +255 255 180 +180 180 24 +74 65 82 +255 255 255 +156 156 156 +0 0 0 +0 0 0 +255 255 255 +148 148 148 +255 123 98 +131 246 90 +255 246 74 +131 148 255 +0 0 0 +115 205 255 +115 180 205 +156 238 255 +49 98 148 +74 65 82 +255 255 255 +156 156 156 +0 0 0 +0 0 0 +255 255 255 +148 148 148 +255 123 98 +131 246 90 +255 246 74 +131 148 255 +0 0 0 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +74 65 82 +255 255 255 +222 222 222 +172 172 197 +255 0 0 +0 0 255 +255 255 0 +0 197 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 164 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/beta_contest_classes.png b/graphics/unused/beta_contest_classes.png Binary files differnew file mode 100755 index 000000000..c2e7b5e29 --- /dev/null +++ b/graphics/unused/beta_contest_classes.png diff --git a/graphics/unused/beta_contest_floor.png b/graphics/unused/beta_contest_floor.png Binary files differnew file mode 100755 index 000000000..94877b921 --- /dev/null +++ b/graphics/unused/beta_contest_floor.png diff --git a/graphics/unused/beta_contest_frame_1.png b/graphics/unused/beta_contest_frame_1.png Binary files differnew file mode 100755 index 000000000..28eaae905 --- /dev/null +++ b/graphics/unused/beta_contest_frame_1.png diff --git a/graphics/unused/beta_contest_frame_2.png b/graphics/unused/beta_contest_frame_2.png Binary files differnew file mode 100755 index 000000000..c8b20408c --- /dev/null +++ b/graphics/unused/beta_contest_frame_2.png diff --git a/graphics/unused/beta_contest_meter.png b/graphics/unused/beta_contest_meter.png Binary files differnew file mode 100755 index 000000000..606208b1f --- /dev/null +++ b/graphics/unused/beta_contest_meter.png diff --git a/graphics/unused/beta_contest_numbers.png b/graphics/unused/beta_contest_numbers.png Binary files differnew file mode 100755 index 000000000..98c145976 --- /dev/null +++ b/graphics/unused/beta_contest_numbers.png diff --git a/graphics/unused/beta_contest_symbols.png b/graphics/unused/beta_contest_symbols.png Binary files differnew file mode 100755 index 000000000..87cac733e --- /dev/null +++ b/graphics/unused/beta_contest_symbols.png @@ -188,3 +188,5 @@ $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin $(UNUSED $(UNUSEDGFXDIR)/color_frames.4bpp: $(UNUSEDGFXDIR)/color_frames.png $(GFX) $< $@ -num_tiles 353 +$(UNUSEDGFXDIR)/beta_contest.4bpp: $(UNUSEDGFXDIR)/beta_contest_frame_1.4bpp $(UNUSEDGFXDIR)/beta_contest_floor.4bpp $(UNUSEDGFXDIR)/beta_contest_frame_2.4bpp $(UNUSEDGFXDIR)/beta_contest_symbols.4bpp $(UNUSEDGFXDIR)/beta_contest_meter.4bpp $(UNUSEDGFXDIR)/beta_contest_classes.4bpp $(UNUSEDGFXDIR)/beta_contest_numbers.4bpp + @cat $(UNUSEDGFXDIR)/beta_contest_frame_1.4bpp $(UNUSEDGFXDIR)/beta_contest_floor.4bpp $(UNUSEDGFXDIR)/beta_contest_frame_2.4bpp $(UNUSEDGFXDIR)/beta_contest_symbols.4bpp $(UNUSEDGFXDIR)/beta_contest_meter.4bpp $(UNUSEDGFXDIR)/beta_contest_classes.4bpp $(UNUSEDGFXDIR)/beta_contest_numbers.4bpp >$@ |
