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/choose_party.c | |
| parent | e3916a561a213a1dfe1d13339c49cd06a1dcbe37 (diff) | |
Fix some sym_common fake-matching symbols
Diffstat (limited to 'src/choose_party.c')
| -rw-r--r-- | src/choose_party.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/choose_party.c b/src/choose_party.c index 5aed5b22e..e81f53a1b 100644 --- a/src/choose_party.c +++ b/src/choose_party.c @@ -25,7 +25,6 @@ extern u8 gLastFieldPokeMenuOpened; extern u8 gUnknown_020384F0; extern struct UnknownPokemonStruct2 gMultiPartnerParty[3]; extern u8 gUnknown_0202E8F6; -extern struct Pokemon gUnknown_030042FC[]; extern const u16 gBattleTowerBannedSpecies[]; EWRAM_DATA u8 gSelectedOrderFromParty[3] = {0}; @@ -204,13 +203,13 @@ static u8 sub_81220C8(void) { u8 j; - ewram1B000.unk282 = GetMonData(&gUnknown_030042FC[gSelectedOrderFromParty[i]], MON_DATA_SPECIES); - ewram1B000.unk280 = GetMonData(&gUnknown_030042FC[gSelectedOrderFromParty[i]], MON_DATA_HELD_ITEM); + ewram1B000.unk282 = GetMonData(&gPlayerParty[gSelectedOrderFromParty[i] - 1], MON_DATA_SPECIES); + ewram1B000.unk280 = GetMonData(&gPlayerParty[gSelectedOrderFromParty[i] - 1], MON_DATA_HELD_ITEM); for (j = i + 1; j < 3; j++) { - if (ewram1B000.unk282 == GetMonData(&gUnknown_030042FC[gSelectedOrderFromParty[j]], MON_DATA_SPECIES)) + if (ewram1B000.unk282 == GetMonData(&gPlayerParty[gSelectedOrderFromParty[j] - 1], MON_DATA_SPECIES)) return 0x12; - if (ewram1B000.unk280 != 0 && ewram1B000.unk280 == GetMonData(&gUnknown_030042FC[gSelectedOrderFromParty[j]], MON_DATA_HELD_ITEM)) + if (ewram1B000.unk280 != 0 && ewram1B000.unk280 == GetMonData(&gPlayerParty[gSelectedOrderFromParty[j] - 1], MON_DATA_HELD_ITEM)) return 0x13; } } |