diff options
| -rw-r--r-- | include/mon_markings.h | 4 | ||||
| -rw-r--r-- | src/mon_markings.c | 4 | ||||
| -rw-r--r-- | src/pokemon_storage_system.c | 2 | ||||
| -rw-r--r-- | src/pokenav_conditions_2.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/mon_markings.h b/include/mon_markings.h index 4053c5f68..fda7ad563 100644 --- a/include/mon_markings.h +++ b/include/mon_markings.h @@ -3,7 +3,7 @@ #define NUM_MON_MARKINGS 4 -struct PokemonMarkMenu +struct MonMarkingsMenu { u16 baseTileTag; u16 basePaletteTag; @@ -23,7 +23,7 @@ struct PokemonMarkMenu u8 tileLoadState; }; -void InitMonMarkingsMenu(struct PokemonMarkMenu *ptr); +void InitMonMarkingsMenu(struct MonMarkingsMenu *ptr); void BufferMonMarkingsMenuTiles(void); void OpenMonMarkingsMenu(u8 markings, s16 x, s16 y); void FreeMonMarkingsMenu(void); diff --git a/src/mon_markings.c b/src/mon_markings.c index ed734e72f..e71d6d795 100644 --- a/src/mon_markings.c +++ b/src/mon_markings.c @@ -285,9 +285,9 @@ static const union AnimCmd *const sAnims_MarkingCombo[] = 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; } diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index c004c8cce..3d6dc331c 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -231,7 +231,7 @@ struct PokemonStorageSystemData struct Sprite *field_D94; struct Sprite *field_D98[2]; u16 *field_DA0; - struct PokemonMarkMenu markMenu; + struct MonMarkingsMenu markMenu; struct UnkPSSStruct_2002370 field_1E5C; struct Pokemon movingMon; struct Pokemon field_2108; diff --git a/src/pokenav_conditions_2.c b/src/pokenav_conditions_2.c index 412d9b8aa..26607926b 100644 --- a/src/pokenav_conditions_2.c +++ b/src/pokenav_conditions_2.c @@ -132,7 +132,7 @@ struct Pokenav7Struct u8 listIndexWindowId; u8 unusedWindowId1; u8 unusedWindowId2; - struct PokemonMarkMenu monMarks; + struct MonMarkingsMenu monMarks; struct Sprite *monMarksSprite; struct Sprite *conditionSparkleSprites[MAX_CONDITION_SPARKLES]; u8 windowModeState; |