summaryrefslogtreecommitdiff
path: root/src/battle_2.c
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2017-11-08 15:20:10 -0600
committerDiegoisawesome <diego@domoreaweso.me>2017-11-08 15:20:10 -0600
commite6ef86e4b0a66440c3339c8d63c13dcd11521984 (patch)
treedcb079ef60b814dc7df699ae4054f717a5a9a088 /src/battle_2.c
parent60bb83144b9d69dbb884874d87bd832aebc8e992 (diff)
Update variable and flag names
Diffstat (limited to 'src/battle_2.c')
-rw-r--r--src/battle_2.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle_2.c b/src/battle_2.c
index 6b7c4063e..bd2899aec 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -511,7 +511,7 @@ static void sub_8036A5C(void)
gBattleStruct->field_182 = r6;
*(&gBattleStruct->field_183) = r6 >> 8;
- gBattleStruct->field_183 |= FlagGet(SYS_FRONTIER_PASS) << 7;
+ gBattleStruct->field_183 |= FlagGet(FLAG_SYS_FRONTIER_PASS) << 7;
}
static void SetPlayerBerryDataInBattleStruct(void)
@@ -1612,7 +1612,7 @@ void BattleMainCB2(void)
if (gMain.heldKeys & B_BUTTON && gBattleTypeFlags & BATTLE_TYPE_RECORDED && sub_8186450())
{
- gScriptResult = gBattleOutcome = BATTLE_PLAYER_TELEPORTED;
+ gSpecialVar_ScriptResult = gBattleOutcome = BATTLE_PLAYER_TELEPORTED;
ResetPaletteFadeControl();
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
SetMainCallback2(CB2_QuitRecordedBattle);
@@ -2070,7 +2070,7 @@ static void sub_8038F34(void)
if (!gSaveBlock2Ptr->field_CA9_b && i == monsCount)
{
- if (FlagGet(SYS_FRONTIER_PASS))
+ if (FlagGet(FLAG_SYS_FRONTIER_PASS))
{
FreeAllWindowBuffers();
SetMainCallback2(sub_80392A8);
@@ -4428,7 +4428,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves)
// badge boost
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER))
- && FlagGet(BADGE03_GET)
+ && FlagGet(FLAG_BADGE03_GET)
&& GetBankSide(bank1) == SIDE_PLAYER)
{
speedBank1 = (speedBank1 * 110) / 100;
@@ -4462,7 +4462,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves)
// badge boost
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER))
- && FlagGet(BADGE03_GET)
+ && FlagGet(FLAG_BADGE03_GET)
&& GetBankSide(bank2) == SIDE_PLAYER)
{
speedBank2 = (speedBank2 * 110) / 100;
@@ -4751,7 +4751,7 @@ static void HandleEndTurn_BattleWon(void)
if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
{
- gScriptResult = gBattleOutcome;
+ gSpecialVar_ScriptResult = gBattleOutcome;
gBattleTextBuff1[0] = gBattleOutcome;
gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1);
gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
@@ -5013,7 +5013,7 @@ static void ReturnFromBattleToOverworld(void)
if (gBattleTypeFlags & BATTLE_TYPE_LINK && gReceivedRemoteLinkPlayers != 0)
return;
- gScriptResult = gBattleOutcome;
+ gSpecialVar_ScriptResult = gBattleOutcome;
gMain.inBattle = 0;
gMain.callback1 = gPreBattleCallback1;