diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-06-30 11:25:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-30 11:25:19 -0700 |
| commit | efebc51972b23ddffa2700b1dd6895d4728646a3 (patch) | |
| tree | 5dfa68e92aa9d1a267af8dde9ca8040294952e3f /src/wild_encounter.c | |
| parent | 91ee3221b3a4885d155ad2cca16b7678062ad18a (diff) | |
| parent | 97712ec931febe390861f2234e26a66f15c9c295 (diff) | |
Merge pull request #268 from DizzyEggg/decompile_battle_tent
Decompile a bit of battle tent
Diffstat (limited to 'src/wild_encounter.c')
| -rw-r--r-- | src/wild_encounter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 82ef74213..9a22323ff 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -5102,7 +5102,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi } if (gMapHeader.mapLayoutId == 0x169) { - headerId = gSaveBlock2Ptr->battlePyramidWildHeaderId; + headerId = gSaveBlock2Ptr->frontier.field_CB2; if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll()) return FALSE; else if (DoWildEncounterRateTest(gBattlePyramidWildMonHeaders[headerId].landMonsInfo->encounterRate, FALSE) != TRUE) @@ -5240,7 +5240,7 @@ bool8 SweetScentWildEncounter(void) } if (gMapHeader.mapLayoutId == 0x169) { - headerId = gSaveBlock2Ptr->battlePyramidWildHeaderId; + headerId = gSaveBlock2Ptr->frontier.field_CB2; if (TryGenerateWildMon(gBattlePyramidWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE) return FALSE; |