diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-12-19 13:39:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-19 13:39:38 -0500 |
| commit | 969efabaf539508405bc1260354e10be86724a42 (patch) | |
| tree | 75ca641b9c95109b538cc03e3b864c7631f167e6 /src/trainer_tower.c | |
| parent | af6ff9956de7c0689e4c61cec8bf0dc10fd5fdc5 (diff) | |
| parent | 84d9a1e7234fab97835f09c35100eaf6536984d5 (diff) | |
Merge pull request #184 from jiangzhengwenjz/nonmatching
fake match sub_804C728 & sub_804CF14; fix build with NONMATCHING defined
Diffstat (limited to 'src/trainer_tower.c')
| -rw-r--r-- | src/trainer_tower.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/trainer_tower.c b/src/trainer_tower.c index dd00bf854..aba6fe7c1 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -431,7 +431,7 @@ static const u8 sKnockoutChallengeMonIdxs[][3] = { {0x01, 0x04, 0x05} }; -extern const struct Unk_203F458_Header gUnknown_84827AC; +extern const struct EReaderTrainerHillSetSubstruct gUnknown_84827AC; extern const struct TrainerTowerFloor *const gUnknown_84827B4[][8]; void sub_815D9E8(void) @@ -527,9 +527,9 @@ static void sub_815DC8C(void) // fakematching else { struct UnkStruct_203F458 * r0_ = sTrainerTowerState; - const struct Unk_203F458_Header * r1 = &gUnknown_84827AC; + const struct EReaderTrainerHillSetSubstruct * r1 = &gUnknown_84827AC; // *r0_ = *r1; - memcpy(&r0_->unk_0004.floorIdx, r1, sizeof(struct Unk_203F458_Header)); + memcpy(&r0_->unk_0004, r1, sizeof(struct EReaderTrainerHillSetSubstruct)); // sTrainerTowerState->unk_0004.floorIdx = gUnknown_84827AC; r7 = gUnknown_84827B4[whichTimer]; for (r4 = 0; r4 < 8; r4++) @@ -540,7 +540,7 @@ static void sub_815DC8C(void) // fakematching memcpy(r0, r7[r4], sizeof(struct TrainerTowerFloor)); // r0[r4] = *r7[r4]; } - sTrainerTowerState->unk_0004.unk4 = CalcByteArraySum((void *)sTrainerTowerState->unk_0004.floors, sizeof(sTrainerTowerState->unk_0004.floors)); + sTrainerTowerState->unk_0004.checksum = CalcByteArraySum((void *)sTrainerTowerState->unk_0004.floors, sizeof(sTrainerTowerState->unk_0004.floors)); ValidateOrResetCurTrainerTowerRecord(); } } |