diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 03:03:45 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-24 03:03:45 -0500 |
commit | 39556605cd27a567a45bfc2c46af745ac031ab90 (patch) | |
tree | c2ff7645625d62e94b369080ba37071eb98426d1 /src/wireless_communication_status_screen.c | |
parent | ef1f9ead0ba44c67185dccc616846646d7ce9257 (diff) | |
parent | 85e5c57e8c86cca00e8bfc7d54e21d08c9e62e69 (diff) |
Merge branch 'master' into doc-ttower
Diffstat (limited to 'src/wireless_communication_status_screen.c')
-rw-r--r-- | src/wireless_communication_status_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index 1c355c3ba..9be2823aa 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -364,7 +364,7 @@ void sub_814F65C(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 palIdx) u32 sub_814F714(struct UnkStruct_x20 * unk20, u32 * arg1) { - u32 r8 = unk20->unk.field_0.unk_0a_0; + u32 r8 = unk20->unk.gname.unk_0a_0; s32 i, j, k; for (i = 0; i < NELEMS(gUnknown_846FAC0); i++) @@ -376,7 +376,7 @@ u32 sub_814F714(struct UnkStruct_x20 * unk20, u32 * arg1) k = 0; for (j = 0; j < 4; j++) { - if (unk20->unk.field_0.unk_04[j] != 0) k++; + if (unk20->unk.gname.unk_04[j] != 0) k++; } k++; arg1[gUnknown_846FAC0[i][1]] += k; |