diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-09 11:14:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 11:14:37 -0700 |
| commit | 84c5825c8ecc9804313ec3b1a8dcc0271ee4c2cc (patch) | |
| tree | c90f705e43f2b1728ed1e0400312b7d6c5c81c21 /src/wild_encounter.c | |
| parent | 562dcc4bcdc14d5b6c0bb2a638410156945cdd41 (diff) | |
| parent | 91f869d1e6ed1ef12ad4b2255d3762e3b1b51429 (diff) | |
Merge pull request #589 from PikalaxALT/unk_debug_menu_3
Unk Debug Menu 3 and Start Menu Debug
Diffstat (limited to 'src/wild_encounter.c')
| -rw-r--r-- | src/wild_encounter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wild_encounter.c b/src/wild_encounter.c index ddad43a56..7e5dac594 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -3698,7 +3698,7 @@ const u16 gRoute119WaterTileData[] = extern u16 gSpecialVar_Result; extern u8 S_RepelWoreOff[]; -EWRAM_DATA u8 sWildEncountersDisabled = 0; +EWRAM_DATA u8 gWildEncountersDisabled = 0; EWRAM_DATA static u32 sFeebasRngValue = 0; #define NUM_FEEBAS_SPOTS 6 @@ -3712,7 +3712,7 @@ static void ApplyCleanseTagEncounterRateMod(u32 *encRate); void DisableWildEncounters(bool8 disabled) { - sWildEncountersDisabled = disabled; + gWildEncountersDisabled = disabled; } static u16 GetRoute119WaterTileNum(s16 x, s16 y, u8 section) @@ -4110,7 +4110,7 @@ bool8 StandardWildEncounter(u16 a, u16 b) u16 headerNum; struct Roamer *roamer; - if (sWildEncountersDisabled == TRUE) + if (gWildEncountersDisabled == TRUE) return 0; else { |