diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/graphics.s | 164 |
1 files changed, 107 insertions, 57 deletions
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 |