From 86c21b8e79a8aa2789342e8804dce68320b2434b Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 1 Jun 2023 14:33:32 -0400 Subject: [PATCH] Colorize menu icon graphics, document sMenuInfoIcons --- .../dex_caught_pokeball_and_pokemon_types.png | Bin 1803 -> 0 bytes graphics/interface/menu_info.png | Bin 0 -> 20869 bytes include/graphics.h | 6 +- include/menu.h | 9 ++- src/graphics.c | 6 +- src/learn_move.c | 12 ++-- src/list_menu.c | 60 +++++++++--------- src/pokedex_screen.c | 10 +-- src/pokemon_summary_screen.c | 12 ++-- src/tm_case.c | 10 +-- src/union_room.c | 2 +- 11 files changed, 67 insertions(+), 60 deletions(-) delete mode 100644 graphics/interface/dex_caught_pokeball_and_pokemon_types.png create mode 100644 graphics/interface/menu_info.png diff --git a/graphics/interface/dex_caught_pokeball_and_pokemon_types.png b/graphics/interface/dex_caught_pokeball_and_pokemon_types.png deleted file mode 100644 index 4a9e67954f7b2cf67f214e3c4cc5038e2401f2ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1803 zcmV+m2lV)fP)=8@!9~f+&ysV`lm{UENjHJwwCc{{GM;=JN>+k3Y{o z(o)Rl1w22_vi*C*Va(?TWLfs`0RSPN8}M<~`|=_B9`pGDpZ3oU5c0VJ=b_>Gs{+1$ z);~Y(4u>(H8}Ook{#Ebsa2WGf0Q8@EfY0X!3{QK#Q!T}OZou#~v^#y3_6m4C`7Z!| zYUkv`-!F6W?eqPdJoxoECtpxIk;_E(6FE+Vwu`*Y+k~`;!~hq>`a@;_-YZiXC&*D* z0f&4@)k8kE1OR4sPV~BP0EnQBlM(=06V{Uou-ijY^?+?x)HB5hSjE8?ZuK$(%IF2} z>t6xKhgIf7R~0@|fKz~~;3xuU^%9 z@O0VBsh}M&6(p#zeUl0poxBR@y{d4`?;KWb792+aQPBgS&4r7z;0$0K1>klC2#I3= zc8aniNRT2C1w387MCqx7S&;iumiuK?%c6iIIjV~Ot4D${cx^*^ZBt&nH!dFVqL-6z ze%#8*2fv->)0R<3m(efs5F0%q?g%}B+xD{MC zzyVe8qlyQ>&ucw%c0Fon6CK_FC(-v$oJNinZS;xW$`S#+vzjGxR^u}RY@#jS1wjET z{^1^QVt|YfD#9Zb(8?!gwWtDm&s&??fi1Knv{Qha1Z2cnR6%>-A3st7fKA_n&7h6e zkt|05R0x1~qY9i?VH0{Pz>1-s15C_2bXxj}bQ4MA17)zpO2#lU*e8su-@nqhaK%?^$Q01wPKi6*r4q3Rn0K9U03Z}7 zzzM0_D%kfhzQ!LV1?-{++;Ju8lmfs4 z#G|MJ2LRT6XFZ@b?LJ&A0JO**p;83+071S7ZI|wBs}WD zqzY|r1F&7xWgZKBJF0NyMk;iisnF%T3MXR#=@tz;1bDdzknR~G0L2pOxHwk90z?2v zdq-@8ph*#c>$SefwOp^^P{6M2mSk7DQrZmwkyBZDBz_Rn{lVOZl$9d zxTTX}>pPKp+z6miZ=G!nx-1&O-qQpx zsJ0X3j4B5l0RuImfw!a?fYG-Aiw6b>Cn^y@@XG=G54Jo5P-go;!1qy#fCE?21z*ed zWY(X3l7Q5w0QzNswJ{O{$bnQ?JU~3ag>M>DY7kcPr~*o~W(LfKh9J@67@#WL0MNaF zPn-u7T1`zR0H($49v}*6TOSXuLJwL9&uqoP6d)OcYr#Ii{(Vh7Kw8a$1_p@UG+-P^ zX3j#oA4ubY0R#tZ0(O@P4-u^?WWkmRliFh`mV2;a(_y$=(mfbalw=~<5$_%+cdYSXDN z$P{488^-{#^>rp-wD`}82abI5GQeo@e`ycg48ULtFy|PA+pzfOFN_J8fV$rtIId6K tHL`=@4QAluf!`d+jJw_#Q~oyt{saT)Pi`6v*B<}?002ovPDHLkV1kpbE^Gh* diff --git a/graphics/interface/menu_info.png b/graphics/interface/menu_info.png new file mode 100644 index 0000000000000000000000000000000000000000..a6a7efed395aa536cb328037e099b3d756bcc459 GIT binary patch literal 20869 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 literal 0 HcmV?d00001 diff --git a/include/graphics.h b/include/graphics.h index 8ed50b9b1..4a4d86250 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2745,9 +2745,9 @@ extern const u32 gTrainerPalette_RuinManiac[]; extern const u32 gTrainerPalette_Lady[]; extern const u32 gTrainerPalette_Painter[]; -extern const u8 gFireRedMenuElements_Gfx[]; -extern const u16 gFireRedMenuElements1_Pal[]; -extern const u16 gFireRedMenuElements2_Pal[]; +extern const u8 gMenuInfoElements_Gfx[]; +extern const u16 gMenuInfoElements1_Pal[]; +extern const u16 gMenuInfoElements2_Pal[]; extern const u32 gItemIcon_QuestionMark[]; extern const u32 gItemIconPalette_QuestionMark[]; diff --git a/include/menu.h b/include/menu.h index 4adf467ca..b0dc232fb 100644 --- a/include/menu.h +++ b/include/menu.h @@ -8,6 +8,13 @@ #define MENU_NOTHING_CHOSEN -2 #define MENU_B_PRESSED -1 +#define MENU_INFO_ICON_CAUGHT 0 +#define MENU_INFO_ICON_TYPE (NUMBER_OF_MON_TYPES + 1) +#define MENU_INFO_ICON_POWER (NUMBER_OF_MON_TYPES + 2) +#define MENU_INFO_ICON_ACCURACY (NUMBER_OF_MON_TYPES + 3) +#define MENU_INFO_ICON_PP (NUMBER_OF_MON_TYPES + 4) +#define MENU_INFO_ICON_EFFECT (NUMBER_OF_MON_TYPES + 5) + struct MenuAction { const u8 *text; @@ -31,7 +38,7 @@ s8 Menu2_GetMonSpriteAnchorCoordMinusx20(u16 species, u32 personality, u8 a2); void ListMenu_LoadMonIconPalette(u8 palOffset, u16 speciesId); void ListMenu_DrawMonIconGraphics(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y); void ListMenuLoadStdPalAt(u8 palOffset, u8 palId); -void BlitMoveInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y); +void BlitMenuInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y); // menu s8 Menu_ProcessInputGridLayout(void); diff --git a/src/graphics.c b/src/graphics.c index f4433f49d..8e606ca3f 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1137,9 +1137,9 @@ const u32 gGhostFrontPic[] = INCBIN_U32("graphics/pokemon/ghost/front.4bpp.lz"); #include "data/graphics/mail.h" -const u16 gFireRedMenuElements1_Pal[] = INCBIN_U16("graphics/interface/dex_caught_pokeball.gbapal"); -const u16 gFireRedMenuElements2_Pal[] = INCBIN_U16("graphics/interface/pokemon_types.gbapal"); -const u8 gFireRedMenuElements_Gfx[] = INCBIN_U8("graphics/interface/dex_caught_pokeball_and_pokemon_types.4bpp"); +const u16 gMenuInfoElements1_Pal[] = INCBIN_U16("graphics/interface/dex_caught_pokeball.gbapal"); +const u16 gMenuInfoElements2_Pal[] = INCBIN_U16("graphics/interface/pokemon_types.gbapal"); +const u8 gMenuInfoElements_Gfx[] = INCBIN_U8("graphics/interface/menu_info.4bpp"); const u16 gMoveRelearner_Pal[] = INCBIN_U16("graphics/interface/learn_move.gbapal"); const u32 gMoveRelearner_Gfx[] = INCBIN_U32("graphics/interface/learn_move.4bpp.lz"); diff --git a/src/learn_move.c b/src/learn_move.c index 40ab59061..2f7f04b01 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -816,7 +816,7 @@ static void MoveLearnerInitListMenu(void) static void PrintMoveInfo(u16 move) { u8 buffer[50]; - BlitMoveInfoIcon(2, gBattleMoves[move].type + 1, 1, 4); + BlitMenuInfoIcon(2, gBattleMoves[move].type + 1, 1, 4); if (gBattleMoves[move].power < 2) { @@ -844,11 +844,11 @@ static void PrintMoveInfo(u16 move) static void LoadMoveInfoUI(void) { - BlitMoveInfoIcon(0, 19, 1, 4); - BlitMoveInfoIcon(1, 20, 0, 4); - BlitMoveInfoIcon(1, 21, 0, 19); - BlitMoveInfoIcon(0, 22, 1, 19); - BlitMoveInfoIcon(0, 23, 1, 34); + BlitMenuInfoIcon(0, MENU_INFO_ICON_TYPE, 1, 4); + BlitMenuInfoIcon(1, MENU_INFO_ICON_POWER, 0, 4); + BlitMenuInfoIcon(1, MENU_INFO_ICON_ACCURACY, 0, 19); + BlitMenuInfoIcon(0, MENU_INFO_ICON_PP, 1, 19); + BlitMenuInfoIcon(0, MENU_INFO_ICON_EFFECT, 1, 34); PutWindowTilemap(0); PutWindowTilemap(1); PutWindowTilemap(4); diff --git a/src/list_menu.c b/src/list_menu.c index 95f4b323b..d759f6d79 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -49,32 +49,32 @@ static void ListMenuDrawCursor(struct ListMenu *list); static void ListMenuCallSelectionChangedCallback(struct ListMenu *list, u8 onInit); static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind); -const struct MoveMenuInfoIcon gMoveMenuInfoIcons[] = -{ - { 12, 12, 0x00 }, // Unused - { 32, 12, 0x20 }, // Normal icon - { 32, 12, 0x64 }, // Fight icon - { 32, 12, 0x60 }, // Flying icon - { 32, 12, 0x80 }, // Poison icon - { 32, 12, 0x48 }, // Ground icon - { 32, 12, 0x44 }, // Rock icon - { 32, 12, 0x6C }, // Bug icon - { 32, 12, 0x68 }, // Ghost icon - { 32, 12, 0x88 }, // Steel icon - { 32, 12, 0xA4 }, // ??? (Mystery) icon - { 32, 12, 0x24 }, // Fire icon - { 32, 12, 0x28 }, // Water icon - { 32, 12, 0x2C }, // Grass icon - { 32, 12, 0x40 }, // Electric icon - { 32, 12, 0x84 }, // Psychic icon - { 32, 12, 0x4C }, // Ice icon - { 32, 12, 0xA0 }, // Dragon icon - { 32, 12, 0x8C }, // Dark icon - { 40, 12, 0xA8 }, // -Type- icon - { 40, 12, 0xC0 }, // -Power- icon - { 40, 12, 0xC8 }, // -Accuracy- icon - { 40, 12, 0xE0 }, // -PP- icon - { 40, 12, 0xE8 }, // -Effect- icon +static const struct MoveMenuInfoIcon sMenuInfoIcons[] = +{ // { width, height, offset } + [MENU_INFO_ICON_CAUGHT] = { 12, 12, 0x00 }, + [TYPE_NORMAL + 1] = { 32, 12, 0x20 }, + [TYPE_FIGHTING + 1] = { 32, 12, 0x64 }, + [TYPE_FLYING + 1] = { 32, 12, 0x60 }, + [TYPE_POISON + 1] = { 32, 12, 0x80 }, + [TYPE_GROUND + 1] = { 32, 12, 0x48 }, + [TYPE_ROCK + 1] = { 32, 12, 0x44 }, + [TYPE_BUG + 1] = { 32, 12, 0x6C }, + [TYPE_GHOST + 1] = { 32, 12, 0x68 }, + [TYPE_STEEL + 1] = { 32, 12, 0x88 }, + [TYPE_MYSTERY + 1] = { 32, 12, 0xA4 }, + [TYPE_FIRE + 1] = { 32, 12, 0x24 }, + [TYPE_WATER + 1] = { 32, 12, 0x28 }, + [TYPE_GRASS + 1] = { 32, 12, 0x2C }, + [TYPE_ELECTRIC + 1] = { 32, 12, 0x40 }, + [TYPE_PSYCHIC + 1] = { 32, 12, 0x84 }, + [TYPE_ICE + 1] = { 32, 12, 0x4C }, + [TYPE_DRAGON + 1] = { 32, 12, 0xA0 }, + [TYPE_DARK + 1] = { 32, 12, 0x8C }, + [MENU_INFO_ICON_TYPE] = { 40, 12, 0xA8 }, + [MENU_INFO_ICON_POWER] = { 40, 12, 0xC0 }, + [MENU_INFO_ICON_ACCURACY] = { 40, 12, 0xC8 }, + [MENU_INFO_ICON_PP] = { 40, 12, 0xE0 }, + [MENU_INFO_ICON_EFFECT] = { 40, 12, 0xE8 }, }; static void ListMenuDummyTask(u8 taskId) @@ -743,16 +743,16 @@ void ListMenuLoadStdPalAt(u8 palOffset, u8 palId) { case 0: default: - palette = gFireRedMenuElements1_Pal; + palette = gMenuInfoElements1_Pal; break; case 1: - palette = gFireRedMenuElements2_Pal; + palette = gMenuInfoElements2_Pal; break; } LoadPalette(palette, palOffset, PLTT_SIZE_4BPP); } -void BlitMoveInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y) +void BlitMenuInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y) { - BlitBitmapRectToWindow(windowId, gFireRedMenuElements_Gfx + gMoveMenuInfoIcons[iconId].offset * 32, 0, 0, 128, 128, x, y, gMoveMenuInfoIcons[iconId].width, gMoveMenuInfoIcons[iconId].height); + BlitBitmapRectToWindow(windowId, &gMenuInfoElements_Gfx[sMenuInfoIcons[iconId].offset * TILE_SIZE_4BPP], 0, 0, 128, 128, x, y, sMenuInfoIcons[iconId].width, sMenuInfoIcons[iconId].height); } diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c index 67d826fa4..01960d240 100644 --- a/src/pokedex_screen.c +++ b/src/pokedex_screen.c @@ -1554,11 +1554,11 @@ static void ItemPrintFunc_OrderedListMenu(u8 windowId, u32 itemId, u8 y) DexScreen_PrintMonDexNo(sPokedexScreenData->numericalOrderWindowId, FONT_SMALL, species, 12, y); if (caught) { - BlitMoveInfoIcon(sPokedexScreenData->numericalOrderWindowId, 0, 0x28, y); + BlitMenuInfoIcon(sPokedexScreenData->numericalOrderWindowId, MENU_INFO_ICON_CAUGHT, 0x28, y); type1 = gSpeciesInfo[species].types[0]; - BlitMoveInfoIcon(sPokedexScreenData->numericalOrderWindowId, type1 + 1, 0x78, y); + BlitMenuInfoIcon(sPokedexScreenData->numericalOrderWindowId, type1 + 1, 0x78, y); if (type1 != gSpeciesInfo[species].types[1]) - BlitMoveInfoIcon(sPokedexScreenData->numericalOrderWindowId, gSpeciesInfo[species].types[1] + 1, 0x98, y); + BlitMenuInfoIcon(sPokedexScreenData->numericalOrderWindowId, gSpeciesInfo[species].types[1] + 1, 0x98, y); } } @@ -3091,9 +3091,9 @@ u8 DexScreen_DrawMonAreaPage(void) if (monIsCaught) { - BlitMoveInfoIcon(sPokedexScreenData->windowIds[12], 1 + gSpeciesInfo[species].types[0], 0, 1); + BlitMenuInfoIcon(sPokedexScreenData->windowIds[12], 1 + gSpeciesInfo[species].types[0], 0, 1); if (gSpeciesInfo[species].types[0] != gSpeciesInfo[species].types[1]) - BlitMoveInfoIcon(sPokedexScreenData->windowIds[12], 1 + gSpeciesInfo[species].types[1], 32, 1); + BlitMenuInfoIcon(sPokedexScreenData->windowIds[12], 1 + gSpeciesInfo[species].types[1], 32, 1); } PutWindowTilemap(sPokedexScreenData->windowIds[12]); CopyWindowToVram(sPokedexScreenData->windowIds[12], COPYWIN_GFX); diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index f4b4af3c3..2ff2483b1 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -2919,11 +2919,11 @@ static void PokeSum_DrawMoveTypeIcons(void) if (sMonSummaryScreen->moveIds[i] == MOVE_NONE) continue; - BlitMoveInfoIcon(sMonSummaryScreen->windowIds[5], sMonSummaryScreen->moveTypes[i] + 1, 3, GetMoveNamePrinterYpos(i)); + BlitMenuInfoIcon(sMonSummaryScreen->windowIds[5], sMonSummaryScreen->moveTypes[i] + 1, 3, GetMoveNamePrinterYpos(i)); } if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE) - BlitMoveInfoIcon(sMonSummaryScreen->windowIds[5], sMonSummaryScreen->moveTypes[4] + 1, 3, GetMoveNamePrinterYpos(4)); + BlitMenuInfoIcon(sMonSummaryScreen->windowIds[5], sMonSummaryScreen->moveTypes[4] + 1, 3, GetMoveNamePrinterYpos(4)); } static void PokeSum_PrintPageHeaderText(u8 curPageIndex) @@ -3362,10 +3362,10 @@ static void PokeSum_PrintMonTypeIcons(void) case PSS_PAGE_INFO: if (!sMonSummaryScreen->isEgg) { - BlitMoveInfoIcon(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], sMonSummaryScreen->monTypes[0] + 1, 47, 35); + BlitMenuInfoIcon(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], sMonSummaryScreen->monTypes[0] + 1, 47, 35); if (sMonSummaryScreen->monTypes[0] != sMonSummaryScreen->monTypes[1]) - BlitMoveInfoIcon(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], sMonSummaryScreen->monTypes[1] + 1, 83, 35); + BlitMenuInfoIcon(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], sMonSummaryScreen->monTypes[1] + 1, 83, 35); } break; case PSS_PAGE_SKILLS: @@ -3374,10 +3374,10 @@ static void PokeSum_PrintMonTypeIcons(void) break; case PSS_PAGE_MOVES_INFO: FillWindowPixelBuffer(sMonSummaryScreen->windowIds[6], 0); - BlitMoveInfoIcon(sMonSummaryScreen->windowIds[6], sMonSummaryScreen->monTypes[0] + 1, 0, 3); + BlitMenuInfoIcon(sMonSummaryScreen->windowIds[6], sMonSummaryScreen->monTypes[0] + 1, 0, 3); if (sMonSummaryScreen->monTypes[0] != sMonSummaryScreen->monTypes[1]) - BlitMoveInfoIcon(sMonSummaryScreen->windowIds[6], sMonSummaryScreen->monTypes[1] + 1, 36, 3); + BlitMenuInfoIcon(sMonSummaryScreen->windowIds[6], sMonSummaryScreen->monTypes[1] + 1, 36, 3); PutWindowTilemap(sMonSummaryScreen->windowIds[6]); break; diff --git a/src/tm_case.c b/src/tm_case.c index d2e81374b..dd5adb345 100644 --- a/src/tm_case.c +++ b/src/tm_case.c @@ -1529,10 +1529,10 @@ static void PrintTitle(void) static void DrawMoveInfoLabels(void) { - BlitMoveInfoIcon(WIN_MOVE_INFO_LABELS, 19, 0, 0); - BlitMoveInfoIcon(WIN_MOVE_INFO_LABELS, 20, 0, 12); - BlitMoveInfoIcon(WIN_MOVE_INFO_LABELS, 21, 0, 24); - BlitMoveInfoIcon(WIN_MOVE_INFO_LABELS, 22, 0, 36); + BlitMenuInfoIcon(WIN_MOVE_INFO_LABELS, MENU_INFO_ICON_TYPE, 0, 0); + BlitMenuInfoIcon(WIN_MOVE_INFO_LABELS, MENU_INFO_ICON_POWER, 0, 12); + BlitMenuInfoIcon(WIN_MOVE_INFO_LABELS, MENU_INFO_ICON_ACCURACY, 0, 24); + BlitMenuInfoIcon(WIN_MOVE_INFO_LABELS, MENU_INFO_ICON_PP, 0, 36); CopyWindowToVram(WIN_MOVE_INFO_LABELS, COPYWIN_GFX); } @@ -1553,7 +1553,7 @@ static void PrintMoveInfo(u16 itemId) { // Draw type icon move = ItemIdToBattleMoveId(itemId); - BlitMoveInfoIcon(WIN_MOVE_INFO, gBattleMoves[move].type + 1, 0, 0); + BlitMenuInfoIcon(WIN_MOVE_INFO, gBattleMoves[move].type + 1, 0, 0); // Print power if (gBattleMoves[move].power < 2) diff --git a/src/union_room.c b/src/union_room.c index c5e77b1e5..172c41f33 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -3934,7 +3934,7 @@ static void TradeBoardPrintItemInfo(u8 windowId, u8 y, struct RfuGameData * data } else { - BlitMoveInfoIcon(windowId, type + 1, 68, y); + BlitMenuInfoIcon(windowId, type + 1, 68, y); PrintUnionRoomText(windowId, FONT_NORMAL, gSpeciesNames[species], 118, y, colorIdx); ConvertIntToDecimalStringN(levelStr, level, STR_CONV_MODE_LEFT_ALIGN, 3); PrintUnionRoomText(windowId, FONT_NORMAL, levelStr, GetStringRightAlignXOffset(2, levelStr, 218), y, colorIdx);