ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename mon markings struct

Browse Source
This commit is contained in:
GriffinR 2021-02-28 17:42:11 -05:00 committed by huderlem
parent ed0347476c
commit 91ab30fa71
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/mon_markings.h
View File

@ -3,7 +3,7 @@
#define NUM_MON_MARKINGS 4 #define NUM_MON_MARKINGS 4
struct PokemonMarkMenu struct MonMarkingsMenu
{ {
u16 baseTileTag; u16 baseTileTag;
u16 basePaletteTag; u16 basePaletteTag;
@ -23,7 +23,7 @@ struct PokemonMarkMenu
u8 tileLoadState; u8 tileLoadState;
}; };
void InitMonMarkingsMenu(struct PokemonMarkMenu *ptr); void InitMonMarkingsMenu(struct MonMarkingsMenu *ptr);
void BufferMonMarkingsMenuTiles(void); void BufferMonMarkingsMenuTiles(void);
void OpenMonMarkingsMenu(u8 markings, s16 x, s16 y); void OpenMonMarkingsMenu(u8 markings, s16 x, s16 y);
void FreeMonMarkingsMenu(void); void FreeMonMarkingsMenu(void);

4
src/mon_markings.c
View File

@ -285,9 +285,9 @@ static const union AnimCmd *const sAnims_MarkingCombo[] =
sAnim_MarkingCombo_AllOn, sAnim_MarkingCombo_AllOn,
}; };
static EWRAM_DATA struct PokemonMarkMenu *sMenu = NULL; static EWRAM_DATA struct MonMarkingsMenu *sMenu = NULL;
void InitMonMarkingsMenu(struct PokemonMarkMenu *ptr) void InitMonMarkingsMenu(struct MonMarkingsMenu *ptr)
{ {
sMenu = ptr; sMenu = ptr;
} }

2
src/pokemon_storage_system.c
View File

@ -231,7 +231,7 @@ struct PokemonStorageSystemData
struct Sprite *field_D94; struct Sprite *field_D94;
struct Sprite *field_D98[2]; struct Sprite *field_D98[2];
u16 *field_DA0; u16 *field_DA0;
struct PokemonMarkMenu markMenu; struct MonMarkingsMenu markMenu;
struct UnkPSSStruct_2002370 field_1E5C; struct UnkPSSStruct_2002370 field_1E5C;
struct Pokemon movingMon; struct Pokemon movingMon;
struct Pokemon field_2108; struct Pokemon field_2108;

2
src/pokenav_conditions_2.c
View File

@ -132,7 +132,7 @@ struct Pokenav7Struct
u8 listIndexWindowId; u8 listIndexWindowId;
u8 unusedWindowId1; u8 unusedWindowId1;
u8 unusedWindowId2; u8 unusedWindowId2;
struct PokemonMarkMenu monMarks; struct MonMarkingsMenu monMarks;
struct Sprite *monMarksSprite; struct Sprite *monMarksSprite;
struct Sprite *conditionSparkleSprites[MAX_CONDITION_SPARKLES]; struct Sprite *conditionSparkleSprites[MAX_CONDITION_SPARKLES];
u8 windowModeState; u8 windowModeState;