atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename a palace battle field

Browse source
This commit is contained in:
DizzyEggg 2019-01-29 22:22:02 +01:00
parent 14641e916e
commit d46e60765d
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/battle.h
View file

@ -168,7 +168,7 @@ struct ProtectStruct
u32 helpingHand:1; u32 helpingHand:1;
u32 bounceMove:1; u32 bounceMove:1;
u32 stealMove:1; u32 stealMove:1;
u32 flag0Unknown:1; u32 flag0Unknown:1; // Only set to 0 once.
u32 prlzImmobility:1; u32 prlzImmobility:1;
u32 confusionSelfDmg:1; u32 confusionSelfDmg:1;
u32 targetNotAffected:1; u32 targetNotAffected:1;
@ -178,10 +178,10 @@ struct ProtectStruct
u32 loveImmobility:1; u32 loveImmobility:1;
u32 usedDisabledMove:1; u32 usedDisabledMove:1;
u32 usedTauntedMove:1; u32 usedTauntedMove:1;
u32 flag2Unknown:1; u32 flag2Unknown:1; // Only set to 0 once. Checked in 'WasUnableToUseMove' function.
u32 flinchImmobility:1; u32 flinchImmobility:1;
u32 notFirstStrike:1; u32 notFirstStrike:1;
u32 palaceAbleToUseMove:1; u32 palaceUnableToUseMove:1;
u32 physicalDmg; u32 physicalDmg;
u32 specialDmg; u32 specialDmg;
u8 physicalBattlerId; u8 physicalBattlerId;

4
src/battle_gfx_sfx_util.c
View file

@ -205,13 +205,13 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
if (Random() % 100 > 49) if (Random() % 100 > 49)
{ {
gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
return 0; return 0;
} }
} }
else else
{ {
gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
return 0; return 0;
} }
} }

2
src/battle_main.c
View file

@ -5492,7 +5492,7 @@ static void HandleAction_UseMove(void)
// choose battlescript // choose battlescript
if (gBattleTypeFlags & BATTLE_TYPE_PALACE if (gBattleTypeFlags & BATTLE_TYPE_PALACE
&& gProtectStructs[gBattlerAttacker].palaceAbleToUseMove) && gProtectStructs[gBattlerAttacker].palaceUnableToUseMove)
{ {
if (gBattleMons[gBattlerAttacker].hp == 0) if (gBattleMons[gBattlerAttacker].hp == 0)
{ {

12
src/battle_util.c
View file

@ -321,7 +321,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
if (gBattleTypeFlags & BATTLE_TYPE_PALACE) if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{ {
gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingDisabledMoveInPalace; gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingDisabledMoveInPalace;
gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
} }
else else
{ {
@ -336,7 +336,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
if (gBattleTypeFlags & BATTLE_TYPE_PALACE) if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{ {
gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingTormentedMoveInPalace; gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingTormentedMoveInPalace;
gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
} }
else else
{ {
@ -351,7 +351,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
if (gBattleTypeFlags & BATTLE_TYPE_PALACE) if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{ {
gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveTauntInPalace; gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveTauntInPalace;
gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
} }
else else
{ {
@ -366,7 +366,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
if (gBattleTypeFlags & BATTLE_TYPE_PALACE) if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{ {
gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisionedMoveInPalace; gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisionedMoveInPalace;
gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
} }
else else
{ {
@ -388,7 +388,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
gLastUsedItem = gBattleMons[gActiveBattler].item; gLastUsedItem = gBattleMons[gActiveBattler].item;
if (gBattleTypeFlags & BATTLE_TYPE_PALACE) if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{ {
gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
} }
else else
{ {
@ -401,7 +401,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
{ {
if (gBattleTypeFlags & BATTLE_TYPE_PALACE) if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{ {
gProtectStructs[gActiveBattler].palaceAbleToUseMove = 1; gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
} }
else else
{ {