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

Convert multiple int heapID to enum HeapID heapID (#879)

Browse Source
This commit is contained in:
Eduardo Quezada 2026-01-08 21:36:05 -03:00 committed by GitHub
parent 7dca5b4f47
commit 8bcb66b1f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
255 changed files with 767 additions and 728 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/applications/poffin_case/main.h
View File

@ -49,7 +49,7 @@ typedef struct PoffinCaseAppData {
PoffinCaseAppItem poffins[MAX_POFFINS];
} PoffinCaseAppData;
PoffinCaseAppData *PoffinCaseAppData_New(SaveData *saveData, int heapID);
PoffinCaseAppData *PoffinCaseAppData_New(SaveData *saveData, enum HeapID heapID);
void PoffinCaseAppData_Free(PoffinCaseAppData *appData);
UnkEnum_02098EAC sub_02098EAC(Poffin *param0, u8 param1);
void sub_02098EF8(Poffin *param0, Pokemon *param1);

2
include/applications/poffin_case/ov79_021D3768.h
View File

@ -4,7 +4,7 @@
#include "applications/poffin_case/struct_ov79_021D3820.h"
#include "applications/poffin_case/struct_ov79_021D38D0.h"
void ov79_021D3768(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *param1, int heapID);
void ov79_021D3768(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *param1, enum HeapID heapID);
void ov79_021D3820(UnkStruct_ov79_021D3820 *param0);
void ov79_021D385C(UnkStruct_ov79_021D3820 *param0);

2
include/applications/pokedex/pokedex_app.h
View File

@ -12,7 +12,7 @@
typedef struct PokedexApp {
BOOL unk_00;
int heapID;
enum HeapID heapID;
PokedexMemory *pokedexMemory;
PokedexSortData sortData;
PokedexGraphicData graphicData;

10
include/applications/pokedex/pokedex_main.h
View File

@ -76,11 +76,11 @@ void ov21_021D1524(Sprite *param0, PokedexTextData *textData, int param2, int pa
void PokedexMain_SetHitTableRect(TouchScreenHitTable *hitTable, int top, int bottom, int left, int right);
void PokedexMain_SetLoadingScreenParams(PokedexLoadingScreen *pokedexLoadingScreen, BgConfig *bgConfig, int layer, NNSG2dScreenData *screenData, int topStart, int topEnd, int bottomStart, int bottomEnd, int duration);
BOOL PokedexMain_LoadingScreenMove(PokedexLoadingScreen *pokedexLoadingScreen);
void PokedexMain_DisplayNameNumberText(Window *window, int dexNumber, int species, int heapID);
Window *PokedexMain_DisplayNameNumber(PokedexGraphicData *pokedexgraphicData, const PokedexSortData *pokedexSortData, int heapID, int species);
Window *PokedexMain_DisplayNameNumberNational(PokedexTextManager *textMan, int heapID, int species);
Window *PokedexMain_DisplayNameNumberLocal(PokedexTextManager *textMan, int heapID, int species);
void PokedexMain_EntryNameNumber(PokedexGraphicData *param0, const PokedexSortData *pokedexSortData, int heapID, int statusIndex, fx32 x, fx32 y);
void PokedexMain_DisplayNameNumberText(Window *window, int dexNumber, int species, enum HeapID heapID);
Window *PokedexMain_DisplayNameNumber(PokedexGraphicData *pokedexgraphicData, const PokedexSortData *pokedexSortData, enum HeapID heapID, int species);
Window *PokedexMain_DisplayNameNumberNational(PokedexTextManager *textMan, enum HeapID heapID, int species);
Window *PokedexMain_DisplayNameNumberLocal(PokedexTextManager *textMan, enum HeapID heapID, int species);
void PokedexMain_EntryNameNumber(PokedexGraphicData *param0, const PokedexSortData *pokedexSortData, enum HeapID heapID, int statusIndex, fx32 x, fx32 y);
void ov21_021D1848(PokedexGraphicData *pokedexGraphicData, int param1, int param2);
void ov21_021D1858(PokedexSpeciesLabel *param0, int param1, int param2);
void PokedexMain_DisplayPokemonSprite(PokedexGraphicData *pokedexGraphicData, PokedexSortData *pokedexSortData, int species, int face, int param4, int param5);

2
include/applications/pokedex/struct_ov21_021E8E0C.h
View File

@ -9,7 +9,7 @@ typedef struct {
BgConfig *unk_00;
PaletteData *unk_04;
PokemonSpriteManager *unk_08;
int heapID;
enum HeapID heapID;
Pokemon *unk_10;
int unk_14;
} UnkStruct_ov21_021E8E0C;

4
include/battle/ov16_0226DB7C.h
View File

@ -6,9 +6,9 @@
#include "palette.h"
#include "sprite_system.h"
void ov16_0226DB7C(SpriteSystem *param0, SpriteManager *param1, PaletteData *param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7);
void ov16_0226DB7C(SpriteSystem *param0, SpriteManager *param1, PaletteData *param2, enum HeapID heapID, u32 param4, u32 param5, u32 param6, u32 param7);
void ov16_0226DBFC(SpriteManager *param0, u32 param1, u32 param2, u32 param3, u32 param4);
UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteSystem *param0, SpriteManager *param1, int heapID, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteSystem *param0, SpriteManager *param1, enum HeapID heapID, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
void ov16_0226DCA8(UnkStruct_ov16_0226DC24 *param0);
void BattleSystem_DrawCursorSprites(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9);
void ov16_0226DD54(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8);

2
include/battle/ov16_0226DE44.h
View File

@ -8,7 +8,7 @@
void ov16_0226DE44(SpriteSystem *param0, SpriteManager *param1, u32 param2, PaletteData *param3, u32 param4, u32 param5, u32 param6, u32 param7);
void ov16_0226DEC4(SpriteManager *param0, u32 param1, u32 param2, u32 param3, u32 param4);
UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteSystem *param0, SpriteManager *param1, int heapID, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteSystem *param0, SpriteManager *param1, enum HeapID heapID, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
void ov16_0226DF68(UnkStruct_ov16_0226DEEC *param0);
void ov16_0226DF80(UnkStruct_ov16_0226DEEC *param0, int param1, int param2, fx32 param3);
void ov16_0226DFB0(UnkStruct_ov16_0226DEEC *param0, int param1, int param2);

4
include/battle_anim/battle_anim_system.h
View File

@ -286,8 +286,8 @@ void BattleAnimSystem_LoadBattleBgTiles(BattleAnimSystem *system, enum BgLayer l
void BattleAnimSystem_LoadBattleBgPaletteBuffer(BattleAnimSystem *system);
BOOL BattleAnimSystem_ShouldBattlerSpriteBeFlipped(BattleAnimSystem *system, int battlerRole);
int BattleAnimSystem_GetBgNarcMemberIndex(int bgID, enum BgNarcMemberType type);
UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *battleSys, int heapID, int param2);
UnkStruct_ov12_02223764 *ov12_02223764(BattleSystem *battleSys, int heapID);
UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *battleSys, enum HeapID heapID, int param2);
UnkStruct_ov12_02223764 *ov12_02223764(BattleSystem *battleSys, enum HeapID heapID);
void ov12_02223770(UnkStruct_ov12_02223764 *param0);
void ov12_022237A4(UnkStruct_ov12_02223764 *param0, int param1);
int ov12_022237D8(UnkStruct_ov12_02223764 *param0);

4
include/battle_anim/ov12_02235E94.h
View File

@ -10,8 +10,8 @@
#include "spl.h"
UnkStruct_ov12_02235FE0 *ov12_02235FE0(int heapID);
UnkStruct_ov12_02235FE0 *ov12_02236004(int heapID, const UnkStruct_ov12_02236030 *param1);
UnkStruct_ov12_02235FE0 *ov12_02235FE0(enum HeapID heapID);
UnkStruct_ov12_02235FE0 *ov12_02236004(enum HeapID heapID, const UnkStruct_ov12_02236030 *param1);
void ov12_02236030(UnkStruct_ov12_02235FE0 *param0, const UnkStruct_ov12_02236030 *param1);
void ov12_02236320(UnkStruct_ov12_02235FE0 *param0);
BOOL ov12_02236374(UnkStruct_ov12_02235FE0 *param0);

6
include/battle_anim/ov12_02237EFC.h
View File

@ -1,16 +1,18 @@
#ifndef POKEPLATINUM_OV12_02237EFC_H
#define POKEPLATINUM_OV12_02237EFC_H
#include "constants/heap.h"
#include "battle_anim/struct_ov12_02237EFC.h"
#include "battle_anim/struct_ov12_02237F38.h"
#include "battle_anim/struct_ov12_02237F98_decl.h"
#include "battle_anim/struct_ov12_02238004_decl.h"
UnkStruct_ov12_02237F98 *ov12_02237EFC(int heapID, UnkStruct_ov12_02237EFC *param1);
UnkStruct_ov12_02237F98 *ov12_02237EFC(enum HeapID heapID, UnkStruct_ov12_02237EFC *param1);
UnkStruct_ov12_02238004 *ov12_02237F38(UnkStruct_ov12_02237F98 *param0, UnkStruct_ov12_02237F38 *param1);
void ov12_02237F74(UnkStruct_ov12_02237F98 *param0);
void ov12_02237F98(UnkStruct_ov12_02237F98 *param0);
UnkStruct_ov12_02238004 *ov12_02237FC8(int heapID, UnkStruct_ov12_02237F38 *param1);
UnkStruct_ov12_02238004 *ov12_02237FC8(enum HeapID heapID, UnkStruct_ov12_02237F38 *param1);
void ov12_02238004(UnkStruct_ov12_02238004 *param0);
BOOL ov12_0223802C(UnkStruct_ov12_02238004 *param0);

8
include/battle_anim/ov12_022380BC.h
View File

@ -3,10 +3,10 @@
#include "battle_anim/struct_ov12_022380DC.h"
void ov12_022380BC(UnkStruct_ov12_022380DC *param0, int heapID);
void ov12_022380CC(UnkStruct_ov12_022380DC *param0, int heapID);
void ov12_022382BC(UnkStruct_ov12_022380DC *param0, int heapID);
void ov12_02238390(UnkStruct_ov12_022380DC *param0, int heapID);
void ov12_022380BC(UnkStruct_ov12_022380DC *param0, enum HeapID heapID);
void ov12_022380CC(UnkStruct_ov12_022380DC *param0, enum HeapID heapID);
void ov12_022382BC(UnkStruct_ov12_022380DC *param0, enum HeapID heapID);
void ov12_02238390(UnkStruct_ov12_022380DC *param0, enum HeapID heapID);
s16 ov12_022384CC(int param0, int param1);
#endif // POKEPLATINUM_OV12_022380BC_H

2
include/battle_anim/struct_ov12_02223764.h
View File

@ -8,7 +8,7 @@
#include "sprite_system.h"
typedef struct {
int heapID;
enum HeapID heapID;
int unk_04;
UnkStruct_ov12_02223764_sub1 unk_08;
int unk_14[4];

2
include/battle_anim/struct_ov12_02236690.h
View File

@ -5,7 +5,7 @@ typedef struct {
s16 unk_00;
s16 unk_02;
int unk_04;
int heapID;
enum HeapID heapID;
int unk_0C;
int unk_10;
} UnkStruct_ov12_02236690;

2
include/battle_anim/struct_ov12_02237728.h
View File

@ -8,7 +8,7 @@
typedef struct BallThrow {
int type;
int heapID;
enum HeapID heapID;
int mode;
int target;
int ballID;

4
include/battle_regulation.h
View File

@ -44,12 +44,12 @@ int BattleRegulation_SaveSize(void);
void BattleRegulation_Copy(const BattleRegulation *src, BattleRegulation *dst);
void RegulationBattles_Init(BattleRegulationData *regulationData);
void BattleRegulation_GetName(const BattleRegulation *regulation, String *string);
String *BattleRegulation_GetNameString(const BattleRegulation *regulation, int heapID);
String *BattleRegulation_GetNameString(const BattleRegulation *regulation, enum HeapID heapID);
int BattleRegulation_GetRuleValue(const BattleRegulation *regulation, enum BattleRegulationRule rule);
BattleRegulation *BattleRegulation_Load(SaveData *saveData, int index);
void BattleRegulation_Save(SaveData *saveData, const BattleRegulation *regulation);
const BattleRegulation *BattleRegulation_GetByIndex(SaveData *saveData, int index);
void BattleRegulation_GetNameByIndex(SaveData *saveData, int index, String *string, int heapID);
void BattleRegulation_GetNameByIndex(SaveData *saveData, int index, String *string, enum HeapID heapID);
const BattleRegulation *BattleRegulation_GetDefault(void);
int BattleRegulation_GetIndex(const BattleRegulation *regulation);

4
include/encounter.h
View File

@ -13,9 +13,9 @@ void Encounter_NewVsHoneyTree(FieldTask *task, int *resultMaskPtr);
void Encounter_NewVsSpeciesAtLevel(FieldTask *task, u16 species, u8 level, int *resultMaskPtr, BOOL isLegendary);
void Encounter_NewFatefulVsSpeciesAtLevel(FieldTask *taskMan, u16 species, u8 level, int *resultMaskPtr, BOOL isLegendary);
void Encounter_NewVsPalParkTransfer(FieldSystem *fieldSystem, FieldBattleDTO *dto);
void Encounter_NewVsFirstBattle(FieldTask *task, int trainerID, int heapID, int *resultMaskPtr);
void Encounter_NewVsFirstBattle(FieldTask *task, int trainerID, enum HeapID heapID, int *resultMaskPtr);
void Encounter_NewCatchingTutorial(FieldTask *task);
void Encounter_NewVsTrainer(FieldTask *taskMan, int enemyTrainer1ID, int enemyTrainer2ID, int partnerTrainerID, int heapID, int *resultMaskPtr);
void Encounter_NewVsTrainer(FieldTask *taskMan, int enemyTrainer1ID, int enemyTrainer2ID, int partnerTrainerID, enum HeapID heapID, int *resultMaskPtr);
void Encounter_NewVsLink(FieldTask *task, const u8 *partyOrder, int battleType);
void Encounter_NewVsWiFi(FieldTask *task, int param1, int normalizedLevel, int wifiBattleType);
void Encounter_NewVsLinkWithRecording(FieldSystem *fieldSystem, const u8 *partyOrder, int battleType);

4
include/evolution.h
View File

@ -42,7 +42,7 @@ typedef struct EvolutionData {
GameRecords *records;
Poketch *poketch;
UnkStruct_020157E4 *unk_58;
int heapID;
enum HeapID heapID;
u16 unk_60;
u16 unk_62;
u8 unk_64;
@ -67,7 +67,7 @@ typedef struct EvolutionData {
u8 unk_86;
} EvolutionData;
EvolutionData *Evolution_Begin(Party *param0, Pokemon *param1, int param2, Options *options, int param4, Pokedex *param5, Bag *param6, GameRecords *records, Poketch *poketch, int param9, int param10, int heapID);
EvolutionData *Evolution_Begin(Party *param0, Pokemon *param1, int param2, Options *options, int param4, Pokedex *param5, Bag *param6, GameRecords *records, Poketch *poketch, int param9, int param10, enum HeapID heapID);
BOOL Evolution_IsDone(EvolutionData *param0);
void sub_0207B0E0(EvolutionData *param0);

2
include/inlines.h
View File

@ -25,7 +25,7 @@
static inline void inline_ov61_0222C3B0_sub_1(UnkStruct_ov61_0222C3B0 *);
static inline void inline_ov61_0222C3B0_sub(SysTask *, void *);
static inline void inline_ov61_0222C3B0(UnkStruct_ov61_0222C3B0 *param0, NARC *param1, int param2, int heapID)
static inline void inline_ov61_0222C3B0(UnkStruct_ov61_0222C3B0 *param0, NARC *param1, int param2, enum HeapID heapID)
{
NNSG2dPaletteData *v0;
void *v1;

4
include/mail.h
View File

@ -7,7 +7,7 @@
void Mail_Init(Mail *mail);
BOOL Mail_IsEmpty(Mail *mail);
Mail *Mail_New(int heapID);
Mail *Mail_New(enum HeapID heapID);
void Mail_Copy(Mail *src, Mail *dest);
void sub_020281AC(Mail *mail, u8 mailType, u8 param2, SaveData *saveData);
u32 Mail_GetTrainerID(const Mail *mail);
@ -28,7 +28,7 @@ int Mail_GetEmptySlotInArray(Mailbox *mailbox, int param1);
void sub_02028470(Mailbox *mailbox, int param1, int slot);
void Mailbox_CopyMailToSlot(Mailbox *mailbox, int param1, int slot, Mail *src);
int sub_02028494(Mailbox *mailbox, int param1);
Mail *sub_020284A8(Mailbox *mailbox, int param1, int slot, int heapID);
Mail *sub_020284A8(Mailbox *mailbox, int param1, int slot, enum HeapID heapID);
void sub_020284CC(Mailbox *mailbox, int param1, int param2, Mail *param3);
#endif // POKEPLATINUM_MAIL_H

9
include/narc.h
View File

@ -1,6 +1,7 @@
#ifndef POKEPLATINUM_NARC_H
#define POKEPLATINUM_NARC_H
#include "constants/heap.h"
#include "constants/narc.h"
/*
@ -35,8 +36,8 @@ void NARC_ReadWholeMemberByIndexPair(void *dest, enum NarcID narcID, int memberI
*
* @returns: Pointer to the allocated buffer which contains the data that was read.
*/
void *NARC_AllocAndReadWholeMemberByIndexPair(enum NarcID narcID, int memberIndex, int heapID);
void *NARC_AllocAtEndAndReadWholeMemberByIndexPair(enum NarcID narcID, int memberIndex, int heapID);
void *NARC_AllocAndReadWholeMemberByIndexPair(enum NarcID narcID, int memberIndex, enum HeapID heapID);
void *NARC_AllocAtEndAndReadWholeMemberByIndexPair(enum NarcID narcID, int memberIndex, enum HeapID heapID);
/*
* Reads a portion of an archive member into an existing buffer
@ -61,8 +62,8 @@ void NARC_ReadFromMemberByIndexPair(void *dest, enum NarcID narcID, int memberIn
*
* @returns: Pointer to the allocated buffer which contains the data that was read.
*/
void *NARC_AllocAndReadFromMemberByIndexPair(enum NarcID narcID, int memberIndex, int heapID, int offset, int bytesToRead);
void *NARC_AllocAtEndAndReadFromMemberByIndexPair(enum NarcID narcID, int memberIndex, int heapID, int offset, int bytesToRead);
void *NARC_AllocAndReadFromMemberByIndexPair(enum NarcID narcID, int memberIndex, enum HeapID heapID, int offset, int bytesToRead);
void *NARC_AllocAtEndAndReadFromMemberByIndexPair(enum NarcID narcID, int memberIndex, enum HeapID heapID, int offset, int bytesToRead);
/*
* Gets the size of a NARC member. Useful when managing the read buffer yourself and the NARC has variable

6
include/overlay004/ov4_021D0D80.h
View File

@ -10,7 +10,7 @@
#include "savedata.h"
int ov4_021D0D80(SaveData *saveData, int heapID, int param2, int param3);
int ov4_021D0D80(SaveData *saveData, enum HeapID heapID, int param2, int param3);
void ov4_021D0F68();
int ov4_021D0FEC();
void ov4_021D1104(UnkFuncPtr_ov4_021D1104 param0, UnkFuncPtr_ov4_021D1104 param1);
@ -27,7 +27,7 @@ void *ov4_021D1AA0(DWCAllocType param0, u32 param1, int param2);
void ov4_021D1B04(DWCAllocType param0, void *param1, u32 param2);
int ov4_021D1B5C(void);
int ov4_021D1E30();
void ov4_021D1E74(int heapID);
void ov4_021D1E74(enum HeapID heapID);
void ov4_021D1F18(void);
int NintendoWFC_GetErrorCode(int param0, int param1);
int ov4_021D20B0(int param0);
@ -48,7 +48,7 @@ void ov4_021D2598(BOOL param0);
int ov4_021D25C0(void);
void ov4_021D25FC(void);
int ov4_021D2610(void);
void ov4_021D2618(BOOL param0, int heapID);
void ov4_021D2618(BOOL param0, enum HeapID heapID);
void ov4_021D26EC(BOOL param0);
u8 ov4_021D27E0(void);
void ov4_021D27F4(void);

4
include/overlay004/ov4_021D2808.h
View File

@ -1,9 +1,11 @@
#ifndef POKEPLATINUM_OV4_021D2808_H
#define POKEPLATINUM_OV4_021D2808_H
#include "constants/heap.h"
void ov4_021D2B28();
BOOL ov4_021D2C70(int param0, void *param1, int param2);
void ov4_021D2CC0(int heapID, int param1, int param2);
void ov4_021D2CC0(enum HeapID heapID, int param1, int param2);
void ov4_021D2EA4();
void ov4_021D2EF4(void (*func)());
void ov4_021D2F08(void);

2
include/overlay005/daycare.h
View File

@ -28,7 +28,7 @@ void Daycare_BufferNicknameLevelGender(Daycare *daycare, u32 idxNickname, u32 id
u16 Party_StringTemplateSetNicknameReturnSpecies(Party *party, int slot, StringTemplate *strTemplate);
u8 Daycare_GetState(Daycare *daycare);
u32 Daycare_GetCompatibilityLevel(Daycare *daycare);
void Egg_CreateHatchedMon(Pokemon *egg, int heapID);
void Egg_CreateHatchedMon(Pokemon *egg, enum HeapID heapID);
u32 BoxMon_GetPairDaycareCompatibilityLevel(BoxPokemon **boxMonPair);
#endif // POKEPLATINUM_DAYCARE_H

4
include/overlay005/ov5_021D1A94.h
View File

@ -1,12 +1,14 @@
#ifndef POKEPLATINUM_OV5_021D1A94_H
#define POKEPLATINUM_OV5_021D1A94_H
#include "constants/heap.h"
#include "field/field_system_decl.h"
#include "overlay005/struct_ov5_021D1A94_decl.h"
#include "overlay005/struct_ov5_021D1BEC_decl.h"
#include "overlay006/struct_ov6_0223E6EC.h"
UnkStruct_ov5_021D1A94 *ov5_021D1A94(FieldSystem *fieldSystem, int heapID, int param2);
UnkStruct_ov5_021D1A94 *ov5_021D1A94(FieldSystem *fieldSystem, enum HeapID heapID, int param2);
void ov5_021D1AE4(UnkStruct_ov5_021D1A94 *param0);
void ov5_021D1B18(UnkStruct_ov5_021D1A94 *param0);
UnkStruct_ov5_021D1BEC *ov5_021D1B6C(UnkStruct_ov5_021D1A94 *param0, const UnkStruct_ov6_0223E6EC *param1);

4
include/overlay005/struct_ov5_021EDDAC.h
View File

@ -1,9 +1,11 @@
#ifndef POKEPLATINUM_STRUCT_OV5_021EDDAC_H
#define POKEPLATINUM_STRUCT_OV5_021EDDAC_H
#include "constants/heap.h"
typedef struct {
int unk_00;
int heapID;
enum HeapID heapID;
} UnkStruct_ov5_021EDDAC;
#endif // POKEPLATINUM_STRUCT_OV5_021EDDAC_H

2
include/overlay006/great_marsh_binoculars.h
View File

@ -20,7 +20,7 @@ typedef struct GreatMarshBinoculars {
} GreatMarshBinoculars;
int GreatMarshBinoculars_GetMonSpecies(FieldSystem *fieldSystem);
GreatMarshBinoculars *GreatMarshBinoculars_InitData(const int heapID, FieldSystem *fieldSystem);
GreatMarshBinoculars *GreatMarshBinoculars_InitData(const enum HeapID heapID, FieldSystem *fieldSystem);
void GreatMarshBinoculars_FreeData(GreatMarshBinoculars *data);
void GreatMarshBinoculars_SetNextLocationWithCoords(const u8 cycleNum, GreatMarshBinoculars *binocularsData);
Location *GreatMarshBinoculars_GetLocation(GreatMarshBinoculars *binocData);

2
include/overlay006/ov6_022426AC.h
View File

@ -19,7 +19,7 @@ typedef struct GreatMarshLookout_SpriteResources {
BOOL unk_1D0;
} GreatMarshLookout_SpriteResources;
GreatMarshLookout_SpriteResources *GreatMarshLookout_AllocSpriteResources(const int heapID);
GreatMarshLookout_SpriteResources *GreatMarshLookout_AllocSpriteResources(const enum HeapID heapID);
void GreatMarshLookout_FreeSpriteResources(GreatMarshLookout_SpriteResources *resources);
void GreatMarshLookout_CreateLookoutMonSprite(GreatMarshLookout_SpriteResources *resources, const int species);
void ov6_022427F4(GreatMarshLookout_SpriteResources *param0);

6
include/overlay017/ov17_0223F118.h
View File

@ -15,9 +15,9 @@
#include "string_gf.h"
#include "text.h"
G3DPipelineBuffers *ov17_0223F140(int heapID);
G3DPipelineBuffers *ov17_0223F140(enum HeapID heapID);
void ov17_0223F1E0(G3DPipelineBuffers *param0);
void ov17_0223F1E8(int heapID, BgConfig *param1, SpriteManager *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const String *param5, enum Font param6, TextColor param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14);
void ov17_0223F1E8(enum HeapID heapID, BgConfig *param1, SpriteManager *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const String *param5, enum Font param6, TextColor param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14);
void ov17_0223F2E4(UnkStruct_ov17_0223F2E4 *param0);
void ov17_0223F2F8(UnkStruct_ov17_0223F2E4 *param0, int param1, int param2, int param3);
String *ov17_0223F310(u32 param0, u32 heapID);
@ -27,7 +27,7 @@ void ov17_0223F560(SpriteSystem *param0, SpriteManager *param1, PaletteData *par
void ov17_0223F5E8(SpriteManager *param0, int param1, int param2, int param3, int param4);
void ov17_0223F630(UnkStruct_ov17_0223F6E8 *param0, SpriteSystem *param1, SpriteManager *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, u32 param10);
void ov17_0223F6C4(UnkStruct_ov17_0223F6E8 *param0);
UnkStruct_ov17_0223F744 *ov17_0223F70C(int heapID, PaletteData *param1, const u16 *param2, int param3, int param4, u32 param5);
UnkStruct_ov17_0223F744 *ov17_0223F70C(enum HeapID heapID, PaletteData *param1, const u16 *param2, int param3, int param4, u32 param5);
void ov17_0223F744(UnkStruct_ov17_0223F744 *param0);
BOOL ov17_0223F760(void);

2
include/overlay017/ov17_02252AB0.h
View File

@ -8,7 +8,7 @@
void ov17_02252AB0(SpriteSystem *param0, SpriteManager *param1, PaletteData *param2, u32 param3, u32 param4, u32 param5, u32 param6);
void ov17_02252B20(SpriteManager *param0, u32 param1, u32 param2, u32 param3, u32 param4);
UnkStruct_ov17_02252B48 *ov17_02252B48(SpriteSystem *param0, SpriteManager *param1, int heapID, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
UnkStruct_ov17_02252B48 *ov17_02252B48(SpriteSystem *param0, SpriteManager *param1, enum HeapID heapID, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
void ov17_02252BCC(UnkStruct_ov17_02252B48 *param0);
void ov17_02252BF0(UnkStruct_ov17_02252B48 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9);
void ov17_02252C78(UnkStruct_ov17_02252B48 *param0, int param1, int param2, int param3, int param4, fx32 param5);

4
include/overlay018/ov18_0221F800.h
View File

@ -1,6 +1,8 @@
#ifndef POKEPLATINUM_OV18_0221F800_H
#define POKEPLATINUM_OV18_0221F800_H
void ov18_0221F800(int heapID);
#include "constants/heap.h"
void ov18_0221F800(enum HeapID heapID);
#endif // POKEPLATINUM_OV18_0221F800_H

2
include/overlay022/ov22_02254DE0.h
View File

@ -7,7 +7,7 @@
#include "overlay022/struct_ov22_0225500C.h"
#include "overlay022/struct_ov22_02255040.h"
UnkStruct_ov22_02254DE0 *ov22_02254DE0(int param0, int heapID);
UnkStruct_ov22_02254DE0 *ov22_02254DE0(int param0, enum HeapID heapID);
void ov22_02254E0C(UnkStruct_ov22_02254DE0 *param0);
UnkStruct_ov22_02255040 *ov22_02254E20(UnkStruct_ov22_0225500C *param0);
BOOL ov22_02254E44(UnkStruct_ov22_02255040 *param0);

4
include/overlay022/ov22_02255094.h
View File

@ -34,9 +34,9 @@ NNSG2dCharacterData *ov22_02255340(UnkStruct_ov22_0225A0E4 *param0, void *param1
void ov22_02255360(void);
void ov22_02255390(void);
void ov22_022553F8(UnkStruct_ov22_0225A0E4 *param0);
void ov22_02255410(UnkStruct_ov22_02255CB8 *param0, int heapID);
void ov22_02255410(UnkStruct_ov22_02255CB8 *param0, enum HeapID heapID);
int ov22_02255420(NNSG2dCharacterData *param0, int param1, int param2, int param3);
void ov22_0225547C(UnkStruct_ov22_0225A0E4 *param0, const SoftwareSpriteManagerTemplate *param1, int heapID);
void ov22_0225547C(UnkStruct_ov22_0225A0E4 *param0, const SoftwareSpriteManagerTemplate *param1, enum HeapID heapID);
void ov22_022554A8(UnkStruct_ov22_0225A0E4 *param0, BgConfig *param1, int param2);
void ov22_022554F8(UnkStruct_ov22_0225A0E4 *param0);
void ov22_02255524(UnkStruct_ov22_0225A0E4 *param0);

2
include/overlay022/ov22_022578F4.h
View File

@ -31,7 +31,7 @@ void ov22_02257B74(UnkStruct_ov22_02257964 *param0, int param1);
BOOL ov22_02257BE8(UnkStruct_ov22_02257964 *param0);
BOOL ov22_02257C04(UnkStruct_ov22_02257964 *param0, int param1, int param2);
UnkStruct_ov22_02259560 *ov22_02257C20(UnkStruct_ov22_02257964 *param0, int *param1, int *param2, NNSG2dCharacterData **param3);
void ov22_02257C88(UnkStruct_ov22_02257964 *param0, int param1, int heapID);
void ov22_02257C88(UnkStruct_ov22_02257964 *param0, int param1, enum HeapID heapID);
void ov22_02257CD4(UnkStruct_ov22_02257964 *param0);
void ov22_02257CE0(UnkStruct_ov22_02257964 *param0, int *param1, int *param2);
int ov22_02257D00(UnkStruct_ov22_02257964 *param0);

4
include/overlay022/ov22_02259484.h
View File

@ -1,10 +1,12 @@
#ifndef POKEPLATINUM_OV22_02259484_H
#define POKEPLATINUM_OV22_02259484_H
#include "constants/heap.h"
#include "overlay022/struct_ov22_02259484.h"
#include "overlay022/struct_ov22_02259560.h"
void ov22_02259484(UnkStruct_ov22_02259484 *param0, int param1, int heapID);
void ov22_02259484(UnkStruct_ov22_02259484 *param0, int param1, enum HeapID heapID);
void ov22_022594AC(UnkStruct_ov22_02259484 *param0);
UnkStruct_ov22_02259560 *ov22_022594C0(UnkStruct_ov22_02259484 *param0, void *param1, int param2);
void ov22_02259510(UnkStruct_ov22_02259560 *param0);

3
include/overlay022/struct_ov22_022599A0.h
View File

@ -1,6 +1,7 @@
#ifndef POKEPLATINUM_STRUCT_OV22_022599A0_H
#define POKEPLATINUM_STRUCT_OV22_022599A0_H
#include "constants/heap.h"
#include "constants/narc.h"
#include "bg_window.h"
@ -17,7 +18,7 @@ typedef struct {
int unk_20;
int unk_24;
int unk_28;
int heapID;
enum HeapID heapID;
} UnkStruct_ov22_022599A0;
#endif // POKEPLATINUM_STRUCT_OV22_022599A0_H

4
include/overlay022/struct_ov22_0225AF8C.h
View File

@ -1,13 +1,15 @@
#ifndef POKEPLATINUM_STRUCT_OV22_0225AF8C_H
#define POKEPLATINUM_STRUCT_OV22_0225AF8C_H
#include "constants/heap.h"
#include "bg_window.h"
typedef struct {
BgConfig *unk_00;
int unk_04;
int unk_08;
int heapID;
enum HeapID heapID;
} UnkStruct_ov22_0225AF8C;
#endif // POKEPLATINUM_STRUCT_OV22_0225AF8C_H

4
include/overlay023/underground_text_printer.h
View File

@ -21,7 +21,7 @@ typedef struct UndergroundTextPrinter {
StringTemplate *template;
int bankID;
int printerID;
int heapID;
enum HeapID heapID;
int renderDelay;
int callbackParam;
u16 windowBaseTile;
@ -32,7 +32,7 @@ typedef struct UndergroundTextPrinter {
} UndergroundTextPrinter;
const ListMenuTemplate *UndergroundTextPrinter_GetListMenuTemplate(void);
UndergroundTextPrinter *UndergroundTextPrinter_New(int bankID, int heapID, BgConfig *bgConfig, int renderDelay, int stringSize);
UndergroundTextPrinter *UndergroundTextPrinter_New(int bankID, enum HeapID heapID, BgConfig *bgConfig, int renderDelay, int stringSize);
void UndergroundTextPrinter_Free(UndergroundTextPrinter *textPrinter);
void UndergroundTextPrinter_ChangeMessageLoaderBank(UndergroundTextPrinter *textPrinter, int bankID, enum MessageLoaderMode loaderMode);
void UndergroundTextPrinter_SetBackground(UndergroundTextPrinter *textPrinter, BgConfig *bgConfig, u16 messageBoxBaseTile, u16 windowBaseTile);

12
include/overlay059/ov59_021D2B44.h
View File

@ -9,12 +9,12 @@
u32 ov59_021D2B44(const SaveData *saveData);
u32 ov59_021D2B4C(const SaveData *saveData);
u32 ov59_021D2B54(const SaveData *saveData);
UnkStruct_0202E794 *ov59_021D2C28(SaveData *saveData, int heapID, u32 param2);
UnkStruct_0202E794 *ov59_021D2C70(SaveData *saveData, int heapID, u32 param2);
UnkStruct_0202E794 *ov59_021D2CB4(SaveData *saveData, int heapID, u32 param2);
UnkStruct_0202E794 *ov59_021D2CF8(SaveData *saveData, int heapID, u32 param2);
UnkStruct_0202E794 *ov59_021D2D3C(SaveData *saveData, int heapID, u32 param2);
UnkStruct_0202E794 *ov59_021D2D80(SaveData *saveData, int heapID, u32 param2);
UnkStruct_0202E794 *ov59_021D2C28(SaveData *saveData, enum HeapID heapID, u32 param2);
UnkStruct_0202E794 *ov59_021D2C70(SaveData *saveData, enum HeapID heapID, u32 param2);
UnkStruct_0202E794 *ov59_021D2CB4(SaveData *saveData, enum HeapID heapID, u32 param2);
UnkStruct_0202E794 *ov59_021D2CF8(SaveData *saveData, enum HeapID heapID, u32 param2);
UnkStruct_0202E794 *ov59_021D2D3C(SaveData *saveData, enum HeapID heapID, u32 param2);
UnkStruct_0202E794 *ov59_021D2D80(SaveData *saveData, enum HeapID heapID, u32 param2);
void ov59_021D2F10(TVBroadcast *broadcast, int param1, int param2, const void **param3, const void **param4);
void ov59_021D2F38(TVBroadcast *broadcast, int param1, int param2, const void **param3, const void **param4);
void ov59_021D2F60(TVBroadcast *broadcast, int param1, int param2, const void **param3, const void **param4);

2
include/overlay061/ov61_0222AE60.h
View File

@ -14,7 +14,7 @@
void ov61_0222AE60(SaveData *saveData, const UnkStruct_02029C68 *param1, UnkStruct_ov61_0222AE80 *param2);
void ov61_0222AE80(const UnkStruct_ov61_0222AE80 *param0, UnkStruct_02029C68 *param1);
void ov61_0222AE88(SaveData *saveData, const PCBoxes *pcBoxes, int boxID, UnkStruct_ov62_02239DA4 *param3, int heapID);
void ov61_0222AE88(SaveData *saveData, const PCBoxes *pcBoxes, int boxID, UnkStruct_ov62_02239DA4 *param3, enum HeapID heapID);
void ov61_0222AF88(SaveData *saveData, UnkStruct_ov62_02239DA4 *param1, int param2);
void ov61_0222AFA4(SaveData *saveData, const UnkStruct_02030A80 *param1, UnkStruct_ov61_0222AFC0 *param2);
void ov61_0222AFC0(const UnkStruct_ov61_0222AFC0 *param0, UnkStruct_02030A80 *param1);

2
include/overlay062/ov62_02231690.h
View File

@ -25,7 +25,7 @@ int ov62_022316D0(UnkStruct_0208C06C *param0);
int ov62_02231710(UnkStruct_0208C06C *param0, int param1);
void ov62_022317CC(UnkStruct_0208C06C *param0, int param1);
void ov62_022318E8(UnkStruct_0208C06C *param0);
u16 *ov62_Pokedex_Alphabetical(int heapID, int unused, int *pokedexLength);
u16 *ov62_Pokedex_Alphabetical(enum HeapID heapID, int unused, int *pokedexLength);
void ov62_0223196C(UnkStruct_0208C06C *param0, BOOL param1);
BOOL ov62_02231974(UnkStruct_0208C06C *param0);
void ov62_0223197C(UnkStruct_0208C06C *param0, int param1);

2
include/overlay062/ov62_02246B00.h
View File

@ -7,7 +7,7 @@
#include "game_options.h"
#include "touch_screen.h"
UnkStruct_ov62_02246B00 *ov62_02246B00(int heapID, int param1, int param2[], Options *options);
UnkStruct_ov62_02246B00 *ov62_02246B00(enum HeapID heapID, int param1, int param2[], Options *options);
void ov62_02246B4C(UnkStruct_ov62_02246B00 *param0);
void ov62_02246B70(UnkStruct_ov62_02246BF4 *param0, int param1);
void ov62_02246BF4(UnkStruct_ov62_02246BF4 *param0);

2
include/overlay062/ov62_02248408.h
View File

@ -6,7 +6,7 @@
#include "field_battle_data_transfer.h"
#include "savedata.h"
void ov62_02248408(BattleRecording *param0, FieldBattleDTO *param1, int heapID);
void ov62_02248408(BattleRecording *param0, FieldBattleDTO *param1, enum HeapID heapID);
int ov62_02248598(SaveData *saveData, int param1, u8 param2, u16 *param3, u16 *param4);
void ov62_02248624(SaveData *saveData);
int ov62_02248658(SaveData *saveData, u64 param1, u16 *param2, u16 *param3);

2
include/overlay062/struct_ov62_022349A8.h
View File

@ -19,7 +19,7 @@ typedef struct {
UnkFuncPtr_ov62_022349A8 unk_04;
void *unk_08;
UnkStruct_ov62_022349A8_sub1 unk_0C;
int heapID;
enum HeapID heapID;
int unk_148;
int unk_14C;
UnkStruct_ov62_022349A8_sub2 unk_150;

2
include/overlay062/struct_ov62_02241130.h
View File

@ -8,7 +8,7 @@
typedef struct {
int unk_00;
int heapID;
enum HeapID heapID;
SaveData *saveData;
UnkStruct_ov62_022349A8_sub2 unk_0C;
UnkFuncPtr_ov62_022349A8 unk_38;

4
include/overlay083/ov83_0223D4CC.h
View File

@ -1,11 +1,13 @@
#ifndef POKEPLATINUM_OV83_0223D4CC_H
#define POKEPLATINUM_OV83_0223D4CC_H
#include "constants/heap.h"
#include "struct_defs/struct_02039A58.h"
#include "overlay083/struct_ov83_0223D4CC_decl.h"
UnkStruct_ov83_0223D4CC *ov83_0223D4CC(const CommCmdTable *param0, int param1, void *param2, int param3, int heapID);
UnkStruct_ov83_0223D4CC *ov83_0223D4CC(const CommCmdTable *param0, int param1, void *param2, int param3, enum HeapID heapID);
BOOL ov83_0223D508(int param0, const void *param1, int param2, UnkStruct_ov83_0223D4CC *param3);
void ov83_0223D558(UnkStruct_ov83_0223D4CC *param0);
int ov83_0223D570(UnkStruct_ov83_0223D4CC *param0);

4
include/overlay083/ov83_0223D6A8.h
View File

@ -29,7 +29,7 @@
#include "sprite.h"
#include "sprite_resource.h"
void ov83_0223D754(UnkStruct_ov83_0223D784 *param0, int param1, int param2, int heapID);
void ov83_0223D754(UnkStruct_ov83_0223D784 *param0, int param1, int param2, enum HeapID heapID);
void ov83_0223D784(UnkStruct_ov83_0223D784 *param0);
void ov83_0223D7A8(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *param1, NARC *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9);
void ov83_0223D894(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *param1, NARC *param2, SpriteResource *param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
@ -113,7 +113,7 @@ void ov83_0223F544(UnkStruct_ov83_0223F4AC *param0, int param1, int param2);
void ov83_0223F730(UnkStruct_ov83_0223F770 *param0, int param1, int param2, int param3, int param4);
void ov83_0223F770(UnkStruct_ov83_0223F770 *param0);
void ov83_0223F784(UnkStruct_ov83_0223F770 *param0);
void ov83_0223F790(UnkStruct_ov83_0223F7A4 *param0, int heapID, BgConfig *param2);
void ov83_0223F790(UnkStruct_ov83_0223F7A4 *param0, enum HeapID heapID, BgConfig *param2);
void ov83_0223F7A4(UnkStruct_ov83_0223F7A4 *param0);
void ov83_0223F7B0(UnkStruct_ov83_0223F7A4 *param0);
u32 ov83_0223F7DC(UnkStruct_ov83_0223F7A4 *param0);

2
include/overlay083/struct_ov83_0223B784.h
View File

@ -24,7 +24,7 @@
#include "software_sprite.h"
typedef struct {
int heapID;
enum HeapID heapID;
BOOL unk_04;
int unk_08;
int unk_0C;

2
include/overlay083/struct_ov83_0223C344.h
View File

@ -7,7 +7,7 @@
#include "overlay_manager.h"
typedef struct {
int heapID;
enum HeapID heapID;
u16 unk_04;
u16 unk_06_0 : 8;
u16 unk_06_8 : 4;

2
include/overlay092/ov92_021D0D80.h
View File

@ -7,7 +7,7 @@
int ov92_021D0D80(ApplicationManager *appMan, int *param1);
int ov92_021D0EB8(ApplicationManager *appMan, int *param1);
int ov92_021D1478(ApplicationManager *appMan, int *param1);
BOOL ov92_021D27E8(int param0, int param1, String *param2, String *param3, int heapID);
BOOL ov92_021D27E8(int param0, int param1, String *param2, String *param3, enum HeapID heapID);
BOOL ov92_021D2854(int param0);
#endif // POKEPLATINUM_OV92_021D0D80_H

4
include/overlay094/screens/deposit.h
View File

@ -24,8 +24,8 @@ void ov94_0224226C(Window *window, MessageLoader *gtsMessageLoader, int messageI
void ov94_022422B8(Window *window, MessageLoader *gtsMessageLoader, int messageIndex, int centered, int y, TextColor textColor, BOOL isRange);
void ov94_022422D4(MessageLoader *gtsMessageLoader, MessageLoader *speciesMessageLoader, StringTemplate *param2, Window windows[], int species, int gender, int levelRange);
void ov94_02242368(MessageLoader *gtsMessageLoader, MessageLoader *speciesMessageLoader, StringTemplate *param2, Window windows[], int species, int gender, int levelRange);
u16 *ov94_Pokedex_Alphabetical(int heapID, int unused, int *pokedexLength);
u8 *ov94_02242548(int heapID);
u16 *ov94_Pokedex_Alphabetical(enum HeapID heapID, int unused, int *pokedexLength);
u8 *ov94_02242548(enum HeapID heapID);
void ov94_022425A8(GTSPokemonListing *listing, GTSApplicationState *appState);
ListMenu *ov94_022426A8(GTSApplicationState *appState, StringList **stringList, Window *window, MessageLoader *gtsMessageLoader);
ListMenu *ov94_022427C0(GTSApplicationState *appState, StringList **stringList, Window *window, MessageLoader *gtsMessageLoader, MessageLoader *speciesMessageLoader, GTSApplicationState_sub3 *appSubState, Pokedex *pokedex);

6
include/overlay098/ov98_022499C8.h
View File

@ -1,10 +1,12 @@
#ifndef POKEPLATINUM_OV98_022499C8_H
#define POKEPLATINUM_OV98_022499C8_H
#include "constants/heap.h"
#include "string_gf.h"
void ov98_022499C8(String *param0, char *param1, int heapID);
int ov98_02249A80(String *param0, int heapID);
void ov98_022499C8(String *param0, char *param1, enum HeapID heapID);
int ov98_02249A80(String *param0, enum HeapID heapID);
void ov98_02249ACC(const char *param0, u32 *param1, int param2);
#endif // POKEPLATINUM_OV98_022499C8_H

4
include/overlay104/ov104_0222DCE0.h
View File

@ -25,8 +25,8 @@ void ov104_0222E1C0(SaveData *saveData, Party *param1, Pokemon *param2);
void ov104_0222E1D8(Sprite *param0, u8 param1);
void ov104_0222E204(Sprite *param0, s16 param1, s16 param2, u8 param3);
u8 ov104_0222E240(u16 param0, u16 param1);
void ov104_0222E278(FrontierDataDTO *param0, u16 param1, int heapID, int param3);
void ov104_0222E284(FieldBattleDTO *param0, FrontierTrainerDataDTO *param1, int param2, int param3, int param4);
void ov104_0222E278(FrontierDataDTO *param0, u16 param1, enum HeapID heapID, int param3);
void ov104_0222E284(FieldBattleDTO *param0, FrontierTrainerDataDTO *param1, int param2, int battlerId, enum HeapID heapID);
u32 ov104_0222E2F0(FrontierPokemonDataDTO *param0, u16 param1, int param2, u8 param3, u32 param4, int param5, int param6);
void ov104_0222E330(FrontierPokemonDataDTO *param0, u16 param1[], u8 param2[], u32 param3[], u32 param4[], int param5, int param6, int param7);
u8 ov104_0222E3A8(u16 param0);

8
include/overlay104/ov104_0222E63C.h
View File

@ -1,18 +1,20 @@
#ifndef POKEPLATINUM_OV104_0222E63C_H
#define POKEPLATINUM_OV104_0222E63C_H
#include "constants/heap.h"
#include "struct_decls/struct_0209B75C_decl.h"
#include "overlay104/struct_ov104_0222E8C8.h"
#include "overlay104/struct_ov104_022320B4_decl.h"
#include "overlay104/struct_ov104_0223C4CC_decl.h"
UnkStruct_ov104_022320B4 *ov104_0222E63C(UnkStruct_0209B75C *param0, int param1, int param2);
UnkStruct_ov104_022320B4 *ov104_0222E63C(UnkStruct_0209B75C *param0, enum HeapID heapID, int param2);
BOOL ov104_0222E6A8(UnkStruct_ov104_022320B4 *param0);
void ov104_0222E710(UnkStruct_ov104_022320B4 *param0);
void ov104_0222E748(UnkStruct_ov104_022320B4 *param0, int param1, int param2);
void ov104_0222E86C(UnkStruct_ov104_022320B4 *param0, int param1, int heapID);
UnkStruct_ov104_0222E8C8 *ov104_0222E8C8(UnkStruct_ov104_022320B4 *param0, int heapID);
void ov104_0222E86C(UnkStruct_ov104_022320B4 *param0, int param1, enum HeapID heapID);
UnkStruct_ov104_0222E8C8 *ov104_0222E8C8(UnkStruct_ov104_022320B4 *param0, enum HeapID heapID);
void ov104_0222E8E8(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0222E8C8 *param1);
u16 *ov104_0222E91C(UnkStruct_ov104_022320B4 *param0, int param1);
UnkStruct_ov104_0223C4CC *ov104_0222E924(UnkStruct_ov104_022320B4 *param0);

2
include/overlay104/ov104_0223A0C4.h
View File

@ -10,7 +10,7 @@
#include "field_battle_data_transfer.h"
#include "savedata.h"
BOOL BattleTower_CreateTrainerParty(BattleTower *battleTower, FrontierDataDTO *opponentDataDTO, u16 battleTowerTrainerID, int partySize, u16 *species, u16 *items, UnkStruct_0204B404 *param6, int heapID);
BOOL BattleTower_CreateTrainerParty(BattleTower *battleTower, FrontierDataDTO *opponentDataDTO, u16 battleTowerTrainerID, int partySize, u16 *species, u16 *items, UnkStruct_0204B404 *param6, enum HeapID heapID);
void ov104_0223A30C(SaveData *saveData, FrontierDataDTO *param1, const u8 param2);
FieldBattleDTO *ov104_0223A580(BattleTower *battleTower, UnkStruct_ov104_02230BE4 *param1);
void ov104_0223A734(BattleTower *battleTower, u16 param1);

2
include/overlay104/ov104_0223D5D0.h
View File

@ -5,7 +5,7 @@
#include "particle_system.h"
UnkStruct_ov104_0223D5F0 *ov104_0223D5D0(int heapID);
UnkStruct_ov104_0223D5F0 *ov104_0223D5D0(enum HeapID heapID);
void ov104_0223D5F0(UnkStruct_ov104_0223D5F0 *param0);
ParticleSystem *ov104_0223D614(UnkStruct_ov104_0223D5F0 *param0, int param1, int param2, int param3);
void ov104_0223D68C(UnkStruct_ov104_0223D5F0 *param0, int param1);

2
include/overlay104/ov104_0223E894.h
View File

@ -28,7 +28,7 @@ BOOL ov104_0223EC34(UnkStruct_ov104_0223EBD0 *param0);
BOOL ov104_0223EE44(UnkStruct_ov104_0223EBD0 *param0);
void ov104_0223F094(UnkStruct_ov104_0223F094 *param0, u32 heapID);
void ov104_0223F0B0(UnkStruct_ov104_0223F094 *param0, u8 param1, u8 param2, u16 param3, fx32 param4, s16 param5, u32 param6, u32 param7, u32 param8);
UnkStruct_ov104_0223F174 *ov104_0223F1B4(u32 param0, UnkStruct_ov104_0223F1B4 *param1, int heapID);
UnkStruct_ov104_0223F174 *ov104_0223F1B4(u32 param0, UnkStruct_ov104_0223F1B4 *param1, enum HeapID heapID);
void ov104_0223F258(UnkStruct_ov104_0223F174 *param0);
void *ov104_0223F27C(const UnkStruct_ov104_0223F174 *param0);

2
include/overlay104/struct_ov104_022320B4_t.h
View File

@ -17,7 +17,7 @@ struct UnkStruct_ov104_022320B4_t {
UnkStruct_0209B75C *unk_00;
FrontierScriptContext *unk_04[8];
UnkStruct_ov104_0222E8C8 unk_24;
int heapID;
enum HeapID heapID;
u8 unk_38;
MessageLoader *unk_3C;
u8 *unk_40;

2
include/overlay119/struct_ov119_021D1930.h
View File

@ -2,7 +2,7 @@
#define POKEPLATINUM_STRUCT_OV119_021D1930_H
typedef struct {
int heapID;
enum HeapID heapID;
int unk_04;
} UnkStruct_ov119_021D1930;

2
include/pal_pad.h
View File

@ -63,7 +63,7 @@ BOOL PalPad_AreTrainersEqual(const PalPad *first, const PalPad *second);
* @param numberToCopy The number of elements to take from {source}
* @param heapID Heap area for pointer operations
*/
void PalPad_PushEntries(PalPad *destination, PalPad *source, int numberToCopy, int heapID);
void PalPad_PushEntries(PalPad *destination, PalPad *source, int numberToCopy, enum HeapID heapID);
/**
* @brief Determine whether a given trainer ID is a known friend or not

6
include/poffin.h
View File

@ -1,6 +1,8 @@
#ifndef POKEPLATINUM_POFFIN_H
#define POKEPLATINUM_POFFIN_H
#include "constants/heap.h"
#include "savedata.h"
#define POFFIN_NONE 0xFFFF
@ -40,7 +42,7 @@ enum PoffinAttributeID {
int Poffin_SizeOf(void);
BOOL Poffin_HasValidFlavor(Poffin *poffin);
void Poffin_Clear(Poffin *poffin);
Poffin *Poffin_New(int heapID);
Poffin *Poffin_New(enum HeapID heapID);
void Poffin_Copy(Poffin *src, Poffin *dest);
u8 Poffin_GetAttribute(Poffin *poffin, enum PoffinAttributeID attributeID);
int Poffin_MakePoffin(Poffin *poffin, u8 *param1, u8 param2, BOOL isFoul);
@ -54,7 +56,7 @@ u16 PoffinCase_AddPoffin(PoffinCase *poffinCase, Poffin *poffin);
BOOL PoffinCase_ClearSlot(PoffinCase *poffinCase, u16 slot);
void PoffinCase_Compact(PoffinCase *poffinCase);
void PoffinCase_CopyPoffinFromSlot(PoffinCase *poffinCase, u16 destSlot, Poffin *poffin);
Poffin *PoffinCase_AllocateForSlot(PoffinCase *poffinCase, u16 destSlot, int heapID);
Poffin *PoffinCase_AllocateForSlot(PoffinCase *poffinCase, u16 destSlot, enum HeapID heapID);
u16 PoffinCase_CountFilledSlots(PoffinCase *poffinCase);
u16 PoffinCase_CountEmptySlots(PoffinCase *poffinCase);

6
include/pokedex_heightweight.h
View File

@ -1,6 +1,8 @@
#ifndef POKEPLATINUM_Pokedex_HeightWeight_H
#define POKEPLATINUM_Pokedex_HeightWeight_H
#include "constants/heap.h"
typedef struct HeightWeightData {
int *height;
int *weight;
@ -10,9 +12,9 @@ typedef struct HeightWeightData {
short *pokemonScale;
} HeightWeightData;
HeightWeightData *Pokedex_HeightWeightData(int heapID);
HeightWeightData *Pokedex_HeightWeightData(enum HeapID heapID);
void Pokedex_HeightWeightData_Free(HeightWeightData *HWData);
void Pokedex_HeightWeightData_Load(HeightWeightData *HWData, int trainerIsGirl, int heapID);
void Pokedex_HeightWeightData_Load(HeightWeightData *HWData, int trainerIsGirl, enum HeapID heapID);
void Pokedex_HeightWeightData_Release(HeightWeightData *HWData);
int Pokedex_HeightWeightData_Height(const HeightWeightData *HWData, int species);
int Pokedex_HeightWeightData_Weight(const HeightWeightData *HWData, int species);

14
include/pokemon.h
View File

@ -196,7 +196,7 @@ void Pokemon_IncreaseValue(Pokemon *mon, enum PokemonDataParam param, int value)
* @param heapID The index of the heap that the SpeciesData should be loaded into
* @return SpeciesData*
*/
SpeciesData *SpeciesData_FromMonForm(int monSpecies, int monForm, int heapID);
SpeciesData *SpeciesData_FromMonForm(int monSpecies, int monForm, enum HeapID heapID);
/**
* @brief Gets a SpeciesData based on a pokemon species
@ -205,7 +205,7 @@ SpeciesData *SpeciesData_FromMonForm(int monSpecies, int monForm, int heapID);
* @param heapID The index of the heap that the SpeciesData should be loaded into
* @return SpeciesData*
*/
SpeciesData *SpeciesData_FromMonSpecies(int monSpecies, int heapID);
SpeciesData *SpeciesData_FromMonSpecies(int monSpecies, enum HeapID heapID);
/**
* @brief Gets a value from a SpeciesData structure
@ -498,7 +498,7 @@ u8 BoxPokemon_SpriteYOffset(BoxPokemon *boxMon, u8 face, BOOL preferDP);
*/
u8 LoadPokemonSpriteYOffset(u16 species, u8 gender, u8 face, u8 form, u32 personality);
void sub_0207697C(PokemonSpriteTemplate *param0, u16 param1);
ManagedSprite *sub_02076994(SpriteSystem *param0, SpriteManager *param1, PaletteData *param2, int param3, int param4, int param5, int param6, int param7, int heapID);
ManagedSprite *sub_02076994(SpriteSystem *param0, SpriteManager *param1, PaletteData *param2, int param3, int param4, int param5, int param6, int param7, enum HeapID heapID);
void sub_02076AAC(int param0, int param1, UnkStruct_ov5_021DE5D0 *param2);
/**
@ -803,7 +803,7 @@ void Pokemon_LoadLevelUpMovesOf(int monSpecies, int monForm, u16 *monLevelUpMove
* @param forceDefaultChatot If TRUE, force usage of Chatot's default cry.
* @param heapID
*/
void PlayCryWithParams(ChatotCry *chatotCry, enum PokemonCryMod cryMod, u16 species, int form, int pan, int volume, int forceDefaultChatot, int heapID);
void PlayCryWithParams(ChatotCry *chatotCry, enum PokemonCryMod cryMod, u16 species, int form, int pan, int volume, int forceDefaultChatot, enum HeapID heapID);
/**
* @brief Play a Pokemon's cry, according to the given species and form number.
@ -819,7 +819,7 @@ void PlayCryWithParams(ChatotCry *chatotCry, enum PokemonCryMod cryMod, u16 spec
* @param heapID
* @param delay Number of frames until playback will begin.
*/
void Species_PlayDelayedCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 species, int form, int pan, int volume, int forceDefaultChatot, int heapID, u8 delay);
void Species_PlayDelayedCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 species, int form, int pan, int volume, int forceDefaultChatot, enum HeapID heapID, u8 delay);
BOOL Pokemon_PlayCry(Pokemon *mon);
void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *trainerInfo, int monPokeball, int metLocation, int metTerrain, enum HeapID heapID);
void Pokemon_UpdateAfterCatch(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
@ -839,7 +839,7 @@ void sub_020780C4(Pokemon *mon, u32 monPersonality);
BOOL Pokemon_IsOnBattleFrontierBanlist(u16 species);
u16 Pokemon_GetBattleFrontierBanlistEntry(u8 index);
BOOL Pokemon_IsBannedFromBattleFrontier(Pokemon *pokemon);
BOOL sub_0207884C(BoxPokemon *boxMon, TrainerInfo *param1, int heapID);
BOOL sub_0207884C(BoxPokemon *boxMon, TrainerInfo *param1, enum HeapID heapID);
int sub_020788D0(int param0);
void Pokemon_ClearBallCapsuleData(Pokemon *mon);
void BoxPokemon_RestorePP(BoxPokemon *boxMon);
@ -907,7 +907,7 @@ void PokemonSprite_LoadXOffsetShadow(NARC *narc, s8 *xOffsetShadow, u16 species)
* @param clientType Client-type of who made the load request
*/
void PokemonSprite_LoadShadowSize(NARC *narc, u8 *shadowSize, u16 species);
BOOL Pokemon_SetBallSeal(int param0, Pokemon *mon, int heapID);
BOOL Pokemon_SetBallSeal(int param0, Pokemon *mon, enum HeapID heapID);
void sub_02078B40(Pokemon *mon, UnkStruct_02078B40 *param1);
void sub_02078E0C(UnkStruct_02078B40 *param0, Pokemon *mon);

2
include/pokemon_anim.h
View File

@ -72,7 +72,7 @@ typedef struct PokemonAnim {
typedef struct PokemonAnimManager {
PokemonAnim *anims;
int heapID;
enum HeapID heapID;
u8 flipSprite;
u8 animCount;
} PokemonAnimManager;

2
include/pokeradar.h
View File

@ -15,7 +15,7 @@ enum PatchShakeType {
PATCH_SHAKE_HARD = 1
};
RadarChain *RadarChain_Init(const int heapID);
RadarChain *RadarChain_Init(const enum HeapID heapID);
void RadarChain_Free(RadarChain *chain);
void RadarChain_Clear(RadarChain *chain);
BOOL RadarSpawnPatches(FieldSystem *fieldSystem, const int param1, const int param2, RadarChain *chain);

5
include/savedata.h
View File

@ -1,6 +1,7 @@
#ifndef POKEPLATINUM_SAVEDATA_H
#define POKEPLATINUM_SAVEDATA_H
#include "constants/heap.h"
#include "constants/savedata/save_table.h"
#include "constants/savedata/savedata.h"
@ -101,8 +102,8 @@ int SaveTableEntry_BodySize(int saveTableID);
void SaveDataExtra_Init(SaveData *saveData);
int SaveDataExtra_Save(const SaveData *saveData, int extraSaveID, void *data);
int SaveDataExtra_SaveMirror(SaveData *saveData, int extraSaveID, void *data);
void *SaveDataExtra_Get(SaveData *saveData, int heapID, int extraSaveID, int *loadResult);
void *SaveDataExtra_Mirror(SaveData *saveData, int heapID, int extraSaveID, int *loadResult, BOOL *isOld);
void *SaveDataExtra_Get(SaveData *saveData, enum HeapID heapID, int extraSaveID, int *loadResult);
void *SaveDataExtra_Mirror(SaveData *saveData, enum HeapID heapID, int extraSaveID, int *loadResult, BOOL *isOld);
BOOL SaveData_CardBackupType(void);
BOOL SaveData_CardSave(u32 address, void *data, u32 size);
BOOL SaveData_CardLoad(u32 address, void *data, u32 size);

6
include/savedata/save_table.h
View File

@ -76,7 +76,7 @@ MigratedPokemon *SaveData_GetPalParkTransfer(SaveData *saveData);
* @param resultCode Load-result opcode output.
* @return Address of the allocated HallOfFame data.
*/
HallOfFame *SaveData_HallOfFame(SaveData *saveData, int heapID, int *resultCode);
HallOfFame *SaveData_HallOfFame(SaveData *saveData, enum HeapID heapID, int *resultCode);
/**
* @brief Saves a mirror of the given HallOfFame data into the extended save.
@ -96,7 +96,7 @@ int SaveData_SaveHallOfFame(SaveData *saveData, HallOfFame *hof);
* @param recNum Which recording slot to load.
* @return Address of the allocated BattleRecording data.
*/
BattleRecording *SaveData_BattleRecording(SaveData *saveData, int heapID, int *resultCode, int recNum);
BattleRecording *SaveData_BattleRecording(SaveData *saveData, enum HeapID heapID, int *resultCode, int recNum);
/**
* @brief Saves a mirror of the given BattleRecording data into the extended save.
@ -116,7 +116,7 @@ int SaveData_SaveBattleRecording(SaveData *saveData, BattleRecording *rec, int r
* @param resultCode Load-result opcode output.
* @return Address of the allocated BattleFrontierStage data.
*/
BattleFrontierStage *SaveData_BattleFrontierStage(SaveData *saveData, int heapID, int *resultCode);
BattleFrontierStage *SaveData_BattleFrontierStage(SaveData *saveData, enum HeapID heapID, int *resultCode);
/**
* @brief Saves a mirror of the given BattleRecording data into the extended save.

2
include/script_manager.h
View File

@ -183,7 +183,7 @@ u16 Script_GetHiddenItemFlag(u16 scriptID);
u16 Script_GetHiddenItemScript(u16 scriptID);
void FieldSystem_ClearDailyHiddenItemFlags(FieldSystem *fieldSystem);
u8 Script_GetHiddenItemRange(u16 scriptID);
HiddenItemTilePosition *FieldSystem_GetNearbyHiddenItems(FieldSystem *fieldSystem, int heapID);
HiddenItemTilePosition *FieldSystem_GetNearbyHiddenItems(FieldSystem *fieldSystem, enum HeapID heapID);
void FieldSystem_InitNewGameState(FieldSystem *fieldSystem);
void FieldSystem_RunScript(FieldSystem *fieldSystem, u16 scriptID);
BOOL FieldSystem_RunInitScript(FieldSystem *fieldSystem, u8 param1);

4
include/software_sprite.h
View File

@ -4,6 +4,8 @@
#include <nitro/gx.h>
#include <nnsys.h>
#include "constants/heap.h"
typedef struct SoftwareSpriteChars SoftwareSpriteChars;
typedef struct SoftwareSpritePalette SoftwareSpritePalette;
typedef struct SoftwareSprite SoftwareSprite;
@ -13,7 +15,7 @@ typedef struct SoftwareSpriteManagerTemplate {
int numSprites;
int numChars;
int numPalettes;
int heapID;
enum HeapID heapID;
} SoftwareSpriteManagerTemplate;
typedef struct SoftwareSpriteCharsTemplate {

2
include/sound.h
View File

@ -172,7 +172,7 @@ BOOL Sound_IsWaveOutPlaying(enum WaveOutChannel channel);
void Sound_SetWaveOutPan(enum WaveOutChannel channel, u8 pan);
void Sound_SetWaveOutSpeed(enum WaveOutChannel channel, u32 speed);
void Sound_SetWaveOutVolume(enum WaveOutChannel channel, int volume);
BOOL Sound_PlayWaveOutReversed(u16 waveArcID, int volume, int pan, enum WaveOutChannel channel, int heapID);
BOOL Sound_PlayWaveOutReversed(u16 waveArcID, int volume, int pan, enum WaveOutChannel channel, enum HeapID heapID);
void Sound_StopWaveOutReversed(enum WaveOutChannel channel);
BOOL Sound_IsCaptureActive(void);
BOOL Sound_StartReverb(int frames);

4
include/sound_playback.h
View File

@ -38,8 +38,8 @@ BOOL Sound_PlayPokemonCry(u16 species, u8 form);
BOOL Sound_PlayDelayedPokemonCry(u16 species, u8 delay, u8 form);
void Sound_StopPokemonCries(int fadeOutFrames);
BOOL Sound_IsPokemonCryPlaying(void);
BOOL Sound_PlayPokemonCryEx(enum PokemonCryMod cryMod, u16 species, int pan, int volume, int heapID, u8 form);
void Sound_PlayDelayedPokemonCryEx(enum PokemonCryMod cryMod, u16 species, int pan, int volume, int heapID, u8 delay, u8 form);
BOOL Sound_PlayPokemonCryEx(enum PokemonCryMod cryMod, u16 species, int pan, int volume, enum HeapID heapID, u8 form);
void Sound_PlayDelayedPokemonCryEx(enum PokemonCryMod cryMod, u16 species, int pan, int volume, enum HeapID heapID, u8 delay, u8 form);
void Sound_ClearPokemonCryParams(void);
BOOL Sound_PlayFanfare(u16 seqID);
BOOL Sound_UpdateFanfareDelay(void);

2
include/struct_defs/battle_tower.h
View File

@ -13,7 +13,7 @@
typedef struct BattleTower {
int unk_00;
int heapID;
enum HeapID heapID;
u32 unk_08;
u8 nextOpponentNum;
u8 unk_0D;

2
include/struct_defs/struct_020127E8.h
View File

@ -20,7 +20,7 @@ typedef struct {
int unk_20;
int unk_24;
int unk_28;
int heapID;
enum HeapID heapID;
} UnkStruct_020127E8;
#endif // POKEPLATINUM_STRUCT_020127E8_H

4
include/struct_defs/struct_0207C894.h
View File

@ -1,8 +1,10 @@
#ifndef POKEPLATINUM_STRUCT_0207C894_H
#define POKEPLATINUM_STRUCT_0207C894_H
#include "constants/heap.h"
typedef struct {
int heapID;
enum HeapID heapID;
int unk_04;
} UnkStruct_0207C894;

4
include/struct_defs/struct_0208B284.h
View File

@ -1,9 +1,11 @@
#ifndef POKEPLATINUM_STRUCT_0208B284_H
#define POKEPLATINUM_STRUCT_0208B284_H
#include "constants/heap.h"
typedef struct {
int unk_00;
int heapID;
enum HeapID heapID;
int unk_08;
int unk_0C;
fx32 unk_10;

2
include/struct_defs/struct_02090800.h
View File

@ -8,7 +8,7 @@
#include "string_template.h"
typedef struct {
int heapID;
enum HeapID heapID;
MessageLoader *unk_04;
StringTemplate *unk_08;
Pokemon *unk_0C;

2
include/system.h
View File

@ -73,7 +73,7 @@ void DisableHBlank(void);
BOOL SetHBlankCallback(Callback cb, void *data);
void InitSystem(void);
void InitVRAM(void);
void *ReadFileToHeap(int heapID, const char *filename);
void *ReadFileToHeap(enum HeapID heapID, const char *filename);
void ReadFileToBuffer(const char *filename, void **buf);
void ClearUnusedSystemCache(void);
void InitKeypadAndTouchpad(void);

6
include/trainer_data.h
View File

@ -32,7 +32,7 @@ enum TrainerDataParam {
* @param save Save data; used to pull out the rival's name, if needed.
* @param heapID Heap on which to allocate message bank access.
*/
void Trainer_Encounter(FieldBattleDTO *dto, const SaveData *saveData, int heapID);
void Trainer_Encounter(FieldBattleDTO *dto, const SaveData *saveData, enum HeapID heapID);
/**
* @brief Get a parameter for the given trainer ID from the data archive.
@ -51,7 +51,7 @@ u32 Trainer_LoadParam(int trainerID, enum TrainerDataParam paramID);
* @param heapID Heap on which to allocate archive access.
* @return TRUE if the trainer has a message of the given type; FALSE if not.
*/
BOOL Trainer_HasMessageType(int trainerID, enum TrainerMessageType msgType, int heapID);
BOOL Trainer_HasMessageType(int trainerID, enum TrainerMessageType msgType, enum HeapID heapID);
/**
* @brief Load the trainer's message of a given type into the provided String.
@ -63,7 +63,7 @@ BOOL Trainer_HasMessageType(int trainerID, enum TrainerMessageType msgType, int
* @param[out] string String which will contain the result message.
* @param heapID Heap on which to allocate archive access.
*/
void Trainer_LoadMessage(int trainerID, enum TrainerMessageType msgType, String *string, int heapID);
void Trainer_LoadMessage(int trainerID, enum TrainerMessageType msgType, String *string, enum HeapID heapID);
/**
* @brief Load data for the requested trainer.

2
include/trainer_info.h
View File

@ -102,7 +102,7 @@ void TrainerInfo_NameString(const TrainerInfo *info, String *name);
* @param heapID Heap on which to allocate the new String struct.
* @return The trainer's name, as a String struct.
*/
String *TrainerInfo_NameNewString(const TrainerInfo *info, int heapID);
String *TrainerInfo_NameNewString(const TrainerInfo *info, enum HeapID heapID);
/**
* @brief Set the trainer's ID.

4
include/tv_episode_segment.h
View File

@ -15,7 +15,7 @@
int TVEpisodeSegment_LoadMessage(int programTypeID, FieldSystem *fieldSystem, StringTemplate *template, UnkStruct_ov6_022465F4 *param3, u16 *bankDestVar);
BOOL TVEpisodeSegment_IsEligible(int programTypeID, FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param2);
void sub_0206CF14(TVBroadcast *broadcast, Pokemon *param1, int param2, int param3, int param4);
void sub_0206CF48(TVBroadcast *broadcast, Pokemon *param1, int heapID);
void sub_0206CF48(TVBroadcast *broadcast, Pokemon *param1, enum HeapID heapID);
void FieldSystem_SaveTVEpisodeSegment_PlantingAndWateringShow(FieldSystem *fieldSystem, u16 berryItemID, u8 yieldRating, u16 yieldAmount);
void sub_0206CF9C(TVBroadcast *broadcast, int param1);
void sub_0206CFB4(TVBroadcast *broadcast, int param1);
@ -29,7 +29,7 @@ void sub_0206D0C8(TVBroadcast *broadcast, u16 param1);
void sub_0206D0F0(TVBroadcast *broadcast);
void sub_0206D104(TVBroadcast *broadcast);
void sub_0206D12C(TVBroadcast *broadcast);
CaptureAttempt *CaptureAttempt_New(int heapID);
CaptureAttempt *CaptureAttempt_New(enum HeapID heapID);
void CaptureAttempt_Free(CaptureAttempt *captureAttempt);
void CaptureAttempt_Init(CaptureAttempt *captureAttempt, Pokemon *mon, int resultMask, int ballsThrown, u32 heapID);
void FieldSystem_SaveTVEpisodeSegment_CatchThatPokemonShow(FieldSystem *fieldSystem, const CaptureAttempt *captureAttempt, int resultMask);

8
include/unk_02012744.h
View File

@ -11,11 +11,11 @@
#include "bg_window.h"
#include "sprite.h"
UnkStruct_02012744 *sub_02012744(int param0, int heapID);
UnkStruct_02012744 *sub_02012744(int param0, enum HeapID heapID);
void sub_020127BC(UnkStruct_02012744 *param0);
FontOAM *sub_020127E8(const UnkStruct_020127E8 *param0);
void sub_02012870(FontOAM *param0);
int sub_02012898(const Window *param0, int param1, int heapID);
int sub_02012898(const Window *param0, int param1, enum HeapID heapID);
void FontOAM_SetXY(FontOAM *fontOAM, int x, int y);
void sub_02012938(FontOAM *param0);
void FontOAM_GetXY(const FontOAM *fontOAM, int *x, int *y);
@ -26,12 +26,12 @@ void sub_02012A60(FontOAM *param0, u32 param1);
void sub_02012A90(FontOAM *param0, u32 param1);
void sub_02012AC0(FontOAM *param0, u32 param1);
void sub_02012AF0(FontOAM *param0, GXOamMode param1);
UnkStruct_02012B20 *sub_02012B20(const Window *param0, int heapID);
UnkStruct_02012B20 *sub_02012B20(const Window *param0, enum HeapID heapID);
void sub_02012B48(UnkStruct_02012B20 *param0);
int sub_02012B58(const UnkStruct_02012B20 *param0, int param1);
FontOAM *sub_02012B60(const UnkStruct_020127E8 *param0, const UnkStruct_02012B20 *param1);
void sub_02012BD8(FontOAM *param0);
void sub_02012BE0(FontOAM *param0, const UnkStruct_02012B20 *param1, const Window *param2, int heapID);
void sub_02012BE0(FontOAM *param0, const UnkStruct_02012B20 *param1, const Window *param2, enum HeapID heapID);
void sub_02012C60(const Window *param0, int param1, int param2, int param3, int param4, char *param5);
void sub_020131E0(FontOAM *param0, const Sprite *param1);

4
include/unk_0201DD00.h
View File

@ -3,11 +3,13 @@
#include <nnsys.h>
#include "constants/heap.h"
#include "struct_decls/struct_0201DD00_decl.h"
#include "struct_decls/struct_0201DDF4_decl.h"
#include "struct_defs/struct_02024184.h"
UnkStruct_0201DD00 *sub_0201DD00(int param0, int heapID);
UnkStruct_0201DD00 *sub_0201DD00(int param0, enum HeapID heapID);
void sub_0201DD3C(UnkStruct_0201DD00 *param0);
UnkStruct_0201DDF4 *sub_0201DD54(UnkStruct_0201DD00 *param0, const UnkStruct_02024184 *param1, const NNSG3dResTex *param2, NNSGfdTexKey param3, NNSGfdPlttKey param4, const fx32 param5);
void sub_0201DDAC(UnkStruct_0201DDF4 *param0);

4
include/unk_02020AEC.h
View File

@ -4,6 +4,8 @@
#include <nitro/fx/fx.h>
#include <nnsys.h>
#include "constants/heap.h"
#include "struct_decls/struct_02020C44_decl.h"
#include "struct_decls/struct_020216E0_decl.h"
#include "struct_defs/struct_020217F4.h"
@ -15,7 +17,7 @@
#include "overlay005/struct_ov5_021EDDAC.h"
void sub_02020B14(UnkStruct_020216E0 *param0);
void sub_02020B90(int param0, int heapIDs);
void sub_02020B90(int param0, enum HeapID heapID);
void sub_02020BD0(void);
void sub_02020C08(void);
UnkStruct_02020C44 *sub_02020C44(const UnkStruct_ov5_021EDDAC *param0);

2
include/unk_0202854C.h
View File

@ -30,7 +30,7 @@ void sub_020287F8(SaveData *saveData);
BOOL sub_02028810(SaveData *saveData);
void Underground_SetUnusedField(Underground *underground);
void Underground_StoreRegisteredFlagOwnerInfo(Underground *underground, const TrainerInfo *info);
TrainerInfo *Underground_GetRegisteredFlagOwnerInfo(const Underground *underground, int heapID, int param2);
TrainerInfo *Underground_GetRegisteredFlagOwnerInfo(const Underground *underground, enum HeapID heapID, int param2);
u32 Underground_GetRandomSeed(Underground *underground);
int Underground_ConvertTreasureToBagItem(int treasureID);
BOOL Underground_TryAddGoodPC(Underground *underground, int goodID);

2
include/unk_0202CC64.h
View File

@ -7,7 +7,7 @@
int ChatotCry_SaveSize(void);
void ChatotCry_Init(ChatotCry *param0);
ChatotCry *ChatotCry_New(int heapID);
ChatotCry *ChatotCry_New(enum HeapID heapID);
ChatotCry *SaveData_GetChatotCry(SaveData *saveData);
BOOL IsChatotCryDataValid(const ChatotCry *param0);
void ResetChatotCryDataStatus(ChatotCry *param0);

2
include/unk_0202D05C.h
View File

@ -53,7 +53,7 @@ void sub_0202D628(UnkStruct_0202D764 *param0, UnkStruct_02049A68 *param1);
void sub_0202D63C(UnkStruct_0202D764 *param0, FrontierDataDTO *param1, const u8 param2);
void sub_0202D6DC(UnkStruct_0202D764 *param0, UnkStruct_ov96_0223B450_sub2 *param1, u8 param2, u8 param3);
void sub_0202D708(UnkStruct_0202D764 *param0, UnkStruct_02049A68 *param1);
UnkStruct_ov90_021D1750 *sub_0202D71C(UnkStruct_0202D764 *, int heapID);
UnkStruct_ov90_021D1750 *sub_0202D71C(UnkStruct_0202D764 *, enum HeapID heapID);
UnkStruct_0202D060 *sub_0202D740(SaveData *saveData);
UnkStruct_0202D750 *sub_0202D750(SaveData *saveData);
UnkStruct_0202D764 *sub_0202D764(SaveData *saveData);

10
include/unk_0202E840.h
View File

@ -1,6 +1,8 @@
#ifndef POKEPLATINUM_UNK_0202E840_H
#define POKEPLATINUM_UNK_0202E840_H
#include "constants/heap.h"
#include "struct_decls/struct_0202E858_decl.h"
#include "struct_decls/struct_0202E8C0_decl.h"
#include "struct_defs/struct_0202EE10.h"
@ -16,10 +18,10 @@ void Rankings_Init(UnkStruct_0202E8C0 *param0);
UnkStruct_0202E8C0 *sub_0202E8C0(SaveData *saveData);
void sub_0202E8D4(UnkStruct_0202E8C0 *param0, int param1, u8 param2);
int sub_0202E91C(void);
void *sub_0202E9FC(SaveData *saveData, int heapID);
void sub_0202ED0C(SaveData *saveData, int param1, u8 param2, const void **param3, int heapID);
UnkStruct_0202EE10 *sub_0202ED8C(SaveData *saveData, int param1, int heapID);
UnkStruct_0202EE10 *sub_0202EE10(UnkStruct_0202E8C0 *param0, int param1, int param2);
void *sub_0202E9FC(SaveData *saveData, enum HeapID heapID);
void sub_0202ED0C(SaveData *saveData, int param1, u8 param2, const void **param3, enum HeapID heapID);
UnkStruct_0202EE10 *sub_0202ED8C(SaveData *saveData, int param1, enum HeapID heapID);
UnkStruct_0202EE10 *sub_0202EE10(UnkStruct_0202E8C0 *param0, int param1, enum HeapID heapID);
void sub_0202EE8C(UnkStruct_0202EE10 *param0);
#endif // POKEPLATINUM_UNK_0202E840_H

8
include/unk_0202F1D4.h
View File

@ -11,7 +11,7 @@
int BattleRecording_SaveSize(void);
void BattleRecording_Init(BattleRecording *param0);
void sub_0202F1F8(SaveData *saveData, int heapID, int *param2);
void sub_0202F1F8(SaveData *saveData, enum HeapID heapID, int *param2);
void sub_0202F22C(void);
BOOL sub_0202F250(void);
BattleRecording *sub_0202F264(void);
@ -28,13 +28,13 @@ void sub_0202F8AC(FieldBattleDTO *param0);
void sub_0202FAA8(int param0, u32 param1);
BOOL sub_0202FAC0(void);
void sub_0202FAFC(FieldBattleDTO *param0, SaveData *saveData);
UnkStruct_0202F41C *sub_0202FD88(int heapID);
UnkStruct_02030A80 *sub_0202FDB8(int heapID);
UnkStruct_0202F41C *sub_0202FD88(enum HeapID heapID);
UnkStruct_02030A80 *sub_0202FDB8(enum HeapID heapID);
UnkStruct_02030A80 *sub_0202FDE8(void);
UnkStruct_0202F41C *sub_0202FE04(void);
void sub_0202FE20(UnkStruct_02030A80 *param0, UnkStruct_0202F41C *param1, UnkStruct_0202F298 *param2, FieldBattleDTO *param3, SaveData *saveData);
u64 sub_0202FE98(UnkStruct_0202F41C *param0, int param1, int param2);
UnkStruct_0202F41C *sub_0202FF2C(int heapID);
UnkStruct_0202F41C *sub_0202FF2C(enum HeapID heapID);
void sub_0202FF44(UnkStruct_0202F41C *param0);
#endif // POKEPLATINUM_UNK_0202F1D4_H

2
include/unk_02030880.h
View File

@ -9,7 +9,7 @@
int Frontier_Extra_SaveSize(void);
void Frontier_Extra_Init(BattleFrontierStage *param0);
BattleFrontierStage *sub_020308A0(SaveData *saveData, int param1, int *param2);
BattleFrontierStage *sub_020308A0(SaveData *saveData, enum HeapID heapID, int *param2);
int sub_020308A8(SaveData *saveData, BattleFrontierStage *param1);
u16 sub_020308BC(SaveData *saveData, BattleFrontierStage *param1, int param2, int param3);
BOOL sub_020309A0(SaveData *saveData, int param1, int param2, int param3, int param4, enum HeapID heapID, int *param6, int *param7);

6
include/unk_02030A80.h
View File

@ -7,17 +7,17 @@
#include "savedata.h"
#include "string_gf.h"
UnkStruct_02030A80 *sub_02030A80(int heapID);
UnkStruct_02030A80 *sub_02030A80(enum HeapID heapID);
void sub_02030A98(UnkStruct_02030A80 *param0);
void sub_02030AA0(UnkStruct_02030A80 *param0, SaveData *saveData);
String *sub_02030B94(const UnkStruct_02030A80 *param0, int heapID);
String *sub_02030B94(const UnkStruct_02030A80 *param0, enum HeapID heapID);
u32 sub_02030BAC(const UnkStruct_02030A80 *param0);
int sub_02030BBC(const UnkStruct_02030A80 *param0);
int sub_02030BCC(const UnkStruct_02030A80 *param0);
int sub_02030BEC(const UnkStruct_02030A80 *param0);
int sub_02030BFC(const UnkStruct_02030A80 *param0);
int sub_02030C08(const UnkStruct_02030A80 *param0);
String *sub_02030C28(const UnkStruct_02030A80 *param0, Sentence *param1, int heapID);
String *sub_02030C28(const UnkStruct_02030A80 *param0, Sentence *param1, enum HeapID heapID);
int sub_02030CCC(const UnkStruct_02030A80 *param0);
int sub_02030CDC(const UnkStruct_02030A80 *param0);

2
include/unk_02038FFC.h
View File

@ -5,7 +5,7 @@
#include "savedata.h"
int sub_02038FFC(int heapID);
int sub_02038FFC(enum HeapID heapID);
void sub_02039034(WiFiList *param0);
int WiFiList_GetUserGsProfileId(WiFiList *wifiList);
BOOL WiFiList_HasValidLogin(SaveData *saveData);

4
include/unk_0203909C.h
View File

@ -7,8 +7,8 @@
int sub_0203909C(SaveData *saveData, DWCFriendData *param1, int *param2);
int sub_02039140(SaveData *saveData, u64 param1, int *param2);
BOOL sub_020391DC(SaveData *saveData, int *param1, int heapID);
void sub_02039298(SaveData *saveData, int param1, int param2, int heapID, int param4);
BOOL sub_020391DC(SaveData *saveData, int *param1, enum HeapID heapID);
void sub_02039298(SaveData *saveData, int param1, int param2, enum HeapID heapID, int param4);
int sub_02039390(SaveData *saveData, int param1);
#endif // POKEPLATINUM_UNK_0203909C_H

4
include/unk_02039814.h
View File

@ -1,6 +1,8 @@
#ifndef POKEPLATINUM_UNK_02039814_H
#define POKEPLATINUM_UNK_02039814_H
void NetworkError_DisplayNetworkError(int heapID, int networkErrorId, int errorCode);
#include "constants/heap.h"
void NetworkError_DisplayNetworkError(enum HeapID heapID, int networkErrorId, int errorCode);
#endif // POKEPLATINUM_UNK_02039814_H

2
include/unk_02039A64.h
View File

@ -1,6 +1,6 @@
#ifndef POKEPLATINUM_UNK_02039A64_H
#define POKEPLATINUM_UNK_02039A64_H
void sub_02039A64(int heapID, int unused);
void sub_02039A64(enum HeapID heapID, int unused);
#endif // POKEPLATINUM_UNK_02039A64_H

14
include/unk_0203D1B8.h
View File

@ -52,7 +52,7 @@ int PartyMenu_GetSelectedSlot(PartyMenu *partyMenu);
int sub_0203D438(void *param0);
int sub_0203D440(void *param0);
void *sub_0203D5C8(int param0, FieldSystem *fieldSystem, int param2);
PokemonSummary *sub_0203D670(FieldSystem *fieldSystem, int heapID, int mode);
PokemonSummary *sub_0203D670(FieldSystem *fieldSystem, enum HeapID heapID, int mode);
void *FieldSystem_OpenSummaryScreenSelectMove(enum HeapID heapID, FieldSystem *fieldSystem, u8 partyIndex);
int PokemonSummary_GetSelectedMoveSlot(void *summary);
void FieldSystem_OpenPokemonStorage(FieldSystem *fieldSystem, PokemonStorageSession *pokemonStorageSession);
@ -62,9 +62,9 @@ void FieldSystem_OpenTownMap(FieldSystem *fieldSystem, TownMapContext *townMapCt
void *FieldSystem_OpenTownMapItem(FieldSystem *fieldSystem);
void *FieldSystem_OpenOptionsMenu(FieldSystem *fieldSystem);
UnkStruct_02097728 *sub_0203D920(FieldSystem *fieldSystem, int param1, u8 param2, u8 mailType, int unusedHeapID);
UnkStruct_02097728 *sub_0203D94C(FieldSystem *fieldSystem, int param1, u8 param2, int heapID);
UnkStruct_02097728 *sub_0203D984(FieldSystem *fieldSystem, Pokemon *param1, int heapID);
PoffinCaseAppData *FieldSystem_LaunchPoffinCaseApp(FieldSystem *fieldSystem, int heapID);
UnkStruct_02097728 *sub_0203D94C(FieldSystem *fieldSystem, int param1, u8 param2, enum HeapID heapID);
UnkStruct_02097728 *sub_0203D984(FieldSystem *fieldSystem, Pokemon *param1, enum HeapID heapID);
PoffinCaseAppData *FieldSystem_LaunchPoffinCaseApp(FieldSystem *fieldSystem, enum HeapID heapID);
void sub_0203D9D8(FieldSystem *fieldSystem, UnkStruct_ov90_021D0D80 *param1);
void sub_0203DAC0(FieldTask *param0, u16 *param1, SaveData *saveData, u16 param3, u16 param4);
BOOL sub_0203DB10(FieldSystem *fieldSystem, void *param1);
@ -101,9 +101,9 @@ void sub_0203E2FC(FieldSystem *fieldSystem);
BOOL sub_0203E348(FieldSystem *fieldSystem, UnkStruct_0203E348 *param1);
void sub_0203E414(FieldTask *task, int slotMachineID);
void AccessoryShop_Init(FieldTask *task);
void *FieldSystem_ShowDiploma(FieldSystem *fieldSystem, int heapID, BOOL isNatDex);
void *sub_0203E564(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 param3, int heapID);
void *sub_0203E608(FieldSystem *fieldSystem, int heapID);
void *FieldSystem_ShowDiploma(FieldSystem *fieldSystem, enum HeapID heapID, BOOL isNatDex);
void *sub_0203E564(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 param3, enum HeapID heapID);
void *sub_0203E608(FieldSystem *fieldSystem, enum HeapID heapID);
void *FieldSystem_OpenSummaryScreenTeachMove(int unused, FieldSystem *fieldSystem, u16 partySlot, u16 move);
void sub_0203E6C0(FieldSystem *fieldSystem, int param1, int param2);
void sub_0203E704(FieldSystem *fieldSystem);

4
include/unk_0204AEE8.h
View File

@ -19,7 +19,7 @@ void sub_0204B060(BattleTower *battleTower, SaveData *saveData);
void sub_0204B0BC(BattleTower *battleTower);
void sub_0204B0D4(BattleTower *battleTower, u16 param1);
u16 BattleTower_GetTrainerIDForRoomAndOpponentNum(BattleTower *battleTower, u8 roomNum, u8 opponentNum, int challengeMode);
BOOL sub_0204B3B8(BattleTower *battleTower, FrontierDataDTO *param1, u16 partnerBattleTowerID, int partysize, u16 *param4, u16 *param5, UnkStruct_0204B404 *param6, int heapID);
void sub_0204B404(BattleTower *battleTower, FrontierDataDTO *param1, u16 partnerBattleTowerID, BOOL param3, const UnkStruct_0204B404 *param4, int heapID);
BOOL sub_0204B3B8(BattleTower *battleTower, FrontierDataDTO *param1, u16 partnerBattleTowerID, int partysize, u16 *param4, u16 *param5, UnkStruct_0204B404 *param6, enum HeapID heapID);
void sub_0204B404(BattleTower *battleTower, FrontierDataDTO *param1, u16 partnerBattleTowerID, BOOL param3, const UnkStruct_0204B404 *param4, enum HeapID heapID);
#endif // POKEPLATINUM_UNK_0204AEE8_H

2
include/unk_02056B30.h
View File

@ -5,7 +5,7 @@
#include "field_task.h"
void sub_02056B30(FieldTask *param0, int param1, int param2, int param3, u16 param4, int param5, int param6, int heapID);
void sub_02056B30(FieldTask *param0, int param1, int param2, int param3, u16 param4, int param5, int param6, enum HeapID heapID);
void sub_02056BDC(FieldSystem *fieldSystem, const int param1, const int param2, const int param3, const int param4, const int param5, const int param6);
void sub_02056C18(FieldSystem *fieldSystem, const int param1, const int param2, const int param3, const int param4, const int param5);

4
include/unk_0205C22C.h
View File

@ -1,6 +1,8 @@
#ifndef POKEPLATINUM_UNK_0205C22C_H
#define POKEPLATINUM_UNK_0205C22C_H
#include "constants/heap.h"
#include "struct_decls/struct_0205B43C_decl.h"
#include "struct_decls/struct_0205C22C_decl.h"
#include "struct_decls/struct_0205C95C_decl.h"
@ -11,7 +13,7 @@ void sub_0205C2B0(UnkStruct_0205C22C *param0);
void sub_0205C2C8(UnkStruct_0205C22C *param0);
void sub_0205C2E0(UnkStruct_0205C22C *param0);
void sub_0205C820(MapObjectManager *param0, UnkStruct_0205C22C *param1);
UnkStruct_0205C95C *sub_0205C95C(int heapID);
UnkStruct_0205C95C *sub_0205C95C(enum HeapID heapID);
void sub_0205C970(UnkStruct_0205C95C *param0);
#endif // POKEPLATINUM_UNK_0205C22C_H

2
include/unk_0205C980.h
View File

@ -7,6 +7,6 @@ void TrainerInfo_LoadAppearanceVariants(u32 trainerId, int trainerGender, String
int TrainerInfo_GetAppearanceIndex(u32 trainerId, int trainerGender, u32 variant);
int sub_0205CA0C(int param0, int param1);
int sub_0205CA14(int param0, int param1, int param2);
u16 *sub_0205CA4C(int heapID);
u16 *sub_0205CA4C(enum HeapID heapID);
#endif // POKEPLATINUM_UNK_0205C980_H

2
include/unk_020711C8.h
View File

@ -5,6 +5,6 @@
#include "savedata.h"
UnkStruct_020711C8 *sub_020711C8(const int heapID, const u8 param1, SaveData *saveData);
UnkStruct_020711C8 *sub_020711C8(const enum HeapID heapID, const u8 param1, SaveData *saveData);
#endif // POKEPLATINUM_UNK_020711C8_H

2
include/unk_0207C63C.h
View File

@ -8,7 +8,7 @@
void sub_0207C63C(void);
void sub_0207C664(void);
G3DPipelineBuffers *sub_0207C690(int heapID);
G3DPipelineBuffers *sub_0207C690(enum HeapID heapID);
void sub_0207C6AC(void);
void sub_0207C730(void);
void sub_0207C770(void);

Some files were not shown because too many files have changed in this diff Show More