dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_gfx_sfx_util.c
+2 -2
View File
@@ -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;
}
}
src/battle_main.c
+1 -1
View File
@@ -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)
{
src/battle_util.c
+6 -6
View File
@@ -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
{