Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix BtlController_EmitChosenMonReturnValue UB (#7197)

Browse Source
This commit is contained in:
DizzyEggg 2025-06-24 09:28:26 +02:00 committed by GitHub
parent bc95824e8c
commit 93511ceb05
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/battle_controllers.c
View File

@ -1415,8 +1415,11 @@ void BtlController_EmitChosenMonReturnValue(u32 battler, u32 bufferId, u8 partyI
gBattleResources->transferBuffer[0] = CONTROLLER_CHOSENMONRETURNVALUE;
gBattleResources->transferBuffer[1] = partyId;
for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
gBattleResources->transferBuffer[2 + i] = battlePartyOrder[i];
if (battlePartyOrder != NULL)
{
for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
gBattleResources->transferBuffer[2 + i] = battlePartyOrder[i];
}
PrepareBufferDataTransfer(battler, bufferId, gBattleResources->transferBuffer, 5);
}