diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-15 21:35:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-15 21:35:16 -0400 |
| commit | 9242ec30de64f458ee99bec2bd1147152cbdb75d (patch) | |
| tree | 108c0c76bc9357718610cb96b596839fbe118d7f /src/recorded_battle.c | |
| parent | 780e49dbc8f833fac36ac47bb1be0e0972fce24b (diff) | |
| parent | 925e68c03ffe27b6f3467f1ee33be240f879f6b5 (diff) | |
Merge pull request #1376 from PikalaxALT/battle_multi_buffer
Resolve link comm buffers in gBattleStruct
Diffstat (limited to 'src/recorded_battle.c')
| -rw-r--r-- | src/recorded_battle.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 5db4f82c5..e29792766 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -84,7 +84,7 @@ EWRAM_DATA static u8 sFrontierFacility = 0; EWRAM_DATA static u8 sFrontierBrainSymbol = 0; EWRAM_DATA static MainCallback sCallback2_AfterRecordedBattle = NULL; EWRAM_DATA u8 gRecordedBattleMultiplayerId = 0; -EWRAM_DATA static u8 sUnknown_0203C7B5 = 0; +EWRAM_DATA static u8 sFrontierPassFlag = 0; EWRAM_DATA static u8 sBattleScene = 0; EWRAM_DATA static u8 sTextSpeed = 0; EWRAM_DATA static u32 sBattleFlags = 0; @@ -687,19 +687,20 @@ u8 GetActiveBattlerLinkPlayerGender(void) return 0; } -void sub_8185F84(void) +void RecordedBattle_ClearFrontierPassFlag(void) { - sUnknown_0203C7B5 = 0; + sFrontierPassFlag = 0; } -void sub_8185F90(u16 arg0) +// Set sFrontierPassFlag to received state of FLAG_SYS_FRONTIER_PASS +void RecordedBattle_SetFrontierPassFlagFromHword(u16 arg0) { - sUnknown_0203C7B5 |= (arg0 & 0x8000) >> 0xF; + sFrontierPassFlag |= (arg0 & 0x8000) >> 15; } -u8 sub_8185FAC(void) +u8 RecordedBattle_GetFrontierPassFlag(void) { - return sUnknown_0203C7B5; + return sFrontierPassFlag; } u8 GetBattleSceneInRecordedBattle(void) |