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

Bit shifts from hex to decimal

Browse Source
This commit is contained in:
GriffinR
2021-03-30 17:38:09 -04:00
parent d5d1caf965
commit 8c6e89e994
9 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/battle_script_commands.c
View File

@@ -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)