From 242bb41682fe76e7e348fcd1c4232dd47c795db5 Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Sat, 11 Mar 2023 23:57:01 +0800 Subject: [PATCH] Document src/graphics.c --- .../backgrounds/solarbeam.bin} | Bin .../unused/lights.bin} | Bin .../unused/lights.png} | Bin .../audience.bin} | Bin .../curtain.bin} | Bin .../interface.bin} | Bin .../interface.pal} | 0 graphics/contest/{misc.png => interface.png} | Bin .../japanese/audience.bin} | Bin .../japanese/audience.png} | Bin .../japanese/bg.bin} | Bin .../japanese/classes.png} | Bin .../japanese/floor.png} | Bin .../japanese/frame_1.png} | Bin .../japanese/frame_2.png} | Bin .../japanese/interface.bin} | Bin .../japanese/interface.png} | Bin .../japanese/meter.png} | Bin .../{unused => contest/japanese}/numbers.png | Bin .../japanese/numbers_2.png} | Bin .../japanese/palette.pal} | 0 .../{misc_2.png => japanese/results.png} | Bin .../japanese/symbols.png} | Bin .../japanese/voltage.png} | Bin .../japanese/windows.bin} | Bin graphics/contest/{misc.pal => results.pal} | 0 .../{misc_2_tilemap_3.bin => results_bg.bin} | 0 ..._2_tilemap_2.bin => results_interface.bin} | Bin ...ilemap_1.bin => results_winner_banner.bin} | Bin .../contest/{heart.png => slider_heart.png} | Bin .../pokemon/hitmontop/unused_garbage.bin | Bin graphics/unknown/unknown_D12A44.png | Bin 84 -> 0 bytes graphics/unknown/unknown_D12A64.png | Bin 95 -> 0 bytes graphics/unknown/unknown_EAFF60.pal | 51 ------------- graphics/unknown/unused_window.png | Bin 608 -> 0 bytes graphics_file_rules.mk | 21 ++--- src/data/graphics/pokemon.h | 2 +- src/graphics.c | 72 ++++++++---------- src/pokemon_special_anim_scene.c | 2 +- 39 files changed, 44 insertions(+), 104 deletions(-) rename graphics/{unknown/unknown_E7CFB0.bin => battle_anims/backgrounds/solarbeam.bin} (100%) rename graphics/{unknown/unknown_D1BE74.bin => battle_anims/unused/lights.bin} (100%) rename graphics/{unknown/unknown_D1BE74.png => battle_anims/unused/lights.png} (100%) rename graphics/{unused/old_contest_2.bin => contest/audience.bin} (100%) rename graphics/{unknown/unknown_D17AB8.bin => contest/curtain.bin} (100%) rename graphics/{unknown/unknown_D172A8.bin => contest/interface.bin} (100%) rename graphics/{unused/old_contest_2.pal => contest/interface.pal} (100%) rename graphics/contest/{misc.png => interface.png} (100%) rename graphics/{unknown/unknown_D17654.bin => contest/japanese/audience.bin} (100%) rename graphics/{unused/old_contest_2_2.png => contest/japanese/audience.png} (100%) rename graphics/{unused/old_contest.bin => contest/japanese/bg.bin} (100%) rename graphics/{unused/old_contest_classes.png => contest/japanese/classes.png} (100%) rename graphics/{unused/old_contest_floor.png => contest/japanese/floor.png} (100%) rename graphics/{unused/old_contest_frame_1.png => contest/japanese/frame_1.png} (100%) rename graphics/{unused/old_contest_frame_2.png => contest/japanese/frame_2.png} (100%) rename graphics/{unknown/unknown_D17548.bin => contest/japanese/interface.bin} (100%) rename graphics/{unused/old_contest_2_1.png => contest/japanese/interface.png} (100%) rename graphics/{unused/old_contest_meter.png => contest/japanese/meter.png} (100%) rename graphics/{unused => contest/japanese}/numbers.png (100%) rename graphics/{unused/old_contest_numbers.png => contest/japanese/numbers_2.png} (100%) rename graphics/{unused/old_contest.pal => contest/japanese/palette.pal} (100%) rename graphics/contest/{misc_2.png => japanese/results.png} (100%) rename graphics/{unused/old_contest_symbols.png => contest/japanese/symbols.png} (100%) rename graphics/{unknown/unknown_D196E4.png => contest/japanese/voltage.png} (100%) rename graphics/{unknown/unknown_D15BE8.bin => contest/japanese/windows.bin} (100%) rename graphics/contest/{misc.pal => results.pal} (100%) rename graphics/contest/{misc_2_tilemap_3.bin => results_bg.bin} (100%) rename graphics/contest/{misc_2_tilemap_2.bin => results_interface.bin} (100%) rename graphics/contest/{misc_2_tilemap_1.bin => results_winner_banner.bin} (100%) rename graphics/contest/{heart.png => slider_heart.png} (100%) rename data/garbage_8DD2290.bin => graphics/pokemon/hitmontop/unused_garbage.bin (100%) delete mode 100644 graphics/unknown/unknown_D12A44.png delete mode 100644 graphics/unknown/unknown_D12A64.png delete mode 100644 graphics/unknown/unknown_EAFF60.pal delete mode 100644 graphics/unknown/unused_window.png diff --git a/graphics/unknown/unknown_E7CFB0.bin b/graphics/battle_anims/backgrounds/solarbeam.bin similarity index 100% rename from graphics/unknown/unknown_E7CFB0.bin rename to graphics/battle_anims/backgrounds/solarbeam.bin diff --git a/graphics/unknown/unknown_D1BE74.bin b/graphics/battle_anims/unused/lights.bin similarity index 100% rename from graphics/unknown/unknown_D1BE74.bin rename to graphics/battle_anims/unused/lights.bin diff --git a/graphics/unknown/unknown_D1BE74.png b/graphics/battle_anims/unused/lights.png similarity index 100% rename from graphics/unknown/unknown_D1BE74.png rename to graphics/battle_anims/unused/lights.png diff --git a/graphics/unused/old_contest_2.bin b/graphics/contest/audience.bin similarity index 100% rename from graphics/unused/old_contest_2.bin rename to graphics/contest/audience.bin diff --git a/graphics/unknown/unknown_D17AB8.bin b/graphics/contest/curtain.bin similarity index 100% rename from graphics/unknown/unknown_D17AB8.bin rename to graphics/contest/curtain.bin diff --git a/graphics/unknown/unknown_D172A8.bin b/graphics/contest/interface.bin similarity index 100% rename from graphics/unknown/unknown_D172A8.bin rename to graphics/contest/interface.bin diff --git a/graphics/unused/old_contest_2.pal b/graphics/contest/interface.pal similarity index 100% rename from graphics/unused/old_contest_2.pal rename to graphics/contest/interface.pal diff --git a/graphics/contest/misc.png b/graphics/contest/interface.png similarity index 100% rename from graphics/contest/misc.png rename to graphics/contest/interface.png diff --git a/graphics/unknown/unknown_D17654.bin b/graphics/contest/japanese/audience.bin similarity index 100% rename from graphics/unknown/unknown_D17654.bin rename to graphics/contest/japanese/audience.bin diff --git a/graphics/unused/old_contest_2_2.png b/graphics/contest/japanese/audience.png similarity index 100% rename from graphics/unused/old_contest_2_2.png rename to graphics/contest/japanese/audience.png diff --git a/graphics/unused/old_contest.bin b/graphics/contest/japanese/bg.bin similarity index 100% rename from graphics/unused/old_contest.bin rename to graphics/contest/japanese/bg.bin diff --git a/graphics/unused/old_contest_classes.png b/graphics/contest/japanese/classes.png similarity index 100% rename from graphics/unused/old_contest_classes.png rename to graphics/contest/japanese/classes.png diff --git a/graphics/unused/old_contest_floor.png b/graphics/contest/japanese/floor.png similarity index 100% rename from graphics/unused/old_contest_floor.png rename to graphics/contest/japanese/floor.png diff --git a/graphics/unused/old_contest_frame_1.png b/graphics/contest/japanese/frame_1.png similarity index 100% rename from graphics/unused/old_contest_frame_1.png rename to graphics/contest/japanese/frame_1.png diff --git a/graphics/unused/old_contest_frame_2.png b/graphics/contest/japanese/frame_2.png similarity index 100% rename from graphics/unused/old_contest_frame_2.png rename to graphics/contest/japanese/frame_2.png diff --git a/graphics/unknown/unknown_D17548.bin b/graphics/contest/japanese/interface.bin similarity index 100% rename from graphics/unknown/unknown_D17548.bin rename to graphics/contest/japanese/interface.bin diff --git a/graphics/unused/old_contest_2_1.png b/graphics/contest/japanese/interface.png similarity index 100% rename from graphics/unused/old_contest_2_1.png rename to graphics/contest/japanese/interface.png diff --git a/graphics/unused/old_contest_meter.png b/graphics/contest/japanese/meter.png similarity index 100% rename from graphics/unused/old_contest_meter.png rename to graphics/contest/japanese/meter.png diff --git a/graphics/unused/numbers.png b/graphics/contest/japanese/numbers.png similarity index 100% rename from graphics/unused/numbers.png rename to graphics/contest/japanese/numbers.png diff --git a/graphics/unused/old_contest_numbers.png b/graphics/contest/japanese/numbers_2.png similarity index 100% rename from graphics/unused/old_contest_numbers.png rename to graphics/contest/japanese/numbers_2.png diff --git a/graphics/unused/old_contest.pal b/graphics/contest/japanese/palette.pal similarity index 100% rename from graphics/unused/old_contest.pal rename to graphics/contest/japanese/palette.pal diff --git a/graphics/contest/misc_2.png b/graphics/contest/japanese/results.png similarity index 100% rename from graphics/contest/misc_2.png rename to graphics/contest/japanese/results.png diff --git a/graphics/unused/old_contest_symbols.png b/graphics/contest/japanese/symbols.png similarity index 100% rename from graphics/unused/old_contest_symbols.png rename to graphics/contest/japanese/symbols.png diff --git a/graphics/unknown/unknown_D196E4.png b/graphics/contest/japanese/voltage.png similarity index 100% rename from graphics/unknown/unknown_D196E4.png rename to graphics/contest/japanese/voltage.png diff --git a/graphics/unknown/unknown_D15BE8.bin b/graphics/contest/japanese/windows.bin similarity index 100% rename from graphics/unknown/unknown_D15BE8.bin rename to graphics/contest/japanese/windows.bin diff --git a/graphics/contest/misc.pal b/graphics/contest/results.pal similarity index 100% rename from graphics/contest/misc.pal rename to graphics/contest/results.pal diff --git a/graphics/contest/misc_2_tilemap_3.bin b/graphics/contest/results_bg.bin similarity index 100% rename from graphics/contest/misc_2_tilemap_3.bin rename to graphics/contest/results_bg.bin diff --git a/graphics/contest/misc_2_tilemap_2.bin b/graphics/contest/results_interface.bin similarity index 100% rename from graphics/contest/misc_2_tilemap_2.bin rename to graphics/contest/results_interface.bin diff --git a/graphics/contest/misc_2_tilemap_1.bin b/graphics/contest/results_winner_banner.bin similarity index 100% rename from graphics/contest/misc_2_tilemap_1.bin rename to graphics/contest/results_winner_banner.bin diff --git a/graphics/contest/heart.png b/graphics/contest/slider_heart.png similarity index 100% rename from graphics/contest/heart.png rename to graphics/contest/slider_heart.png diff --git a/data/garbage_8DD2290.bin b/graphics/pokemon/hitmontop/unused_garbage.bin similarity index 100% rename from data/garbage_8DD2290.bin rename to graphics/pokemon/hitmontop/unused_garbage.bin diff --git a/graphics/unknown/unknown_D12A44.png b/graphics/unknown/unknown_D12A44.png deleted file mode 100644 index 96c49a9921532eab55692b37e4706470431ff0ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 84 zcmeAS@N?(olHy`uVBq!ia0vp^93adBBp6ht@Pq*=X-^l&5RRG2JF1iZ)w8WR!Y2^8 g@1OnQx99%YFa4JZ-r>mdKI;Vst02iGY5dZ)H diff --git a/graphics/unknown/unknown_D12A64.png b/graphics/unknown/unknown_D12A64.png deleted file mode 100644 index 1a82e117e5bad43c802509335c7d2703214067a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^5zopr0C)ZztpET3 diff --git a/graphics/unknown/unknown_EAFF60.pal b/graphics/unknown/unknown_EAFF60.pal deleted file mode 100644 index ea7e6ddbf..000000000 --- a/graphics/unknown/unknown_EAFF60.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -148 222 164 -164 230 172 -180 238 189 -197 246 205 -213 255 222 -238 255 238 -255 255 255 -189 65 255 -255 255 255 -123 123 123 -255 0 255 -246 238 205 -139 123 74 -180 189 189 -255 255 255 -0 0 255 -164 172 172 -98 106 115 -123 131 139 -139 148 156 -115 156 189 -156 189 222 -148 222 164 -180 164 115 -205 189 148 -213 205 172 -230 222 189 -246 238 205 -139 123 74 -74 131 189 -65 74 90 -98 172 180 -41 41 57 -213 213 222 -205 205 205 -238 238 238 -0 0 0 -0 0 0 -0 0 0 -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/unused_window.png b/graphics/unknown/unused_window.png deleted file mode 100644 index 73086d4d2c01768222d8a12bd518fe74fcd6f71c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 608 zcmV-m0-ybfP)s=E8Ewg*Uws;;ZL4K?9CGiZFOm1T268DS!egKsyPfnoxicc;a6a0a~Ctf?psKxj(qv!M*iz`L$`- z+`(N2xy!KS=7sLwAq&~%Lepp!GFjN&JLI3ayLYg;gXR3(p_e~|bBA93aAxjs>?D&r zc=>~L-utn~>Cd5_e(jLXIf2a`EOuH+?tlWx9Z+CPI0179DnRZ)1;`x&!c-H&_wB0+ z`NhIFLjen$J6O)o9Zv2fn>$$IUT`f6{=vT`L7C-L*uPu}@f6gRkcGenBE}1m$gQE? u>&=2Zt>k&fB6LSsy!x$Dd?6CKH@*O#xH);E&>e~Z0000 $@ -$(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 +$(JPCONTESTGFXDIR)/composite_1.4bpp: $(JPCONTESTGFXDIR)/frame_1.4bpp \ + $(JPCONTESTGFXDIR)/floor.4bpp \ + $(JPCONTESTGFXDIR)/frame_2.4bpp \ + $(JPCONTESTGFXDIR)/symbols.4bpp \ + $(JPCONTESTGFXDIR)/meter.4bpp \ + $(JPCONTESTGFXDIR)/classes.4bpp \ + $(JPCONTESTGFXDIR)/numbers_2.4bpp @cat $^ >$@ -$(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp \ - $(UNUSEDGFXDIR)/old_contest_2_2.4bpp +$(JPCONTESTGFXDIR)/composite_2.4bpp: $(JPCONTESTGFXDIR)/interface.4bpp \ + $(JPCONTESTGFXDIR)/audience.4bpp @cat $^ >$@ -$(UNKNOWNGFXDIR)/unknown_D196E4.4bpp: %.4bpp: %.png +$(JPCONTESTGFXDIR)/voltage.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 36 -Wnum_tiles $(BTLANMSPRGFXDIR)/ice_crystals.4bpp: $(BTLANMSPRGFXDIR)/ice_crystals_0.4bpp \ diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index bdf780908..e744f80e0 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -1658,7 +1658,7 @@ const u32 gMonShinyPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/ const u8 gMonIcon_Hitmontop[] = INCBIN_U8("graphics/pokemon/hitmontop/icon.4bpp"); // This might be undefined memory garbage. Its all 00s except for 1 0F. Its also not referenced. -const u32 gUndefined_8DD1E90[] = INCBIN_U32("data/garbage_8DD2290.bin"); +const u32 gUnusedGarbage[] = INCBIN_U32("graphics/pokemon/hitmontop/unused_garbage.bin"); const u8 gMonFootprint_Hitmontop[] = INCBIN_U8("graphics/pokemon/hitmontop/footprint.1bpp"); diff --git a/src/graphics.c b/src/graphics.c index 4eab25e87..01ed0161b 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -413,50 +413,41 @@ const u32 gBattleAnimSpritePal_BlueFlames[] = INCBIN_U32("graphics/battle_anims/ const u32 gBattleAnimSpriteGfx_BlueFlames2[] = INCBIN_U32("graphics/battle_anims/sprites/blue_flames_2.4bpp.lz"); -// Contest +// Contest (unused) -const u32 gUnusedGfx_OldContest[] = INCBIN_U32("graphics/unused/old_contest.4bpp.lz"); -const u32 gUnusedPal_OldContest[] = INCBIN_U32("graphics/unused/old_contest.gbapal.lz"); -const u32 gUnusedTilemap_OldContest[] = INCBIN_U32("graphics/unused/old_contest.bin.lz"); +const u32 gJpContest_Gfx1[] = INCBIN_U32("graphics/contest/japanese/composite_1.4bpp.lz"); +const u32 gJpContest_Pal[] = INCBIN_U32("graphics/contest/japanese/palette.gbapal.lz"); +const u32 gJpContest_Bg_Tilemap[] = INCBIN_U32("graphics/contest/japanese/bg.bin.lz"); +const u32 gJpContest_Windows_Tilemap[] = INCBIN_U32("graphics/contest/japanese/windows.bin.lz"); +const u32 gJpContest_Numbers_Gfx[] = INCBIN_U32("graphics/contest/japanese/numbers.4bpp.lz"); +const u32 gJpContest_Numbers_Pal[] = INCBIN_U32("graphics/contest/japanese/numbers.gbapal.lz"); +const u32 gJpContest_Gfx2[] = INCBIN_U32("graphics/contest/japanese/composite_2.4bpp.lz"); -const u32 gFile_graphics_unknown_unknown_D15BE8_tilemap[] = INCBIN_U32("graphics/unknown/unknown_D15BE8.bin.lz"); +const u32 gContest_Interface_Pal[] = INCBIN_U32("graphics/contest/interface.gbapal.lz"); +const u32 gContest_Audience_Tilemap[] = INCBIN_U32("graphics/contest/audience.bin.lz"); +const u32 gContest_Interface_Tilemap[] = INCBIN_U32("graphics/contest/interface.bin.lz"); -const u32 gFile_graphics_unused_numbers_sheet[] = INCBIN_U32("graphics/unused/numbers.4bpp.lz"); // From ruby -const u32 gFile_graphics_unused_numbers_palette[] = INCBIN_U32("graphics/unused/numbers.gbapal.lz"); // From ruby +const u32 gJpContest_Interface_Tilemap[] = INCBIN_U32("graphics/contest/japanese/interface.bin.lz"); +const u32 gJpContest_Audience_Tilemap[] = INCBIN_U32("graphics/contest/japanese/audience.bin.lz"); -const u32 gUnusedGfx_OldContest2[] = INCBIN_U32("graphics/unused/old_contest_2.4bpp.lz"); -const u32 gOldContestPalette[] = INCBIN_U32("graphics/unused/old_contest_2.gbapal.lz"); -const u32 gOldContestGfx[] = INCBIN_U32("graphics/unused/old_contest_2.bin.lz"); +const u32 gContest_Curtain_Tilemap[] = INCBIN_U32("graphics/contest/curtain.bin.lz"); +const u32 gContest_Interface_Gfx[] = INCBIN_U32("graphics/contest/interface.4bpp.lz"); +const u32 gContest_Audience_Gfx[] = INCBIN_U32("graphics/contest/audience.4bpp.lz"); +const u32 gContest_Faces_Gfx[] = INCBIN_U32("graphics/contest/faces.4bpp.lz"); +const u32 gContest_JudgeSymbols_Gfx[] = INCBIN_U32("graphics/contest/judge_symbols.4bpp.lz"); +const u32 gContest_JudgeSymbols_Pal[] = INCBIN_U32("graphics/contest/judge_symbols.gbapal.lz"); +const u8 gContest_SliderHeart_Gfx[] = INCBIN_U8("graphics/contest/slider_heart.4bpp"); -const u32 gFile_graphics_unknown_unknown_D172A8_tilemap[] = INCBIN_U32("graphics/unknown/unknown_D172A8.bin.lz"); +const u32 gJpContest_Voltage_Gfx[] = INCBIN_U32("graphics/contest/japanese/voltage.4bpp.lz"); +const u32 gJpContest_Voltage_Pal[] = INCBIN_U32("graphics/contest/japanese/voltage.gbapal.lz"); -const u32 gFile_graphics_unknown_unknown_D17548_tilemap[] = INCBIN_U32("graphics/unknown/unknown_D17548.bin.lz"); +const u32 gJpContestResults_Gfx[] = INCBIN_U32("graphics/contest/japanese/results.4bpp.lz"); -const u32 gFile_graphics_unknown_unknown_D17654_tilemap[] = INCBIN_U32("graphics/unknown/unknown_D17654.bin.lz"); +const u32 gContestResults_WinnerBanner_Tilemap[] = INCBIN_U32("graphics/contest/results_winner_banner.bin.lz"); +const u32 gContestResults_Interface_Tilemap[] = INCBIN_U32("graphics/contest/results_interface.bin.lz"); +const u32 gContestResults_Bg_Tilemap[] = INCBIN_U32("graphics/contest/results_bg.bin.lz"); +const u32 gContestResults_Pal[] = INCBIN_U32("graphics/contest/results.gbapal.lz"); -const u32 gFile_graphics_unknown_unknown_D17AB8_tilemap[] = INCBIN_U32("graphics/unknown/unknown_D17AB8.bin.lz"); - -const u32 gContestMiscGfx[] = INCBIN_U32("graphics/contest/misc.4bpp.lz"); - -const u32 gContestAudienceGfx[] = INCBIN_U32("graphics/contest/audience.4bpp.lz"); - -const u32 gContestFacesSheetGfx[] = INCBIN_U32("graphics/contest/faces.4bpp.lz"); - -const u32 gContestJudgeSymbolsGfx[] = INCBIN_U32("graphics/contest/judge_symbols.4bpp.lz"); -const u32 gContestJudgeSymbolsPal[] = INCBIN_U32("graphics/contest/judge_symbols.gbapal.lz"); - -const u8 gContestHeartGfx[] = INCBIN_U8("graphics/contest/heart.4bpp"); - -const u32 gFile_graphics_unknown_unknown_D196E4_sheet[] = INCBIN_U32("graphics/unknown/unknown_D196E4.4bpp.lz"); -const u32 gFile_graphics_unknown_unknown_D196E4_palette[] = INCBIN_U32("graphics/unknown/unknown_D196E4.gbapal.lz"); - -const u32 gContestMisc2Gfx[] = INCBIN_U32("graphics/contest/misc_2.4bpp.lz"); - -const u32 gContestMiscTilemap1[] = INCBIN_U32("graphics/contest/misc_2_tilemap_1.bin.lz"); -const u32 gContestMiscTilemap2[] = INCBIN_U32("graphics/contest/misc_2_tilemap_2.bin.lz"); -const u32 gContestMiscTilemap3[] = INCBIN_U32("graphics/contest/misc_2_tilemap_3.bin.lz"); - -const u32 gContestMiscPal[] = INCBIN_U32("graphics/contest/misc.gbapal.lz"); const u32 gBattleAnimSpriteGfx_Impact[] = INCBIN_U32("graphics/battle_anims/sprites/impact.4bpp.lz"); const u32 gBattleAnimSpritePal_Impact[] = INCBIN_U32("graphics/battle_anims/sprites/impact.gbapal.lz"); @@ -532,9 +523,9 @@ const u32 gBattleAnimSpritePal_RazorLeaf[] = INCBIN_U32("graphics/battle_anims/s const u32 gBattleAnimSpriteGfx_MistCloud[] = INCBIN_U32("graphics/battle_anims/sprites/mist_cloud.4bpp.lz"); const u32 gBattleAnimSpritePal_MistCloud[] = INCBIN_U32("graphics/battle_anims/sprites/mist_cloud.gbapal.lz"); -const u32 gFile_graphics_unknown_unknown_D1BE74_sheet[] = INCBIN_U32("graphics/unknown/unknown_D1BE74.4bpp.lz"); -const u32 gFile_graphics_unknown_unknown_D1BE74_palette[] = INCBIN_U32("graphics/unknown/unknown_D1BE74.gbapal.lz"); -const u32 gFile_graphics_unknown_unknown_D1BE74_tilemap[] = INCBIN_U32("graphics/unknown/unknown_D1BE74.bin.lz"); +const u32 gBattleAnimUnusedGfx_Lights[] = INCBIN_U32("graphics/battle_anims/unused/lights.4bpp.lz"); +const u32 gBattleAnimUnusedPal_Lights[] = INCBIN_U32("graphics/battle_anims/unused/lights.gbapal.lz"); +const u32 gBattleAnimUnusedTilemap_Lights[] = INCBIN_U32("graphics/battle_anims/unused/lights.bin.lz"); const u32 gBattleAnimSpriteGfx_WhirlwindLines[] = INCBIN_U32("graphics/battle_anims/sprites/whirlwind_lines.4bpp.lz"); const u32 gBattleAnimSpritePal_WhirlwindLines[] = INCBIN_U32("graphics/battle_anims/sprites/whirlwind_lines.gbapal.lz"); @@ -1011,8 +1002,7 @@ const u32 gBattleAnimBgTilemap_Ghost[] = INCBIN_U32("graphics/battle_anims/backg const u32 gBattleAnimSpritePal_WhipHit[] = INCBIN_U32("graphics/battle_anims/sprites/whip_hit.gbapal.lz"); const u32 gBattleAnimBgPalette_SolarBeam[] = INCBIN_U32("graphics/battle_anims/backgrounds/solarbeam.gbapal.lz"); - -const u32 gFile_graphics_unknown_unknown_E7CFB0_tilemap[] = INCBIN_U32("graphics/unknown/unknown_E7CFB0.bin.lz"); +const u32 gBattleAnimBgTilemap_SolarBeam[] = INCBIN_U32("graphics/battle_anims/backgrounds/solarbeam.bin.lz"); // Unused const u32 gFile_graphics_berry_blender_center_sheet[] = INCBIN_U32("graphics/berry_blender/center.8bpp.lz"); diff --git a/src/pokemon_special_anim_scene.c b/src/pokemon_special_anim_scene.c index a2e58d761..e88399ea2 100644 --- a/src/pokemon_special_anim_scene.c +++ b/src/pokemon_special_anim_scene.c @@ -98,7 +98,7 @@ static const u8 *const s1_2_and_Poof_textPtrs[] = { gText_Poof, }; -static const u16 sUnref_84599A4[] = { +static const u16 sUnusedArray[] = { 0, 16, 68 };