diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-16 15:12:38 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-16 15:12:38 -0600 |
| commit | c3c13d0acfa46a54bd05d1c7dcea2955103ac3ad (patch) | |
| tree | 09bb789798614475d8f6c73c449f13385e18545a /src/battle_util2.c | |
| parent | 157b88b6dbfa7816cac9c6cf2ef20bd70a573b10 (diff) | |
more renaming
Diffstat (limited to 'src/battle_util2.c')
| -rw-r--r-- | src/battle_util2.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/battle_util2.c b/src/battle_util2.c index d242ab6c9..fb01865a4 100644 --- a/src/battle_util2.c +++ b/src/battle_util2.c @@ -87,15 +87,15 @@ void AdjustFriendshipOnBattleFaint(u8 bank) { u8 opposingBank2; - opposingBank = GetBankByIdentity(B_POSITION_OPPONENT_LEFT); - opposingBank2 = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT); + opposingBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT); + opposingBank2 = GetBankByPosition(B_POSITION_OPPONENT_RIGHT); if (gBattleMons[opposingBank2].level > gBattleMons[opposingBank].level) opposingBank = opposingBank2; } else { - opposingBank = GetBankByIdentity(B_POSITION_OPPONENT_LEFT); + opposingBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT); } if (gBattleMons[opposingBank].level > gBattleMons[bank].level) @@ -138,11 +138,11 @@ u32 sub_805725C(u8 bank) switch (gBattleCommunication[MULTIUSE_STATE]) { case 0: - if (gBattleMons[bank].status1 & STATUS_SLEEP) + if (gBattleMons[bank].status1 & STATUS1_SLEEP) { if (UproarWakeUpCheck(bank)) { - gBattleMons[bank].status1 &= ~(STATUS_SLEEP); + gBattleMons[bank].status1 &= ~(STATUS1_SLEEP); gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); BattleScriptPushCursor(); gBattleCommunication[MULTISTRING_CHOOSER] = 1; @@ -158,12 +158,12 @@ u32 sub_805725C(u8 bank) else toSub = 1; - if ((gBattleMons[bank].status1 & STATUS_SLEEP) < toSub) - gBattleMons[bank].status1 &= ~(STATUS_SLEEP); + if ((gBattleMons[bank].status1 & STATUS1_SLEEP) < toSub) + gBattleMons[bank].status1 &= ~(STATUS1_SLEEP); else gBattleMons[bank].status1 -= toSub; - if (gBattleMons[bank].status1 & STATUS_SLEEP) + if (gBattleMons[bank].status1 & STATUS1_SLEEP) { gBattlescriptCurrInstr = BattleScript_MoveUsedIsAsleep; effect = 2; @@ -181,7 +181,7 @@ u32 sub_805725C(u8 bank) gBattleCommunication[MULTIUSE_STATE]++; break; case 1: - if (gBattleMons[bank].status1 & STATUS_FREEZE) + if (gBattleMons[bank].status1 & STATUS1_FREEZE) { if (Random() % 5 != 0) { @@ -189,7 +189,7 @@ u32 sub_805725C(u8 bank) } else { - gBattleMons[bank].status1 &= ~(STATUS_FREEZE); + gBattleMons[bank].status1 &= ~(STATUS1_FREEZE); BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze; gBattleCommunication[MULTISTRING_CHOOSER] = 0; |