diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-11-04 14:32:13 -0400 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-11-04 11:32:13 -0700 |
| commit | 51cbe1d8740a3226a38e80ff2318c3f9cf440c28 (patch) | |
| tree | 02d63fb8194e2ab3b781209cb15ce14d1ff6add1 /src/wild_encounter.c | |
| parent | 49b433a4183bafefeb9f4e4aef848fda08e2fb3a (diff) | |
decompile battle_setup.c (#86)
* purge text label redundancy in data2
* revo you dummy dont commit experimental changes like that
* Map header music constants
* Declare CoordEvent and BgEvent structs
* start labeling AI labels
* begin decompiling battle_setup.c
* more decompilation of battle_setup.c
* decompile even more battle_setup.c
* finish decompiling battle_setup.c aside from one function
* impeach PikalaxALT
* formatting
Diffstat (limited to 'src/wild_encounter.c')
| -rw-r--r-- | src/wild_encounter.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/wild_encounter.c b/src/wild_encounter.c index c81036587..b2d662e13 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -33,7 +33,7 @@ extern u8 TestPlayerAvatarFlags(u8); extern u8 MetatileBehavior_IsLandWildEncounter(u8); extern u8 sub_81344CC(void); extern u8 MetatileBehavior_IsWaterWildEncounter(u8); -extern void sub_8081A00(void); +extern void CheckForSafariZoneAndProceed(void); extern u8 MetatileBehavior_IsBridge(u8); extern void PlayerGetDestCoords(u16 *x, u16 *y); extern void sub_80BEA50(u16); @@ -501,7 +501,7 @@ bool8 StandardWildEncounter(u16 a, u16 b) { if(DoMassOutbreakEncounterTest() == TRUE && SetUpMassOutbreakEncounter(1) == TRUE) { - sub_8081A00(); + CheckForSafariZoneAndProceed(); return 1; } if (GenerateWildMon(gWildMonHeaders[unk].landMonsInfo, 0, 1) == 1) @@ -540,7 +540,7 @@ bool8 StandardWildEncounter(u16 a, u16 b) { label: //_0808527A - sub_8081A00(); + CheckForSafariZoneAndProceed(); return 1; } } @@ -569,7 +569,7 @@ void RockSmashWildEncounter(void) else if(DoWildEncounterTest(wildPokemonInfo->encounterRate, 1) == TRUE && GenerateWildMon(wildPokemonInfo, 2, 1) == 1) { - sub_8081A00(); + CheckForSafariZoneAndProceed(); gScriptResult = 1; return; } @@ -609,7 +609,7 @@ u8 SweetScentWildEncounter(void) //_08085374 GenerateWildMon(wildPokemonInfo, 0, 0); //_080853D2 - sub_8081A00(); + CheckForSafariZoneAndProceed(); return 1; } //_08085380 @@ -630,7 +630,7 @@ u8 SweetScentWildEncounter(void) else //_080853C8 GenerateWildMon(wildPokemonInfo, 1, 0); - sub_8081A00(); + CheckForSafariZoneAndProceed(); return 1; } } @@ -667,7 +667,7 @@ void FishingWildEncounter(u8 rod) } sav12_xor_increment(12); sub_80BEA50(species); - sub_8081A00(); + CheckForSafariZoneAndProceed(); } u16 GetLocalWildMon(bool8 *isWaterMon) |