Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-12 06:55:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

update oak/old man/pokedude controllers

Browse Source
This commit is contained in:
cawtds 2025-01-07 22:22:05 +01:00
parent c393f5dc07
commit d0dbc7036c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/battle_controller_oak_old_man.c
View File

@ -123,9 +123,9 @@ void SetControllerToOakOrOldMan(u32 battler)
static void OakOldManBufferRunCommand(u32 battler)
{
if (gBattleControllerExecFlags & gBitTable[battler])
if (gBattleControllerExecFlags & (1u << battler))
{
if (gBattleResources->bufferA[battler][0] < NELEMS(sOakOldManBufferCommands))
if (gBattleResources->bufferA[battler][0] < ARRAY_COUNT(sOakOldManBufferCommands))
sOakOldManBufferCommands[gBattleResources->bufferA[battler][0]](battler);
else
OakOldManBufferExecCompleted(battler);
@ -277,7 +277,7 @@ static void OakOldManSetBattleEndCallbacks(u32 battler)
void OakOldManHandleInputChooseMove(u32 battler)
{
HandleInputChooseMove(battler);
if (!(gBattleControllerExecFlags & gBitTable[battler]))
if (!(gBattleControllerExecFlags & (1u << battler)))
OakOldManBufferExecCompleted(battler);
}
@ -660,7 +660,7 @@ static void OakOldManBufferExecCompleted(u32 battler)
}
else
{
gBattleControllerExecFlags &= ~gBitTable[battler];
gBattleControllerExecFlags &= ~(1u << battler);
}
}

10
src/battle_controller_pokedude.c
View File

@ -151,9 +151,9 @@ void SetControllerToPokedude(u32 battler)
static void PokedudeBufferRunCommand(u32 battler)
{
if (gBattleControllerExecFlags & gBitTable[battler])
if (gBattleControllerExecFlags & (1u << battler))
{
if (gBattleResources->bufferA[battler][0] < NELEMS(sPokedudeBufferCommands))
if (gBattleResources->bufferA[battler][0] < ARRAY_COUNT(sPokedudeBufferCommands))
{
if (!HandlePokedudeVoiceoverEtc(battler))
sPokedudeBufferCommands[gBattleResources->bufferA[battler][0]](battler);
@ -377,7 +377,7 @@ static void PokedudeBufferExecCompleted(u32 battler)
}
else
{
gBattleControllerExecFlags &= ~gBitTable[battler];
gBattleControllerExecFlags &= ~(1u << battler);
}
}
@ -1219,7 +1219,7 @@ static void PokedudeAction_PrintMessageWithHealthboxPals(u32 battler)
case 1:
if (!gPaletteFade.active)
{
u32 mask = (gBitTable[gBattleStruct->pdHealthboxPal2] | gBitTable[gBattleStruct->pdHealthboxPal1]) << 16;
u32 mask = ((1u << gBattleStruct->pdHealthboxPal2) | (1u << gBattleStruct->pdHealthboxPal1)) << 16;
++mask; // It's possible that this is influenced by other functions, as
--mask; // this also striked in battle_controller_oak_old_man.c but was naturally fixed.
@ -1245,7 +1245,7 @@ static void PokedudeAction_PrintMessageWithHealthboxPals(u32 battler)
u32 mask;
PlaySE(SE_SELECT);
mask = (gBitTable[gBattleStruct->pdHealthboxPal2] | gBitTable[gBattleStruct->pdHealthboxPal1]) << 16;
mask = ((1u << gBattleStruct->pdHealthboxPal2) | (1u << gBattleStruct->pdHealthboxPal1)) << 16;
++mask;
--mask;
BeginNormalPaletteFade(mask, 4, 0, 8, RGB_BLACK);