diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-07 16:10:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 16:10:35 -0400 |
| commit | a2655ba9ab82646a54f60abc6078df372179f8d4 (patch) | |
| tree | 95b074a1a4d77d6cd77e413e1d6e72eb55b595b0 /src/battle_tower.c | |
| parent | e86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff) | |
| parent | 001a25e49cd6acdac89a62f4230aef80422e78f2 (diff) | |
Merge branch 'master' into doc-union
Diffstat (limited to 'src/battle_tower.c')
| -rw-r--r-- | src/battle_tower.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_tower.c b/src/battle_tower.c index f2ffd97a6..8d914d706 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -1339,7 +1339,7 @@ void PutNewBattleTowerRecord(struct EmeraldBattleTowerRecord *newRecordEm) if (gSaveBlock2Ptr->frontier.towerRecords[i].name[j] != newRecord->name[j]) break; if (newRecord->name[j] == EOS) - #endif + #endif { k = PLAYER_NAME_LENGTH; break; @@ -2655,7 +2655,7 @@ static void TowerTryCloseLink(void) static void SetMultiPartnerGfx(void) { // 0xF below means use VAR_OBJ_GFX_ID_E - SetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[17], 0xF); + SetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[17], 0xF); } static void SetTowerInterviewData(void) @@ -2968,7 +2968,7 @@ static void FillPartnerParty(u16 trainerId) sStevenMons[i].species, sStevenMons[i].level, sStevenMons[i].fixedIV, - TRUE, + TRUE, #ifdef BUGFIX j, #else |