diff options
author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-25 09:22:50 +0800 |
---|---|---|
committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-25 09:22:50 +0800 |
commit | 2f87855072fb4fdca6ce22d60bfb1b7fdc000134 (patch) | |
tree | a3a6d928910ed170904b5b367084afb2d1fb8b3d /src/vs_seeker.c | |
parent | 6ca932e5e98fcd69c281d798406e53aee5a4d816 (diff) | |
parent | 7579fc65c12bd46c045d10eb8cd9a2320fd1f3f0 (diff) |
Merge branch 'master' into battle
Diffstat (limited to 'src/vs_seeker.c')
-rw-r--r-- | src/vs_seeker.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vs_seeker.c b/src/vs_seeker.c index 8b916410a..9a8ff5dd6 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -1290,7 +1290,7 @@ static u8 GetRematchTrainerIdGivenGameState(const u16 * a0, u8 a1) return 0; } -u8 sub_810CD4C(void) +u8 ShouldTryRematchBattle(void) { if (sub_810CD80(sVsSeekerData, gTrainerBattleOpponent_A)) { @@ -1364,7 +1364,7 @@ s32 GetRematchTrainerId(u16 a0) return sVsSeekerData[i].trainerIdxs[j]; } -u8 sub_810CEB4(void) // unreferenced, or reference not disassembled +u8 ScrSpecial_GetTrainerEyeRematchFlag(void) // unreferenced, or reference not disassembled { return sub_810CED0(sVsSeekerData, gTrainerBattleOpponent_A); } |