diff options
| author | shinny456 <shinny456@users.noreply.github.com> | 2019-01-19 10:44:58 -0500 |
|---|---|---|
| committer | shinny456 <shinny456@users.noreply.github.com> | 2019-01-19 10:44:58 -0500 |
| commit | 1b30da21d9a0f1264ba3649e725ac1a62eca3e3a (patch) | |
| tree | 3105ab0101ffd0768589279130163a971c8365ca /src/party_menu.c | |
| parent | 8a5fce7837b7314adb9bf6996ef06c009e853c29 (diff) | |
| parent | 6857b73ee348b16ecbd11d3dd12de022c08af3a5 (diff) | |
merge trainer hill changes
Diffstat (limited to 'src/party_menu.c')
| -rwxr-xr-x | src/party_menu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/party_menu.c b/src/party_menu.c index 241df1c91..a8c98faec 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -1563,7 +1563,7 @@ static void InitPartyMenu(u8 a, u8 b, u8 c, u8 d, u8 e, TaskFunc task, MainCallb for (i = 0; i <= 15; i++) gUnknown_0203CEC4->data[i] = 0; for (i = 0; i < 3; i++) - gUnknown_0203CEC4->unkC[i] |= 0xFF; + gUnknown_0203CEC4->unkC[i] = 0xFF; if (d == 0) gUnknown_0203CEC8.unk9 = 0; @@ -1851,10 +1851,10 @@ static void PartyMenuInitHelperStructs(u8 a) gUnknown_0203CEDC[i].unk0 = &gUnknown_086156C4[1]; gUnknown_0203CEDC[i].unk4 = gUnknown_08615704[a][i]; gUnknown_0203CEDC[i].windowId = i; - gUnknown_0203CEDC[i].unk9 |= 0xFF; - gUnknown_0203CEDC[i].unkA |= 0xFF; - gUnknown_0203CEDC[i].unkB |= 0xFF; - gUnknown_0203CEDC[i].unkC |= 0xFF; + gUnknown_0203CEDC[i].unk9 = 0xFF; + gUnknown_0203CEDC[i].unkA = 0xFF; + gUnknown_0203CEDC[i].unkB = 0xFF; + gUnknown_0203CEDC[i].unkC = 0xFF; } gUnknown_0203CEDC[0].unk0 = &gUnknown_086156C4[0]; if (a == 3) |