dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish decomp of wild_encounter

Browse Source
This commit is contained in:
PikalaxALT
2019-10-31 17:06:06 -04:00
committed by PikalaxALT
parent b07b36c6d2
commit 079310c70b
13 changed files with 505 additions and 1065 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_control_avatar.s
+3 -3
View File
@@ -1725,7 +1725,7 @@ sub_806D5E8: @ 806D5E8
lsls r0, 24
cmp r0, 0
bne _0806D658
bl sub_80830B8
bl UpdateRepelCounter
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1956,7 +1956,7 @@ _0806D7E2:
thumb_func_start RestartWildEncounterImmunitySteps
RestartWildEncounterImmunitySteps: @ 806D7E8
push {lr}
bl sub_80832D4
bl ResetEncounterRateModifiers
pop {r0}
bx r0
thumb_func_end RestartWildEncounterImmunitySteps
@@ -1964,7 +1964,7 @@ RestartWildEncounterImmunitySteps: @ 806D7E8
thumb_func_start is_it_battle_time_3
is_it_battle_time_3: @ 806D7F4
push {lr}
bl sub_80833B0
bl TryStandardWildEncounter
lsls r0, 24
lsrs r0, 24
pop {r1}
asm/field_player_avatar.s
+2 -2
View File
@@ -4481,7 +4481,7 @@ sub_805D508: @ 805D508
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
bl sub_8082F78
bl DoesCurrentMapHaveFishingMons
lsls r0, 24
cmp r0, 0
beq _0805D53A
@@ -4791,7 +4791,7 @@ _0805D788:
ldrh r0, [r5, 0x26]
lsls r0, 24
lsrs r0, 24
bl sub_8082FB0
bl FishingWildEncounter
ldr r0, _0805D7BC @ =sub_805D304
bl FindTaskIdByFunc
lsls r0, 24
asm/wild_encounter.s
-1007
View File
File diff suppressed because it is too large Load Diff
data/event_scripts.s
+2 -2
View File
@@ -10397,7 +10397,7 @@ EventScript_1BE06F:: @ 81BE06F
applymovement VAR_LAST_TALKED, Movement_1BE08F
waitmovement 0
removeobject VAR_LAST_TALKED
special Special_RockSmashEncounter
special ScrSpecial_RockSmashWildEncounter
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1BE08D
waitstate
@@ -11731,7 +11731,7 @@ EventScript_81BFB5F:: @ 81BFB5F
setflashradius 0
end
EventScript_1BFB65:: @ 81BFB65
EventScript_RepelWoreOff:: @ 81BFB65
msgbox Text_1BFB6E, 3
end
data/specials.inc
+1 -1
View File
@@ -179,7 +179,7 @@ gSpecials:: @ 815FD60
def_special sub_8113510
def_special sub_81130A8
def_special sub_8113530
def_special Special_RockSmashEncounter
def_special ScrSpecial_RockSmashWildEncounter
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
include/event_scripts.h
+2
View File
@@ -1186,4 +1186,6 @@ extern const u8 Text_1BCA95[];
extern const u8 Text_1BCACB[];
extern const u8 Text_1BCAF2[];
extern const u8 EventScript_RepelWoreOff[];
#endif //GUARD_EVENT_SCRIPTS_H
include/fieldmap.h
+2
View File
@@ -28,5 +28,7 @@ struct MapConnection * GetMapConnectionAtPos(s16 x, s16 y);
void sub_8059948(u8 a0, u8 a1);
void save_serialize_map(void);
u32 sub_8058F1C(u32 original, u8 bit);
u32 sub_8058F48(s16 x, s16 y, u8 z);
#endif //GUARD_FIELDMAP_H
include/wild_encounter.h
+4 -3
View File
@@ -34,7 +34,7 @@ struct WildPokemonHeader
extern const struct WildPokemonHeader gWildMonHeaders[];
void DisableWildEncounters(bool8 disabled);
bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavior);
bool8 StandardWildEncounter(u32 currMetaTileBehavior, u16 previousMetaTileBehavior);
void ScrSpecial_RockSmashWildEncounter(void);
bool8 SweetScentWildEncounter(void);
bool8 DoesCurrentMapHaveFishingMons(void);
@@ -42,9 +42,10 @@ void FishingWildEncounter(u8 rod);
u16 GetLocalWildMon(bool8 *isWaterMon);
u16 GetLocalWaterMon(void);
bool8 UpdateRepelCounter(void);
void sub_8082740(bool8 state);
void DisableWildEncounters(bool8 state);
u8 GetUnownLetterByPersonalityLoByte(u32 personality);
bool8 SweetScentWildEncounter(void);
void sub_8083214(u16 randVal);
void SeedWildEncounterRng(u16 randVal);
void ResetEncounterRateModifiers(void);
#endif // GUARD_WILD_ENCOUNTER_H
ld_script.txt
-1
View File
@@ -126,7 +126,6 @@ SECTIONS {
asm/cable_club.o(.text);
asm/trainer_see.o(.text);
src/wild_encounter.o(.text);
asm/wild_encounter.o(.text);
asm/field_effect.o(.text);
src/scanline_effect.o(.text);
asm/option_menu.o(.text);
src/new_game.c
+1 -1
View File
@@ -102,7 +102,7 @@ void ResetMenuAndMonGlobals(void)
ResetTMCaseCursorPos();
BerryPouch_CursorResetToTop();
sub_811089C();
sub_8083214(Random());
SeedWildEncounterRng(Random());
ResetSpecialVars();
}
src/quest_log.c
+2 -2
View File
@@ -870,7 +870,7 @@ static void sub_8110F90(u8 unused)
gSaveBlock1Ptr->location.warpId = -1;
gUnknown_203ADF8 = 0;
gDisableMapMusicChangeOnMapLoad = 1;
sub_8082740(1);
DisableWildEncounters(TRUE);
sub_8111368();
}
@@ -1600,7 +1600,7 @@ static void sub_81120AC(u8 taskId)
ScriptContext2_Disable();
gTextFlags.autoScroll = FALSE;
gUnknown_2036E28 = 0;
sub_8082740(0);
DisableWildEncounters(FALSE);
gHelpSystemEnabled = TRUE;
DestroyTask(taskId);
break;
src/wild_encounter.c
+484 -37
View File
@@ -2,38 +2,53 @@
#include "random.h"
#include "wild_encounter.h"
#include "event_data.h"
#include "fieldmap.h"
#include "roamer.h"
#include "field_player_avatar.h"
#include "battle_setup.h"
#include "overworld.h"
#include "metatile_behavior.h"
#include "event_scripts.h"
#include "script.h"
#include "link.h"
#include "quest_log.h"
#include "constants/species.h"
#include "constants/maps.h"
#include "constants/vars.h"
#include "constants/abilities.h"
#include "constants/items.h"
struct UnkStruct_20386D0
struct WildEncounterData
{
u8 filler_0[6];
u16 unk_6;
u8 unk_8;
u8 unk_9;
u32 rngState;
u16 prevMetaTileBehavior;
u16 encounterRateBuff;
u8 stepsSinceLastEncounter;
u8 abilityEffect;
u16 leadMonHeldItem;
};
EWRAM_DATA struct UnkStruct_20386D0 gUnknown_20386D0 = {};
EWRAM_DATA bool8 gUnknown_20386DC = FALSE;
static EWRAM_DATA struct WildEncounterData sWildEncounterData = {};
static EWRAM_DATA bool8 sWildEncountersDisabled = FALSE;
extern const u8 gUnknown_83CA71C[][12];
bool8 UnlockedTanobyOrAreNotInTanoby(void);
u32 GenerateUnownPersonalityByLetter(u8 letter);
bool8 sub_808310C(u8 level);
u16 sub_808322C(void);
void ApplyFluteEncounterRateMod(u32 *rate);
void ApplyCleanseTagEncounterRateMod(u32 *rate);
static bool8 UnlockedTanobyOrAreNotInTanoby(void);
static u32 GenerateUnownPersonalityByLetter(u8 letter);
static bool8 IsWildLevelAllowedByRepel(u8 level);
static void ApplyFluteEncounterRateMod(u32 *rate);
static u8 GetFluteEncounterRateModType(void);
static void ApplyCleanseTagEncounterRateMod(u32 *rate);
static u8 IsLeadMonHoldingCleanseTag(void);
static u16 WildEncounterRandom(void);
static void AddToWildEncounterRateBuff(u8 encouterRate);
void sub_8082740(bool8 state)
void DisableWildEncounters(bool8 state)
{
gUnknown_20386DC = state;
sWildEncountersDisabled = state;
}
u8 ChooseWildMonIndex_Land(void)
static u8 ChooseWildMonIndex_Land(void)
{
u8 pct = Random() % 100;
if (pct < 20)
@@ -61,7 +76,7 @@ u8 ChooseWildMonIndex_Land(void)
return 11;
}
u8 ChooseWildMonIndex_WaterRock(void)
static u8 ChooseWildMonIndex_WaterRock(void)
{
u8 pct = Random() % 100;
if (pct < 60)
@@ -75,7 +90,7 @@ u8 ChooseWildMonIndex_WaterRock(void)
return 4;
}
u8 ChooseWildMonIndex_Fishing(u8 rod)
static u8 ChooseWildMonIndex_Fishing(u8 rod)
{
u8 slot = 0;
u8 pct = Random() % 100;
@@ -111,7 +126,7 @@ u8 ChooseWildMonIndex_Fishing(u8 rod)
return slot;
}
u8 ChooseWildMonLevel(const struct WildPokemon * info)
static u8 ChooseWildMonLevel(const struct WildPokemon * info)
{
u8 lo;
u8 hi;
@@ -132,7 +147,7 @@ u8 ChooseWildMonLevel(const struct WildPokemon * info)
return lo + res;
}
u16 sub_8082934(void)
static u16 GetCurrentMapWildMonHeaderId(void)
{
u16 i;
@@ -164,7 +179,7 @@ u16 sub_8082934(void)
return -1;
}
bool8 UnlockedTanobyOrAreNotInTanoby(void)
static bool8 UnlockedTanobyOrAreNotInTanoby(void)
{
if (FlagGet(FLAG_SYS_UNLOCKED_TANOBY_RUINS))
return TRUE;
@@ -182,7 +197,7 @@ bool8 UnlockedTanobyOrAreNotInTanoby(void)
return FALSE;
}
void GenerateWildMon(u16 species, u8 level, u8 slot)
static void GenerateWildMon(u16 species, u8 level, u8 slot)
{
u32 personality;
s8 chamber;
@@ -199,7 +214,7 @@ void GenerateWildMon(u16 species, u8 level, u8 slot)
}
}
u32 GenerateUnownPersonalityByLetter(u8 letter)
static u32 GenerateUnownPersonalityByLetter(u8 letter)
{
u32 personality;
do
@@ -214,7 +229,7 @@ u8 GetUnownLetterByPersonalityLoByte(u32 personality)
return (((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | (personality & 0x3)) % 0x1C;
}
bool8 sub_8082AEC(const struct WildPokemonInfo * info, u8 tableIdx, u8 a2)
static bool8 TryGenerateWildMon(const struct WildPokemonInfo * info, u8 tableIdx, u8 a2)
{
u8 slot = 0;
u8 level;
@@ -231,7 +246,7 @@ bool8 sub_8082AEC(const struct WildPokemonInfo * info, u8 tableIdx, u8 a2)
break;
}
level = ChooseWildMonLevel(&info->wildPokemon[slot]);
if (a2 == 1 && !sub_808310C(level))
if (a2 == 1 && !IsWildLevelAllowedByRepel(level))
{
return FALSE;
}
@@ -239,7 +254,7 @@ bool8 sub_8082AEC(const struct WildPokemonInfo * info, u8 tableIdx, u8 a2)
return TRUE;
}
u16 sub_8082B64(const struct WildPokemonInfo * info, u8 rod)
static u16 GenerateFishingEncounter(const struct WildPokemonInfo * info, u8 rod)
{
u8 slot = ChooseWildMonIndex_Fishing(rod);
u8 level = ChooseWildMonLevel(&info->wildPokemon[slot]);
@@ -247,24 +262,24 @@ u16 sub_8082B64(const struct WildPokemonInfo * info, u8 rod)
return info->wildPokemon[slot].species;
}
bool8 DoWildEncounterRateDiceRoll(u16 a0)
static bool8 DoWildEncounterRateDiceRoll(u16 a0)
{
if (sub_808322C() % 1600 < a0)
if (WildEncounterRandom() % 1600 < a0)
return TRUE;
return FALSE;
}
bool8 sub_8082BCC(u32 encounterRate, bool8 ignoreAbility)
static bool8 DoWildEncounterRateTest(u32 encounterRate, bool8 ignoreAbility)
{
encounterRate *= 16;
if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
encounterRate = encounterRate * 80 / 100;
encounterRate += gUnknown_20386D0.unk_6 * 16 / 200;
encounterRate += sWildEncounterData.encounterRateBuff * 16 / 200;
ApplyFluteEncounterRateMod(&encounterRate);
ApplyCleanseTagEncounterRateMod(&encounterRate);
if (!ignoreAbility)
{
switch (gUnknown_20386D0.unk_9)
switch (sWildEncounterData.abilityEffect)
{
case 1:
encounterRate /= 2;
@@ -279,23 +294,455 @@ bool8 sub_8082BCC(u32 encounterRate, bool8 ignoreAbility)
return DoWildEncounterRateDiceRoll(encounterRate);
}
u8 sub_8082C58(void)
static u8 GetAbilityEncounterRateModType(void)
{
gUnknown_20386D0.unk_9 = 0;
sWildEncounterData.abilityEffect = 0;
if (!GetMonData(&gPlayerParty[0], MON_DATA_SANITY_IS_EGG))
{
u8 ability = GetMonAbility(&gPlayerParty[0]);
if (ability == ABILITY_STENCH)
gUnknown_20386D0.unk_9 = 1;
sWildEncounterData.abilityEffect = 1;
else if (ability == ABILITY_ILLUMINATE)
gUnknown_20386D0.unk_9 = 2;
sWildEncounterData.abilityEffect = 2;
}
return gUnknown_20386D0.unk_9;
return sWildEncounterData.abilityEffect;
}
bool8 sub_8082C98(void)
static bool8 DoGlobalWildEncounterDiceRoll(void)
{
if ((Random() % 100) >= 60)
return FALSE;
return TRUE;
}
bool8 StandardWildEncounter(u32 currMetaTileBehavior, u16 previousMetaTileBehavior)
{
u16 headerId;
struct Roamer *roamer;
if (sWildEncountersDisabled == TRUE)
return FALSE;
headerId = GetCurrentMapWildMonHeaderId();
if (headerId != 0xFFFF)
{
if (sub_8058F1C(currMetaTileBehavior, 4) == TRUE)
{
if (gWildMonHeaders[headerId].landMonsInfo == NULL)
return FALSE;
else if (previousMetaTileBehavior != sub_8058F1C(currMetaTileBehavior, 0) && !DoGlobalWildEncounterDiceRoll())
return FALSE;
if (DoWildEncounterRateTest(gWildMonHeaders[headerId].landMonsInfo->encounterRate, FALSE) != TRUE)
{
AddToWildEncounterRateBuff(gWildMonHeaders[headerId].landMonsInfo->encounterRate);
return FALSE;
}
else if (TryStartRoamerEncounter() == TRUE)
{
roamer = &gSaveBlock1Ptr->roamer;
if (!IsWildLevelAllowedByRepel(roamer->level))
{
return FALSE;
}
BattleSetup_StartRoamerBattle();
return TRUE;
}
else
{
// try a regular wild land encounter
if (TryGenerateWildMon(gWildMonHeaders[headerId].landMonsInfo, 0, 1) == TRUE)
{
BattleSetup_StartWildBattle();
return TRUE;
}
else
{
AddToWildEncounterRateBuff(gWildMonHeaders[headerId].landMonsInfo->encounterRate);
}
}
}
else if (sub_8058F1C(currMetaTileBehavior, 4) == 2
|| (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && MetatileBehavior_IsBridge(sub_8058F1C(currMetaTileBehavior, 0)) == TRUE))
{
if (gWildMonHeaders[headerId].waterMonsInfo == NULL)
return FALSE;
else if (previousMetaTileBehavior != sub_8058F1C(currMetaTileBehavior, 0) && !DoGlobalWildEncounterDiceRoll())
return FALSE;
else if (DoWildEncounterRateTest(gWildMonHeaders[headerId].waterMonsInfo->encounterRate, FALSE) != TRUE)
{
AddToWildEncounterRateBuff(gWildMonHeaders[headerId].waterMonsInfo->encounterRate);
return FALSE;
}
if (TryStartRoamerEncounter() == TRUE)
{
roamer = &gSaveBlock1Ptr->roamer;
if (!IsWildLevelAllowedByRepel(roamer->level))
{
return FALSE;
}
BattleSetup_StartRoamerBattle();
return TRUE;
}
else // try a regular surfing encounter
{
if (TryGenerateWildMon(gWildMonHeaders[headerId].waterMonsInfo, 1, 1) == TRUE)
{
BattleSetup_StartWildBattle();
return TRUE;
}
else
{
AddToWildEncounterRateBuff(gWildMonHeaders[headerId].waterMonsInfo->encounterRate);
}
}
}
}
return FALSE;
}
void ScrSpecial_RockSmashWildEncounter(void)
{
u16 headerIdx = GetCurrentMapWildMonHeaderId();
if (headerIdx == 0xFFFF)
gSpecialVar_Result = FALSE;
else if (gWildMonHeaders[headerIdx].rockSmashMonsInfo == NULL)
gSpecialVar_Result = FALSE;
else if (DoWildEncounterRateTest(gWildMonHeaders[headerIdx].rockSmashMonsInfo->encounterRate, TRUE) != TRUE)
gSpecialVar_Result = FALSE;
else if (TryGenerateWildMon(gWildMonHeaders[headerIdx].rockSmashMonsInfo, 2, 1) == TRUE)
{
BattleSetup_StartWildBattle();
gSpecialVar_Result = TRUE;
}
else
gSpecialVar_Result = FALSE;
}
bool8 SweetScentWildEncounter(void)
{
s16 x, y;
u16 headerId;
PlayerGetDestCoords(&x, &y);
headerId = GetCurrentMapWildMonHeaderId();
if (headerId != 0xFFFF)
{
if (sub_8058F48(x, y, 4) == 1)
{
if (TryStartRoamerEncounter() == TRUE)
{
BattleSetup_StartRoamerBattle();
return TRUE;
}
if (gWildMonHeaders[headerId].landMonsInfo == NULL)
return FALSE;
TryGenerateWildMon(gWildMonHeaders[headerId].landMonsInfo, 0, 0);
BattleSetup_StartWildBattle();
return TRUE;
}
else if (sub_8058F48(x, y, 4) == 2)
{
if (TryStartRoamerEncounter() == TRUE)
{
BattleSetup_StartRoamerBattle();
return TRUE;
}
if (gWildMonHeaders[headerId].waterMonsInfo == NULL)
return FALSE;
TryGenerateWildMon(gWildMonHeaders[headerId].waterMonsInfo, 1, 0);
BattleSetup_StartWildBattle();
return TRUE;
}
}
return FALSE;
}
bool8 DoesCurrentMapHaveFishingMons(void)
{
u16 headerIdx = GetCurrentMapWildMonHeaderId();
if (headerIdx == 0xFFFF)
return FALSE;
if (gWildMonHeaders[headerIdx].fishingMonsInfo == NULL)
return FALSE;
return TRUE;
}
void FishingWildEncounter(u8 rod)
{
GenerateFishingEncounter(gWildMonHeaders[GetCurrentMapWildMonHeaderId()].fishingMonsInfo, rod);
IncrementGameStat(GAME_STAT_FISHING_CAPTURES);
BattleSetup_StartWildBattle();
}
u16 GetLocalWildMon(bool8 *isWaterMon)
{
u16 headerId;
const struct WildPokemonInfo * landMonsInfo;
const struct WildPokemonInfo * waterMonsInfo;
*isWaterMon = FALSE;
headerId = GetCurrentMapWildMonHeaderId();
if (headerId == 0xFFFF)
return SPECIES_NONE;
landMonsInfo = gWildMonHeaders[headerId].landMonsInfo;
waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo;
// Neither
if (landMonsInfo == NULL && waterMonsInfo == NULL)
return SPECIES_NONE;
// Land Pokemon
else if (landMonsInfo != NULL && waterMonsInfo == NULL)
return landMonsInfo->wildPokemon[ChooseWildMonIndex_Land()].species;
// Water Pokemon
else if (landMonsInfo == NULL && waterMonsInfo != NULL)
{
*isWaterMon = TRUE;
return waterMonsInfo->wildPokemon[ChooseWildMonIndex_WaterRock()].species;
}
// Either land or water Pokemon
if ((Random() % 100) < 80)
{
return landMonsInfo->wildPokemon[ChooseWildMonIndex_Land()].species;
}
else
{
*isWaterMon = TRUE;
return waterMonsInfo->wildPokemon[ChooseWildMonIndex_WaterRock()].species;
}
}
u16 GetLocalWaterMon(void)
{
u16 headerId = GetCurrentMapWildMonHeaderId();
if (headerId != 0xFFFF)
{
const struct WildPokemonInfo * waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo;
if (waterMonsInfo)
return waterMonsInfo->wildPokemon[ChooseWildMonIndex_WaterRock()].species;
}
return SPECIES_NONE;
}
bool8 UpdateRepelCounter(void)
{
u16 steps;
if (InUnionRoom() == TRUE)
return FALSE;
if (gUnknown_203ADFA == 2)
return FALSE;
steps = VarGet(VAR_REPEL_STEP_COUNT);
if (steps != 0)
{
steps--;
VarSet(VAR_REPEL_STEP_COUNT, steps);
if (steps == 0)
{
ScriptContext1_SetupScript(EventScript_RepelWoreOff);
return TRUE;
}
}
return FALSE;
}
static bool8 IsWildLevelAllowedByRepel(u8 wildLevel)
{
u8 i;
if (!VarGet(VAR_REPEL_STEP_COUNT))
return TRUE;
for (i = 0; i < PARTY_SIZE; i++)
{
if (GetMonData(&gPlayerParty[i], MON_DATA_HP) && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG))
{
u8 ourLevel = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
if (wildLevel < ourLevel)
return FALSE;
else
return TRUE;
}
}
return FALSE;
}
static void ApplyFluteEncounterRateMod(u32 *encounterRate)
{
switch (GetFluteEncounterRateModType())
{
case 1:
*encounterRate += *encounterRate / 2;
break;
case 2:
*encounterRate = *encounterRate / 2;
break;
}
}
static u8 GetFluteEncounterRateModType(void)
{
if (FlagGet(FLAG_SYS_WHITE_FLUTE_ACTIVE) == TRUE)
return 1;
else if (FlagGet(FLAG_SYS_BLACK_FLUTE_ACTIVE) == TRUE)
return 2;
else
return 0;
}
static void ApplyCleanseTagEncounterRateMod(u32 *encounterRate)
{
if (IsLeadMonHoldingCleanseTag())
*encounterRate = *encounterRate * 2 / 3;
}
static bool8 IsLeadMonHoldingCleanseTag(void)
{
if (sWildEncounterData.leadMonHeldItem == ITEM_CLEANSE_TAG)
return TRUE;
else
return FALSE;
}
void SeedWildEncounterRng(u16 seed)
{
sWildEncounterData.rngState = seed;
ResetEncounterRateModifiers();
}
static u16 WildEncounterRandom(void)
{
sWildEncounterData.rngState *= 1103515245;
sWildEncounterData.rngState += 12345;
return sWildEncounterData.rngState >> 16;
}
static u8 GetMapBaseEncounterCooldown(u8 a0)
{
u16 headerIdx = GetCurrentMapWildMonHeaderId();
if (headerIdx == 0xFFFF)
return 0xFF;
if (a0 == 1)
{
if (gWildMonHeaders[headerIdx].landMonsInfo == NULL)
return 0xFF;
if (gWildMonHeaders[headerIdx].landMonsInfo->encounterRate >= 80)
return 0;
if (gWildMonHeaders[headerIdx].landMonsInfo->encounterRate < 10)
return 8;
return 8 - (gWildMonHeaders[headerIdx].landMonsInfo->encounterRate / 10);
}
if (a0 == 2)
{
if (gWildMonHeaders[headerIdx].waterMonsInfo == NULL)
return 0xFF;
if (gWildMonHeaders[headerIdx].waterMonsInfo->encounterRate >= 80)
return 0;
if (gWildMonHeaders[headerIdx].waterMonsInfo->encounterRate < 10)
return 8;
return 8 - (gWildMonHeaders[headerIdx].waterMonsInfo->encounterRate / 10);
}
return 0xFF;
}
void ResetEncounterRateModifiers(void)
{
sWildEncounterData.encounterRateBuff = 0;
sWildEncounterData.stepsSinceLastEncounter = 0;
}
static bool8 HandleWildEncounterCooldown(u32 currMetaTileBehavior)
{
u8 unk = sub_8058F1C(currMetaTileBehavior, 4);
u32 minSteps;
u32 encRate;
if (unk == 0)
return FALSE;
minSteps = GetMapBaseEncounterCooldown(unk);
if (minSteps == 0xFF)
return FALSE;
minSteps *= 256;
encRate = 5 * 256;
switch (GetFluteEncounterRateModType())
{
case 1:
minSteps -= minSteps / 2;
encRate += encRate / 2;
break;
case 2:
minSteps *= 2;
encRate /= 2;
break;
}
sWildEncounterData.leadMonHeldItem = GetMonData(&gPlayerParty[0], MON_DATA_HELD_ITEM);
if (IsLeadMonHoldingCleanseTag() == TRUE)
{
minSteps += minSteps / 3;
encRate -= encRate / 3;
}
switch (GetAbilityEncounterRateModType())
{
case 1:
minSteps *= 2;
encRate /= 2;
break;
case 2:
minSteps /= 2;
encRate *= 2;
break;
}
minSteps /= 256;
encRate /= 256;
if (sWildEncounterData.stepsSinceLastEncounter >= minSteps)
return TRUE;
sWildEncounterData.stepsSinceLastEncounter++;
if ((Random() % 100) < encRate)
return TRUE;
return FALSE;
}
bool8 TryStandardWildEncounter(u32 currMetaTileBehavior)
{
if (!HandleWildEncounterCooldown(currMetaTileBehavior))
{
sWildEncounterData.prevMetaTileBehavior = sub_8058F1C(currMetaTileBehavior, 0);
return FALSE;
}
else if (StandardWildEncounter(currMetaTileBehavior, sWildEncounterData.prevMetaTileBehavior) == TRUE)
{
sWildEncounterData.encounterRateBuff = 0;
sWildEncounterData.stepsSinceLastEncounter = 0;
sWildEncounterData.prevMetaTileBehavior = sub_8058F1C(currMetaTileBehavior, 0);
return TRUE;
}
else
{
sWildEncounterData.prevMetaTileBehavior = sub_8058F1C(currMetaTileBehavior, 0);
return FALSE;
}
}
static void AddToWildEncounterRateBuff(u8 encounterRate)
{
if (VarGet(VAR_REPEL_STEP_COUNT) == 0)
sWildEncounterData.encounterRateBuff += encounterRate;
else
sWildEncounterData.encounterRateBuff = 0;
}
sym_ewram.txt
+2 -6
View File
@@ -213,13 +213,9 @@ gUnknown_20386A8: @ 20386A8
.include "src/battle_setup.o"
.align 2
.include "src/wild_encounter.o"
gUnknown_20386D0: @ 20386D0
.space 0xC
gUnknown_20386DC: @ 20386DC
.space 0x4
.align 2
gFieldEffectArguments: @ 20386E0
.space 0x20