diff options
85 files changed, 1218 insertions, 58 deletions
diff --git a/compare-ruby.sh b/compare-ruby.sh new file mode 100755 index 000000000..5fbd2a1c8 --- /dev/null +++ b/compare-ruby.sh @@ -0,0 +1,11 @@ +#!/bin/sh +# Compares baserom-ruby.gba and pokeruby.gba + +# create baserom.txt if necessary +if [ ! -f baserom-ruby.txt ]; then + hexdump -C baserom-ruby.gba > baserom-ruby.txt +fi + +hexdump -C pokeruby.gba > pokeruby.txt + +diff -u baserom-ruby.txt pokeruby.txt | less diff --git a/compare-sapphire.sh b/compare-sapphire.sh new file mode 100755 index 000000000..b4047e81d --- /dev/null +++ b/compare-sapphire.sh @@ -0,0 +1,11 @@ +#!/bin/sh +# Compares baserom-sapphire.gba and pokesapphire.gba + +# create baserom.txt if necessary +if [ ! -f baserom-sapphire.txt ]; then + hexdump -C baserom-sapphire.gba > baserom-sapphire.txt +fi + +hexdump -C pokesapphire.gba > pokesapphire.txt + +diff -u baserom-sapphire.txt pokesapphire.txt | less diff --git a/data/graphics.s b/data/graphics.s index 360338b53..430d8644f 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -18,9 +18,9 @@ gUnknown_08D00524:: @ 8D00524 .include "data/graphics/pokemon/circled_question_mark_graphics.s" @ 8D019E4 - .incbin "graphics/unused/old.4bpp.lz" @ japanese table and bunch of stuff - .incbin "graphics/unused/unknown_D021BC.bin" - .incbin "graphics/unused/unknown_D023E8.bin" + .incbin "graphics/unused/old_charmap.4bpp.lz" @ japanese table and bunch of stuff + .incbin "graphics/unused/old_charmap.bin.lz" + .incbin "graphics/unused/old_charmap.gbapal.lz" .align 2 gSmokescreenImpactTiles:: @ 8D02410 @@ -30,78 +30,103 @@ gSmokescreenImpactTiles:: @ 8D02410 gSmokescreenImpactPalette:: @ 8D024F0 .incbin "graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz" + .align 2 gInterfaceGfx_PokeBall:: .incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_PokeBall:: .incbin "graphics/interface/ball/poke.gbapal.lz" + .align 2 gInterfaceGfx_GreatBall:: .incbin "graphics/interface/ball/great.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_GreatBall:: .incbin "graphics/interface/ball/great.gbapal.lz" + .align 2 gInterfaceGfx_SafariBall:: .incbin "graphics/interface/ball/safari.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_SafariBall:: .incbin "graphics/interface/ball/safari.gbapal.lz" + .align 2 gInterfaceGfx_UltraBall:: .incbin "graphics/interface/ball/ultra.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_UltraBall:: .incbin "graphics/interface/ball/ultra.gbapal.lz" + .align 2 gInterfaceGfx_MasterBall:: .incbin "graphics/interface/ball/master.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_MasterBall:: .incbin "graphics/interface/ball/master.gbapal.lz" + .align 2 gInterfaceGfx_NetBall:: .incbin "graphics/interface/ball/net.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_NetBall:: .incbin "graphics/interface/ball/net.gbapal.lz" + .align 2 gInterfaceGfx_DiveBall:: .incbin "graphics/interface/ball/dive.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_DiveBall:: .incbin "graphics/interface/ball/dive.gbapal.lz" + .align 2 gInterfaceGfx_NestBall:: .incbin "graphics/interface/ball/nest.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_NestBall:: .incbin "graphics/interface/ball/nest.gbapal.lz" + .align 2 gInterfaceGfx_RepeatBall:: .incbin "graphics/interface/ball/repeat.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_RepeatBall:: .incbin "graphics/interface/ball/repeat.gbapal.lz" + .align 2 gInterfaceGfx_TimerBall:: .incbin "graphics/interface/ball/timer.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_TimerBall:: .incbin "graphics/interface/ball/timer.gbapal.lz" + .align 2 gInterfaceGfx_LuxuryBall:: .incbin "graphics/interface/ball/luxury.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_LuxuryBall:: .incbin "graphics/interface/ball/luxury.gbapal.lz" + .align 2 gInterfaceGfx_PremierBall:: .incbin "graphics/interface/ball/premier.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_PremierBall:: .incbin "graphics/interface/ball/premier.gbapal.lz" + .align 2 gUnknown_08D030D0:: @ 8D030D0 .incbin "graphics/interface/ball_open.4bpp.lz" @@ -250,7 +275,7 @@ gBattleAnimSpriteSheet_017:: @ 8D04368 .incbin "graphics/battle_anims/sprites/017.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD04388, 0x21 @ LZ, uncomp. size = 0x20 + .incbin "baserom.gba", 0xD04388, 0x24 @ LZ, uncomp. size = 0x20 .align 2 gBattleAnimSpritePalette_019:: @ 8D043AC @@ -277,10 +302,10 @@ gBattleAnimSpriteSheet_023:: @ 8D045A4 .incbin "graphics/battle_anims/sprites/023.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD046AC, 0x26 @ LZ, uncomp. size = 0x20 + .incbin "baserom.gba", 0xD046AC, 0x28 @ palette .align 2 - .incbin "baserom.gba", 0xD046D4, 0xFA @ LZ, uncomp. size = 0x400 + .incbin "graphics/unused/music_notes.4bpp.lz" .align 2 gBattleAnimSpritePalette_021:: @ 8D047D0 @@ -395,31 +420,33 @@ gBattleAnimSpriteSheet_037:: @ 8D0781C .incbin "graphics/battle_anims/sprites/037.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD07B68, 0x42 @ LZ, uncomp. size = 0xA0 - + .incbin "graphics/unknown/unknown_D07B68.4bpp.lz" + .align 2 - .incbin "baserom.gba", 0xD07BAC, 0x14 @ LZ, uncomp. size = 0x20 - + .incbin "graphics/unknown/unknown_D07B68.gbapal.lz" + .align 2 - .incbin "baserom.gba", 0xD07BC0, 0x33 @ LZ, uncomp. size = 0x40 - + .incbin "graphics/unknown/unknown_D07B68_2.gbapal.lz" + +@ old battle interface data, unused + .align 2 - .incbin "baserom.gba", 0xD07BF4, 0x362 @ LZ, uncomp. size = 0x800 - + .incbin "graphics/unused/obi1.4bpp.lz" + .align 2 - .incbin "baserom.gba", 0xD07F58, 0x41 @ LZ, uncomp. size = 0x60 - + .incbin "graphics/unused/obi_palpak1.gbapal.lz" @ palettes 1-3 + .align 2 - .incbin "baserom.gba", 0xD07F9C, 0x16 @ LZ, uncomp. size = 0x20 - + .incbin "graphics/unused/old_pal4.gbapal.lz" @ 4 is by itself + .align 2 - .incbin "baserom.gba", 0xD07FB4, 0x57 @ LZ, uncomp. size = 0x60 - + .incbin "graphics/unused/obi_palpak3.gbapal.lz" @ palettes 5-7 + .align 2 - .incbin "baserom.gba", 0xD0800C, 0x5C6 @ LZ, uncomp. size = 0x1400 - + .incbin "graphics/unused/obi2.4bpp.lz" + .align 2 - .incbin "baserom.gba", 0xD085D4, 0x10D @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/old_battle_interface_tilemap.bin.lz" .align 2 gBattleAnimSpritePalette_038:: @ 8D086E4 @@ -479,7 +506,7 @@ gBattleAnimSpriteSheet_045:: @ 8D099DC .align 2 gUnknown_08D09C48:: @ 8D09C48 - .incbin "baserom.gba", 0xD09C48, 0x211 @ LZ, uncomp. size = 0x520 + .incbin "graphics/interface/hp_numbers.4bpp.lz" .align 2 gBattleAnimSpriteSheet_046:: @ 8D09E5C @@ -522,10 +549,10 @@ gBattleAnimSpriteSheet_052:: @ 8D0A6D8 .incbin "graphics/battle_anims/sprites/052.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD0A7A4, 0x181 @ LZ, uncomp. size = 0x600 - + .incbin "graphics/unused/line_sketch.4bpp.lz" @ unused + .align 2 - .incbin "baserom.gba", 0xD0A928, 0xF @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/line_sketch.gbapal.lz" .align 2 gBattleAnimSpriteSheet_054:: @ 8D0A938 @@ -604,7 +631,7 @@ gBattleAnimSpritePalette_063:: @ 8D0BB90 .incbin "graphics/battle_anims/sprites/063.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD0BBB8, 0x6D @ LZ, uncomp. size = 0x80 + .incbin "graphics/unused/metronome_hand_small.4bpp.lz" @ unused, was for metronome at one point .align 2 gBattleAnimSpritePalette_091:: @ 8D0BC28 @@ -934,50 +961,73 @@ gBattleAnimSpriteSheet_114:: @ 8D10F78 .align 2 gBattleAnimSpritePalette_114:: @ 8D1106C .incbin "graphics/battle_anims/sprites/114.gbapal.lz" - + .align 2 - .incbin "baserom.gba", 0xD11094, 0x115 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/blue_frame.bin.lz" @ P1, P2, P3 and P4 tilemaps? .align 2 - .incbin "baserom.gba", 0xD111AC, 0x3FE @ LZ, uncomp. size = 0x2000 - + .incbin "graphics/unused/redyellowgreen_frame.bin.lz" + .align 2 - .incbin "baserom.gba", 0xD115AC, 0x59F @ LZ, uncomp. size = 0x2C20 - + .incbin "graphics/unused/color_frames.4bpp.lz" + .align 2 - .incbin "baserom.gba", 0xD11B4C, 0x28 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/color_frames.gbapal.lz" .align 2 gBattleAnimSpriteSheet_115:: @ 8D11B74 .incbin "graphics/battle_anims/sprites/115.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD11CA4, 0x188 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/water_splash.8bpp.lz" .align 2 - .incbin "baserom.gba", 0xD11E2C, 0xDD @ LZ, uncomp. size = 0x400 + .incbin "graphics/unused/water_splash.bin.lz" .align 2 - .incbin "baserom.gba", 0xD11F0C, 0x5D @ LZ, uncomp. size = 0x200 + .incbin "graphics/unused/water_splash.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD11F6C, 0x8C @ LZ, uncomp. size = 0x140 + .incbin "graphics/unused/basic_frame.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD11FF8, 0x28 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/basic_frame.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD12020, 0x10C @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/basic_frame.bin.lz" + .align 2 gUnknown_08D1212C:: .incbin "graphics/interface/battle_window.gbapal" + + .align 2 gUnknown_08D1214C:: - .incbin "baserom.gba", 0xd1214c, 0x20 + .incbin "graphics/battle_interface/hpbar.gbapal" + + .align 2 gUnknown_08D1216C:: @ 8D1216C - .incbin "baserom.gba", 0xd1216c, 0x840 + .incbin "graphics/battle_interface/hpbar.4bpp" + .incbin "graphics/battle_interface/expbar.4bpp" + .incbin "graphics/battle_interface/status_psn.4bpp" + .incbin "graphics/battle_interface/status_par.4bpp" + .incbin "graphics/battle_interface/status_slp.4bpp" + .incbin "graphics/battle_interface/status_frz.4bpp" + .incbin "graphics/battle_interface/status_brn.4bpp" + .incbin "graphics/battle_interface/misc.4bpp" + .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" + + @ extra stuff + .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 @@ -1128,13 +1178,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/old_contest.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD15ADC, 0x104 @ LZ, uncomp. size = 0x200 + .incbin "graphics/unused/old_contest.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD15BE0, 0x183 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/old_contest.bin.lz" .align 2 .incbin "baserom.gba", 0xD15D64, 0x2C0 @ LZ, uncomp. size = 0x1000 @@ -1148,15 +1198,15 @@ gContestNumbers_UnusedPal:: .incbin "graphics/unused/numbers.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD16134, 0x100F @ LZ, uncomp. size = 0x4000 + .incbin "graphics/unused/old_contest_2.4bpp.lz" .align 2 gUnknown_08D17144:: @ 8D17144 - .incbin "baserom.gba", 0xD17144, 0x116 @ LZ, uncomp. size = 0x200 + .incbin "graphics/unused/old_contest_2.gbapal.lz" .align 2 gUnknown_08D1725C:: @ 8D1725C - .incbin "baserom.gba", 0xD1725C, 0x1C5 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/old_contest_2.bin.lz" .align 2 gUnknown_08D17424:: @ 8D17424 @@ -1174,7 +1224,7 @@ gUnknown_08D17C3C:: @ 8D17C3C .align 2 gUnknown_08D17D6C:: @ 8D17D6C - .incbin "baserom.gba", 0xD17D6C, 0xAAA @ LZ, uncomp. size = 0x2000 + .incbin "graphics/contest/misc.4bpp.lz" .align 2 gUnknown_08D18818:: @ 8D18818 @@ -1185,11 +1235,11 @@ gUnknown_08D18818:: @ 8D18818 .align 2 gContestJudgeSymbolsGfx:: @ 8D19590 - .incbin "graphics/misc/judge_symbols.4bpp.lz" + .incbin "graphics/contest/judge_symbols.4bpp.lz" .align 2 gContest3Pal:: - .incbin "graphics/misc/judge_symbols.gbapal.lz" + .incbin "graphics/contest/judge_symbols.gbapal.lz" .align 2 gTiles_8D1975C:: @ 8D1975C @@ -1472,11 +1522,11 @@ gBattleAnimSpritePalette_172:: @ 8D1C728 .align 2 gContestJudgeGfx:: - .incbin "graphics/misc/judge.4bpp.lz" + .incbin "graphics/contest/judge.4bpp.lz" .align 2 gContest2Pal:: @ 8D1CA1C - .incbin "graphics/misc/judge.gbapal.lz" + .incbin "graphics/contest/judge.gbapal.lz" .align 2 gBattleAnimSpriteSheet_001:: @ 8D1CA44 @@ -2778,7 +2828,7 @@ gBattleAnimSpritePalette_262:: @ 8E693DC .align 2 gContestNextTurnGfx:: - .incbin "graphics/misc/nextturn.4bpp.lz" + .incbin "graphics/contest/nextturn.4bpp.lz" gUnknown_08E69478:: @ 8E69478 .incbin "baserom.gba", 0x00e69478, 0x100 @@ -2815,7 +2865,7 @@ gUnknown_08E6978C:: @ 8E6978C .align 2 gContestPal:: - .incbin "graphics/misc/nextturn.gbapal" + .incbin "graphics/contest/nextturn.gbapal" .align 2 gBattleAnimSpriteSheet_272:: @ 8E6982C 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/expbar.png b/graphics/battle_interface/expbar.png Binary files differnew file mode 100755 index 000000000..b54dbe600 --- /dev/null +++ b/graphics/battle_interface/expbar.png diff --git a/graphics/battle_interface/hpbar.pal b/graphics/battle_interface/hpbar.pal new file mode 100755 index 000000000..ea646bb82 --- /dev/null +++ b/graphics/battle_interface/hpbar.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +57 57 57 +255 255 255 +213 205 189 +131 131 139 +74 65 90 +82 106 90 +255 180 123 +246 148 115 +222 106 90 +115 255 172 +90 213 131 +255 230 57 +205 172 8 +255 90 57 +172 65 74 diff --git a/graphics/battle_interface/hpbar.png b/graphics/battle_interface/hpbar.png Binary files differnew file mode 100755 index 000000000..f3a0314e4 --- /dev/null +++ b/graphics/battle_interface/hpbar.png diff --git a/graphics/battle_interface/hpbar_anim.png b/graphics/battle_interface/hpbar_anim.png Binary files differnew file mode 100755 index 000000000..9e7564234 --- /dev/null +++ b/graphics/battle_interface/hpbar_anim.png diff --git a/graphics/battle_interface/misc.png b/graphics/battle_interface/misc.png Binary files differnew file mode 100755 index 000000000..6456ebe5c --- /dev/null +++ b/graphics/battle_interface/misc.png diff --git a/graphics/battle_interface/misc_frameend.png b/graphics/battle_interface/misc_frameend.png Binary files differnew file mode 100755 index 000000000..630f44242 --- /dev/null +++ b/graphics/battle_interface/misc_frameend.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/battle_interface/status_brn.png b/graphics/battle_interface/status_brn.png Binary files differnew file mode 100755 index 000000000..0de1e3ad2 --- /dev/null +++ b/graphics/battle_interface/status_brn.png diff --git a/graphics/battle_interface/status_frz.png b/graphics/battle_interface/status_frz.png Binary files differnew file mode 100755 index 000000000..3e1d534b5 --- /dev/null +++ b/graphics/battle_interface/status_frz.png diff --git a/graphics/battle_interface/status_par.png b/graphics/battle_interface/status_par.png Binary files differnew file mode 100755 index 000000000..177d4eb5b --- /dev/null +++ b/graphics/battle_interface/status_par.png diff --git a/graphics/battle_interface/status_psn.png b/graphics/battle_interface/status_psn.png Binary files differnew file mode 100755 index 000000000..95869e572 --- /dev/null +++ b/graphics/battle_interface/status_psn.png diff --git a/graphics/battle_interface/status_slp.png b/graphics/battle_interface/status_slp.png Binary files differnew file mode 100755 index 000000000..b0eb5a250 --- /dev/null +++ b/graphics/battle_interface/status_slp.png diff --git a/graphics/misc/judge.pal b/graphics/contest/judge.pal index e62f2abd3..e62f2abd3 100755 --- a/graphics/misc/judge.pal +++ b/graphics/contest/judge.pal diff --git a/graphics/misc/judge.png b/graphics/contest/judge.png Binary files differindex c4dcf520b..c4dcf520b 100755 --- a/graphics/misc/judge.png +++ b/graphics/contest/judge.png diff --git a/graphics/misc/judge_symbols.pal b/graphics/contest/judge_symbols.pal index 3eeaa1128..3eeaa1128 100755 --- a/graphics/misc/judge_symbols.pal +++ b/graphics/contest/judge_symbols.pal diff --git a/graphics/misc/judge_symbols.png b/graphics/contest/judge_symbols.png Binary files differindex 7669fb88b..7669fb88b 100755 --- a/graphics/misc/judge_symbols.png +++ 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..536924daf --- /dev/null +++ b/graphics/contest/misc.png diff --git a/graphics/misc/nextturn.pal b/graphics/contest/nextturn.pal index 05991c79e..05991c79e 100755 --- a/graphics/misc/nextturn.pal +++ b/graphics/contest/nextturn.pal diff --git a/graphics/misc/nextturn.png b/graphics/contest/nextturn.png Binary files differindex 747c4b5a7..747c4b5a7 100755 --- a/graphics/misc/nextturn.png +++ b/graphics/contest/nextturn.png diff --git a/graphics/interface/hpbar_anim.png b/graphics/interface/hpbar_anim.png Binary files differnew file mode 100755 index 000000000..d4e79fdae --- /dev/null +++ b/graphics/interface/hpbar_anim.png diff --git a/graphics/interface/numbers1.png b/graphics/interface/numbers1.png Binary files differnew file mode 100755 index 000000000..f15757958 --- /dev/null +++ b/graphics/interface/numbers1.png diff --git a/graphics/interface/numbers2.png b/graphics/interface/numbers2.png Binary files differnew file mode 100755 index 000000000..4ddf364bf --- /dev/null +++ b/graphics/interface/numbers2.png diff --git a/graphics/unknown/unknown_D07B68.pal b/graphics/unknown/unknown_D07B68.pal new file mode 100755 index 000000000..ca77648e6 --- /dev/null +++ b/graphics/unknown/unknown_D07B68.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 0 0 +255 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 0 +0 0 0 diff --git a/graphics/unknown/unknown_D07B68.png b/graphics/unknown/unknown_D07B68.png Binary files differnew file mode 100755 index 000000000..d36afa64d --- /dev/null +++ b/graphics/unknown/unknown_D07B68.png diff --git a/graphics/unknown/unknown_D07B68_2.pal b/graphics/unknown/unknown_D07B68_2.pal new file mode 100755 index 000000000..44f4b55d6 --- /dev/null +++ b/graphics/unknown/unknown_D07B68_2.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +98 156 131 +57 57 57 +156 156 156 +255 255 255 +255 205 0 +255 255 98 +213 98 24 +255 123 32 +106 65 172 +65 24 172 +255 205 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 156 131 +57 57 57 +156 156 156 +255 255 255 +57 123 0 +90 189 0 +123 255 8 +230 106 148 +255 139 255 +255 205 0 +255 255 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/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/basic_frame.bin b/graphics/unused/basic_frame.bin Binary files differnew file mode 100755 index 000000000..8e83eb9f5 --- /dev/null +++ b/graphics/unused/basic_frame.bin diff --git a/graphics/unused/basic_frame.pal b/graphics/unused/basic_frame.pal new file mode 100755 index 000000000..70ff9b632 --- /dev/null +++ b/graphics/unused/basic_frame.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +106 123 164 +205 205 205 +255 255 255 +164 164 164 +0 0 0 +172 0 0 +222 0 0 +197 74 0 +255 24 0 +205 164 106 +255 222 164 +255 131 0 +255 255 255 +123 238 90 +131 172 246 diff --git a/graphics/unused/basic_frame.png b/graphics/unused/basic_frame.png Binary files differnew file mode 100755 index 000000000..132671581 --- /dev/null +++ b/graphics/unused/basic_frame.png diff --git a/graphics/unused/blank_frame.bin b/graphics/unused/blank_frame.bin Binary files differnew file mode 100755 index 000000000..e9784eb4c --- /dev/null +++ b/graphics/unused/blank_frame.bin diff --git a/graphics/unused/blue_frame.bin b/graphics/unused/blue_frame.bin Binary files differnew file mode 100755 index 000000000..d5c3b6600 --- /dev/null +++ b/graphics/unused/blue_frame.bin diff --git a/graphics/unused/color_frames.pal b/graphics/unused/color_frames.pal new file mode 100755 index 000000000..56bf2a29c --- /dev/null +++ b/graphics/unused/color_frames.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 255 255 +106 123 164 +205 205 205 +255 255 255 +164 164 164 +0 0 0 +172 0 0 +222 0 0 +197 74 0 +255 24 0 +205 164 106 +255 222 164 +255 131 0 +255 255 255 +123 238 90 +131 172 246 diff --git a/graphics/unused/color_frames.png b/graphics/unused/color_frames.png Binary files differnew file mode 100755 index 000000000..9270879eb --- /dev/null +++ b/graphics/unused/color_frames.png diff --git a/graphics/unused/green_frame.bin b/graphics/unused/green_frame.bin Binary files differnew file mode 100755 index 000000000..b381235d9 --- /dev/null +++ b/graphics/unused/green_frame.bin diff --git a/graphics/unused/line_sketch.pal b/graphics/unused/line_sketch.pal new file mode 100755 index 000000000..dc1d51763 --- /dev/null +++ b/graphics/unused/line_sketch.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 255 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 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unused/line_sketch.png b/graphics/unused/line_sketch.png Binary files differnew file mode 100755 index 000000000..fdfc8d771 --- /dev/null +++ b/graphics/unused/line_sketch.png diff --git a/graphics/unused/metronome_hand_small.png b/graphics/unused/metronome_hand_small.png Binary files differnew file mode 100755 index 000000000..bd6cc8530 --- /dev/null +++ b/graphics/unused/metronome_hand_small.png diff --git a/graphics/unused/music_notes.png b/graphics/unused/music_notes.png Binary files differnew file mode 100755 index 000000000..af89e55a0 --- /dev/null +++ b/graphics/unused/music_notes.png diff --git a/graphics/unused/old.png b/graphics/unused/old.png Binary files differdeleted file mode 100755 index 523f8fa9f..000000000 --- a/graphics/unused/old.png +++ /dev/null diff --git a/graphics/unused/old_battle_interface_1.png b/graphics/unused/old_battle_interface_1.png Binary files differnew file mode 100755 index 000000000..0b2fe5eb7 --- /dev/null +++ b/graphics/unused/old_battle_interface_1.png diff --git a/graphics/unused/old_battle_interface_2.png b/graphics/unused/old_battle_interface_2.png Binary files differnew file mode 100755 index 000000000..04229ccda --- /dev/null +++ b/graphics/unused/old_battle_interface_2.png diff --git a/graphics/unused/old_battle_interface_3.png b/graphics/unused/old_battle_interface_3.png Binary files differnew file mode 100755 index 000000000..428c7765d --- /dev/null +++ b/graphics/unused/old_battle_interface_3.png diff --git a/graphics/unused/old_battle_interface_tilemap.bin b/graphics/unused/old_battle_interface_tilemap.bin Binary files differnew file mode 100755 index 000000000..aae3307e7 --- /dev/null +++ b/graphics/unused/old_battle_interface_tilemap.bin diff --git a/graphics/unused/old_bulbasaur.png b/graphics/unused/old_bulbasaur.png Binary files differnew file mode 100755 index 000000000..729ebe789 --- /dev/null +++ b/graphics/unused/old_bulbasaur.png diff --git a/graphics/unused/old_bulbasaur2.png b/graphics/unused/old_bulbasaur2.png Binary files differnew file mode 100755 index 000000000..f374e5a9f --- /dev/null +++ b/graphics/unused/old_bulbasaur2.png diff --git a/graphics/unused/old_charizard.png b/graphics/unused/old_charizard.png Binary files differnew file mode 100755 index 000000000..e1470aada --- /dev/null +++ b/graphics/unused/old_charizard.png diff --git a/graphics/unused/old_charmap.bin b/graphics/unused/old_charmap.bin Binary files differnew file mode 100755 index 000000000..aa15ea36e --- /dev/null +++ b/graphics/unused/old_charmap.bin diff --git a/graphics/unused/old_charmap.pal b/graphics/unused/old_charmap.pal new file mode 100755 index 000000000..cbcd5de4d --- /dev/null +++ b/graphics/unused/old_charmap.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +24 0 0 +41 0 0 +255 255 255 +0 0 0 +255 255 255 +255 65 0 +0 0 0 +255 0 0 +255 24 0 +255 65 0 +255 98 0 +255 131 0 +255 180 0 +255 222 0 +255 255 255 diff --git a/graphics/unused/old_charmap.png b/graphics/unused/old_charmap.png Binary files differnew file mode 100755 index 000000000..b5ea6e803 --- /dev/null +++ b/graphics/unused/old_charmap.png diff --git a/graphics/unused/old_contest.bin b/graphics/unused/old_contest.bin Binary files differnew file mode 100755 index 000000000..da6f4652e --- /dev/null +++ b/graphics/unused/old_contest.bin diff --git a/graphics/unused/old_contest.pal b/graphics/unused/old_contest.pal new file mode 100755 index 000000000..69fde2000 --- /dev/null +++ b/graphics/unused/old_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/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/unused/old_contest_2_1.png b/graphics/unused/old_contest_2_1.png Binary files differnew file mode 100755 index 000000000..67b81de2d --- /dev/null +++ b/graphics/unused/old_contest_2_1.png diff --git a/graphics/unused/old_contest_2_2.png b/graphics/unused/old_contest_2_2.png Binary files differnew file mode 100755 index 000000000..a33a8c324 --- /dev/null +++ b/graphics/unused/old_contest_2_2.png diff --git a/graphics/unused/old_contest_classes.png b/graphics/unused/old_contest_classes.png Binary files differnew file mode 100755 index 000000000..c2e7b5e29 --- /dev/null +++ b/graphics/unused/old_contest_classes.png diff --git a/graphics/unused/old_contest_floor.png b/graphics/unused/old_contest_floor.png Binary files differnew file mode 100755 index 000000000..94877b921 --- /dev/null +++ b/graphics/unused/old_contest_floor.png diff --git a/graphics/unused/old_contest_frame_1.png b/graphics/unused/old_contest_frame_1.png Binary files differnew file mode 100755 index 000000000..28eaae905 --- /dev/null +++ b/graphics/unused/old_contest_frame_1.png diff --git a/graphics/unused/old_contest_frame_2.png b/graphics/unused/old_contest_frame_2.png Binary files differnew file mode 100755 index 000000000..c8b20408c --- /dev/null +++ b/graphics/unused/old_contest_frame_2.png diff --git a/graphics/unused/old_contest_meter.png b/graphics/unused/old_contest_meter.png Binary files differnew file mode 100755 index 000000000..606208b1f --- /dev/null +++ b/graphics/unused/old_contest_meter.png diff --git a/graphics/unused/old_contest_numbers.png b/graphics/unused/old_contest_numbers.png Binary files differnew file mode 100755 index 000000000..98c145976 --- /dev/null +++ b/graphics/unused/old_contest_numbers.png diff --git a/graphics/unused/old_contest_symbols.png b/graphics/unused/old_contest_symbols.png Binary files differnew file mode 100755 index 000000000..87cac733e --- /dev/null +++ b/graphics/unused/old_contest_symbols.png diff --git a/graphics/unused/old_pal1.pal b/graphics/unused/old_pal1.pal new file mode 100755 index 000000000..1e2ef9083 --- /dev/null +++ b/graphics/unused/old_pal1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +16 139 0 +0 0 0 +148 65 65 +0 0 0 +148 65 32 +16 0 0 +148 65 32 +8 8 0 +148 65 32 +148 8 8 +148 65 65 +24 16 0 +16 139 98 +32 0 0 +0 16 139 +0 0 0 diff --git a/graphics/unused/old_pal2.pal b/graphics/unused/old_pal2.pal new file mode 100755 index 000000000..3c5e6ad7f --- /dev/null +++ b/graphics/unused/old_pal2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +16 139 0 +0 0 0 +148 65 65 +0 0 0 +148 65 32 +16 0 0 +148 65 32 +8 8 0 +148 65 32 +16 0 0 +148 65 65 +0 0 0 +16 139 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unused/old_pal3.pal b/graphics/unused/old_pal3.pal new file mode 100755 index 000000000..d07e21019 --- /dev/null +++ b/graphics/unused/old_pal3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 16 139 +0 0 0 +0 213 98 +32 0 0 +0 213 98 +24 16 0 +0 213 98 +156 8 8 +0 213 98 +24 16 0 +0 213 98 +32 0 0 +0 16 139 +0 0 0 diff --git a/graphics/unused/old_pal4.pal b/graphics/unused/old_pal4.pal new file mode 100755 index 000000000..60b814f75 --- /dev/null +++ b/graphics/unused/old_pal4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +41 41 57 +90 90 106 +172 172 180 +197 197 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unused/old_pal5.pal b/graphics/unused/old_pal5.pal new file mode 100755 index 000000000..b6f481d46 --- /dev/null +++ b/graphics/unused/old_pal5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 156 131 +115 115 115 +189 189 189 +255 255 255 +189 164 41 +246 246 41 +222 106 32 +246 131 41 +115 98 246 +98 74 205 +238 115 156 +246 148 246 +115 172 246 +8 8 8 +90 90 90 +65 65 65 diff --git a/graphics/unused/old_pal6.pal b/graphics/unused/old_pal6.pal new file mode 100755 index 000000000..6d91e9918 --- /dev/null +++ b/graphics/unused/old_pal6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 156 131 +115 115 115 +189 189 189 +255 255 255 +115 148 74 +156 205 74 +148 246 74 +238 115 156 +246 148 246 +189 164 41 +246 246 41 +8 8 8 +8 8 8 +8 8 8 +90 90 90 +65 65 65 diff --git a/graphics/unused/old_pal7.pal b/graphics/unused/old_pal7.pal new file mode 100755 index 000000000..d380bc65d --- /dev/null +++ b/graphics/unused/old_pal7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 156 131 +115 115 115 +156 156 156 +255 255 255 +98 115 246 +115 172 246 +164 98 41 +230 172 139 +189 164 41 +246 246 41 +246 98 82 +148 123 205 +197 164 205 +213 41 156 +90 90 90 +65 65 65 diff --git a/graphics/unused/red_frame.bin b/graphics/unused/red_frame.bin Binary files differnew file mode 100755 index 000000000..5090b1b84 --- /dev/null +++ b/graphics/unused/red_frame.bin diff --git a/graphics/unused/unknown_D021BC.bin b/graphics/unused/unknown_D021BC.bin Binary files differdeleted file mode 100755 index 9d7c14a2d..000000000 --- a/graphics/unused/unknown_D021BC.bin +++ /dev/null diff --git a/graphics/unused/unknown_D023E8.bin b/graphics/unused/unknown_D023E8.bin Binary files differdeleted file mode 100755 index 58efd7d3e..000000000 --- a/graphics/unused/unknown_D023E8.bin +++ /dev/null diff --git a/graphics/unused/water_splash.bin b/graphics/unused/water_splash.bin Binary files differnew file mode 100755 index 000000000..059347fa7 --- /dev/null +++ b/graphics/unused/water_splash.bin diff --git a/graphics/unused/water_splash.pal b/graphics/unused/water_splash.pal new file mode 100755 index 000000000..ada1391df --- /dev/null +++ b/graphics/unused/water_splash.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +255 255 255 +205 255 255 +156 255 255 +106 255 255 +57 255 255 +8 255 255 +8 205 255 +8 156 255 +8 106 255 +8 57 255 +8 8 255 +8 8 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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 +205 255 255 +156 255 255 +106 255 255 +57 255 255 +8 255 255 +8 205 255 +8 156 255 +8 106 255 +8 57 255 +8 8 255 +8 8 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/water_splash.png b/graphics/unused/water_splash.png Binary files differnew file mode 100755 index 000000000..a8439a050 --- /dev/null +++ b/graphics/unused/water_splash.png diff --git a/graphics/unused/yellow_frame.bin b/graphics/unused/yellow_frame.bin Binary files differnew file mode 100755 index 000000000..30ba3ed01 --- /dev/null +++ b/graphics/unused/yellow_frame.bin @@ -5,10 +5,12 @@ PSSGFXDIR := graphics/pokemon_storage MISCGFXDIR := graphics/misc PKNAVGFXDIR := graphics/pokenav UNKNOWNGFXDIR := graphics/unknown +UNUSEDGFXDIR := graphics/unused REELGFXDIR := graphics/slot_machine ROULGFXDIR := graphics/roulette BTLANMSPRGFXDIR := graphics/battle_anims/sprites PICFRAMEGFXDIR := graphics/picture_frame +CONTESTGFXDIR := graphics/contest $(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal @cat $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal >$@ @@ -163,5 +165,32 @@ $(BTLANMSPRGFXDIR)/159.4bpp: $(BTLANMSPRGFXDIR)/159_0.4bpp $(BTLANMSPRGFXDIR)/15 $(PICFRAMEGFXDIR)/frame5.4bpp: $(PICFRAMEGFXDIR)/frame5.png $(GFX) $< $@ -num_tiles 86 -$(MISCGFXDIR)/nextturn.4bpp: $(MISCGFXDIR)/nextturn.png +$(CONTESTGFXDIR)/nextturn.4bpp: $(CONTESTGFXDIR)/nextturn.png $(GFX) $< $@ -num_tiles 8 + +$(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal $(UNUSEDGFXDIR)/old_pal2.gbapal $(UNUSEDGFXDIR)/old_pal3.gbapal + @cat $(UNUSEDGFXDIR)/old_pal1.gbapal $(UNUSEDGFXDIR)/old_pal2.gbapal $(UNUSEDGFXDIR)/old_pal3.gbapal >$@ + +$(UNUSEDGFXDIR)/obi_palpak3.gbapal: $(UNUSEDGFXDIR)/old_pal5.gbapal $(UNUSEDGFXDIR)/old_pal6.gbapal $(UNUSEDGFXDIR)/old_pal7.gbapal + @cat $(UNUSEDGFXDIR)/old_pal5.gbapal $(UNUSEDGFXDIR)/old_pal6.gbapal $(UNUSEDGFXDIR)/old_pal7.gbapal >$@ + +$(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur.4bpp $(UNUSEDGFXDIR)/old_charizard.4bpp + @cat $(UNUSEDGFXDIR)/old_bulbasaur.4bpp $(UNUSEDGFXDIR)/old_charizard.4bpp >$@ + +$(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp $(UNUSEDGFXDIR)/old_battle_interface_1.4bpp $(UNUSEDGFXDIR)/old_battle_interface_2.4bpp $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp + @cat $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp $(UNUSEDGFXDIR)/old_battle_interface_1.4bpp $(UNUSEDGFXDIR)/old_battle_interface_2.4bpp $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp >$@ + +$(MENUGFXDIR)/hp_numbers.4bpp: $(MENUGFXDIR)/hpbar_anim.4bpp $(MENUGFXDIR)/numbers1.4bpp $(MENUGFXDIR)/numbers2.4bpp + @cat $(MENUGFXDIR)/hpbar_anim.4bpp $(MENUGFXDIR)/numbers1.4bpp $(MENUGFXDIR)/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 + +$(UNUSEDGFXDIR)/old_contest.4bpp: $(UNUSEDGFXDIR)/old_contest_frame_1.4bpp $(UNUSEDGFXDIR)/old_contest_floor.4bpp $(UNUSEDGFXDIR)/old_contest_frame_2.4bpp $(UNUSEDGFXDIR)/old_contest_symbols.4bpp $(UNUSEDGFXDIR)/old_contest_meter.4bpp $(UNUSEDGFXDIR)/old_contest_classes.4bpp $(UNUSEDGFXDIR)/old_contest_numbers.4bpp + @cat $(UNUSEDGFXDIR)/old_contest_frame_1.4bpp $(UNUSEDGFXDIR)/old_contest_floor.4bpp $(UNUSEDGFXDIR)/old_contest_frame_2.4bpp $(UNUSEDGFXDIR)/old_contest_symbols.4bpp $(UNUSEDGFXDIR)/old_contest_meter.4bpp $(UNUSEDGFXDIR)/old_contest_classes.4bpp $(UNUSEDGFXDIR)/old_contest_numbers.4bpp >$@ + +$(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 >$@ |
