diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 10:14:31 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 10:14:31 -0500 |
| commit | a5ee2c14fda450ca67985805b8bc71e66dfcf622 (patch) | |
| tree | 9f874dbe25d28bf81e9375da5731889b9b466b07 /src/use_pokeblock.c | |
| parent | 91fa5faf4acf617db0625992b2caf116e64f0888 (diff) | |
| parent | e8add87bf3ccc3563a3d4fa94e109251f4a06eea (diff) | |
Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
# include/menu_specialized.h
Diffstat (limited to 'src/use_pokeblock.c')
| -rw-r--r-- | src/use_pokeblock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 49aff99ab..59077b059 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -272,14 +272,14 @@ void sub_8166380(void) gUnknown_0203BC90->field_50++; break; case 11: - sub_81D2754(&gUnknown_0203BCAC->field_7C58, gUnknown_0203BCAC->field_7C58.unk14[0]); + sub_81D2754(gUnknown_0203BCAC->field_7C58.unk0[0], gUnknown_0203BCAC->field_7C58.unk14[0]); sub_81D20AC(&gUnknown_0203BCAC->field_7C58); gUnknown_0203BC90->field_50++; break; case 12: if (!sub_81D20BC(&gUnknown_0203BCAC->field_7C58)) { - sub_81D1F84(&gUnknown_0203BCAC->field_7C58, gUnknown_0203BCAC->field_7C58.unk14, gUnknown_0203BCAC->field_7C58.unk14); + sub_81D1F84(&gUnknown_0203BCAC->field_7C58, gUnknown_0203BCAC->field_7C58.unk14[0], gUnknown_0203BCAC->field_7C58.unk14[0]); gUnknown_0203BC90->field_50++; } break; |