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/field/tv.c | |
| parent | d783f420001b67c19f8d81bbc94d266af98e89ad (diff) | |
| parent | 24b1dee67f5d91272f432cd2aee4ee92125fcbcb (diff) | |
Merge pull request #453 from huderlem/battle_tower
Decompile battle_tower
Diffstat (limited to 'src/field/tv.c')
| -rw-r--r-- | src/field/tv.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/field/tv.c b/src/field/tv.c index e9b5e850d..87fc03065 100644 --- a/src/field/tv.c +++ b/src/field/tv.c @@ -123,7 +123,6 @@ void ClearTVShowData(void) bool8 sub_80BF1B4(u8); void sub_80BF20C(void); -extern u16 sub_8135D3C(u8); extern u8 gScriptContestCategory; extern u8 gScriptContestRank; extern u8 gUnknown_03004316[11]; @@ -674,12 +673,12 @@ void sub_80BE320(void) bravoTrainerTower->var00 = TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE; bravoTrainerTower->var01 = 1; StringCopy(bravoTrainerTower->trainerName, gSaveBlock2.playerName); - StringCopy(bravoTrainerTower->pokemonName, gSaveBlock2.filler_A8.filler_3DC); - bravoTrainerTower->species = gSaveBlock2.filler_A8.var_480; - bravoTrainerTower->defeatedSpecies = gSaveBlock2.filler_A8.var_482; - bravoTrainerTower->var16 = sub_8135D3C(gSaveBlock2.filler_A8.var_4D0); - bravoTrainerTower->var1c = gSaveBlock2.filler_A8.var_4AD; - if (gSaveBlock2.filler_A8.var_4D0 == 0) + StringCopy(bravoTrainerTower->pokemonName, gSaveBlock2.battleTower.defeatedByTrainerName); + bravoTrainerTower->species = gSaveBlock2.battleTower.firstMonSpecies; + bravoTrainerTower->defeatedSpecies = gSaveBlock2.battleTower.defeatedBySpecies; + bravoTrainerTower->var16 = GetCurrentBattleTowerWinStreak(gSaveBlock2.battleTower.lastStreakLevelType); + bravoTrainerTower->var1c = gSaveBlock2.battleTower.battleOutcome; + if (gSaveBlock2.battleTower.lastStreakLevelType == 0) bravoTrainerTower->btLevel = 50; else bravoTrainerTower->btLevel = 100; |