diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-01-29 17:22:13 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-29 17:22:13 -0600 |
| commit | d2c17c7fb3ba6149b4e278bd3b644cd4d4d240e2 (patch) | |
| tree | 6b7125b6172aa023d2cc7ccabe294812df809913 | |
| parent | 14641e916e94cfce9f70f9a16843a8e4a31b065f (diff) | |
| parent | d46e60765d4dca8e160368949fad5376af82fa71 (diff) | |
Merge pull request #529 from DizzyEggg/rename
Rename a palace battle field
| -rw-r--r-- | include/battle.h | 6 | ||||
| -rw-r--r-- | src/battle_gfx_sfx_util.c | 4 | ||||
| -rw-r--r-- | src/battle_main.c | 2 | ||||
| -rw-r--r-- | src/battle_util.c | 12 |
4 files changed, 12 insertions, 12 deletions
diff --git a/include/battle.h b/include/battle.h index 0ed09caad..9295a3548 100644 --- a/include/battle.h +++ b/include/battle.h @@ -168,7 +168,7 @@ struct ProtectStruct u32 helpingHand:1; u32 bounceMove:1; u32 stealMove:1; - u32 flag0Unknown:1; + u32 flag0Unknown:1; // Only set to 0 once. u32 prlzImmobility:1; u32 confusionSelfDmg:1; u32 targetNotAffected:1; @@ -178,10 +178,10 @@ struct ProtectStruct u32 loveImmobility:1; u32 usedDisabledMove:1; u32 usedTauntedMove:1; - u32 flag2Unknown:1; + u32 flag2Unknown:1; // Only set to 0 once. Checked in 'WasUnableToUseMove' function. u32 flinchImmobility:1; u32 notFirstStrike:1; - u32 palaceAbleToUseMove:1; + u32 palaceUnableToUseMove:1; u32 physicalDmg; u32 specialDmg; u8 physicalBattlerId; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 089d09558..7c6b74304 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -205,13 +205,13 @@ u16 ChooseMoveAndTargetInBattlePalace(void) if (Random() % 100 > 49) { - gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; + gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; return 0; } } else { - gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; + gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; return 0; } } diff --git a/src/battle_main.c b/src/battle_main.c index 6d04103e5..09ea3dfc9 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -5492,7 +5492,7 @@ static void HandleAction_UseMove(void) // choose battlescript if (gBattleTypeFlags & BATTLE_TYPE_PALACE - && gProtectStructs[gBattlerAttacker].palaceAbleToUseMove) + && gProtectStructs[gBattlerAttacker].palaceUnableToUseMove) { if (gBattleMons[gBattlerAttacker].hp == 0) { diff --git a/src/battle_util.c b/src/battle_util.c index 04659571e..2f583a9c7 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -321,7 +321,7 @@ u8 TrySetCantSelectMoveBattleScript(void) if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingDisabledMoveInPalace; - gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; + gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; } else { @@ -336,7 +336,7 @@ u8 TrySetCantSelectMoveBattleScript(void) if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingTormentedMoveInPalace; - gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; + gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; } else { @@ -351,7 +351,7 @@ u8 TrySetCantSelectMoveBattleScript(void) if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveTauntInPalace; - gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; + gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; } else { @@ -366,7 +366,7 @@ u8 TrySetCantSelectMoveBattleScript(void) if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisionedMoveInPalace; - gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; + gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; } else { @@ -388,7 +388,7 @@ u8 TrySetCantSelectMoveBattleScript(void) gLastUsedItem = gBattleMons[gActiveBattler].item; if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { - gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; + gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; } else { @@ -401,7 +401,7 @@ u8 TrySetCantSelectMoveBattleScript(void) { if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { - gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; + gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; } else { |