diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-31 00:36:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 00:36:20 -0400 |
| commit | 5d7c438efcd341c777c866a7eb3f8401f8548dc5 (patch) | |
| tree | ea4c848c8239b51efff64c5bc4fccc9517c2722d /src/battle_script_commands.c | |
| parent | e8b6b4b65e3b53f5fcf83035b9f848c5ef6378bd (diff) | |
| parent | 8c6e89e994b312b3c6d36bcda8636343f80e4801 (diff) | |
Merge pull request #1391 from GriffinRichards/objvram
Add some uses of OBJ_VRAM/VRAM_SIZE
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 8 |
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) |