Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix variable names related to fleeing battles being logically inverted #1219

Merged
merged 3 commits into from
Nov 9, 2024
Merged

Fix variable names related to fleeing battles being logically inverted #1219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
203bbe8
fix: inverted logic for fleeing battles
icebound777 Nov 7, 2024
a88c2e3
fix: wrongly named can_flee enum name
icebound777 Nov 7, 2024
e1d02e3
refactor: rename fleeing vars for dx parity
icebound777 Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/enums.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3606,7 +3606,7 @@ enum BattleStatusFlags2 {
BS_FLAGS2_PARTNER_TURN_USED = 0x00000004, // set after partner has used their action for this turn
BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER = 0x00000008, // override inactive player animations and effects
BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER = 0x00000010, // override inactive partner animations and effects
BS_FLAGS2_CANT_FLEE = 0x00000020,
BS_FLAGS2_CAN_FLEE = 0x00000020,
BS_FLAGS2_PEACH_BATTLE = 0x00000040,
BS_FLAGS2_STORED_TURBO_CHARGE_TURN = 0x00000100, // prevents turbo charge turns from decrementing on begin player turn
BS_FLAGS2_DOING_JUMP_TUTORIAL = 0x00000200,
Expand Down
2 changes: 1 addition & 1 deletion include/npc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ typedef struct EncounterStatus {
/* 0x00D */ char unk_0D;
/* 0x00E */ s16 coinsEarned; /* valid after battle */
/* 0x010 */ s8 instigatorValue;
/* 0x011 */ s8 allowFleeing;
/* 0x011 */ s8 forbidFleeing;
/* 0x012 */ s8 scriptedBattle; ///< battle started by StartBattle but not by encounter
/* 0x013 */ s8 dropWhackaBump;
/* 0x014 */ s32 songID;
Expand Down
6 changes: 3 additions & 3 deletions src/battle/btl_states_actions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,9 @@ void btl_state_update_normal_start(void) {
battleStatus->jumpCharge = 0;
battleStatus->unk_98 = 0;
battleStatus->hpDrainCount = 0;
gBattleStatus.flags2 |= BS_FLAGS2_CANT_FLEE;
if (currentEncounter->allowFleeing) {
gBattleStatus.flags2 &= ~BS_FLAGS2_CANT_FLEE;
gBattleStatus.flags2 |= BS_FLAGS2_CAN_FLEE;
if (currentEncounter->forbidFleeing) {
gBattleStatus.flags2 &= ~BS_FLAGS2_CAN_FLEE;
}
battleStatus->endBattleFadeOutRate = 10;
battleStatus->waitForState = BATTLE_STATE_0;
Expand Down
2 changes: 1 addition & 1 deletion src/battle/btl_states_menus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3581,7 +3581,7 @@ void btl_state_update_player_menu(void) {
D_802AD690[entryIdx] = 1;
D_802AD658[entryIdx] = BattleMenu_LeftJustMessages[BTL_MENU_TYPE_RUN_AWAY];
D_802AD6C0[entryIdx] = MSG_Menus_Action_RunAway;
if (!(gBattleStatus.flags2 & BS_FLAGS2_CANT_FLEE)) {
if (!(gBattleStatus.flags2 & BS_FLAGS2_CAN_FLEE)) {
ethteck marked this conversation as resolved.
Show resolved Hide resolved
D_802AD640[entryIdx] = battle_menu_FleeHudScripts.disabled;
D_802AD690[entryIdx] = 0;
D_802AD6A8[entryIdx] = 1;
Expand Down
2 changes: 1 addition & 1 deletion src/encounter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ void update_encounters_neutral(void) {
currentEncounter->songID = -1;
currentEncounter->unk_18 = -1;
currentEncounter->hitType = 0;
currentEncounter->allowFleeing = FALSE;
currentEncounter->forbidFleeing = FALSE;
currentEncounter->dropWhackaBump = FALSE;
currentEncounter->flags &= ~ENCOUNTER_FLAG_THUMBS_UP;
currentEncounter->flags &= ~ENCOUNTER_FLAG_CANT_SKIP_WIN_DELAY;
Expand Down
6 changes: 3 additions & 3 deletions src/encounter_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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->allowFleeing = FALSE;
currentEncounter->forbidFleeing = FALSE;
currentEncounter->songID = songID;
currentEncounter->unk_18 = -1;

Expand Down Expand Up @@ -277,7 +277,7 @@ API_CALLABLE(StartBossBattle) {
currentEncounter->curEnemy = enemy;
currentEncounter->curEncounter = currentEncounter->encounterList[enemy->encounterIndex];
currentEncounter->firstStrikeType = FIRST_STRIKE_NONE;
currentEncounter->allowFleeing = TRUE;
currentEncounter->forbidFleeing = TRUE;
currentEncounter->songID = songID;
currentEncounter->unk_18 = -1;

Expand Down Expand Up @@ -326,7 +326,7 @@ API_CALLABLE(SetBattleMusic) {
Bytecode songID = evt_get_variable(script, *args++);
EncounterStatus* currentEncounter = &gCurrentEncounter;

currentEncounter->allowFleeing = TRUE;
currentEncounter->forbidFleeing = TRUE;
currentEncounter->songID = songID;
currentEncounter->unk_18 = -1;
return ApiStatus_DONE2;
Expand Down
Loading