From e1d02e352ea8c888d201546b5550c6224551a540 Mon Sep 17 00:00:00 2001 From: Icebound777 Date: Fri, 8 Nov 2024 16:06:38 +0100 Subject: [PATCH] refactor: rename fleeing vars for dx parity --- include/npc.h | 2 +- src/battle/btl_states_actions.c | 2 +- src/encounter.c | 2 +- src/encounter_api.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/npc.h b/include/npc.h index bf89bcf020..ff07693581 100644 --- a/include/npc.h +++ b/include/npc.h @@ -390,7 +390,7 @@ typedef struct EncounterStatus { /* 0x00D */ char unk_0D; /* 0x00E */ s16 coinsEarned; /* valid after battle */ /* 0x010 */ s8 instigatorValue; - /* 0x011 */ s8 disallowFleeing; + /* 0x011 */ s8 forbidFleeing; /* 0x012 */ s8 scriptedBattle; ///< battle started by StartBattle but not by encounter /* 0x013 */ s8 dropWhackaBump; /* 0x014 */ s32 songID; diff --git a/src/battle/btl_states_actions.c b/src/battle/btl_states_actions.c index 4490d6ce05..98c76c70f8 100644 --- a/src/battle/btl_states_actions.c +++ b/src/battle/btl_states_actions.c @@ -274,7 +274,7 @@ void btl_state_update_normal_start(void) { battleStatus->unk_98 = 0; battleStatus->hpDrainCount = 0; gBattleStatus.flags2 |= BS_FLAGS2_CAN_FLEE; - if (currentEncounter->disallowFleeing) { + if (currentEncounter->forbidFleeing) { gBattleStatus.flags2 &= ~BS_FLAGS2_CAN_FLEE; } battleStatus->endBattleFadeOutRate = 10; diff --git a/src/encounter.c b/src/encounter.c index 48e84b70d7..7877261717 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -522,7 +522,7 @@ void update_encounters_neutral(void) { currentEncounter->songID = -1; currentEncounter->unk_18 = -1; currentEncounter->hitType = 0; - currentEncounter->disallowFleeing = FALSE; + currentEncounter->forbidFleeing = FALSE; currentEncounter->dropWhackaBump = FALSE; currentEncounter->flags &= ~ENCOUNTER_FLAG_THUMBS_UP; currentEncounter->flags &= ~ENCOUNTER_FLAG_CANT_SKIP_WIN_DELAY; diff --git a/src/encounter_api.c b/src/encounter_api.c index 207af9cdb5..6350834636 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -206,7 +206,7 @@ void start_battle(Evt* script, s32 songID) { currentEncounter->curEnemy = enemy; currentEncounter->curEncounter = currentEncounter->encounterList[enemy->encounterIndex]; currentEncounter->firstStrikeType = FIRST_STRIKE_NONE; - currentEncounter->disallowFleeing = FALSE; + currentEncounter->forbidFleeing = FALSE; currentEncounter->songID = songID; currentEncounter->unk_18 = -1; @@ -277,7 +277,7 @@ API_CALLABLE(StartBossBattle) { currentEncounter->curEnemy = enemy; currentEncounter->curEncounter = currentEncounter->encounterList[enemy->encounterIndex]; currentEncounter->firstStrikeType = FIRST_STRIKE_NONE; - currentEncounter->disallowFleeing = TRUE; + currentEncounter->forbidFleeing = TRUE; currentEncounter->songID = songID; currentEncounter->unk_18 = -1; @@ -326,7 +326,7 @@ API_CALLABLE(SetBattleMusic) { Bytecode songID = evt_get_variable(script, *args++); EncounterStatus* currentEncounter = &gCurrentEncounter; - currentEncounter->disallowFleeing = TRUE; + currentEncounter->forbidFleeing = TRUE; currentEncounter->songID = songID; currentEncounter->unk_18 = -1; return ApiStatus_DONE2;