diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-10 18:12:18 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-10 18:12:18 -0600 |
| commit | 2e40384fa22725de06a5293454b8962ab4de8f4d (patch) | |
| tree | b44de7b89c3c19dd3f6ee985c92707462a446c89 /src/battle_2.c | |
| parent | a6c30ba9513ccbd202fec8e628c9336c5c3a4aa4 (diff) | |
Extract baseroms from event_scripts
Diffstat (limited to 'src/battle_2.c')
| -rw-r--r-- | src/battle_2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_2.c b/src/battle_2.c index 289425ee2..c60b99e13 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -1611,7 +1611,7 @@ void BattleMainCB2(void) if (gMain.heldKeys & B_BUTTON && gBattleTypeFlags & BATTLE_TYPE_RECORDED && sub_8186450()) { - gSpecialVar_ScriptResult = gBattleOutcome = BATTLE_PLAYER_TELEPORTED; + gSpecialVar_Result = gBattleOutcome = BATTLE_PLAYER_TELEPORTED; ResetPaletteFadeControl(); BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); SetMainCallback2(CB2_QuitRecordedBattle); @@ -4750,7 +4750,7 @@ static void HandleEndTurn_BattleWon(void) if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) { - gSpecialVar_ScriptResult = gBattleOutcome; + gSpecialVar_Result = gBattleOutcome; gBattleTextBuff1[0] = gBattleOutcome; gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1); gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost; @@ -5012,7 +5012,7 @@ static void ReturnFromBattleToOverworld(void) if (gBattleTypeFlags & BATTLE_TYPE_LINK && gReceivedRemoteLinkPlayers != 0) return; - gSpecialVar_ScriptResult = gBattleOutcome; + gSpecialVar_Result = gBattleOutcome; gMain.inBattle = 0; gMain.callback1 = gPreBattleCallback1; |