merge with battle tent update

2018-07-01 12:16:52 +02:00
parent d2e47323fe efebc51972
commit f35c0abe80
2935 changed files with 9978 additions and 10814 deletions
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -1854,7 +1854,7 @@ static void LinkOpponentHandleCmd55(void)
    else
        gBattleOutcome = gBattleBufferA[gActiveBattler][1] ^ B_OUTCOME_DREW;

-    gSaveBlock2Ptr->field_CA9_b = gBattleBufferA[gActiveBattler][2];
+    gSaveBlock2Ptr->frontier.field_CA9_b = gBattleBufferA[gActiveBattler][2];
    FadeOutMapMusic(5);
    BeginFastPaletteFade(3);
    LinkOpponentBufferExecCompleted();