Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-10-01 05:51:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Document many more functions and scructs for WildEncounters

Browse Source
This commit is contained in:
tillgeissler
2024-06-18 02:44:19 +02:00
parent 7918343e71
commit 8d39b5fc85
5 changed files with 418 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/overlay006/ov6_02240C9C.h
View File

@@ -6,7 +6,7 @@
#include "overlay006/battle_params.h"
#include "overlay006/wild_encounters.h"
void ov6_02240C9C(const WildEncounters * encounterData, int * param1, int * param2);
void WildEncounters_ReplaceTimedEncounters(const WildEncounters * encounterData, int * param1, int * param2);
BOOL ov6_02240D5C(FieldSystem * fieldSystem);
BOOL ov6_0224106C(FieldSystem * fieldSystem, const int param1, BattleParams ** param2);
BOOL ov6_022411C8(FieldSystem * fieldSystem, TaskManager * param1);

2
include/overlay006/ov6_022477B8.h
View File

@@ -3,6 +3,6 @@
#include "overlay006/wild_encounters.h"
void ov6_022477B8(const WildEncounters * encounterData, const BOOL param1, int * param2, int * param3);
void WildEncounters_ReplaceDualSlotEncounters(const WildEncounters * encounterData, const BOOL param1, int * param2, int * param3);
#endif // POKEPLATINUM_OV6_022477B8_H

820
src/overlay006/ov6_02240C9C.c
View File

File diff suppressed because it is too large Load Diff

4
src/overlay006/ov6_02242984.c
View File

@@ -46,8 +46,8 @@ int ov6_02242984 (FieldSystem * fieldSystem)
v1 = sub_02027474(SaveData_Pokedex(FieldSystem_SaveData(fieldSystem)));
ov6_02242F74(sub_0202D814(sub_0202D834(fieldSystem->saveData), 1), v1, fieldSystem->location->mapId, &v2[6], &v2[7]);
ov6_02240C9C(encounterData, &v2[2], &v2[3]);
ov6_022477B8(encounterData, v1, &v2[8], &v2[9]);
WildEncounters_ReplaceTimedEncounters(encounterData, &v2[2], &v2[3]);
WildEncounters_ReplaceDualSlotEncounters(encounterData, v1, &v2[8], &v2[9]);
return v2[inline_020564D0(MAX_GRASS_ENCOUNTERS)];
}

4
src/overlay006/ov6_022477B8.c
View File

@@ -7,9 +7,9 @@
#include "overlay006/ov6_022477B8.h"
void ov6_022477B8 (const WildEncounters * encounterData, const BOOL param1, int * param2, int * param3)
void WildEncounters_ReplaceDualSlotEncounters (const WildEncounters * encounterData, const BOOL nationalDexObtained, int * param2, int * param3)
{
if (!param1) {
if (!nationalDexObtained) {
return;
}