summaryrefslogtreecommitdiff
path: root/src/battle_script_commands.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_script_commands.c')
-rw-r--r--src/battle_script_commands.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 96c849cbc..84f8efaa8 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -4855,7 +4855,7 @@ static void Cmd_openpartyscreen(void)
{
u8 flag40_0, flag40_1, flag40_2, flag40_3;
- hitmarkerFaintBits = gHitMarker >> 0x1C;
+ hitmarkerFaintBits = gHitMarker >> 28;
if (gBitTable[0] & hitmarkerFaintBits)
{
@@ -4984,7 +4984,7 @@ static void Cmd_openpartyscreen(void)
{
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{
- hitmarkerFaintBits = gHitMarker >> 0x1C;
+ hitmarkerFaintBits = gHitMarker >> 28;
if (gBitTable[2] & hitmarkerFaintBits && gBitTable[0] & hitmarkerFaintBits)
{
gActiveBattler = 2;
@@ -5029,7 +5029,7 @@ static void Cmd_openpartyscreen(void)
gBattlescriptCurrInstr += 6;
}
- hitmarkerFaintBits = gHitMarker >> 0x1C;
+ hitmarkerFaintBits = gHitMarker >> 28;
gBattlerFainted = 0;
while (!(gBitTable[gBattlerFainted] & hitmarkerFaintBits)
@@ -5229,7 +5229,7 @@ static void Cmd_switchineffects(void)
if (gBattlescriptCurrInstr[1] == 5)
{
- u32 hitmarkerFaintBits = gHitMarker >> 0x1C;
+ u32 hitmarkerFaintBits = gHitMarker >> 28;
gBattlerFainted++;
while (1)