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/battle_anims/masks/unknown_D2EC24.bin b/graphics/battle_anims/masks/unused_level_up.bin similarity index 100% rename from graphics/battle_anims/masks/unknown_D2EC24.bin rename to graphics/battle_anims/masks/unused_level_up.bin diff --git a/graphics/battle_anims/masks/unknown_D2EC24.png b/graphics/battle_anims/masks/unused_level_up.png similarity index 100% rename from graphics/battle_anims/masks/unknown_D2EC24.png rename to graphics/battle_anims/masks/unused_level_up.png 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/graphics/interface/trainer_memo_pal1.pal b/graphics/interface/trainer_memo_pal.pal similarity index 71% rename from graphics/interface/trainer_memo_pal1.pal rename to graphics/interface/trainer_memo_pal.pal index 44fe49317..a574f8c50 100644 --- a/graphics/interface/trainer_memo_pal1.pal +++ b/graphics/interface/trainer_memo_pal.pal @@ -1,6 +1,6 @@ JASC-PAL 0100 -80 +112 255 0 255 0 123 197 230 222 156 @@ -81,3 +81,35 @@ JASC-PAL 123 131 148 255 255 255 98 106 123 +255 0 255 +255 255 255 +230 230 238 +106 230 230 +98 106 123 +90 213 213 +230 205 255 +205 172 238 +255 0 255 +255 0 255 +255 255 255 +213 213 213 +222 222 222 +230 230 230 +246 246 246 +246 246 246 +255 0 255 +0 123 197 +230 222 156 +230 205 255 +0 74 148 +123 156 156 +197 189 115 +106 197 205 +106 230 230 +90 213 213 +205 172 238 +180 139 213 +255 180 0 +123 131 148 +255 255 255 +98 106 123 diff --git a/graphics/interface/trainer_memo_pal2.pal b/graphics/interface/trainer_memo_pal2.pal deleted file mode 100644 index 22efdfee5..000000000 --- a/graphics/interface/trainer_memo_pal2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -255 255 255 -230 230 238 -106 230 230 -98 106 123 -90 213 213 -230 205 255 -205 172 238 -255 0 255 -255 0 255 -255 255 255 -213 213 213 -222 222 222 -230 230 230 -246 246 246 -246 246 246 diff --git a/graphics/interface/trainer_memo_pal3.pal b/graphics/interface/trainer_memo_pal3.pal deleted file mode 100644 index 7f6927b5f..000000000 --- a/graphics/interface/trainer_memo_pal3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 255 -0 123 197 -230 222 156 -230 205 255 -0 74 148 -123 156 156 -197 189 115 -106 197 205 -106 230 230 -90 213 213 -205 172 238 -180 139 213 -255 180 0 -123 131 148 -255 255 255 -98 106 123 diff --git a/graphics/item_menu/bag_tilemap1.bin b/graphics/item_menu/bg.bin similarity index 100% rename from graphics/item_menu/bag_tilemap1.bin rename to graphics/item_menu/bg.bin diff --git a/graphics/item_menu/bag_tiles.png b/graphics/item_menu/bg.png similarity index 100% rename from graphics/item_menu/bag_tiles.png rename to graphics/item_menu/bg.png diff --git a/graphics/item_menu/bag_tilemap2.bin b/graphics/item_menu/bg_item_pc.bin similarity index 100% rename from graphics/item_menu/bag_tilemap2.bin rename to graphics/item_menu/bg_item_pc.bin 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/teachy_tv/border.png b/graphics/teachy_tv/border.png new file mode 100644 index 000000000..08fa27da6 Binary files /dev/null and b/graphics/teachy_tv/border.png differ diff --git a/graphics/unknown/unknown_D12A44.png b/graphics/unknown/unknown_D12A44.png deleted file mode 100644 index 96c49a992..000000000 Binary files a/graphics/unknown/unknown_D12A44.png and /dev/null differ diff --git a/graphics/unknown/unknown_D12A64.png b/graphics/unknown/unknown_D12A64.png deleted file mode 100644 index 1a82e117e..000000000 Binary files a/graphics/unknown/unknown_D12A64.png and /dev/null differ diff --git a/graphics/unknown/unknown_E861A8.bin b/graphics/unknown/unknown_E861A8.bin deleted file mode 100644 index deae79449..000000000 Binary files a/graphics/unknown/unknown_E861A8.bin and /dev/null differ 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 73086d4d2..000000000 Binary files a/graphics/unknown/unused_window.png and /dev/null differ diff --git a/graphics/unknown/unknown_E87010.pal b/graphics/unused/gray_palette.pal similarity index 100% rename from graphics/unknown/unknown_E87010.pal rename to graphics/unused/gray_palette.pal diff --git a/graphics/unknown/unknown_E9BD08.pal b/graphics/unused/red_palette.pal similarity index 100% rename from graphics/unknown/unknown_E9BD08.pal rename to graphics/unused/red_palette.pal diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 96917f5c9..2b3f4ea83 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -31,6 +31,7 @@ HALLOFFAMEGFXDIR := graphics/hall_of_fame MAPPREVIEWGFXDIR := graphics/map_preview NAMINGGFXDIR := graphics/naming_screen WALLPAPERGFXDIR := graphics/pokemon_storage/wallpapers +JPCONTESTGFXDIR := graphics/contest/japanese types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -158,20 +159,20 @@ $(BATINTGFXDIR)/level_up_banner.4bpp: %.4bpp: %.png $(BATINTGFXDIR)/textbox.gbapal: $(BATINTGFXDIR)/textbox1.gbapal $(BATINTGFXDIR)/textbox2.gbapal cat $^ > $@ -$(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 \ @@ -193,7 +194,7 @@ $(BTLANMSPRGFXDIR)/spark.4bpp: $(BTLANMSPRGFXDIR)/spark_0.4bpp \ $(BTLANMSPRGFXDIR)/spark_1.4bpp @cat $^ >$@ -$(MASKSGFXDIR)/unknown_D2EC24.4bpp: %.4bpp: %.png +$(MASKSGFXDIR)/unused_level_up.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 14 -Wnum_tiles $(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png @@ -502,7 +503,7 @@ graphics/pokemon/heracross/unk_icon.4bpp: %.4bpp: %.png graphics/misc/emoticons.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(ITEMMENUGFXDIR)/bag_tiles.4bpp: %.4bpp: %.png +$(ITEMMENUGFXDIR)/bg.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 55 -Wnum_tiles $(INTROGFXDIR)/scene_1/grass.4bpp: %.4bpp: %.png diff --git a/include/graphics.h b/include/graphics.h index 065132441..15b4ce3cc 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4866,9 +4866,9 @@ extern const u16 gBattleInterface_Healthbox_Pal[]; extern const u16 gBattleInterface_Healthbar_Pal[]; // item_menu -extern const u32 gUnknown_8E830CC[]; -extern const u32 gUnknown_8E832C0[]; -extern const u32 gUnknown_8E83444[]; +extern const u32 gBagBg_Gfx[]; +extern const u32 gBagBg_Tilemap[]; +extern const u32 gBagBg_ItemPC_Tilemap[]; extern const u32 gBagBgPalette[]; extern const u32 gBagBgPalette_FemaleOverride[]; 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..31d3a8e2c 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"); @@ -892,8 +883,8 @@ const u32 gBattleAnimSpriteGfx_TagHand[] = INCBIN_U32("graphics/battle_anims/spr const u32 gBattleAnimSpriteGfx_NoiseLine[] = INCBIN_U32("graphics/battle_anims/sprites/noise_line.4bpp.lz"); -const u32 gUnusedLevelupAnimationGfx[] = INCBIN_U32("graphics/battle_anims/masks/unknown_D2EC24.4bpp.lz"); -const u32 gUnusedLevelupAnimationTilemap[] = INCBIN_U32("graphics/battle_anims/masks/unknown_D2EC24.bin.lz"); +const u32 gUnusedLevelupAnimationGfx[] = INCBIN_U32("graphics/battle_anims/masks/unused_level_up.4bpp.lz"); +const u32 gUnusedLevelupAnimationTilemap[] = INCBIN_U32("graphics/battle_anims/masks/unused_level_up.bin.lz"); const u32 gBattleAnimSpriteGfx_SmallRedEye[] = INCBIN_U32("graphics/battle_anims/sprites/small_red_eye.4bpp.lz"); const u32 gBattleAnimSpritePal_SmallRedEye[] = INCBIN_U32("graphics/battle_anims/sprites/small_red_eye.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"); @@ -1085,11 +1075,9 @@ const u32 gPartyMenuPokeball_Pal[] = INCBIN_U32("graphics/party_menu/pokeball.gb const u32 gStatusGfx_Icons[] = INCBIN_U32("graphics/interface/status_icons.4bpp.lz"); const u32 gStatusPal_Icons[] = INCBIN_U32("graphics/interface/status_icons.gbapal.lz"); -const u32 gUnknown_8E830CC[] = INCBIN_U32("graphics/item_menu/bag_tiles.4bpp.lz"); - -const u32 gUnknown_8E832C0[] = INCBIN_U32("graphics/item_menu/bag_tilemap1.bin.lz"); // bag menu -const u32 gUnknown_8E83444[] = INCBIN_U32("graphics/item_menu/bag_tilemap2.bin.lz"); // PC deposit items - +const u32 gBagBg_Gfx[] = INCBIN_U32("graphics/item_menu/bg.4bpp.lz"); +const u32 gBagBg_Tilemap[] = INCBIN_U32("graphics/item_menu/bg.bin.lz"); +const u32 gBagBg_ItemPC_Tilemap[] = INCBIN_U32("graphics/item_menu/bg_item_pc.bin.lz"); const u32 gBagBgPalette[] = INCBIN_U32("graphics/item_menu/bag_pal1.gbapal.lz"); // palette 1 (Boy + misc Pal) const u32 gBagBgPalette_FemaleOverride[] = INCBIN_U32("graphics/item_menu/bag_pal2.gbapal.lz"); // palette 2 (Girl) @@ -1125,14 +1113,13 @@ const u32 gBuyMenuFrame_Tilemap[] = INCBIN_U32("graphics/shop_menu/shop_tilemap. const u32 gBuyMenuFrame_TmHmTilemap[] = INCBIN_U32("graphics/shop_menu/shop_tm_hm_tilemap.bin.lz"); const u32 gBuyMenuFrame_Pal[] = INCBIN_U32("graphics/shop_menu/shop_menu.gbapal.lz"); -const u32 gUnknown_8E861A8[] = INCBIN_U32("graphics/unknown/unknown_E861A8.bin.lz"); - +const u8 gTeachyTv_Border_Gfx[] = INCBIN_U8("graphics/teachy_tv/border.4bpp.lz"); // Unused const u8 gTeachyTv_Gfx[] = INCBIN_U8("graphics/teachy_tv/tiles.4bpp.lz"); const u8 gTeachyTvScreen_Tilemap[] = INCBIN_U8("graphics/teachy_tv/screen.bin.lz"); const u8 gTeachyTvTitle_Tilemap[] = INCBIN_U8("graphics/teachy_tv/title.bin.lz"); const u32 gTeachyTv_Pal[] = INCBIN_U32("graphics/teachy_tv/tiles.gbapal.lz"); -const u32 gUnknown_8E87010[] = INCBIN_U32("graphics/unknown/unknown_E87010.gbapal.lz"); +const u32 gUnusedGrayPalette[] = INCBIN_U32("graphics/unused/gray_palette.gbapal.lz"); #include "data/graphics/items.h" @@ -1205,9 +1192,7 @@ const u32 gEasyChatButtonWindow_Gfx[] = INCBIN_U32("graphics/easy_chat/button_wi const u32 gEasyChatMode_Gfx[] = INCBIN_U32("graphics/easy_chat/mode.4bpp.lz"); const u32 gPokeSumBgTiles[] = INCBIN_U32("graphics/interface/trainer_memo.4bpp.lz"); -const u32 gTrainerMemoPal1[] = INCBIN_U32("graphics/interface/trainer_memo_pal1.gbapal"); -const u32 gUnknown_8E9B3B0[] = INCBIN_U32("graphics/interface/trainer_memo_pal2.gbapal"); -const u32 gUnknown_8E9B3D0[] = INCBIN_U32("graphics/interface/trainer_memo_pal3.gbapal"); +const u32 gTrainerMemoPal[] = INCBIN_U32("graphics/interface/trainer_memo_pal.gbapal"); const u32 gPokeSummary_ExpBarTiles[] = INCBIN_U32("graphics/interface/summary_exp_bar.4bpp.lz"); const u32 gPokeSummary_HpBarTiles[] = INCBIN_U32("graphics/interface/summary_hp_bar.4bpp.lz"); @@ -1219,7 +1204,7 @@ const u32 gBgTilemap_PokeSum_MovesListForDelete[] = INCBIN_U32("graphics/interfa const u32 gBgTilemap_PokeSum_MoveDetailsForDelete[] = INCBIN_U32("graphics/interface/trainer_memo_4.bin.lz"); const u32 gBgTilemap_TrainerMemo_Egg[] = INCBIN_U32("graphics/interface/trainer_memo_5.bin.lz"); -const u16 gUnknown_8E9BD08[] = INCBIN_U16("graphics/unknown/unknown_E9BD08.gbapal"); +const u16 gUnusedRedPalette[] = INCBIN_U16("graphics/unused/red_palette.gbapal"); const u32 gEasyChatRectangleCursor_Gfx[] = INCBIN_U32("graphics/easy_chat/rectangle_cursor.4bpp.lz"); const u16 gPokeSummary_StatusAilmentIconPals[] = INCBIN_U16("graphics/interface/status_ailment_icons.gbapal"); diff --git a/src/item_menu.c b/src/item_menu.c index f9b2a9f1a..4b31cfab0 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -562,16 +562,16 @@ static bool8 DoLoadBagGraphics(void) { case 0: ResetTempTileDataBuffers(); - DecompressAndCopyTileDataToVram(1, gUnknown_8E830CC, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, gBagBg_Gfx, 0, 0, 0); sBagMenuDisplay->data[0]++; break; case 1: if (FreeTempTileDataBuffersIfPossible() != TRUE) { if (gBagMenuState.location != ITEMMENULOCATION_ITEMPC) - LZDecompressWram(gUnknown_8E832C0, sBagBgTilemapBuffer); + LZDecompressWram(gBagBg_Tilemap, sBagBgTilemapBuffer); else - LZDecompressWram(gUnknown_8E83444, sBagBgTilemapBuffer); + LZDecompressWram(gBagBg_ItemPC_Tilemap, sBagBgTilemapBuffer); sBagMenuDisplay->data[0]++; } break; 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 }; diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index c56f243b2..01518a96f 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -332,7 +332,7 @@ extern const u32 gBgTilemap_PokeSum_MovesListForDelete[]; extern const u32 gBgTilemap_TrainerMemo_Details[]; extern const u32 gBgTilemap_PokeSum_MoveDetailsForDelete[]; extern const u32 gBgTilemap_TrainerMemo_Egg[]; -extern const u16 gTrainerMemoPal1[]; +extern const u16 gTrainerMemoPal[]; extern const u32 gPokeSumBgTiles[]; extern const u16 gPokeSummary_ExpBarPals[]; extern const u32 gPokeSummary_StatusAilmentIconTiles[]; @@ -2007,16 +2007,16 @@ static u8 PokeSum_HandleLoadBgGfx(void) switch (sMonSummaryScreen->loadBgGfxStep) { case 0: - LoadPalette(gTrainerMemoPal1, 0, 0x20 * 5); + LoadPalette(gTrainerMemoPal, 0, 0x20 * 5); if (IsMonShiny(&sMonSummaryScreen->currentMon) == TRUE && !sMonSummaryScreen->isEgg) { - LoadPalette(&gTrainerMemoPal1[16 * 6], 0, 0x20); - LoadPalette(&gTrainerMemoPal1[16 * 5], 0x10, 0x20); + LoadPalette(&gTrainerMemoPal[16 * 6], 0, 0x20); + LoadPalette(&gTrainerMemoPal[16 * 5], 0x10, 0x20); } else { - LoadPalette(&gTrainerMemoPal1[16 * 0], 0, 0x20); - LoadPalette(&gTrainerMemoPal1[16 * 1], 0x10, 0x20); + LoadPalette(&gTrainerMemoPal[16 * 0], 0, 0x20); + LoadPalette(&gTrainerMemoPal[16 * 1], 0x10, 0x20); } break; @@ -5079,13 +5079,13 @@ static void Task_PokeSum_SwitchDisplayedPokemon(u8 taskId) if (IsMonShiny(&sMonSummaryScreen->currentMon) == TRUE && !sMonSummaryScreen->isEgg) { - LoadPalette(&gTrainerMemoPal1[16 * 6], 0, 0x20); - LoadPalette(&gTrainerMemoPal1[16 * 5], 0x10, 0x20); + LoadPalette(&gTrainerMemoPal[16 * 6], 0, 0x20); + LoadPalette(&gTrainerMemoPal[16 * 5], 0x10, 0x20); } else { - LoadPalette(&gTrainerMemoPal1[16 * 0], 0, 0x20); - LoadPalette(&gTrainerMemoPal1[16 * 1], 0x10, 0x20); + LoadPalette(&gTrainerMemoPal[16 * 0], 0, 0x20); + LoadPalette(&gTrainerMemoPal[16 * 1], 0x10, 0x20); } sMonSummaryScreen->switchMonTaskState++;