dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some fakematchings

Browse Source
This commit is contained in:
Kurausukun
2021-04-02 15:32:42 -04:00
parent 0ecc1876a9
commit 5112364e63
2 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trainer_tower.c
+2 -11
View File
@@ -501,7 +501,7 @@ void GetTrainerTowerOpponentLoseText(u8 *dest, u8 opponentIdx)
TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechLose2, dest);
}
static void SetUpTrainerTowerDataStruct(void) // fakematching
static void SetUpTrainerTowerDataStruct(void)
{
u32 challengeType = gSaveBlock1Ptr->towerChallengeId;
s32 r4;
@@ -519,16 +519,7 @@ static void SetUpTrainerTowerDataStruct(void) // fakematching
r7 = gUnknown_84827B4[challengeType];
for (r4 = 0; r4 < MAX_TRAINER_TOWER_FLOORS; r4++)
{
#ifndef NONMATCHING
void * r5;
register void * r0 asm("r0") = sTrainerTowerState;
r5 = (void *)(r4 * sizeof(struct TrainerTowerFloor));
r0 = r5 + (uintptr_t)r0;
r0 += offsetof(struct UnkStruct_203F458, unk_0004.floors);
memcpy(r0, r7[r4], sizeof(struct TrainerTowerFloor));
#else
memcpy(&sTrainerTowerState->unk_0004.floors[r4], r7[r4], sizeof(struct TrainerTowerFloor));
#endif
*(sTrainerTowerState->unk_0004.floors + r4) = *(r7[r4]); // manual pointer arithmetic needed to match
}
sTrainerTowerState->unk_0004.checksum = CalcByteArraySum((void *)sTrainerTowerState->unk_0004.floors, sizeof(sTrainerTowerState->unk_0004.floors));
ValidateOrResetCurTrainerTowerRecord();