diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-17 15:07:17 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-17 15:07:17 -0600 |
| commit | 52624c4fb7c145c33a2d0edc1d64b2d6e09c1336 (patch) | |
| tree | aec3073d480a2fbc3f0221397aa5e84f85755e48 /src/secret_base.c | |
| parent | f8402b3d7408e31a085dc136967f99705c764553 (diff) | |
| parent | 3883c399912a35ca4eca3cbee7cb0c46c81e8d76 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'src/secret_base.c')
| -rw-r--r-- | src/secret_base.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/secret_base.c b/src/secret_base.c index 89e276e80..de2b7221a 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1099,9 +1099,9 @@ void game_continue(u8 taskId) } gUnknown_03006310 = gUnknown_0858D07C; gUnknown_03006310.unk_10 = data[6]; - gUnknown_03006310.unk_0c = data[0]; - gUnknown_03006310.unk_00 = gUnknown_0203A020->items; - gUnknown_03006310.unk_0e = data[3]; + gUnknown_03006310.totalItems = data[0]; + gUnknown_03006310.items = gUnknown_0203A020->items; + gUnknown_03006310.maxShowed = data[3]; } void sub_80E9DEC(u32 a0, bool8 flag, struct ListMenu *menu) @@ -1866,7 +1866,7 @@ void sub_80EAF80(void *records, size_t recordSize, u8 linkIdx) { struct SecretBaseRecordMixer mixers[3]; u16 i; - + if (FlagGet(0x60)) { switch (GetLinkPlayerCount()) |