From 7a322ba04e1293719a3ca9b6be19e25ae351203a Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Mon, 13 Mar 2023 23:09:19 +0800 Subject: [PATCH] Document more of src/graphics.c --- ...unknown_D2EC24.bin => unused_level_up.bin} | Bin ...unknown_D2EC24.png => unused_level_up.png} | Bin ...ner_memo_pal1.pal => trainer_memo_pal.pal} | 34 +++++++++++++++++- graphics/interface/trainer_memo_pal2.pal | 19 ---------- graphics/interface/trainer_memo_pal3.pal | 19 ---------- .../item_menu/{bag_tilemap1.bin => bg.bin} | Bin graphics/item_menu/{bag_tiles.png => bg.png} | Bin .../{bag_tilemap2.bin => bg_item_pc.bin} | Bin graphics/teachy_tv/border.png | Bin 0 -> 307 bytes graphics/unknown/unknown_E861A8.bin | Bin 512 -> 0 bytes .../gray_palette.pal} | 0 .../red_palette.pal} | 0 graphics_file_rules.mk | 4 +-- include/graphics.h | 6 ++-- src/graphics.c | 23 +++++------- src/item_menu.c | 6 ++-- src/pokemon_summary_screen.c | 20 +++++------ 17 files changed, 60 insertions(+), 71 deletions(-) rename graphics/battle_anims/masks/{unknown_D2EC24.bin => unused_level_up.bin} (100%) rename graphics/battle_anims/masks/{unknown_D2EC24.png => unused_level_up.png} (100%) rename graphics/interface/{trainer_memo_pal1.pal => trainer_memo_pal.pal} (71%) delete mode 100644 graphics/interface/trainer_memo_pal2.pal delete mode 100644 graphics/interface/trainer_memo_pal3.pal rename graphics/item_menu/{bag_tilemap1.bin => bg.bin} (100%) rename graphics/item_menu/{bag_tiles.png => bg.png} (100%) rename graphics/item_menu/{bag_tilemap2.bin => bg_item_pc.bin} (100%) create mode 100644 graphics/teachy_tv/border.png delete mode 100644 graphics/unknown/unknown_E861A8.bin rename graphics/{unknown/unknown_E87010.pal => unused/gray_palette.pal} (100%) rename graphics/{unknown/unknown_E9BD08.pal => unused/red_palette.pal} (100%) 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/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/graphics/teachy_tv/border.png b/graphics/teachy_tv/border.png new file mode 100644 index 0000000000000000000000000000000000000000..08fa27da6c847939c93b82cb77cd1c7f26997525 GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv_7YEDSN7-3JZutj+p6YP0fod% zTq8ibrPy~PaG)&ISmybKL3le4p1dV2md z{0E``Tfd*vyf#Omzh5*FsFyLx+uensgH_f8$O-p!aSW-Llbn&@z~0o<>YSW6kA%3y8w#AA7g|ZQ`osv@OlUChG4^q|Ikj;D!zw;Dwd4{;;Zv+LF6O8@ nHLyA>i1;>$Iy0QTrpUwaMu#uyflS#6pcM?Bu6{1-oD!M<89-r= literal 0 HcmV?d00001 diff --git a/graphics/unknown/unknown_E861A8.bin b/graphics/unknown/unknown_E861A8.bin deleted file mode 100644 index deae79449574294ae3ed9108efe3e5b02fb77957..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmd6i!3n@H2t~aJJ?aLH6STTOAr8<(vi~a8o>Is)&<8Jw20v~PFf(xxVl^tY(dkIq vAWe#hshOL558mGRR7dcRFd2>CrZp+TZejg;M0C2E%(&7x>rQcX;=lGk*I^Fn 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 be3f9d58f..2b3f4ea83 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -194,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 @@ -503,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/graphics.c b/src/graphics.c index 01ed0161b..31d3a8e2c 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -883,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"); @@ -1075,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) @@ -1115,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" @@ -1195,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"); @@ -1209,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_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++;