diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-05-30 18:05:50 -0500 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-05-30 18:18:37 -0500 |
commit | ed3367f9f60bf5e0ae9bf6367b903609b76afbe4 (patch) | |
tree | 4fad3ce70394291c746f482a906c22035c879b39 /src/tv.c | |
parent | e3916a561a213a1dfe1d13339c49cd06a1dcbe37 (diff) |
Fix some sym_common fake-matching symbols
Diffstat (limited to 'src/tv.c')
-rw-r--r-- | src/tv.c | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -70,7 +70,6 @@ extern u16 gSpecialVar_LastTalked; extern u8 gSpecialVar_ContestCategory; extern u8 gSpecialVar_ContestRank; -extern u8 gUnknown_03004316[11]; extern u8 gBattleOutcome; extern u16 gLastUsedItem; @@ -447,7 +446,6 @@ bool8 sub_80BF1B4(u8); void sub_80BF20C(void); extern u8 gSpecialVar_ContestCategory; extern u8 gSpecialVar_ContestRank; -extern u8 gUnknown_03004316[11]; extern u8 gBattleOutcome; void InterviewBefore_FanClubLetter(void); @@ -667,7 +665,7 @@ void GabbyAndTyBeforeInterview(void) { for (i=0; i<11; i++) { - if (gBattleResults.unk36[i] != 0) + if (gBattleResults.usedBalls[i] != 0) { gSaveBlock1.gabbyAndTyData.valA_3 = 1; break; @@ -832,7 +830,7 @@ void PutPokemonTodayCaughtOnAir(void) if (gUnknown_03005D38.var0 != -1 && sub_80BF1B4(TVSHOW_POKEMON_TODAY_CAUGHT) != 1) { for (i = 0; i < 11; i++) - total += gBattleResults.unk36[i]; + total += gBattleResults.usedBalls[i]; if (total != 0 || gBattleResults.unk5_1 != 0) { struct TVShowPokemonToday *pokemonToday; @@ -849,7 +847,7 @@ void PutPokemonTodayCaughtOnAir(void) else { for (i = 0; i < 11; i++) - total += gBattleResults.unk36[i]; + total += gBattleResults.usedBalls[i]; if (total > 0xff) total = 0xff; item = gLastUsedItem; @@ -893,8 +891,8 @@ void sub_80BE074(void) if (sub_80BF77C(0xffff) == 0) { - for (i = 0, total = 0; i < ARRAY_COUNT(gUnknown_03004316); i++) - total += gUnknown_03004316[i]; + for (i = 0, total = 0; i < 11; i++) + total += gBattleResults.usedBalls[i]; if (total > 0xff) total = 0xff; if (total > 2 && gBattleOutcome == 1) |