diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-09 02:36:30 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-09 02:36:30 -0400 |
| commit | fc761599b412206f80d961a6052dce49b9998689 (patch) | |
| tree | 1f3eb8f01ae005b8b509d1f120ce5d7bce230992 /src/wild_encounter.c | |
| parent | d343d1f19a74657489d987dbd97b84e7389ae295 (diff) | |
| parent | 4b4f716ae0c582068928a4ae7b31d9d10ac89eb5 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'src/wild_encounter.c')
| -rw-r--r-- | src/wild_encounter.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 408dc69ce..9dfcf0e5c 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -7,6 +7,7 @@ #include "field_player_avatar.h" #include "metatile_behavior.h" #include "rng.h" +#include "roamer.h" #include "rom4.h" #include "safari_zone.h" #include "script.h" @@ -3323,7 +3324,7 @@ bool8 StandardWildEncounter(u16 a, u16 b) if (DoWildEncounterTest(gWildMonHeaders[headerNum].landMonsInfo->encounterRate, 0) == TRUE) { - if (sub_81344CC() == TRUE) + if (TryStartRoamerEncounter() == TRUE) { roamer = &gSaveBlock1.roamer; if (RepelCheck(roamer->level)) @@ -3357,7 +3358,7 @@ bool8 StandardWildEncounter(u16 a, u16 b) if (DoWildEncounterTest(gWildMonHeaders[headerNum].waterMonsInfo->encounterRate, 0) == TRUE) { - if (sub_81344CC() == TRUE) + if (TryStartRoamerEncounter() == TRUE) { roamer = &gSaveBlock1.roamer; if (RepelCheck(roamer->level)) @@ -3425,7 +3426,7 @@ bool8 SweetScentWildEncounter(void) wildPokemonInfo = gWildMonHeaders[headerNum].landMonsInfo; if (wildPokemonInfo == NULL) return FALSE; - if (sub_81344CC() == TRUE) + if (TryStartRoamerEncounter() == TRUE) { StartBattle_Roamer(); return TRUE; @@ -3442,7 +3443,7 @@ bool8 SweetScentWildEncounter(void) wildPokemonInfo = gWildMonHeaders[headerNum].waterMonsInfo; if (wildPokemonInfo == NULL) return FALSE; - if (sub_81344CC() == TRUE) + if (TryStartRoamerEncounter() == TRUE) { StartBattle_Roamer(); return TRUE; |