diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-05 17:53:03 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-06 00:18:20 -0500 |
| commit | 49a5bda839e5873e74017192ba1a33851897b025 (patch) | |
| tree | ec91866308eb2fc63d15a7b9c7e3c9605f78a427 /src/wild_encounter.c | |
| parent | 77093721ba470adb6ba3fccccb6cb8de8a99a220 (diff) | |
Label/document field_control_avatar.c and a few misc things
Diffstat (limited to 'src/wild_encounter.c')
| -rw-r--r-- | src/wild_encounter.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 7e5dac594..99594d3f2 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -4105,7 +4105,7 @@ static bool8 DoGlobalWildEncounterDiceRoll(void) return TRUE; } -bool8 StandardWildEncounter(u16 a, u16 b) +bool8 StandardWildEncounter(u16 curMetatileBehavior, u16 prevMetatileBehavior) { u16 headerNum; struct Roamer *roamer; @@ -4117,11 +4117,11 @@ bool8 StandardWildEncounter(u16 a, u16 b) headerNum = GetCurrentMapWildMonHeader(); if (headerNum != 0xFFFF) { - if (MetatileBehavior_IsLandWildEncounter(a) == TRUE) + if (MetatileBehavior_IsLandWildEncounter(curMetatileBehavior) == TRUE) { if (gWildMonHeaders[headerNum].landMonsInfo) { - if (b != a && !DoGlobalWildEncounterDiceRoll()) + if (prevMetatileBehavior != curMetatileBehavior && !DoGlobalWildEncounterDiceRoll()) return 0; if (DoWildEncounterTest(gWildMonHeaders[headerNum].landMonsInfo->encounterRate, 0) == TRUE) @@ -4150,12 +4150,12 @@ bool8 StandardWildEncounter(u16 a, u16 b) } } } - else if (MetatileBehavior_IsWaterWildEncounter(a) == TRUE - || (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && MetatileBehavior_IsBridge(a) == TRUE)) + else if (MetatileBehavior_IsWaterWildEncounter(curMetatileBehavior) == TRUE + || (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && MetatileBehavior_IsBridge(curMetatileBehavior) == TRUE)) { if (gWildMonHeaders[headerNum].waterMonsInfo) { - if (b != a && !DoGlobalWildEncounterDiceRoll()) + if (prevMetatileBehavior != curMetatileBehavior && !DoGlobalWildEncounterDiceRoll()) return 0; if (DoWildEncounterTest(gWildMonHeaders[headerNum].waterMonsInfo->encounterRate, 0) == TRUE) |