Skip to content

Commit

Permalink
Revert "Reverse Mode is now a Status1 condition"
Browse files Browse the repository at this point in the history 
This reverts commit 8253723.

# Conflicts:
#	include/constants/party_menu.h
#	include/pokemon.h
#	src/pokemon.c
  • Loading branch information
@AsparagusEduardo
AsparagusEduardo committed Feb 2, 2024
1 parent 0614320 commit 0c9842d
Show file tree
Hide file tree
Showing 24 changed files with 121 additions and 124 deletions.
2 changes: 1 addition & 1 deletion include/battle_controllers.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ enum {
REQUEST_SMART_RIBBON_BATTLE,
REQUEST_TOUGH_RIBBON_BATTLE,
REQUEST_IS_SHADOW_BATTLE,
// REQUEST_REVERSE_MODE_BATTLE,
REQUEST_REVERSE_MODE_BATTLE,
REQUEST_HEART_VALUE_BATTLE,
REQUEST_HEART_MAX_BATTLE,
};
Expand Down
1 change: 0 additions & 1 deletion include/constants/battle.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@
#define STATUS1_TOXIC_COUNTER (1 << 8 | 1 << 9 | 1 << 10 | 1 << 11)
#define STATUS1_TOXIC_TURN(num) ((num) << 8)
#define STATUS1_FROSTBITE (1 << 12)
#define STATUS1_REVERSE_MODE (1 << 13)
#define STATUS1_PSN_ANY (STATUS1_POISON | STATUS1_TOXIC_POISON)
#define STATUS1_ANY (STATUS1_SLEEP | STATUS1_POISON | STATUS1_BURN | STATUS1_FREEZE | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON | STATUS1_FROSTBITE)

Expand Down
2 changes: 1 addition & 1 deletion include/constants/party_menu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#define AILMENT_PKRS 6
#define AILMENT_FNT 7
#define AILMENT_FSB 8
#define AILMENT_SHDW 9
#define AILMENT_SHADOW 9

#define PARTY_LAYOUT_SINGLE 0
#define PARTY_LAYOUT_DOUBLE 1
Expand Down
2 changes: 1 addition & 1 deletion include/pokemon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ struct BattlePokemon
/*0x5A*/ u8 shadowAggro:3;
/*0x5A*/ u8 isReverse:1;
/*0x5A*/ u8 snagged:1;
/*0x5A*/ u8 filler:2;
/*0x5A*/ u8 filler:3;
/*0x5B*/ u8 shadowID;
/*0x5C*/ u16 heartVal;
/*0x5E*/ u16 heartMax;
Expand Down
4 changes: 2 additions & 2 deletions src/battle_ai_util.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3045,7 +3045,7 @@ bool32 AnyPartyMemberStatused(u8 battlerId, bool32 checkSoundproof)
if (checkSoundproof && GetMonAbility(&party[i]) == ABILITY_SOUNDPROOF)
continue;

if (GetMonData(&party[i], MON_DATA_STATUS) & ~STATUS1_REVERSE_MODE)
if (GetMonData(&party[i], MON_DATA_STATUS))
return TRUE;
}

Expand Down Expand Up @@ -3332,7 +3332,7 @@ bool32 ShouldUseWishAromatherapy(u8 battlerAtk, u8 battlerDef, u16 move)
needHealing = TRUE;
}

if (GetMonData(&party[i], MON_DATA_STATUS, NULL) & ~STATUS1_REVERSE_MODE)
if (GetMonData(&party[i], MON_DATA_STATUS, NULL))
{
if (move != MOVE_HEAL_BELL || GetMonAbility(&party[i]) != ABILITY_SOUNDPROOF)
hasStatus = TRUE;
Expand Down
14 changes: 7 additions & 7 deletions src/battle_controller_link_opponent.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -864,10 +864,10 @@ static u32 CopyLinkOpponentMonData(u8 monId, u8 *dst)
dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_IS_SHADOW);
size = 1;
break;
// case REQUEST_REVERSE_MODE_BATTLE:
// dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_REVERSE_MODE);
// size = 1;
// break;
case REQUEST_REVERSE_MODE_BATTLE:
dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_REVERSE_MODE);
size = 1;
break;
case REQUEST_HEART_VALUE_BATTLE:
dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_HEART_VALUE);
size = 1;
Expand Down Expand Up @@ -1127,9 +1127,9 @@ static void SetLinkOpponentMonData(u8 monId)
case REQUEST_IS_SHADOW_BATTLE:
SetMonData(&gEnemyParty[monId], MON_DATA_IS_SHADOW, &gBattleResources->bufferA[gActiveBattler][3]);
break;
// case REQUEST_REVERSE_MODE_BATTLE:
// SetMonData(&gEnemyParty[monId], MON_DATA_REVERSE_MODE, &gBattleResources->bufferA[gActiveBattler][3]);
// break;
case REQUEST_REVERSE_MODE_BATTLE:
SetMonData(&gEnemyParty[monId], MON_DATA_REVERSE_MODE, &gBattleResources->bufferA[gActiveBattler][3]);
break;
case REQUEST_HEART_VALUE_BATTLE:
SetMonData(&gEnemyParty[monId], MON_DATA_HEART_VALUE, &gBattleResources->bufferA[gActiveBattler][3]);
break;
Expand Down
14 changes: 7 additions & 7 deletions src/battle_controller_link_partner.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -758,10 +758,10 @@ static u32 CopyLinkPartnerMonData(u8 monId, u8 *dst)
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_IS_SHADOW);
size = 1;
break;
// case REQUEST_REVERSE_MODE_BATTLE:
// dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE);
// size = 1;
// break;
case REQUEST_REVERSE_MODE_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE);
size = 1;
break;
case REQUEST_HEART_VALUE_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_HEART_VALUE);
size = 1;
Expand Down Expand Up @@ -1021,9 +1021,9 @@ static void SetLinkPartnerMonData(u8 monId)
case REQUEST_IS_SHADOW_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_IS_SHADOW, &gBattleResources->bufferA[gActiveBattler][3]);
break;
// case REQUEST_REVERSE_MODE_BATTLE:
// SetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE, &gBattleResources->bufferA[gActiveBattler][3]);
// break;
case REQUEST_REVERSE_MODE_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE, &gBattleResources->bufferA[gActiveBattler][3]);
break;
case REQUEST_HEART_VALUE_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_HEART_VALUE, &gBattleResources->bufferA[gActiveBattler][3]);
break;
Expand Down
14 changes: 7 additions & 7 deletions src/battle_controller_opponent.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -885,10 +885,10 @@ static u32 GetOpponentMonData(u8 monId, u8 *dst)
dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_IS_SHADOW);
size = 1;
break;
// case REQUEST_REVERSE_MODE_BATTLE:
// dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_REVERSE_MODE);
// size = 1;
// break;
case REQUEST_REVERSE_MODE_BATTLE:
dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_REVERSE_MODE);
size = 1;
break;
case REQUEST_HEART_VALUE_BATTLE:
dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_HEART_VALUE);
size = 1;
Expand Down Expand Up @@ -1157,9 +1157,9 @@ static void SetOpponentMonData(u8 monId)
case REQUEST_IS_SHADOW_BATTLE:
SetMonData(&gEnemyParty[monId], MON_DATA_IS_SHADOW, &gBattleResources->bufferA[gActiveBattler][3]);
break;
// case REQUEST_REVERSE_MODE_BATTLE:
// SetMonData(&gEnemyParty[monId], MON_DATA_REVERSE_MODE, &gBattleResources->bufferA[gActiveBattler][3]);
// break;
case REQUEST_REVERSE_MODE_BATTLE:
SetMonData(&gEnemyParty[monId], MON_DATA_REVERSE_MODE, &gBattleResources->bufferA[gActiveBattler][3]);
break;
case REQUEST_HEART_VALUE_BATTLE:
SetMonData(&gEnemyParty[monId], MON_DATA_HEART_VALUE, &gBattleResources->bufferA[gActiveBattler][3]);
break;
Expand Down
14 changes: 7 additions & 7 deletions src/battle_controller_player.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2142,10 +2142,10 @@ static u32 CopyPlayerMonData(u8 monId, u8 *dst)
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_IS_SHADOW);
size = 1;
break;
// case REQUEST_REVERSE_MODE_BATTLE:
// dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE);
// size = 1;
// break;
case REQUEST_REVERSE_MODE_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE);
size = 1;
break;
case REQUEST_HEART_VALUE_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_HEART_VALUE);
size = 1;
Expand Down Expand Up @@ -2414,9 +2414,9 @@ static void SetPlayerMonData(u8 monId)
case REQUEST_IS_SHADOW_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_IS_SHADOW, &gBattleResources->bufferA[gActiveBattler][3]);
break;
// case REQUEST_REVERSE_MODE_BATTLE:
// SetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE, &gBattleResources->bufferA[gActiveBattler][3]);
// break;
case REQUEST_REVERSE_MODE_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE, &gBattleResources->bufferA[gActiveBattler][3]);
break;
case REQUEST_HEART_VALUE_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_HEART_VALUE, &gBattleResources->bufferA[gActiveBattler][3]);
break;
Expand Down
14 changes: 7 additions & 7 deletions src/battle_controller_player_partner.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -953,10 +953,10 @@ static u32 CopyPlayerPartnerMonData(u8 monId, u8 *dst)
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_IS_SHADOW);
size = 1;
break;
// case REQUEST_REVERSE_MODE_BATTLE:
// dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE);
// size = 1;
// break;
case REQUEST_REVERSE_MODE_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE);
size = 1;
break;
case REQUEST_HEART_VALUE_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_HEART_VALUE);
size = 1;
Expand Down Expand Up @@ -1216,9 +1216,9 @@ static void SetPlayerPartnerMonData(u8 monId)
case REQUEST_IS_SHADOW_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_IS_SHADOW, &gBattleResources->bufferA[gActiveBattler][3]);
break;
// case REQUEST_REVERSE_MODE_BATTLE:
// SetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE, &gBattleResources->bufferA[gActiveBattler][3]);
// break;
case REQUEST_REVERSE_MODE_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE, &gBattleResources->bufferA[gActiveBattler][3]);
break;
case REQUEST_HEART_VALUE_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_HEART_VALUE, &gBattleResources->bufferA[gActiveBattler][3]);
break;
Expand Down
16 changes: 8 additions & 8 deletions src/battle_controller_recorded_opponent.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -853,10 +853,10 @@ static u32 CopyRecordedOpponentMonData(u8 monId, u8 *dst)
dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_IS_SHADOW);
size = 1;
break;
// case REQUEST_REVERSE_MODE_BATTLE:
// dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_REVERSE_MODE);
// size = 1;
// break;
case REQUEST_REVERSE_MODE_BATTLE:
dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_REVERSE_MODE);
size = 1;
break;
case REQUEST_HEART_VALUE_BATTLE:
dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_HEART_VALUE);
size = 1;
Expand Down Expand Up @@ -1116,9 +1116,9 @@ static void SetRecordedOpponentMonData(u8 monId)
case REQUEST_IS_SHADOW_BATTLE:
SetMonData(&gEnemyParty[monId], MON_DATA_IS_SHADOW, &gBattleResources->bufferA[gActiveBattler][3]);
break;
// case REQUEST_REVERSE_MODE_BATTLE:
// SetMonData(&gEnemyParty[monId], MON_DATA_REVERSE_MODE, &gBattleResources->bufferA[gActiveBattler][3]);
// break;
case REQUEST_REVERSE_MODE_BATTLE:
SetMonData(&gEnemyParty[monId], MON_DATA_REVERSE_MODE, &gBattleResources->bufferA[gActiveBattler][3]);
break;
case REQUEST_HEART_VALUE_BATTLE:
SetMonData(&gEnemyParty[monId], MON_DATA_HEART_VALUE, &gBattleResources->bufferA[gActiveBattler][3]);
break;
Expand Down Expand Up @@ -1540,7 +1540,7 @@ static void RecordedOpponentHandleStatusIconUpdate(void)
gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;

if (gTestRunnerEnabled)
TestRunner_Battle_RecordStatus1(battlerId, GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerId]], MON_DATA_STATUS) & ~STATUS1_REVERSE_MODE);
TestRunner_Battle_RecordStatus1(battlerId, GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerId]], MON_DATA_STATUS));
}
}

Expand Down
16 changes: 8 additions & 8 deletions src/battle_controller_recorded_player.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -832,10 +832,10 @@ static u32 CopyRecordedPlayerMonData(u8 monId, u8 *dst)
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_IS_SHADOW);
size = 1;
break;
// case REQUEST_REVERSE_MODE_BATTLE:
// dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE);
// size = 1;
// break;
case REQUEST_REVERSE_MODE_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE);
size = 1;
break;
case REQUEST_HEART_VALUE_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_HEART_VALUE);
size = 1;
Expand Down Expand Up @@ -1095,9 +1095,9 @@ static void SetRecordedPlayerMonData(u8 monId)
case REQUEST_IS_SHADOW_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_IS_SHADOW, &gBattleResources->bufferA[gActiveBattler][3]);
break;
// case REQUEST_REVERSE_MODE_BATTLE:
// SetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE, &gBattleResources->bufferA[gActiveBattler][3]);
// break;
case REQUEST_REVERSE_MODE_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE, &gBattleResources->bufferA[gActiveBattler][3]);
break;
case REQUEST_HEART_VALUE_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_HEART_VALUE, &gBattleResources->bufferA[gActiveBattler][3]);
break;
Expand Down Expand Up @@ -1562,7 +1562,7 @@ static void RecordedPlayerHandleStatusIconUpdate(void)
gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;

if (gTestRunnerEnabled)
TestRunner_Battle_RecordStatus1(battlerId, GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_STATUS) & ~STATUS1_REVERSE_MODE);
TestRunner_Battle_RecordStatus1(battlerId, GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_STATUS));
}
}

Expand Down
14 changes: 7 additions & 7 deletions src/battle_controller_wally.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -760,10 +760,10 @@ static u32 CopyWallyMonData(u8 monId, u8 *dst)
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_IS_SHADOW);
size = 1;
break;
// case REQUEST_REVERSE_MODE_BATTLE:
// dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE);
// size = 1;
// break;
case REQUEST_REVERSE_MODE_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE);
size = 1;
break;
case REQUEST_HEART_VALUE_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_HEART_VALUE);
size = 1;
Expand Down Expand Up @@ -1023,9 +1023,9 @@ static void SetWallyMonData(u8 monId)
case REQUEST_IS_SHADOW_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_IS_SHADOW, &gBattleResources->bufferA[gActiveBattler][3]);
break;
// case REQUEST_REVERSE_MODE_BATTLE:
// SetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE, &gBattleResources->bufferA[gActiveBattler][3]);
// break;
case REQUEST_REVERSE_MODE_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_REVERSE_MODE, &gBattleResources->bufferA[gActiveBattler][3]);
break;
case REQUEST_HEART_VALUE_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_HEART_VALUE, &gBattleResources->bufferA[gActiveBattler][3]);
break;
Expand Down
3 changes: 0 additions & 3 deletions src/battle_debug.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ static const u8 sText_MaxHp[] = _("HP Max");
static const u8 sText_CurrHp[] = _("HP Current");
static const u8 sText_Freeze[] = _("Freeze");
static const u8 sText_Frostbite[] = _("Frostbite");
static const u8 sText_ReverseMode[] = _("Reverse Mode");
static const u8 sText_ToxicPoison[] = _("Toxic Poison");
static const u8 sText_ToxicCounter[] = _("Toxic Counter");
static const u8 sText_Flinch[] = _("Flinch");
Expand Down Expand Up @@ -259,7 +258,6 @@ static const struct BitfieldInfo sStatus1Bitfield[] =
{/*Toxic Poison*/ 1, 7},
{/*Toxic Counter*/ 4, 8},
{/*Frostbite*/ 1, 12},
{/*Reverse Mode*/1, 13},
};

static const struct BitfieldInfo sStatus2Bitfield[] =
Expand Down Expand Up @@ -400,7 +398,6 @@ static const struct ListMenuItem sStatus1ListItems[] =
{sText_ToxicPoison, 5},
{sText_ToxicCounter, 6},
{sText_Frostbite, 7},
{sText_ReverseMode, 8}
};

static const struct ListMenuItem sStatus2ListItems[] =
Expand Down
6 changes: 2 additions & 4 deletions src/battle_gfx_sfx_util.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ void ShdwLoadHealthboxPalette(u8 battlerId)

LoadSpritePalette(&gSpritePalettes_HealthBoxHealthBar[palNum]);

if (GetMonData(mon, MON_DATA_STATUS) & ~STATUS1_REVERSE_MODE)
if (GetMonData(mon, MON_DATA_STATUS))
UpdateHealthboxAttribute(gHealthboxSpriteIds[battlerId], mon, HEALTHBOX_STATUS_ICON);
}

Expand Down Expand Up @@ -477,8 +477,6 @@ void InitAndLaunchChosenStatusAnimation(bool8 isStatus2, u32 status)
LaunchStatusAnimation(gActiveBattler, B_ANIM_STATUS_SLP);
else if (status == STATUS1_PARALYSIS)
LaunchStatusAnimation(gActiveBattler, B_ANIM_STATUS_PRZ);
else if (status == STATUS1_REVERSE_MODE)
LaunchStatusAnimation(gActiveBattler, B_ANIM_STATUS_REVERSE_MODE);
else // no animation
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].statusAnimActive = 0;
}
Expand Down Expand Up @@ -1302,7 +1300,7 @@ bool32 ShouldPlayNormalMonCry(struct Pokemon *mon)
s16 hp, maxHP;
s32 barLevel;

if (GetMonData(mon, MON_DATA_STATUS) & (STATUS1_ANY | STATUS1_TOXIC_COUNTER | STATUS1_REVERSE_MODE))
if (GetMonData(mon, MON_DATA_STATUS) & (STATUS1_ANY | STATUS1_TOXIC_COUNTER))
return FALSE;

hp = GetMonData(mon, MON_DATA_HP);
Expand Down
8 changes: 4 additions & 4 deletions src/battle_interface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1008,7 +1008,7 @@ static void UpdateLvlInHealthbox(u8 healthboxSpriteId, u8 lvl)
u32 xPos;
u8 *objVram;
u8 battler = gSprites[healthboxSpriteId].hMain_Battler;
bool32 reverse = (gBattleMons[battler].status1 & STATUS1_REVERSE_MODE) ? TRUE : FALSE;
bool32 reverse = gBattleMons[battler].isReverse;;

// Don't print Lv char if mon is mega evolved, primal reverted, or reverse mode.
if (IsBattlerMegaEvolved(battler) || IsBattlerPrimalReverted(battler) || reverse)
Expand Down Expand Up @@ -1538,7 +1538,7 @@ static bool32 MegaIndicator_ShouldBeInvisible(u32 battlerId, struct Sprite *spri
u32 side = GetBattlerSide(battlerId);
bool32 megaEvolved = IsBattlerMegaEvolved(battlerId);
bool32 primalReverted = IsBattlerPrimalReverted(battlerId);
bool32 reverseMode = (gBattleMons[battlerId].status1 & STATUS1_REVERSE_MODE) ? TRUE : FALSE;
bool32 reverseMode = gBattleMons[battlerId].isReverse;

if (!reverseMode && !megaEvolved && !primalReverted)
return TRUE;
Expand Down Expand Up @@ -2200,15 +2200,15 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId)
healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId;
if (GetBattlerSide(battlerId) == B_SIDE_PLAYER)
{
status = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_STATUS) & ~STATUS1_REVERSE_MODE;
status = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_STATUS);
if (!WhichBattleCoords(battlerId))
tileNumAdder = 0x1A;
else
tileNumAdder = 0x12;
}
else
{
status = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerId]], MON_DATA_STATUS) & ~STATUS1_REVERSE_MODE;
status = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerId]], MON_DATA_STATUS);
tileNumAdder = 0x11;
}

Expand Down
Loading

0 comments on commit 0c9842d

Please sign in to comment.