diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-09-24 10:17:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 10:17:34 -0400 |
| commit | 42d2fefe0218f529f9c22f3b6b4230ca91a00de5 (patch) | |
| tree | db4ae87659baced2022e440109306266c1c80e3b /src/battle_tower.c | |
| parent | f8f7617946e150514313267ba52a35ebd9052936 (diff) | |
| parent | 09fd4fc4c57796036905cdc5caaa53fb96c436f8 (diff) | |
Merge branch 'master' into tag-none
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 082ea6822..27defc1fa 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 |