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

through CheckStandardWildEncounter

Browse Source
This commit is contained in:
PikalaxALT
2020-03-17 22:08:02 -04:00
parent 901fceec18
commit ba7e4acfee
11 changed files with 371 additions and 922 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/event_bg.h
+2
View File
@@ -7,4 +7,6 @@
#define BG_EVENT_PLAYER_FACING_EAST 3
#define BG_EVENT_PLAYER_FACING_WEST 4
#define BG_EVENT_HIDDEN_ITEM 7
#endif // GUARD_CONSTANTS_EVENT_BG_H
include/constants/vars.h
+4 -4
View File
@@ -49,10 +49,10 @@
// Counts up every step. Wraps around at 128.
// When wraparound occurs, the friendship of
// every party poke gets a slight boost.
#define VAR_FRIENDSHIP_STEP_COUNT 0x4021
#define VAR_HAPPINESS_STEP_COUNTER 0x4021
// Maybe unused?
#define VAR_0x4022 0x4022
#define VAR_POISON_STEP_COUNTER 0x4022
// Step counter. Caps at 1500. If you enter a map with
// renewable hidden items and this counter is capped,
@@ -81,8 +81,8 @@
#define VAR_QUEST_LOG_MON_COUNTS 0x4027
#define VAR_MENEWS_JISAN_STEP_COUNTER 0x4028
#define VAR_0x4029 0x4029
#define VAR_HAPPINESS_STEP_COUNTER 0x402A
#define VAR_POISON_STEP_COUNTER 0x402B
#define VAR_0x402A 0x402A
#define VAR_0x402B 0x402B
#define VAR_RESET_RTC_ENABLE 0x402C
#define VAR_0x402D 0x402D
#define VAR_0x402E 0x402E
include/daycare.h
+1
View File
@@ -29,5 +29,6 @@ bool8 sub_8071614(void);
void EggHatch(void);
u8 GetEggStepsToSubtract(void);
u16 sub_80722E0(void);
bool8 ShouldEggHatch(void);
#endif // GUARD_DAYCARE_H
include/event_scripts.h
+43 -1
View File
@@ -1161,7 +1161,7 @@ extern const u8 EventScript_TryDoNormalTrainerBattle[];
extern const u8 EventScript_TryDoDoubleRematchBattle[];
extern const u8 EventScript_TryDoRematchBattle[];
extern const u8 EventScript_DoTrainerBattleFromApproach[];
extern const u8 Test_EventScript_Sign[];
extern const u8 EventScript_TestSignpostMsg[];
// new_game
extern const u8 EventScript_ResetAllMapFlags[];
@@ -1215,5 +1215,47 @@ extern const u8 EventScript_FldEffFlash[];
// field_control_avatar
extern const u8 gUnknown_81A7ADB[];
extern const u8 PalletTown_PlayersHouse_2F_EventScript_PC[];
extern const u8 EventScript_HiddenItemScript[];
extern const u8 EventScript_PC[];
extern const u8 EventScript_WallTownMap[];
extern const u8 gUnknown_81A7606[];
extern const u8 gUnknown_81A760F[];
extern const u8 gUnknown_81A7618[];
extern const u8 gUnknown_81A7633[];
extern const u8 gUnknown_81A763C[];
extern const u8 gUnknown_81A7621[];
extern const u8 gUnknown_81A7645[];
extern const u8 gUnknown_81A762A[];
extern const u8 TrainerTower_EventScript_ShowTime[];
extern const u8 gUnknown_81A764E[];
extern const u8 gUnknown_81A7657[];
extern const u8 gUnknown_81A7660[];
extern const u8 gUnknown_81A7669[];
extern const u8 gUnknown_81A7672[];
extern const u8 gUnknown_81A767B[];
extern const u8 gUnknown_81A7684[];
extern const u8 gUnknown_81A768D[];
extern const u8 gUnknown_81A7696[];
extern const u8 gUnknown_81A769F[];
extern const u8 gUnknown_81A76A8[];
extern const u8 gUnknown_81A76B1[];
extern const u8 gUnknown_81A76BA[];
extern const u8 gUnknown_81A76C3[];
extern const u8 gUnknown_81A76CC[];
extern const u8 gUnknown_81A76D5[];
extern const u8 CableClub_EventScript_81BBFD8[];
extern const u8 EventScript_Questionnaire[];
extern const u8 CableClub_EventScript_ShowBattleRecords[];
extern const u8 gUnknown_81A76F0[];
extern const u8 gUnknown_81A76F9[];
extern const u8 gUnknown_81A76DE[];
extern const u8 gUnknown_81A76E7[];
extern const u8 EventScript_CurrentTooFast[];
extern const u8 EventScript_UseSurf[];
extern const u8 EventScript_Waterfall[];
extern const u8 EventScript_CantUseWaterfall[];
extern const u8 gUnknown_81A8CED[];
extern const u8 EventScript_FieldPoison[];
extern const u8 EventScript_EggHatch[];
#endif //GUARD_EVENT_SCRIPTS_H
include/vs_seeker.h
+1
View File
@@ -14,5 +14,6 @@ bool8 sub_810CF04(u8 a0);
u8 sub_810CF54();
void sub_810D0D0(void);
void sub_810CB90(void);
bool8 sub_810C4EC(void);
#endif //GUARD_VS_SEEKER_H
include/wild_encounter.h
+1 -1
View File
@@ -45,6 +45,6 @@ void DisableWildEncounters(bool8 state);
u8 GetUnownLetterByPersonalityLoByte(u32 personality);
bool8 SweetScentWildEncounter(void);
void SeedWildEncounterRng(u16 randVal);
void ResetEncounterRateModifiers(void);
void ResetEncounterRateModifiers(void);bool8 TryStandardWildEncounter(u32 currMetatileBehavior);
#endif // GUARD_WILD_ENCOUNTER_H