diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-28 17:42:11 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2021-02-28 17:11:46 -0600 |
| commit | 91ab30fa71dfe800215e9e7b3309f366ccc6173e (patch) | |
| tree | e8abb91a460d45bcad237fc5f72dd7a326d4d71d /src | |
| parent | ed0347476c73122ec9fb36a14b47ab3850c00231 (diff) | |
Rename mon markings struct
Diffstat (limited to 'src')
| -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 |
3 files changed, 4 insertions, 4 deletions
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; |