dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #631 from GriffinRichards/colorize

Browse Source 
Correct more graphics colors
This commit is contained in:
GriffinR
2023-07-26 22:49:23 -04:00
committed by GitHub
parent 25a8d2b9b1 8ef8535fc5
commit 4da9e7549b
74 changed files with 234 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/graphics.h
+5 -5
View File
@@ -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[];
@@ -4464,9 +4464,9 @@ extern const u32 gBuyMenuFrame_Pal[];
extern const u16 gPPTextPalette[];
// trainer card
extern const u16 gKantoTrainerCard_Pal[];
extern const u16 gKantoTrainerCardBlue_Pal[];
extern const u32 gKantoTrainerCard_Gfx[];
extern const u16 gHoennTrainerCard_Pal[];
extern const u16 gHoennTrainerCardGreen_Pal[];
extern const u32 gHoennTrainerCard_Gfx[];
// battle_interface
include/menu.h
+8 -1
View File
@@ -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);