summaryrefslogtreecommitdiff
path: root/src/field
diff options
context:
space:
mode:
authorCameron Hall <cameronghall@cox.net>2018-02-17 17:54:53 -0600
committerCameron Hall <cameronghall@cox.net>2018-02-17 17:54:53 -0600
commit99befda409870bedc2120f3af0b84f3d6d55806b (patch)
treec113e556b2af84b803cbc6fb96347591de3856b1 /src/field
parent17a5968adbc1dfb6586641729b39eeb3873481df (diff)
remove unnecessary struct in battle tower data
Diffstat (limited to 'src/field')
-rw-r--r--src/field/battle_tower.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c
index 8d8498d45..d4dbba120 100644
--- a/src/field/battle_tower.c
+++ b/src/field/battle_tower.c
@@ -1521,9 +1521,9 @@ void PrintBattleTowerTrainerGreeting(void)
if (gSaveBlock2.battleTower.battleTowerTrainerId == BATTLE_TOWER_EREADER_TRAINER_ID)
PrintBattleTowerTrainerMessage(gSaveBlock2.battleTower.ereaderTrainer.greeting);
else if (gSaveBlock2.battleTower.battleTowerTrainerId < BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID)
- PrintBattleTowerTrainerMessage((u16 *)gBattleTowerTrainers[gSaveBlock2.battleTower.battleTowerTrainerId].greeting.easyChat);
+ PrintBattleTowerTrainerMessage((u16 *)gBattleTowerTrainers[gSaveBlock2.battleTower.battleTowerTrainerId].greeting);
else
- PrintBattleTowerTrainerMessage(gSaveBlock2.battleTower.records[gSaveBlock2.battleTower.battleTowerTrainerId - BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID].greeting.easyChat);
+ PrintBattleTowerTrainerMessage(gSaveBlock2.battleTower.records[gSaveBlock2.battleTower.battleTowerTrainerId - BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID].greeting);
}
void sub_81354CC(void)
@@ -1792,7 +1792,7 @@ void sub_8135AC4(void)
playerRecord->winStreak = GetCurrentBattleTowerWinStreak(battleTowerLevelType);
for (i = 0; i < 6; i++)
- playerRecord->greeting.easyChat[i] = gSaveBlock1.easyChats.unk2B28[i];
+ playerRecord->greeting[i] = gSaveBlock1.easyChats.unk2B28[i];
for (i = 0; i < 3; i++)
sub_803AF78(&gUnknown_030042FC[gSaveBlock2.battleTower.selectedPartyMons[i]], &playerRecord->party[i]);