diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-11-02 21:03:52 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-02 21:03:52 -0700 |
commit | 08e6fb5382bb4e2104d370783d15b4a2a3c65a2a (patch) | |
tree | 9c71b110b696c3e0c285d1a5278c69cf78610369 /src/battle/battle_records.c | |
parent | d783f420001b67c19f8d81bbc94d266af98e89ad (diff) | |
parent | 24b1dee67f5d91272f432cd2aee4ee92125fcbcb (diff) |
Merge pull request #453 from huderlem/battle_tower
Decompile battle_tower
Diffstat (limited to 'src/battle/battle_records.c')
-rw-r--r-- | src/battle/battle_records.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/battle/battle_records.c b/src/battle/battle_records.c index d848a10b8..fd1f528ac 100644 --- a/src/battle/battle_records.c +++ b/src/battle/battle_records.c @@ -260,9 +260,9 @@ void ShowLinkBattleRecords(void) { static bool32 sub_8110494(u8 level) { - struct SaveBlock2_Sub *sb2sub = &gSaveBlock2.filler_A8; + struct BattleTowerData *battleTower = &gSaveBlock2.battleTower; - switch (sb2sub->var_4AE[level]) + switch (battleTower->var_4AE[level]) { case 0: return FALSE; @@ -294,17 +294,18 @@ static void PrintWinStreak(const u8 *str, u16 streak, u8 left, u8 top) static void PrintRecordWinStreak(u8 level, u8 left, u8 top) { - struct SaveBlock2_Sub *sb2sub = &gSaveBlock2.filler_A8; - u16 winStreak = sb2sub->recordWinStreak[level]; + struct BattleTowerData *battleTower = &gSaveBlock2.battleTower; + u16 winStreak = battleTower->recordWinStreaks[level]; PrintWinStreak(gOtherText_Record, winStreak, left, top); } static u16 GetLastWinStreak(u8 level) { - u16 result = gSaveBlock2.filler_A8.winStreak[level]; - if (result > 9999) - result = 9999; - return result; + u16 winStreak = gSaveBlock2.battleTower.currentWinStreaks[level]; + if (winStreak > 9999) + winStreak = 9999; + + return winStreak; } static void PrintLastWinStreak(u8 level, u8 left, u8 top) |