summaryrefslogtreecommitdiff
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/mystery_event_script.c2
-rw-r--r--src/engine/record_mixing.c4
-rw-r--r--src/engine/trainer_card.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/engine/mystery_event_script.c b/src/engine/mystery_event_script.c
index c07a23262..0fb3a21cd 100644
--- a/src/engine/mystery_event_script.c
+++ b/src/engine/mystery_event_script.c
@@ -420,7 +420,7 @@ bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx)
bool8 MEScrCmd_addtrainer(struct ScriptContext *ctx)
{
u32 data = ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0];
- memcpy(&gSaveBlock2.filler_A8.ereaderTrainer, (void *)data, sizeof(gSaveBlock2.filler_A8.ereaderTrainer));
+ memcpy(&gSaveBlock2.battleTower.ereaderTrainer, (void *)data, sizeof(gSaveBlock2.battleTower.ereaderTrainer));
sub_813601C();
StringExpandPlaceholders(gStringVar4, gOtherText_NewTrainerInHoenn);
ctx->data[2] = 2;
diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c
index 000bafa4e..87fc6a81d 100644
--- a/src/engine/record_mixing.c
+++ b/src/engine/record_mixing.c
@@ -43,7 +43,7 @@ void *gUnknown_083D0274 = &gSaveBlock1.unknown_2ABC;
void *gUnknown_083D0278 = &gSaveBlock1.mauvilleMan;
void *recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs;
struct RecordMixingDayCareMail *gUnknown_083D0280 = &gUnknown_02038738;
-void *gUnknown_083D0284 = &gSaveBlock2.filler_A8;
+void *gBattleTowerPlayerRecord = &gSaveBlock2.battleTower.playerRecord;
#define BUFFER_CHUNK_SIZE 200
@@ -78,7 +78,7 @@ void RecordMixing_PrepareExchangePacket(void)
gUnknown_02038738.mail[1] = gSaveBlock1.daycareData.misc.mail[1];
sub_8041324(gSaveBlock1.daycareData.mons, &gUnknown_02038738);
memcpy(&unk_2018000.filler10AC, gUnknown_083D0280, sizeof(struct RecordMixingDayCareMail));
- memcpy(&unk_2018000.battleTowerRecord, gUnknown_083D0284, sizeof(struct BattleTowerRecord));
+ memcpy(&unk_2018000.battleTowerRecord, gBattleTowerPlayerRecord, sizeof(struct BattleTowerRecord));
if (GetMultiplayerId() == 0)
unk_2018000.filler11C8[0] = GetRecordMixingGift();
diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c
index 11baa65d5..3e9dadbda 100644
--- a/src/engine/trainer_card.c
+++ b/src/engine/trainer_card.c
@@ -352,8 +352,8 @@ void sub_8093390(struct TrainerCard *trainerCard)
trainerCard->pokemonTrades = sav12_xor_get_clamped_above(GAME_STAT_POKEMON_TRADES, 0xFFFF);
// Battle Tower
- trainerCard->battleTowerWins = gSaveBlock2.filler_A8.totalBattleTowerWins;
- trainerCard->battleTowerLosses = gSaveBlock2.filler_A8.bestBattleTowerWinStreak;
+ trainerCard->battleTowerWins = gSaveBlock2.battleTower.totalBattleTowerWins;
+ trainerCard->battleTowerLosses = gSaveBlock2.battleTower.bestBattleTowerWinStreak;
if (trainerCard->battleTowerWins > 9999)
{
trainerCard->battleTowerWins = 9999;