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

Corrects battler position checks in battle_message.c (#8070)

Browse Source
This commit is contained in:
grintoul 2025-10-28 18:24:13 +00:00 committed by GitHub
parent fd07daf0d8
commit 5873621154
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_message.c
View File

@ -2178,7 +2178,7 @@ void BufferStringBattle(enum StringID stringID, u32 battler)
case STRINGID_RETURNMON: // sending poke to ball msg
if (IsOnPlayerSide(battler))
{
if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBattlerAtPosition(battler) == 2)
if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBattlerPosition(battler) == B_POSITION_PLAYER_RIGHT)
stringPtr = sText_InGamePartnerWithdrewPkmn2;
else if (*(&gBattleStruct->hpScale) == 0)
stringPtr = sText_PkmnThatsEnough;
@ -2202,7 +2202,7 @@ void BufferStringBattle(enum StringID stringID, u32 battler)
{
if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
{
if (GetBattlerAtPosition(battler) == 1)
if (GetBattlerPosition(battler) == B_POSITION_OPPONENT_LEFT)
stringPtr = sText_Trainer1WithdrewPkmn;
else
stringPtr = sText_Trainer2WithdrewPkmn;