summaryrefslogtreecommitdiff
path: root/src/battle_setup.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2019-02-07 11:37:28 -0600
committerMarcus Huderle <huderlem@gmail.com>2019-02-07 11:51:03 -0600
commit3a88ab831d2fb57e1f3e0908aeb79395700867d4 (patch)
tree79323a659a2ad1f81645566d434296966e2dad19 /src/battle_setup.c
parenta1ad1bad3a96222e8575bb2ce4625864593daa73 (diff)
Document more battle pyramid
Diffstat (limited to 'src/battle_setup.c')
-rw-r--r--src/battle_setup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index f5e9e3e9e..7626420e9 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -874,8 +874,8 @@ u8 sub_80B100C(s32 arg0)
return sUnknown_0854FE98[Random() % ARRAY_COUNT(sUnknown_0854FE98)];
}
- var = gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum * 2 + 0]
- + gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum * 2 + 1];
+ var = gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum * 2 + 0]
+ + gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum * 2 + 1];
return sUnknown_0854FE98[var % ARRAY_COUNT(sUnknown_0854FE98)];
}
@@ -1266,7 +1266,7 @@ void BattleSetup_StartTrainerBattle(void)
ZeroMonData(&gEnemyParty[2]);
}
- sub_81A9B04();
+ MarkApproachingPyramidTrainersAsBattled();
}
else if (sub_81D5C18())
{