From 15eea860a6ee0631b722cadb03d451ddeee28b25 Mon Sep 17 00:00:00 2001 From: sbird Date: Thu, 24 Oct 2024 05:30:58 -0400 Subject: [PATCH] fixup: naming convention --- include/difficulty.h | 2 +- src/difficulty.c | 8 ++++---- src/new_game.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/difficulty.h b/include/difficulty.h index 09c3b53298b..578fda6fdb5 100644 --- a/include/difficulty.h +++ b/include/difficulty.h @@ -5,7 +5,7 @@ #include "script.h" u32 GetCurrentDifficultyLevel(void); -void SetCurrentDifficulty(u32); +void SetCurrentDifficultyLevel(u32); u32 GetBattlePartnerDifficultyLevel(u16); u32 GetTrainerDifficultyLevel(u16); diff --git a/src/difficulty.c b/src/difficulty.c index ae570e095b3..60843444022 100644 --- a/src/difficulty.c +++ b/src/difficulty.c @@ -12,7 +12,7 @@ u32 GetCurrentDifficultyLevel(void) return VarGet(B_VAR_DIFFICULTY); } -void SetCurrentDifficulty(u32 desiredDifficulty) +void SetCurrentDifficultyLevel(u32 desiredDifficulty) { if (!B_VAR_DIFFICULTY) return; @@ -64,7 +64,7 @@ void Script_IncreaseDifficulty(struct ScriptContext *ctx) if (currentDifficulty++ > DIFFICULTY_MAX) return; - SetCurrentDifficulty(currentDifficulty); + SetCurrentDifficultyLevel(currentDifficulty); } void Script_DecreaseDifficulty(struct ScriptContext *ctx) @@ -79,7 +79,7 @@ void Script_DecreaseDifficulty(struct ScriptContext *ctx) if (!currentDifficulty) return; - SetCurrentDifficulty(--currentDifficulty); + SetCurrentDifficultyLevel(--currentDifficulty); } void Script_GetDifficulty(struct ScriptContext *ctx) @@ -91,5 +91,5 @@ void Script_SetDifficulty(struct ScriptContext *ctx) { u32 desiredDifficulty = ScriptReadByte(ctx); - SetCurrentDifficulty(desiredDifficulty); + SetCurrentDifficultyLevel(desiredDifficulty); } diff --git a/src/new_game.c b/src/new_game.c index 1238d730920..2e87238fbbb 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -206,7 +206,7 @@ void NewGameInitData(void) WipeTrainerNameRecords(); ResetTrainerHillResults(); ResetContestLinkResults(); - SetCurrentDifficulty(DIFFICULTY_NORMAL); + SetCurrentDifficultyLevel(DIFFICULTY_NORMAL); ResetItemFlags(); }