Skip to content

Commit

Permalink
fixup: naming convention
Browse files Browse the repository at this point in the history
  • Loading branch information
sbird committed Oct 24, 2024
1 parent a8032f9 commit 15eea86
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion include/difficulty.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "script.h"

u32 GetCurrentDifficultyLevel(void);
void SetCurrentDifficulty(u32);
void SetCurrentDifficultyLevel(u32);

u32 GetBattlePartnerDifficultyLevel(u16);
u32 GetTrainerDifficultyLevel(u16);
Expand Down
8 changes: 4 additions & 4 deletions src/difficulty.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand All @@ -79,7 +79,7 @@ void Script_DecreaseDifficulty(struct ScriptContext *ctx)
if (!currentDifficulty)
return;

SetCurrentDifficulty(--currentDifficulty);
SetCurrentDifficultyLevel(--currentDifficulty);
}

void Script_GetDifficulty(struct ScriptContext *ctx)
Expand All @@ -91,5 +91,5 @@ void Script_SetDifficulty(struct ScriptContext *ctx)
{
u32 desiredDifficulty = ScriptReadByte(ctx);

SetCurrentDifficulty(desiredDifficulty);
SetCurrentDifficultyLevel(desiredDifficulty);
}
2 changes: 1 addition & 1 deletion src/new_game.c
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ void NewGameInitData(void)
WipeTrainerNameRecords();
ResetTrainerHillResults();
ResetContestLinkResults();
SetCurrentDifficulty(DIFFICULTY_NORMAL);
SetCurrentDifficultyLevel(DIFFICULTY_NORMAL);
ResetItemFlags();
}

Expand Down

0 comments on commit 15eea86

Please sign in to comment.