From cf4d05e9e78c25eec55818b372bfb0c4d8fb4b13 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 11 Aug 2022 12:09:38 -0400 Subject: [PATCH] Fix typo --- data/battle_scripts_1.s | 4 ++-- include/constants/battle_arena.h | 4 ++-- src/battle_arena.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index ce8d581c8a..1f4ff74b20 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -4496,8 +4496,8 @@ BattleScript_ArenaDoJudgment:: arenajudgmentstring B_MSG_REF_JUDGE_BODY arenawaitmessage B_MSG_REF_JUDGE_BODY arenajudgmentwindow - jumpifbyte CMP_EQUAL, gBattleCommunication + 1, AREAN_RESULT_PLAYER_LOST, BattleScript_ArenaJudgmentPlayerLoses - jumpifbyte CMP_EQUAL, gBattleCommunication + 1, AREAN_RESULT_TIE, BattleScript_ArenaJudgmentDraw + jumpifbyte CMP_EQUAL, gBattleCommunication + 1, ARENA_RESULT_PLAYER_LOST, BattleScript_ArenaJudgmentPlayerLoses + jumpifbyte CMP_EQUAL, gBattleCommunication + 1, ARENA_RESULT_TIE, BattleScript_ArenaJudgmentDraw @ ARENA_RESULT_PLAYER_WON arenajudgmentstring B_MSG_REF_PLAYER_WON arenawaitmessage B_MSG_REF_PLAYER_WON diff --git a/include/constants/battle_arena.h b/include/constants/battle_arena.h index c300459b39..d4288d04fc 100644 --- a/include/constants/battle_arena.h +++ b/include/constants/battle_arena.h @@ -20,7 +20,7 @@ #define ARENA_RESULT_RUNNING 0 // For intermediate steps, when BattleArena_ShowJudgmentWindow should be called again immediately #define ARENA_RESULT_STEP_DONE 1 // A step has been completed, the script may advance to the next instruction #define ARENA_RESULT_PLAYER_WON 2 -#define AREAN_RESULT_PLAYER_LOST 3 -#define AREAN_RESULT_TIE 4 +#define ARENA_RESULT_PLAYER_LOST 3 +#define ARENA_RESULT_TIE 4 #endif //GUARD_CONSTANTS_BATTLE_ARENA_H diff --git a/src/battle_arena.c b/src/battle_arena.c index e0f917e18a..32b52e009f 100644 --- a/src/battle_arena.c +++ b/src/battle_arena.c @@ -473,12 +473,12 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state) } else if (gBattleTextBuff1[0] < gBattleTextBuff2[0]) { - result = AREAN_RESULT_PLAYER_LOST; + result = ARENA_RESULT_PLAYER_LOST; gBattleScripting.battler = 1; } else { - result = AREAN_RESULT_TIE; + result = ARENA_RESULT_TIE; } (*state)++; break;