diff --git a/include/applications/poffin_case/main.h b/include/applications/poffin_case/main.h index 470d9a817a..f30fcf30b6 100644 --- a/include/applications/poffin_case/main.h +++ b/include/applications/poffin_case/main.h @@ -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); diff --git a/include/applications/poffin_case/ov79_021D3768.h b/include/applications/poffin_case/ov79_021D3768.h index 7f038f610e..d8fc6bf7cc 100644 --- a/include/applications/poffin_case/ov79_021D3768.h +++ b/include/applications/poffin_case/ov79_021D3768.h @@ -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); diff --git a/include/applications/pokedex/pokedex_app.h b/include/applications/pokedex/pokedex_app.h index 39d0cb5364..1d84be2298 100644 --- a/include/applications/pokedex/pokedex_app.h +++ b/include/applications/pokedex/pokedex_app.h @@ -12,7 +12,7 @@ typedef struct PokedexApp { BOOL unk_00; - int heapID; + enum HeapID heapID; PokedexMemory *pokedexMemory; PokedexSortData sortData; PokedexGraphicData graphicData; diff --git a/include/applications/pokedex/pokedex_main.h b/include/applications/pokedex/pokedex_main.h index bedfcb4b8c..da90bdef96 100644 --- a/include/applications/pokedex/pokedex_main.h +++ b/include/applications/pokedex/pokedex_main.h @@ -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); diff --git a/include/applications/pokedex/struct_ov21_021E8E0C.h b/include/applications/pokedex/struct_ov21_021E8E0C.h index e08012de04..47f919fd94 100644 --- a/include/applications/pokedex/struct_ov21_021E8E0C.h +++ b/include/applications/pokedex/struct_ov21_021E8E0C.h @@ -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; diff --git a/include/battle/ov16_0226DB7C.h b/include/battle/ov16_0226DB7C.h index 06600124ac..5a03d04f17 100644 --- a/include/battle/ov16_0226DB7C.h +++ b/include/battle/ov16_0226DB7C.h @@ -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); diff --git a/include/battle/ov16_0226DE44.h b/include/battle/ov16_0226DE44.h index dd0a161332..bd689c19b9 100644 --- a/include/battle/ov16_0226DE44.h +++ b/include/battle/ov16_0226DE44.h @@ -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); diff --git a/include/battle_anim/battle_anim_system.h b/include/battle_anim/battle_anim_system.h index 80be26c272..8e9d68dcca 100644 --- a/include/battle_anim/battle_anim_system.h +++ b/include/battle_anim/battle_anim_system.h @@ -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); diff --git a/include/battle_anim/ov12_02235E94.h b/include/battle_anim/ov12_02235E94.h index 026e437464..dd3aeb0a24 100644 --- a/include/battle_anim/ov12_02235E94.h +++ b/include/battle_anim/ov12_02235E94.h @@ -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); diff --git a/include/battle_anim/ov12_02237EFC.h b/include/battle_anim/ov12_02237EFC.h index a9c38342d1..f8c0a601f0 100644 --- a/include/battle_anim/ov12_02237EFC.h +++ b/include/battle_anim/ov12_02237EFC.h @@ -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); diff --git a/include/battle_anim/ov12_022380BC.h b/include/battle_anim/ov12_022380BC.h index c2a727da52..be370c18be 100644 --- a/include/battle_anim/ov12_022380BC.h +++ b/include/battle_anim/ov12_022380BC.h @@ -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 diff --git a/include/battle_anim/struct_ov12_02223764.h b/include/battle_anim/struct_ov12_02223764.h index fef8bb192f..fd9353c832 100644 --- a/include/battle_anim/struct_ov12_02223764.h +++ b/include/battle_anim/struct_ov12_02223764.h @@ -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]; diff --git a/include/battle_anim/struct_ov12_02236690.h b/include/battle_anim/struct_ov12_02236690.h index 0d0444e84c..4f72bf5387 100644 --- a/include/battle_anim/struct_ov12_02236690.h +++ b/include/battle_anim/struct_ov12_02236690.h @@ -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; diff --git a/include/battle_anim/struct_ov12_02237728.h b/include/battle_anim/struct_ov12_02237728.h index dff961875d..a00b6e0b31 100644 --- a/include/battle_anim/struct_ov12_02237728.h +++ b/include/battle_anim/struct_ov12_02237728.h @@ -8,7 +8,7 @@ typedef struct BallThrow { int type; - int heapID; + enum HeapID heapID; int mode; int target; int ballID; diff --git a/include/battle_regulation.h b/include/battle_regulation.h index dea62a3148..6b505a94f9 100644 --- a/include/battle_regulation.h +++ b/include/battle_regulation.h @@ -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); diff --git a/include/encounter.h b/include/encounter.h index 4db8530452..e42c8f0d34 100644 --- a/include/encounter.h +++ b/include/encounter.h @@ -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); diff --git a/include/evolution.h b/include/evolution.h index f2bb31c6f8..f99db6fa3c 100644 --- a/include/evolution.h +++ b/include/evolution.h @@ -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); diff --git a/include/inlines.h b/include/inlines.h index d8169e2edb..03ed04f76d 100644 --- a/include/inlines.h +++ b/include/inlines.h @@ -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; diff --git a/include/mail.h b/include/mail.h index 0e68c0f60c..e8fbf42b61 100644 --- a/include/mail.h +++ b/include/mail.h @@ -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 diff --git a/include/narc.h b/include/narc.h index 96bfb046ec..65cdc8aa7b 100644 --- a/include/narc.h +++ b/include/narc.h @@ -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 diff --git a/include/overlay004/ov4_021D0D80.h b/include/overlay004/ov4_021D0D80.h index 753ba47492..bf6e669d0a 100644 --- a/include/overlay004/ov4_021D0D80.h +++ b/include/overlay004/ov4_021D0D80.h @@ -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); diff --git a/include/overlay004/ov4_021D2808.h b/include/overlay004/ov4_021D2808.h index fa51a3cbeb..a711193a23 100644 --- a/include/overlay004/ov4_021D2808.h +++ b/include/overlay004/ov4_021D2808.h @@ -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); diff --git a/include/overlay005/daycare.h b/include/overlay005/daycare.h index ac236a8bde..b3bf906c40 100644 --- a/include/overlay005/daycare.h +++ b/include/overlay005/daycare.h @@ -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 diff --git a/include/overlay005/ov5_021D1A94.h b/include/overlay005/ov5_021D1A94.h index 62816b14ca..b250af7472 100644 --- a/include/overlay005/ov5_021D1A94.h +++ b/include/overlay005/ov5_021D1A94.h @@ -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); diff --git a/include/overlay005/struct_ov5_021EDDAC.h b/include/overlay005/struct_ov5_021EDDAC.h index 88e8f1eb77..9df2a48d0b 100644 --- a/include/overlay005/struct_ov5_021EDDAC.h +++ b/include/overlay005/struct_ov5_021EDDAC.h @@ -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 diff --git a/include/overlay006/great_marsh_binoculars.h b/include/overlay006/great_marsh_binoculars.h index ebd025ba67..98ba675e72 100644 --- a/include/overlay006/great_marsh_binoculars.h +++ b/include/overlay006/great_marsh_binoculars.h @@ -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); diff --git a/include/overlay006/ov6_022426AC.h b/include/overlay006/ov6_022426AC.h index d6e6203de1..791f01ced3 100644 --- a/include/overlay006/ov6_022426AC.h +++ b/include/overlay006/ov6_022426AC.h @@ -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); diff --git a/include/overlay017/ov17_0223F118.h b/include/overlay017/ov17_0223F118.h index 404e2f8ddf..4c9de9fe35 100644 --- a/include/overlay017/ov17_0223F118.h +++ b/include/overlay017/ov17_0223F118.h @@ -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); diff --git a/include/overlay017/ov17_02252AB0.h b/include/overlay017/ov17_02252AB0.h index ada1b6153d..25c30ae1f7 100644 --- a/include/overlay017/ov17_02252AB0.h +++ b/include/overlay017/ov17_02252AB0.h @@ -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); diff --git a/include/overlay018/ov18_0221F800.h b/include/overlay018/ov18_0221F800.h index 87d02f654c..f2992e8270 100644 --- a/include/overlay018/ov18_0221F800.h +++ b/include/overlay018/ov18_0221F800.h @@ -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 diff --git a/include/overlay022/ov22_02254DE0.h b/include/overlay022/ov22_02254DE0.h index 3c6e829cf8..525c68e5b9 100644 --- a/include/overlay022/ov22_02254DE0.h +++ b/include/overlay022/ov22_02254DE0.h @@ -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); diff --git a/include/overlay022/ov22_02255094.h b/include/overlay022/ov22_02255094.h index f3380790b4..f839bc3f23 100644 --- a/include/overlay022/ov22_02255094.h +++ b/include/overlay022/ov22_02255094.h @@ -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); diff --git a/include/overlay022/ov22_022578F4.h b/include/overlay022/ov22_022578F4.h index 1e5d496d5f..1b9ae74fd8 100644 --- a/include/overlay022/ov22_022578F4.h +++ b/include/overlay022/ov22_022578F4.h @@ -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); diff --git a/include/overlay022/ov22_02259484.h b/include/overlay022/ov22_02259484.h index 1b98e18ff0..a67ac4798a 100644 --- a/include/overlay022/ov22_02259484.h +++ b/include/overlay022/ov22_02259484.h @@ -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); diff --git a/include/overlay022/struct_ov22_022599A0.h b/include/overlay022/struct_ov22_022599A0.h index 2fd5a3e202..c2dad9b7d6 100644 --- a/include/overlay022/struct_ov22_022599A0.h +++ b/include/overlay022/struct_ov22_022599A0.h @@ -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 diff --git a/include/overlay022/struct_ov22_0225AF8C.h b/include/overlay022/struct_ov22_0225AF8C.h index 5736bdfaa9..24a20d9cc4 100644 --- a/include/overlay022/struct_ov22_0225AF8C.h +++ b/include/overlay022/struct_ov22_0225AF8C.h @@ -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 diff --git a/include/overlay023/underground_text_printer.h b/include/overlay023/underground_text_printer.h index 11f27db9d3..1a1df54876 100644 --- a/include/overlay023/underground_text_printer.h +++ b/include/overlay023/underground_text_printer.h @@ -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); diff --git a/include/overlay059/ov59_021D2B44.h b/include/overlay059/ov59_021D2B44.h index 60b6bfd367..4c6956bbb4 100644 --- a/include/overlay059/ov59_021D2B44.h +++ b/include/overlay059/ov59_021D2B44.h @@ -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); diff --git a/include/overlay061/ov61_0222AE60.h b/include/overlay061/ov61_0222AE60.h index 13647226ed..edfe1e7b37 100644 --- a/include/overlay061/ov61_0222AE60.h +++ b/include/overlay061/ov61_0222AE60.h @@ -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); diff --git a/include/overlay062/ov62_02231690.h b/include/overlay062/ov62_02231690.h index 2313f2a90d..e9c60ceb30 100644 --- a/include/overlay062/ov62_02231690.h +++ b/include/overlay062/ov62_02231690.h @@ -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); diff --git a/include/overlay062/ov62_02246B00.h b/include/overlay062/ov62_02246B00.h index f099b11644..c14ce9b25c 100644 --- a/include/overlay062/ov62_02246B00.h +++ b/include/overlay062/ov62_02246B00.h @@ -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); diff --git a/include/overlay062/ov62_02248408.h b/include/overlay062/ov62_02248408.h index dc34bb5124..7b093a581a 100644 --- a/include/overlay062/ov62_02248408.h +++ b/include/overlay062/ov62_02248408.h @@ -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); diff --git a/include/overlay062/struct_ov62_022349A8.h b/include/overlay062/struct_ov62_022349A8.h index f63a3fb74f..58f926134a 100644 --- a/include/overlay062/struct_ov62_022349A8.h +++ b/include/overlay062/struct_ov62_022349A8.h @@ -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; diff --git a/include/overlay062/struct_ov62_02241130.h b/include/overlay062/struct_ov62_02241130.h index 3fca589ceb..47a875dad8 100644 --- a/include/overlay062/struct_ov62_02241130.h +++ b/include/overlay062/struct_ov62_02241130.h @@ -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; diff --git a/include/overlay083/ov83_0223D4CC.h b/include/overlay083/ov83_0223D4CC.h index d8195e85e8..e0729f3b7e 100644 --- a/include/overlay083/ov83_0223D4CC.h +++ b/include/overlay083/ov83_0223D4CC.h @@ -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); diff --git a/include/overlay083/ov83_0223D6A8.h b/include/overlay083/ov83_0223D6A8.h index 53e42fed1e..ebc01319e6 100644 --- a/include/overlay083/ov83_0223D6A8.h +++ b/include/overlay083/ov83_0223D6A8.h @@ -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); diff --git a/include/overlay083/struct_ov83_0223B784.h b/include/overlay083/struct_ov83_0223B784.h index 05da517822..c1bd0720cd 100644 --- a/include/overlay083/struct_ov83_0223B784.h +++ b/include/overlay083/struct_ov83_0223B784.h @@ -24,7 +24,7 @@ #include "software_sprite.h" typedef struct { - int heapID; + enum HeapID heapID; BOOL unk_04; int unk_08; int unk_0C; diff --git a/include/overlay083/struct_ov83_0223C344.h b/include/overlay083/struct_ov83_0223C344.h index 28678c497d..85ce80640d 100644 --- a/include/overlay083/struct_ov83_0223C344.h +++ b/include/overlay083/struct_ov83_0223C344.h @@ -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; diff --git a/include/overlay092/ov92_021D0D80.h b/include/overlay092/ov92_021D0D80.h index 3d217fb18f..3592d8f859 100644 --- a/include/overlay092/ov92_021D0D80.h +++ b/include/overlay092/ov92_021D0D80.h @@ -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 diff --git a/include/overlay094/screens/deposit.h b/include/overlay094/screens/deposit.h index fcae360ef4..5ed9ef683a 100644 --- a/include/overlay094/screens/deposit.h +++ b/include/overlay094/screens/deposit.h @@ -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); diff --git a/include/overlay098/ov98_022499C8.h b/include/overlay098/ov98_022499C8.h index 0c51935309..b19af060bf 100644 --- a/include/overlay098/ov98_022499C8.h +++ b/include/overlay098/ov98_022499C8.h @@ -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 diff --git a/include/overlay104/ov104_0222DCE0.h b/include/overlay104/ov104_0222DCE0.h index d1d12bbc05..416bf322eb 100644 --- a/include/overlay104/ov104_0222DCE0.h +++ b/include/overlay104/ov104_0222DCE0.h @@ -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); diff --git a/include/overlay104/ov104_0222E63C.h b/include/overlay104/ov104_0222E63C.h index 89fa4af834..ab8e776866 100644 --- a/include/overlay104/ov104_0222E63C.h +++ b/include/overlay104/ov104_0222E63C.h @@ -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); diff --git a/include/overlay104/ov104_0223A0C4.h b/include/overlay104/ov104_0223A0C4.h index d6cf6390f9..7430e59600 100644 --- a/include/overlay104/ov104_0223A0C4.h +++ b/include/overlay104/ov104_0223A0C4.h @@ -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); diff --git a/include/overlay104/ov104_0223D5D0.h b/include/overlay104/ov104_0223D5D0.h index 5aa867d2a9..39958c97da 100644 --- a/include/overlay104/ov104_0223D5D0.h +++ b/include/overlay104/ov104_0223D5D0.h @@ -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); diff --git a/include/overlay104/ov104_0223E894.h b/include/overlay104/ov104_0223E894.h index f0a43dee9c..d05095a860 100644 --- a/include/overlay104/ov104_0223E894.h +++ b/include/overlay104/ov104_0223E894.h @@ -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); diff --git a/include/overlay104/struct_ov104_022320B4_t.h b/include/overlay104/struct_ov104_022320B4_t.h index 3624d4060e..45664ff307 100644 --- a/include/overlay104/struct_ov104_022320B4_t.h +++ b/include/overlay104/struct_ov104_022320B4_t.h @@ -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; diff --git a/include/overlay119/struct_ov119_021D1930.h b/include/overlay119/struct_ov119_021D1930.h index d27604db13..53f1f2d2b2 100644 --- a/include/overlay119/struct_ov119_021D1930.h +++ b/include/overlay119/struct_ov119_021D1930.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV119_021D1930_H typedef struct { - int heapID; + enum HeapID heapID; int unk_04; } UnkStruct_ov119_021D1930; diff --git a/include/pal_pad.h b/include/pal_pad.h index 54bd7d2aac..b1d40b5191 100644 --- a/include/pal_pad.h +++ b/include/pal_pad.h @@ -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 diff --git a/include/poffin.h b/include/poffin.h index f26853c769..5242299958 100644 --- a/include/poffin.h +++ b/include/poffin.h @@ -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); diff --git a/include/pokedex_heightweight.h b/include/pokedex_heightweight.h index ab23f88485..0b3eaf134a 100644 --- a/include/pokedex_heightweight.h +++ b/include/pokedex_heightweight.h @@ -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); diff --git a/include/pokemon.h b/include/pokemon.h index 883f2f4388..af5d020b21 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -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); diff --git a/include/pokemon_anim.h b/include/pokemon_anim.h index e636a1e267..5283b9f9f8 100644 --- a/include/pokemon_anim.h +++ b/include/pokemon_anim.h @@ -72,7 +72,7 @@ typedef struct PokemonAnim { typedef struct PokemonAnimManager { PokemonAnim *anims; - int heapID; + enum HeapID heapID; u8 flipSprite; u8 animCount; } PokemonAnimManager; diff --git a/include/pokeradar.h b/include/pokeradar.h index 1706e7ee0f..bea309b9c7 100644 --- a/include/pokeradar.h +++ b/include/pokeradar.h @@ -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); diff --git a/include/savedata.h b/include/savedata.h index 44b47f2e53..37d1be9f03 100644 --- a/include/savedata.h +++ b/include/savedata.h @@ -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); diff --git a/include/savedata/save_table.h b/include/savedata/save_table.h index 39065e5d55..3967ca3572 100644 --- a/include/savedata/save_table.h +++ b/include/savedata/save_table.h @@ -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. diff --git a/include/script_manager.h b/include/script_manager.h index 6eea269204..25824ac59e 100644 --- a/include/script_manager.h +++ b/include/script_manager.h @@ -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); diff --git a/include/software_sprite.h b/include/software_sprite.h index bc7a111a3f..8595e3f4c6 100644 --- a/include/software_sprite.h +++ b/include/software_sprite.h @@ -4,6 +4,8 @@ #include #include +#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 { diff --git a/include/sound.h b/include/sound.h index d998592ff4..bf86d5ce22 100644 --- a/include/sound.h +++ b/include/sound.h @@ -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); diff --git a/include/sound_playback.h b/include/sound_playback.h index 48c0395edc..bf123f2724 100644 --- a/include/sound_playback.h +++ b/include/sound_playback.h @@ -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); diff --git a/include/struct_defs/battle_tower.h b/include/struct_defs/battle_tower.h index 03cc5f4021..1c223e6a6f 100644 --- a/include/struct_defs/battle_tower.h +++ b/include/struct_defs/battle_tower.h @@ -13,7 +13,7 @@ typedef struct BattleTower { int unk_00; - int heapID; + enum HeapID heapID; u32 unk_08; u8 nextOpponentNum; u8 unk_0D; diff --git a/include/struct_defs/struct_020127E8.h b/include/struct_defs/struct_020127E8.h index 173e6197ab..bc57ded6bb 100644 --- a/include/struct_defs/struct_020127E8.h +++ b/include/struct_defs/struct_020127E8.h @@ -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 diff --git a/include/struct_defs/struct_0207C894.h b/include/struct_defs/struct_0207C894.h index b709125bc7..ee4a907808 100644 --- a/include/struct_defs/struct_0207C894.h +++ b/include/struct_defs/struct_0207C894.h @@ -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; diff --git a/include/struct_defs/struct_0208B284.h b/include/struct_defs/struct_0208B284.h index 6693a5858b..22768f47bd 100644 --- a/include/struct_defs/struct_0208B284.h +++ b/include/struct_defs/struct_0208B284.h @@ -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; diff --git a/include/struct_defs/struct_02090800.h b/include/struct_defs/struct_02090800.h index 222bcd6a9d..c4a5485fcd 100644 --- a/include/struct_defs/struct_02090800.h +++ b/include/struct_defs/struct_02090800.h @@ -8,7 +8,7 @@ #include "string_template.h" typedef struct { - int heapID; + enum HeapID heapID; MessageLoader *unk_04; StringTemplate *unk_08; Pokemon *unk_0C; diff --git a/include/system.h b/include/system.h index 49fd2a0edc..6a7a9ad663 100644 --- a/include/system.h +++ b/include/system.h @@ -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); diff --git a/include/trainer_data.h b/include/trainer_data.h index d0788cc632..075e10c058 100644 --- a/include/trainer_data.h +++ b/include/trainer_data.h @@ -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. diff --git a/include/trainer_info.h b/include/trainer_info.h index 093c32a570..42897a6c9a 100644 --- a/include/trainer_info.h +++ b/include/trainer_info.h @@ -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. diff --git a/include/tv_episode_segment.h b/include/tv_episode_segment.h index d4c395f635..060969dfb8 100644 --- a/include/tv_episode_segment.h +++ b/include/tv_episode_segment.h @@ -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); diff --git a/include/unk_02012744.h b/include/unk_02012744.h index 97e7bd8606..2836a30624 100644 --- a/include/unk_02012744.h +++ b/include/unk_02012744.h @@ -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); diff --git a/include/unk_0201DD00.h b/include/unk_0201DD00.h index 4bc7e48e18..5604f7fab0 100644 --- a/include/unk_0201DD00.h +++ b/include/unk_0201DD00.h @@ -3,11 +3,13 @@ #include +#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); diff --git a/include/unk_02020AEC.h b/include/unk_02020AEC.h index 6f7ded87ad..5a2884ea53 100644 --- a/include/unk_02020AEC.h +++ b/include/unk_02020AEC.h @@ -4,6 +4,8 @@ #include #include +#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); diff --git a/include/unk_0202854C.h b/include/unk_0202854C.h index e2bf652099..7ed99fe459 100644 --- a/include/unk_0202854C.h +++ b/include/unk_0202854C.h @@ -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); diff --git a/include/unk_0202CC64.h b/include/unk_0202CC64.h index 429d2c9873..3fe6ec62f1 100644 --- a/include/unk_0202CC64.h +++ b/include/unk_0202CC64.h @@ -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); diff --git a/include/unk_0202D05C.h b/include/unk_0202D05C.h index 2688fbfbe2..384cd39f7d 100644 --- a/include/unk_0202D05C.h +++ b/include/unk_0202D05C.h @@ -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); diff --git a/include/unk_0202E840.h b/include/unk_0202E840.h index 811f36c35e..260d247a45 100644 --- a/include/unk_0202E840.h +++ b/include/unk_0202E840.h @@ -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 diff --git a/include/unk_0202F1D4.h b/include/unk_0202F1D4.h index e1d6b697d7..57e067958a 100644 --- a/include/unk_0202F1D4.h +++ b/include/unk_0202F1D4.h @@ -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 diff --git a/include/unk_02030880.h b/include/unk_02030880.h index 351044c2ca..9d747a3810 100644 --- a/include/unk_02030880.h +++ b/include/unk_02030880.h @@ -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); diff --git a/include/unk_02030A80.h b/include/unk_02030A80.h index c016e8853c..7c5fb5adbf 100644 --- a/include/unk_02030A80.h +++ b/include/unk_02030A80.h @@ -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); diff --git a/include/unk_02038FFC.h b/include/unk_02038FFC.h index 16750581ab..1316b539e8 100644 --- a/include/unk_02038FFC.h +++ b/include/unk_02038FFC.h @@ -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); diff --git a/include/unk_0203909C.h b/include/unk_0203909C.h index 8dc612e68c..c0bcc4f238 100644 --- a/include/unk_0203909C.h +++ b/include/unk_0203909C.h @@ -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 diff --git a/include/unk_02039814.h b/include/unk_02039814.h index 1e068dde1a..afa02c73ba 100644 --- a/include/unk_02039814.h +++ b/include/unk_02039814.h @@ -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 diff --git a/include/unk_02039A64.h b/include/unk_02039A64.h index 2ab3d8bfad..ee3d575ce7 100644 --- a/include/unk_02039A64.h +++ b/include/unk_02039A64.h @@ -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 diff --git a/include/unk_0203D1B8.h b/include/unk_0203D1B8.h index 5f18afddd1..0050b371ea 100644 --- a/include/unk_0203D1B8.h +++ b/include/unk_0203D1B8.h @@ -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); diff --git a/include/unk_0204AEE8.h b/include/unk_0204AEE8.h index f312cab30f..d2c2c65244 100644 --- a/include/unk_0204AEE8.h +++ b/include/unk_0204AEE8.h @@ -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 diff --git a/include/unk_02056B30.h b/include/unk_02056B30.h index 40f347ffa1..30054dd083 100644 --- a/include/unk_02056B30.h +++ b/include/unk_02056B30.h @@ -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); diff --git a/include/unk_0205C22C.h b/include/unk_0205C22C.h index efa5c66578..b83dd8c20a 100644 --- a/include/unk_0205C22C.h +++ b/include/unk_0205C22C.h @@ -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 diff --git a/include/unk_0205C980.h b/include/unk_0205C980.h index 34a4d776ba..1afa5b5f32 100644 --- a/include/unk_0205C980.h +++ b/include/unk_0205C980.h @@ -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 diff --git a/include/unk_020711C8.h b/include/unk_020711C8.h index c2a0d25f6c..2b9b8659c9 100644 --- a/include/unk_020711C8.h +++ b/include/unk_020711C8.h @@ -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 diff --git a/include/unk_0207C63C.h b/include/unk_0207C63C.h index e481da8eac..e92c92833a 100644 --- a/include/unk_0207C63C.h +++ b/include/unk_0207C63C.h @@ -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); diff --git a/include/unk_020890F4.h b/include/unk_020890F4.h index 019284a3a3..f45260cfc9 100644 --- a/include/unk_020890F4.h +++ b/include/unk_020890F4.h @@ -5,8 +5,8 @@ #include "game_options.h" -UnkStruct_02089438 *sub_02089400(int heapID, int param1, int param2[], Options *options, u32 param4, u32 param5); -UnkStruct_02089438 *sub_0208941C(int heapID, int param1, int param2[], Options *options, u32 param4, u32 param5, u32 param6, u32 param7); +UnkStruct_02089438 *sub_02089400(enum HeapID heapID, int param1, int param2[], Options *options, u32 param4, u32 param5); +UnkStruct_02089438 *sub_0208941C(enum HeapID heapID, int param1, int param2[], Options *options, u32 param4, u32 param5, u32 param6, u32 param7); void sub_02089438(UnkStruct_02089438 *param0); #endif // POKEPLATINUM_UNK_020890F4_H diff --git a/include/unk_0208C098.h b/include/unk_0208C098.h index 89570eccaf..0faff1d259 100644 --- a/include/unk_0208C098.h +++ b/include/unk_0208C098.h @@ -57,7 +57,7 @@ u8 App_BarColor(u32 cur, u32 max); u8 HealthBar_Color(u16 curHP, u16 maxHP, u32 barSize); void App_StartScreenFade(u8 fadeOut, u32 heapID); u8 sub_0208C15C(s16 *param0, u16 param1); -void App_LoadGraphicMember(BgConfig *bgConfig, int heapID, NARC *narc, int unused, int memberIndex, int bgLayer, enum GraphicMemberType memberType, u16 memberSize, u16 offset); +void App_LoadGraphicMember(BgConfig *bgConfig, enum HeapID heapID, NARC *narc, int unused, int memberIndex, int bgLayer, enum GraphicMemberType memberType, u16 memberSize, u16 offset); void *App_LoadScreenData(NARC *narc, enum NarcID unused, int memberIdx, NNSG2dScreenData **dst, enum HeapID heapID); #endif // POKEPLATINUM_UNK_0208C098_H diff --git a/include/unk_02092494.h b/include/unk_02092494.h index f31a42abe1..3c8b0dda88 100644 --- a/include/unk_02092494.h +++ b/include/unk_02092494.h @@ -6,9 +6,9 @@ #include "pokemon.h" #include "trainer_info.h" -PokemonInfoDisplayStruct *sub_02092494(Pokemon *param0, BOOL param1, int heapID); +PokemonInfoDisplayStruct *sub_02092494(Pokemon *param0, BOOL param1, enum HeapID heapID); void sub_0209282C(PokemonInfoDisplayStruct *param0); -void UpdateMonStatusAndTrainerInfo(Pokemon *mon, TrainerInfo *trainerInfo, int sel, int metLocation, int heapID); -void UpdateBoxMonStatusAndTrainerInfo(BoxPokemon *boxMon, TrainerInfo *trainerInfo, int sel, int metLocation, int heapID); +void UpdateMonStatusAndTrainerInfo(Pokemon *mon, TrainerInfo *trainerInfo, int sel, int metLocation, enum HeapID heapID); +void UpdateBoxMonStatusAndTrainerInfo(BoxPokemon *boxMon, TrainerInfo *trainerInfo, int sel, int metLocation, enum HeapID heapID); #endif // POKEPLATINUM_UNK_02092494_H diff --git a/include/unk_02094EDC.h b/include/unk_02094EDC.h index edf426a0d1..adf12f0dfa 100644 --- a/include/unk_02094EDC.h +++ b/include/unk_02094EDC.h @@ -17,9 +17,9 @@ BOOL sub_02094EDC(UnkStruct_02095C48 *param0); void sub_02094F04(UnkStruct_02095C48 *param0, enum HeapID heapID, int param2, enum PokemonContestType contestType, enum PokemonContestRank contestRank, int param5, BOOL isGameCompleted, BOOL isNatDexObtained); void sub_020951B0(UnkStruct_02095C48 *param0, enum HeapID heapID); void sub_02095338(UnkStruct_02095C48 *param0); -void sub_02095380(const UnkStruct_ov6_02248BE8 *param0, Pokemon *param1, int heapID); -PokemonSprite *sub_02095484(PokemonSpriteManager *param0, int param1, Pokemon *param2, int param3, PokemonSpriteData *pokemonSpriteData, int heapID, int param6, int param7, int param8); -void sub_020954F0(UnkStruct_02095C48 *param0, int heapID, int param2, enum PokemonContestType contestType, enum PokemonContestRank contestRank); +void sub_02095380(const UnkStruct_ov6_02248BE8 *param0, Pokemon *param1, enum HeapID heapID); +PokemonSprite *sub_02095484(PokemonSpriteManager *param0, int param1, Pokemon *param2, int param3, PokemonSpriteData *pokemonSpriteData, enum HeapID heapID, int param6, int param7, int param8); +void sub_020954F0(UnkStruct_02095C48 *param0, enum HeapID heapID, int param2, enum PokemonContestType contestType, enum PokemonContestRank contestRank); s8 sub_02095734(enum ContestEffects contestEffect); void LoadTwoLineContestEffectMessages(int param0, u32 *lineOneEffectMessageID, u32 *lineTwoEffectMessageID); u32 sub_0209577C(int param0); diff --git a/include/unk_02097624.h b/include/unk_02097624.h index 6045f29a5d..44033f74a7 100644 --- a/include/unk_02097624.h +++ b/include/unk_02097624.h @@ -7,15 +7,15 @@ #include "pokemon.h" #include "savedata.h" -UnkStruct_02097728 *sub_02097624(SaveData *saveData, int param1, u8 param2, u8 param3, int heapID); -UnkStruct_02097728 *sub_0209767C(SaveData *saveData, int param1, u16 param2, int heapID); -UnkStruct_02097728 *sub_020976BC(SaveData *saveData, Pokemon *param1, int heapID); -UnkStruct_02097728 *sub_020976F4(SaveData *saveData, u8 param1, int heapID); +UnkStruct_02097728 *sub_02097624(SaveData *saveData, int param1, u8 param2, u8 param3, enum HeapID heapID); +UnkStruct_02097728 *sub_0209767C(SaveData *saveData, int param1, u16 param2, enum HeapID heapID); +UnkStruct_02097728 *sub_020976BC(SaveData *saveData, Pokemon *param1, enum HeapID heapID); +UnkStruct_02097728 *sub_020976F4(SaveData *saveData, u8 param1, enum HeapID heapID); BOOL sub_02097728(UnkStruct_02097728 *param0); int sub_0209772C(UnkStruct_02097728 *param0, int param1, u8 param2); int sub_02097750(UnkStruct_02097728 *param0, Pokemon *param1); void sub_02097770(UnkStruct_02097728 *param0); -int sub_02097788(Mailbox *mailbox, Pokemon *mon, int heapID); -int sub_020977E4(Mailbox *mailbox, u16 param1, Pokemon *param2, int heapID); +int sub_02097788(Mailbox *mailbox, Pokemon *mon, enum HeapID heapID); +int sub_020977E4(Mailbox *mailbox, u16 param1, Pokemon *param2, enum HeapID heapID); #endif // POKEPLATINUM_UNK_02097624_H diff --git a/include/unk_02099604.h b/include/unk_02099604.h index 6dc5dc74f2..e3214dfc95 100644 --- a/include/unk_02099604.h +++ b/include/unk_02099604.h @@ -6,7 +6,7 @@ #include "savedata.h" -UnkStruct_ov82_0223B164 *sub_02099674(FieldSystem *fieldSystem, int param1, int heapID); -UnkStruct_ov82_0223B164 *sub_020996A0(FieldSystem *fieldSystem, int heapID, BOOL param2); +UnkStruct_ov82_0223B164 *sub_02099674(FieldSystem *fieldSystem, int param1, enum HeapID heapID); +UnkStruct_ov82_0223B164 *sub_020996A0(FieldSystem *fieldSystem, enum HeapID heapID, BOOL param2); #endif // POKEPLATINUM_UNK_02099604_H diff --git a/include/unk_0209A74C.h b/include/unk_0209A74C.h index 90f3398742..f79af25a4e 100644 --- a/include/unk_0209A74C.h +++ b/include/unk_0209A74C.h @@ -1,7 +1,9 @@ #ifndef POKEPLATINUM_UNK_0209A74C_H #define POKEPLATINUM_UNK_0209A74C_H -void sub_0209A74C(int heapID); -void sub_0209A8E0(int heapID); +#include "constants/heap.h" + +void sub_0209A74C(enum HeapID heapID); +void sub_0209A8E0(enum HeapID heapID); #endif // POKEPLATINUM_UNK_0209A74C_H diff --git a/include/unk_0209AA74.h b/include/unk_0209AA74.h index ac16f21d36..51be209144 100644 --- a/include/unk_0209AA74.h +++ b/include/unk_0209AA74.h @@ -1,6 +1,8 @@ #ifndef POKEPLATINUM_UNK_0209AA74_H #define POKEPLATINUM_UNK_0209AA74_H -void sub_0209AA74(int heapID, int param1); +#include "constants/heap.h" + +void sub_0209AA74(enum HeapID heapID, int param1); #endif // POKEPLATINUM_UNK_0209AA74_H diff --git a/include/unk_0209C370.h b/include/unk_0209C370.h index f8a8eb72cd..78abe3666f 100644 --- a/include/unk_0209C370.h +++ b/include/unk_0209C370.h @@ -1,7 +1,9 @@ #ifndef POKEPLATINUM_UNK_0209C370_H #define POKEPLATINUM_UNK_0209C370_H -u8 *sub_0209C370(int heapID); +#include "constants/heap.h" + +u8 *sub_0209C370(enum HeapID heapID); void sub_0209C388(u8 *param0); #endif // POKEPLATINUM_UNK_0209C370_H diff --git a/src/applications/diploma.c b/src/applications/diploma.c index 25ced846cf..1c1d53bc25 100644 --- a/src/applications/diploma.c +++ b/src/applications/diploma.c @@ -26,7 +26,7 @@ #include "res/text/bank/diploma.h" typedef struct Diploma { - int heapID; + enum HeapID heapID; BOOL isNatDex; SaveData *saveData; TrainerInfo *trainerInfo; diff --git a/src/applications/party_menu/main.c b/src/applications/party_menu/main.c index cf9cd22b6d..bf6c97d959 100644 --- a/src/applications/party_menu/main.c +++ b/src/applications/party_menu/main.c @@ -143,7 +143,7 @@ static u8 CheckDuplicateValues(PartyMenuApplication *application); static u8 CheckUniqueValues(PartyMenuApplication *application); static u8 CheckEqualityInArray(PartyMenuApplication *application); static BOOL ShouldShowSubscreen(PartyMenuApplication *application); -static G3DPipelineBuffers *sub_0207EAD4(int heapID); +static G3DPipelineBuffers *sub_0207EAD4(enum HeapID heapID); static void sub_0207EAF4(void); static void sub_0207EB64(G3DPipelineBuffers *param0); static int ProcessMessageResult(PartyMenuApplication *application); @@ -888,7 +888,7 @@ void sub_0207EA74(PartyMenuApplication *application, int param1) } } -static G3DPipelineBuffers *sub_0207EAD4(int heapID) +static G3DPipelineBuffers *sub_0207EAD4(enum HeapID heapID) { return G3DPipeline_Init(heapID, TEXTURE_VRAM_SIZE_128K, PALETTE_VRAM_SIZE_32K, sub_0207EAF4); } diff --git a/src/applications/poffin_case/main.c b/src/applications/poffin_case/main.c index c1169c37aa..6244dfcc9e 100644 --- a/src/applications/poffin_case/main.c +++ b/src/applications/poffin_case/main.c @@ -100,7 +100,7 @@ const ApplicationManagerTemplate gPoffinCaseAppTemplate = { FS_OVERLAY_ID_NONE }; -PoffinCaseAppData *PoffinCaseAppData_New(SaveData *saveData, int heapID) +PoffinCaseAppData *PoffinCaseAppData_New(SaveData *saveData, enum HeapID heapID) { StringTemplate *unused; u8 count = 0, j = 0; diff --git a/src/applications/poffin_case/ov79_021D2268.c b/src/applications/poffin_case/ov79_021D2268.c index 0d2986ee30..70c92664de 100644 --- a/src/applications/poffin_case/ov79_021D2268.c +++ b/src/applications/poffin_case/ov79_021D2268.c @@ -85,7 +85,7 @@ struct UnkStruct_ov79_021D29B4_t { }; typedef struct { - int heapID; + enum HeapID heapID; int unk_04; int unk_08; u16 unk_0C; diff --git a/src/applications/poffin_case/ov79_021D3768.c b/src/applications/poffin_case/ov79_021D3768.c index 4c80465db3..cf80e21af1 100644 --- a/src/applications/poffin_case/ov79_021D3768.c +++ b/src/applications/poffin_case/ov79_021D3768.c @@ -13,9 +13,9 @@ #include "unk_0202419C.h" static void ov79_021D3870(UnkStruct_ov79_021D3820 *param0, int param1); -static void ov79_021D38D0(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *param1, int heapIDs); +static void ov79_021D38D0(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *param1, enum HeapID heapID); -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) { MI_CpuClear8(param0, sizeof(UnkStruct_ov79_021D3820)); @@ -77,7 +77,7 @@ static void ov79_021D3870(UnkStruct_ov79_021D3820 *param0, int param1) Camera_SetAsActive(param0->camera); } -static void ov79_021D38D0(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *param1, int heapID) +static void ov79_021D38D0(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *param1, enum HeapID heapID) { PokemonSpriteTemplate spriteTemplate; PokemonSprite *sprite; diff --git a/src/applications/pokedex/ov21_021D5AEC.c b/src/applications/pokedex/ov21_021D5AEC.c index 1e720f4fd0..b6ce61b533 100644 --- a/src/applications/pokedex/ov21_021D5AEC.c +++ b/src/applications/pokedex/ov21_021D5AEC.c @@ -108,20 +108,20 @@ static void ov21_021D7538(UnkStruct_ov21_021D5B68 *param0, int param1); static void ov21_021D7590(UnkStruct_ov21_021D7464 *param0, UnkStruct_ov21_021D5B68 *param1); static void ov21_021D75DC(UnkStruct_ov21_021D7464 *param0, UnkStruct_ov21_021D5B68 *param1); static void ov21_021D6C24(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1); -static void ov21_021D6114(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2, int heapID); +static void ov21_021D6114(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2, enum HeapID heapID); static void ov21_021D61D8(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1); -static void ov21_021D61F4(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2, int heapID); -static void ov21_021D62E4(PokedexGraphicData *param0, int heapID); -static void ov21_021D637C(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, int heapID, int param3); +static void ov21_021D61F4(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2, enum HeapID heapID); +static void ov21_021D62E4(PokedexGraphicData *param0, enum HeapID heapID); +static void ov21_021D637C(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, enum HeapID heapID, int param3); static void ov21_021D63C0(UnkStruct_ov21_021D71A8 *param0); -static void ov21_021D63DC(PokedexGraphicData *param0, int param1, int param2, int param3); -static void ov21_021D64B0(PokedexGraphicData *param0, int param1, int param2); -static void ov21_021D6538(UnkStruct_ov21_021D71A8 *param0, int heapID); +static void ov21_021D63DC(PokedexGraphicData *param0, enum HeapID heapID, int param2, int param3); +static void ov21_021D64B0(PokedexGraphicData *param0, enum HeapID heapID, int param2); +static void ov21_021D6538(UnkStruct_ov21_021D71A8 *param0, enum HeapID heapID); static void ov21_021D6580(UnkStruct_ov21_021D71A8 *param0); static void ov21_021D65DC(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, int param2); static void ov21_021D6744(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, int param2); static void ov21_021D695C(UnkStruct_ov21_021D71A8 *param0); -static int ov21_021D70C0(PokedexGraphicData *param0, int heapID); +static int ov21_021D70C0(PokedexGraphicData *param0, enum HeapID heapID); static void ov21_021D67EC(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2, int param3); static void ov21_021D6940(UnkStruct_ov21_021D71A8 *param0); static void ov21_021D68C8(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2); @@ -137,7 +137,7 @@ static void ov21_021D6BB0(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_ static void ov21_021D6C44(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2, int param3); static void ov21_021D6CC8(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2, int param3); static void ov21_021D6D78(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2, int param3, int param4, int dexIndex); -static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, int param2, int param3, int param4); +static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, enum HeapID heapID, int param3, int param4); static void ov21_021D6CA4(Sprite *param0, int *param1, int *param2); static fx32 ov21_021D6BF8(fx32 param0, fx32 param1, int param2, int param3); static void ov21_021D6F20(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2); @@ -612,7 +612,7 @@ static BOOL ov21_021D6108(UnkStruct_ov21_021D5B68 *param0, int param1) return PokedexSort_TakeStep(param0->unk_04, param1); } -static void ov21_021D6114(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2, int heapID) +static void ov21_021D6114(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2, enum HeapID heapID) { PokedexGraphics_LoadGraphicNarcPaletteData(param1, background_scroll_default_NCLR, 0, 0, 0, heapID); ov21_021D62E4(param1, heapID); @@ -642,7 +642,7 @@ static void ov21_021D61D8(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *p ov21_021D63C0(param0); } -static void ov21_021D61F4(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2, int heapID) +static void ov21_021D61F4(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2, enum HeapID heapID) { void *v0; NNSG2dPaletteData *v1; @@ -677,7 +677,7 @@ static void ov21_021D61F4(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *p ov21_021D6F20(param0, param1, param2); } -static void ov21_021D62E4(PokedexGraphicData *param0, int heapID) +static void ov21_021D62E4(PokedexGraphicData *param0, enum HeapID heapID) { void *v0; NNSG2dScreenData *v1; @@ -696,7 +696,7 @@ static void ov21_021D62E4(PokedexGraphicData *param0, int heapID) Bg_ScheduleTilemapTransfer(param0->bgConfig, 3); } -static void ov21_021D637C(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, int heapID, int param3) +static void ov21_021D637C(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, enum HeapID heapID, int param3) { int v0; @@ -718,7 +718,7 @@ static void ov21_021D63C0(UnkStruct_ov21_021D71A8 *param0) param0->unk_DC = NULL; } -static void ov21_021D63DC(PokedexGraphicData *param0, int heapID, int param2, int param3) +static void ov21_021D63DC(PokedexGraphicData *param0, enum HeapID heapID, int param2, int param3) { String *v0 = String_Init(32, heapID); MessageLoader *pokedexMessageBank = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEDEX, heapID); @@ -740,7 +740,7 @@ static void ov21_021D63DC(PokedexGraphicData *param0, int heapID, int param2, in Bg_ScheduleTilemapTransfer(param0->bgConfig, 1); } -static void ov21_021D64B0(PokedexGraphicData *param0, int heapID, int param2) +static void ov21_021D64B0(PokedexGraphicData *param0, enum HeapID heapID, int param2) { String *v0 = String_Init(32, heapID); MessageLoader *pokedexMessageBank = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEDEX, heapID); @@ -754,7 +754,7 @@ static void ov21_021D64B0(PokedexGraphicData *param0, int heapID, int param2) Bg_ScheduleTilemapTransfer(param0->bgConfig, 1); } -static void ov21_021D6538(UnkStruct_ov21_021D71A8 *param0, int heapID) +static void ov21_021D6538(UnkStruct_ov21_021D71A8 *param0, enum HeapID heapID) { param0->unk_80[0] = SpriteResourceCollection_New(2, 0, heapID); param0->unk_80[1] = SpriteResourceCollection_New(2, 1, heapID); @@ -1262,7 +1262,7 @@ static void ov21_021D6D78(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *p PokedexTextManager_FreeWindow(v1); } -static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, int heapID, int param3, int param4) +static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, enum HeapID heapID, int param3, int param4) { PokedexDisplayBox displayBox; Window *v1; @@ -1430,7 +1430,7 @@ static void ov21_021D7094(PokedexGraphicData **param0, const UnkStruct_ov21_021D GX_SetVisibleWnd(GX_WNDMASK_NONE); } -static int ov21_021D70C0(PokedexGraphicData *param0, int heapID) +static int ov21_021D70C0(PokedexGraphicData *param0, enum HeapID heapID) { Window *v0; int v1; diff --git a/src/applications/pokedex/ov21_021D76B0.c b/src/applications/pokedex/ov21_021D76B0.c index a85210ae04..8e341707a3 100644 --- a/src/applications/pokedex/ov21_021D76B0.c +++ b/src/applications/pokedex/ov21_021D76B0.c @@ -40,7 +40,7 @@ typedef struct { int unk_00[7]; UnkStruct_ov21_021D5B68 *unk_1C; int *unk_20; - int heapID; + enum HeapID heapID; } UnkStruct_ov21_021D77D4; typedef struct { @@ -95,7 +95,7 @@ static void ov21_021D7B20(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77 static void ov21_021D7B70(UnkStruct_ov21_021D7A64 *param0); static void ov21_021D7B8C(u32 param0, enum TouchScreenButtonState param1, void *param2); static void ov21_021D84B8(UnkStruct_ov21_021D77D4 *param0); -static void ov21_021D7C64(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021D77D4 *param2, int heapID); +static void ov21_021D7C64(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021D77D4 *param2, enum HeapID heapID); static void ov21_021D7CAC(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1, enum HeapID heapID); static void ov21_021D7CD8(PokedexGraphicData **param0, const UnkStruct_ov21_021D77D4 *param1, enum HeapID heapID); static void ov21_021D7D8C(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1, int param2); @@ -104,8 +104,8 @@ static void ov21_021D7E80(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData ** static void ov21_021D7FEC(UnkStruct_ov21_021D7C64 *param0); static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021D77D4 *param2, int param3); static void ov21_021D81EC(UnkStruct_ov21_021D7C64 *param0); -static void ov21_021D820C(PokedexGraphicData **param0, int heapID); -static void ov21_021D828C(PokedexGraphicData **param0, int heapID); +static void ov21_021D820C(PokedexGraphicData **param0, enum HeapID heapID); +static void ov21_021D828C(PokedexGraphicData **param0, enum HeapID heapID); static void ov21_021D853C(UnkStruct_ov21_021D77D4 *param0, int param1); static void ov21_021D82A8(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1); static void ov21_021D8324(UnkStruct_ov21_021D7A64 *param0); @@ -507,7 +507,7 @@ static void ov21_021D7B8C(u32 param0, enum TouchScreenButtonState param1, void * } } -static void ov21_021D7C64(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021D77D4 *param2, int heapID) +static void ov21_021D7C64(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021D77D4 *param2, enum HeapID heapID) { ov21_021D7CD8(param1, param2, heapID); ov21_021D820C(param1, heapID); @@ -752,7 +752,7 @@ static void ov21_021D81EC(UnkStruct_ov21_021D7C64 *param0) PokedexTextManager_FreeTextData(param0->unk_24); } -static void ov21_021D820C(PokedexGraphicData **param0, int heapID) +static void ov21_021D820C(PokedexGraphicData **param0, enum HeapID heapID) { void *v0; NNSG2dScreenData *v1; @@ -769,7 +769,7 @@ static void ov21_021D820C(PokedexGraphicData **param0, int heapID) Bg_SetOffset(v2, BG_LAYER_SUB_3, 3, 0); } -static void ov21_021D828C(PokedexGraphicData **param0, int heapID) +static void ov21_021D828C(PokedexGraphicData **param0, enum HeapID heapID) { BgConfig *v0 = (*param0)->bgConfig; diff --git a/src/applications/pokedex/ov21_021D94BC.c b/src/applications/pokedex/ov21_021D94BC.c index 3fbc88eb20..a1ff9332e1 100644 --- a/src/applications/pokedex/ov21_021D94BC.c +++ b/src/applications/pokedex/ov21_021D94BC.c @@ -104,12 +104,12 @@ static int ov21_021D97A0(void *graphics, PokedexGraphicsManager *graphicsMan, co static int ov21_021D9830(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan); static int ov21_021D9960(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan); static void ov21_021DC96C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, const UnkStruct_ov21_021D95B8 *param2); -static void ov21_021D9A08(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, const UnkStruct_ov21_021D95B8 *param2, const UnkStruct_ov21_021D9B24 *param3, int heapID); +static void ov21_021D9A08(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, const UnkStruct_ov21_021D95B8 *param2, const UnkStruct_ov21_021D9B24 *param3, enum HeapID heapID); static void ov21_021D9A4C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1); -static void ov21_021D9A74(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_021D95B8 *param1, int heapID); -static void ov21_021DB50C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2); +static void ov21_021D9A74(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID); +static void ov21_021DB50C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, enum HeapID heapID); static void ov21_021DB5DC(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1); -static void ov21_021DB634(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2); +static void ov21_021DB634(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, enum HeapID heapID); static void ov21_021DB6C8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1); static void ov21_021DC7C0(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1); static void ov21_021DC7F4(UnkStruct_ov21_021DC96C *param0); @@ -117,7 +117,7 @@ static void ov21_021DC8B4(UnkStruct_ov21_021DC96C *param0, int param1, int param static void ov21_021DC8D0(UnkStruct_ov21_021DC96C *param0, int param1); static void ov21_021DC90C(UnkStruct_ov21_021DC96C *param0, int param1); static void ov21_021DC93C(UnkStruct_ov21_021DC96C *param0, int param1); -static void ov21_021DB708(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2); +static void ov21_021DB708(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, enum HeapID heapID); static void ov21_021DB78C(UnkStruct_ov21_021DC96C *param0); static void ov21_021DB81C(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *param1, int param2, int param3); static void ov21_021DB79C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2); @@ -129,9 +129,9 @@ static void ov21_021DB9B4(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *p static void ov21_021DBA24(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *param1); static void ov21_021DBAB8(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *param1); static void ov21_021DBB74(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *param1); -static void ov21_021DBBE4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2); +static void ov21_021DBBE4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, enum HeapID heapID); static void ov21_021DBDA0(UnkStruct_ov21_021DC96C *param0); -static void ov21_021DBDC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2); +static void ov21_021DBDC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, enum HeapID heapID); static void ov21_021DBE2C(UnkStruct_ov21_021DC96C *param0); static void ov21_021DBE98(UnkStruct_ov21_021DC96C *param0, PokedexDisplayBox *displayBox, PokedexTextManager *textMan, int param3, int param4); static void ov21_021DBE3C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2); @@ -561,7 +561,7 @@ static int ov21_021D9960(void *graphics, PokedexGraphicsManager *graphicsMan, co return 0; } -static void ov21_021D9A08(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, const UnkStruct_ov21_021D95B8 *param2, const UnkStruct_ov21_021D9B24 *param3, int heapID) +static void ov21_021D9A08(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, const UnkStruct_ov21_021D95B8 *param2, const UnkStruct_ov21_021D9B24 *param3, enum HeapID heapID) { ov21_021D9A74(param1, param2, heapID); ov21_021DB50C(param0, param1, heapID); @@ -578,7 +578,7 @@ static void ov21_021D9A4C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95 PokedexGraphics_SetDrawCursor(¶m1->unk_00->cursorGraphics, 0); } -static void ov21_021D9A74(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_021D95B8 *param1, int heapID) +static void ov21_021D9A74(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID) { void *v0; NNSG2dScreenData *v1; @@ -2275,23 +2275,23 @@ static BOOL ov21_021DB4E4(UnkStruct_ov21_021D95CC *param0, BOOL param1) return 0; } -static void ov21_021DB50C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2) +static void ov21_021DB50C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, enum HeapID heapID) { PokedexGraphicData *v0 = param1->unk_00; NARC *v1 = PokedexGraphics_GetNARC(param1->unk_00); - param0->unk_E4[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, search_buttons_NCGR_lz, TRUE, search_buttons_NCGR_lz + 16000, NNS_G2D_VRAM_TYPE_2DSUB, param2); + param0->unk_E4[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, search_buttons_NCGR_lz, TRUE, search_buttons_NCGR_lz + 16000, NNS_G2D_VRAM_TYPE_2DSUB, heapID); SpriteTransfer_RequestCharAtEnd(param0->unk_E4[0]); SpriteResource_ReleaseData(param0->unk_E4[0]); - param0->unk_E4[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, buttons_NCLR, FALSE, buttons_NCLR + 16000, NNS_G2D_VRAM_TYPE_2DSUB, 6, param2); + param0->unk_E4[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, buttons_NCLR, FALSE, buttons_NCLR + 16000, NNS_G2D_VRAM_TYPE_2DSUB, 6, heapID); SpriteTransfer_RequestPlttFreeSpace(param0->unk_E4[1]); SpriteResource_ReleaseData(param0->unk_E4[1]); - param0->unk_E4[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, search_buttons_cell_NCER_lz, TRUE, search_buttons_cell_NCER_lz + 16000, 2, param2); - param0->unk_E4[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, search_buttons_anim_NANR_lz, TRUE, search_buttons_anim_NANR_lz + 16000, 3, param2); + param0->unk_E4[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, search_buttons_cell_NCER_lz, TRUE, search_buttons_cell_NCER_lz + 16000, 2, heapID); + param0->unk_E4[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, search_buttons_anim_NANR_lz, TRUE, search_buttons_anim_NANR_lz + 16000, 3, heapID); } static void ov21_021DB5DC(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1) @@ -2307,18 +2307,18 @@ static void ov21_021DB5DC(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95 SpriteResourceCollection_Remove(v0->spriteResourceCollection[3], param0->unk_E4[3]); } -static void ov21_021DB634(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2) +static void ov21_021DB634(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, enum HeapID heapID) { PokedexGraphicData *v0 = param1->unk_00; NARC *v1 = PokedexGraphics_GetNARC(param1->unk_00); - param0->unk_F4[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, search_button_forms_NCGR_lz, TRUE, search_button_forms_NCGR_lz + 16000, NNS_G2D_VRAM_TYPE_2DSUB, param2); + param0->unk_F4[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, search_button_forms_NCGR_lz, TRUE, search_button_forms_NCGR_lz + 16000, NNS_G2D_VRAM_TYPE_2DSUB, heapID); SpriteTransfer_RequestCharAtEnd(param0->unk_F4[0]); SpriteResource_ReleaseData(param0->unk_F4[0]); - param0->unk_F4[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, search_button_forms_cell_NCER_lz, TRUE, search_button_forms_cell_NCER_lz + 16000, 2, param2); - param0->unk_F4[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, search_button_forms_anim_NANR_lz, TRUE, search_button_forms_anim_NANR_lz + 16000, 3, param2); + param0->unk_F4[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, search_button_forms_cell_NCER_lz, TRUE, search_button_forms_cell_NCER_lz + 16000, 2, heapID); + param0->unk_F4[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, search_button_forms_anim_NANR_lz, TRUE, search_button_forms_anim_NANR_lz + 16000, 3, heapID); } static void ov21_021DB6C8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1) @@ -2331,7 +2331,7 @@ static void ov21_021DB6C8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95 SpriteResourceCollection_Remove(v0->spriteResourceCollection[3], param0->unk_F4[3]); } -static void ov21_021DB708(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2) +static void ov21_021DB708(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, enum HeapID heapID) { SpriteResourcesHeader v0; SpriteListTemplate v1; @@ -2344,7 +2344,7 @@ static void ov21_021DB708(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95 v1.resourceData = &v0; v1.priority = 32; v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB; - v1.heapID = param2; + v1.heapID = heapID; ov21_021DB858(param0, &v1); ov21_021DB81C(param0, &v1, param0->unk_104, param0->unk_108); @@ -2581,7 +2581,7 @@ static void ov21_021DBB74(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *p } } -static void ov21_021DBBE4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2) +static void ov21_021DBBE4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, enum HeapID heapID) { SpriteResourcesHeader v0; SpriteListTemplate v1; @@ -2594,7 +2594,7 @@ static void ov21_021DBBE4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95 v1.resourceData = &v0; v1.priority = 15; v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB; - v1.heapID = param2; + v1.heapID = heapID; for (v3 = 0; v3 < 5; v3++) { v1.position.y = 16 + (v3 * (48 - 16)); @@ -2668,7 +2668,7 @@ static void ov21_021DBDA0(UnkStruct_ov21_021DC96C *param0) } } -static void ov21_021DBDC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2) +static void ov21_021DBDC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, enum HeapID heapID) { PokedexDisplayBox displayBox; SpriteResource *v1; @@ -2681,7 +2681,7 @@ static void ov21_021DBDC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95 displayBox.spriteResourcePriority = 0; displayBox.spriteListPriority = 0; displayBox.vramType = NNS_G2D_VRAM_TYPE_2DSUB; - displayBox.heapID = param2; + displayBox.heapID = heapID; ov21_021DBEC8(param0, &displayBox, v2->textMan); ov21_021DBE98(param0, &displayBox, v2->textMan, param0->unk_104, param0->unk_108); diff --git a/src/applications/pokedex/ov21_021DDD2C.c b/src/applications/pokedex/ov21_021DDD2C.c index 51f701a10e..288f523773 100644 --- a/src/applications/pokedex/ov21_021DDD2C.c +++ b/src/applications/pokedex/ov21_021DDD2C.c @@ -90,16 +90,16 @@ static void ov21_021DE3D0(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDD static void ov21_021DE5A4(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1); static void ov21_021DE358(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1); static void ov21_021DE630(PokedexGraphicData **param0, const UnkStruct_ov21_021DDE4C *param1, const UnkStruct_ov21_021DDDA4 *param2); -static void ov21_021DE100(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData **param1, int heapID); +static void ov21_021DE100(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData **param1, enum HeapID heapID); static void ov21_021DE128(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData **param1, int param2); -static void ov21_021DE13C(PokedexGraphicData **param0, int heapID); +static void ov21_021DE13C(PokedexGraphicData **param0, enum HeapID heapID); static void ov21_021DE1A4(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData **param1, int param2); static void ov21_021DE224(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData **param1); static void ov21_021DE258(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData **param1, int param2); static void ov21_021DE2E0(UnkStruct_ov21_021DDEC8 *param0); static void ov21_021DE49C(UnkStruct_ov21_021DDEC8 *param0, const UnkStruct_ov21_021DDDA4 *param1, const UnkStruct_ov21_021DDE4C *param2); static int ov21_021DE5DC(int param0); -static void ov21_021DE4D4(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021DDDA4 *param2, int heapID); +static void ov21_021DE4D4(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021DDDA4 *param2, enum HeapID heapID); void ov21_021DDD2C(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID) { @@ -365,7 +365,7 @@ static BOOL ov21_021DE0C4(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData ** return 0; } -static void ov21_021DE100(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData **param1, int heapID) +static void ov21_021DE100(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData **param1, enum HeapID heapID) { ov21_021DE13C(param1, heapID); ov21_021DE1A4(param0, param1, heapID); @@ -378,7 +378,7 @@ static void ov21_021DE128(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData ** ov21_021DE224(param0, param1); } -static void ov21_021DE13C(PokedexGraphicData **param0, int heapID) +static void ov21_021DE13C(PokedexGraphicData **param0, enum HeapID heapID) { void *v0; NNSG2dScreenData *v1; @@ -584,7 +584,7 @@ static void ov21_021DE49C(UnkStruct_ov21_021DDEC8 *param0, const UnkStruct_ov21_ Sprite_SetAnim(param0->unk_00, ov21_021DCA28(param1->unk_00)); } -static void ov21_021DE4D4(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021DDDA4 *param2, int heapID) +static void ov21_021DE4D4(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021DDDA4 *param2, enum HeapID heapID) { int v0; int v1 = 0; diff --git a/src/applications/pokedex/ov21_021DE668.c b/src/applications/pokedex/ov21_021DE668.c index 56e71d30cc..87e997feb4 100644 --- a/src/applications/pokedex/ov21_021DE668.c +++ b/src/applications/pokedex/ov21_021DE668.c @@ -72,13 +72,13 @@ static void ov21_021DF6C4(UnkStruct_ov21_021DF374 *param0, int param1, int param static BOOL ov21_021DF6E0(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData **param1); static void ov21_021DF6FC(UnkStruct_ov21_021DF374 *param0); static BOOL ov21_021DF718(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData **param1); -static void ov21_021DE9A4(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021DE6D4 *param2, int heapID); +static void ov21_021DE9A4(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021DE6D4 *param2, enum HeapID heapID); static void ov21_021DEA0C(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData **param1); -static void ov21_021DEA44(PokedexGraphicData **param0, int heapID); +static void ov21_021DEA44(PokedexGraphicData **param0, enum HeapID heapID); static void ov21_021DEB58(PokedexGraphicData **param0, const UnkStruct_ov21_021DE6D4 *param1, int param2); -static void ov21_021DEC2C(Window *param0, int heapID, int param2, u32 param3); -static void ov21_021DEC80(Window *param0, int heapID, int param2, u32 param3); -static void ov21_021DECD4(Window *param0, int heapID, int param2, int param3, u32 param4); +static void ov21_021DEC2C(Window *param0, enum HeapID heapID, int param2, u32 param3); +static void ov21_021DEC80(Window *param0, enum HeapID heapID, int param2, u32 param3); +static void ov21_021DECD4(Window *param0, enum HeapID heapID, int param2, int param3, u32 param4); static void ov21_021DED24(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021DE6D4 *param2, int param3); static void ov21_021DED68(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData **param1); static void ov21_021DED7C(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData **param1, int param2, int param3); @@ -353,7 +353,7 @@ static int ov21_021DE8E8(void *graphics, PokedexGraphicsManager *graphicsMan, co return 0; } -static void ov21_021DE9A4(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021DE6D4 *param2, int heapID) +static void ov21_021DE9A4(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021DE6D4 *param2, enum HeapID heapID) { ov21_021DEF08(param1, param2, heapID); ov21_021DEF54(param1, param2); @@ -381,7 +381,7 @@ static void ov21_021DEA0C(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData ** Bg_ClearTilemap((*param1)->bgConfig, 1); } -static void ov21_021DEA44(PokedexGraphicData **param0, int heapID) +static void ov21_021DEA44(PokedexGraphicData **param0, enum HeapID heapID) { void *v0; NNSG2dScreenData *v1; @@ -435,7 +435,7 @@ void ov21_021DEB8C(Window *param0, int param1, enum HeapID heapID, int param3, u ov21_021DECD4(param0, heapID, param1, param3, param4); } -static void ov21_021DEC2C(Window *param0, int heapID, int param2, u32 param3) +static void ov21_021DEC2C(Window *param0, enum HeapID heapID, int param2, u32 param3) { String *v0 = String_Init(64, heapID); @@ -448,7 +448,7 @@ static void ov21_021DEC2C(Window *param0, int heapID, int param2, u32 param3) MessageLoader_Free(v1); } -static void ov21_021DEC80(Window *param0, int heapID, int param2, u32 param3) +static void ov21_021DEC80(Window *param0, enum HeapID heapID, int param2, u32 param3) { String *v0 = String_Init(64, heapID); @@ -461,7 +461,7 @@ static void ov21_021DEC80(Window *param0, int heapID, int param2, u32 param3) MessageLoader_Free(v1); } -static void ov21_021DECD4(Window *param0, int heapID, int param2, int param3, u32 param4) +static void ov21_021DECD4(Window *param0, enum HeapID heapID, int param2, int param3, u32 param4) { String *v0 = PokedexText_DexEntry(param2, GAME_LANGUAGE, param3, heapID); u32 v1 = Font_CalcMaxLineWidth(FONT_SYSTEM, v0, 0); diff --git a/src/applications/pokedex/ov21_021DF734.c b/src/applications/pokedex/ov21_021DF734.c index eb90312fb7..e6f3adcddc 100644 --- a/src/applications/pokedex/ov21_021DF734.c +++ b/src/applications/pokedex/ov21_021DF734.c @@ -86,9 +86,9 @@ static BOOL ov21_021E015C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF8 static int ov21_021E01CC(int species, const UnkStruct_ov21_021DF844 *param1); static int ov21_021E0268(int species, const UnkStruct_ov21_021DF844 *param1); static int ov21_021E02F0(int species, const UnkStruct_ov21_021DF844 *param1); -static void ov21_021DFA84(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int heapID); +static void ov21_021DFA84(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, enum HeapID heapID); static void ov21_021DFACC(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1); -static void ov21_021DFAE8(UnkStruct_ov21_021DF858 *param0, int heapID); +static void ov21_021DFAE8(UnkStruct_ov21_021DF858 *param0, enum HeapID heapID); static void ov21_021DFD1C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, int param2); static void ov21_021DFDC8(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1); static void ov21_021DFE0C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3); @@ -403,7 +403,7 @@ static int ov21_021DFA18(void *graphics, PokedexGraphicsManager *graphicsMan, co return 0; } -static void ov21_021DFA84(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int heapID) +static void ov21_021DFA84(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, enum HeapID heapID) { ov21_021DFB50(param0, param1, param2); ov21_021DFD1C(param0, param1, heapID); @@ -419,7 +419,7 @@ static void ov21_021DFACC(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF8 ov21_021DFDC8(param0, param1); } -static void ov21_021DFAE8(UnkStruct_ov21_021DF858 *param0, int heapID) +static void ov21_021DFAE8(UnkStruct_ov21_021DF858 *param0, enum HeapID heapID) { void *v0; NNSG2dScreenData *v1; diff --git a/src/applications/pokedex/ov21_021E0C68.c b/src/applications/pokedex/ov21_021E0C68.c index 8c764c5df2..c9fb1764a0 100644 --- a/src/applications/pokedex/ov21_021E0C68.c +++ b/src/applications/pokedex/ov21_021E0C68.c @@ -75,9 +75,9 @@ static void ov21_021E17EC(UnkStruct_ov21_021E14D4 *param0, int param1, int param static BOOL ov21_021E1808(UnkStruct_ov21_021E14D4 *param0, PokedexGraphicData **param1); static void ov21_021E1824(UnkStruct_ov21_021E14D4 *param0); static BOOL ov21_021E1840(UnkStruct_ov21_021E14D4 *param0, PokedexGraphicData **param1); -static void ov21_021E0F4C(UnkStruct_ov21_021E14D4 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021E0D68 *param2, int heapID); +static void ov21_021E0F4C(UnkStruct_ov21_021E14D4 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021E0D68 *param2, enum HeapID heapID); static void ov21_021E0F94(UnkStruct_ov21_021E14D4 *param0, PokedexGraphicData **param1); -static void ov21_021E0FBC(PokedexGraphicData **param0, int heapID); +static void ov21_021E0FBC(PokedexGraphicData **param0, enum HeapID heapID); static void ov21_021E10D0(PokedexGraphicData **param0, const UnkStruct_ov21_021E0D68 *param1, enum HeapID heapID); static void ov21_021E1188(PokedexGraphicData **param0, int param1, int param2, int param3, int param4); static int LanguageMessage(int param0); @@ -360,7 +360,7 @@ static int ov21_021E0E90(void *graphics, PokedexGraphicsManager *graphicsMan, co return 0; } -static void ov21_021E0F4C(UnkStruct_ov21_021E14D4 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021E0D68 *param2, int heapID) +static void ov21_021E0F4C(UnkStruct_ov21_021E14D4 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021E0D68 *param2, enum HeapID heapID) { ov21_021E11DC(param1, param2, heapID); ov21_021E1228(param1, param2); @@ -379,7 +379,7 @@ static void ov21_021E0F94(UnkStruct_ov21_021E14D4 *param0, PokedexGraphicData ** Bg_ClearTilemap((*param1)->bgConfig, 1); } -static void ov21_021E0FBC(PokedexGraphicData **param0, int heapID) +static void ov21_021E0FBC(PokedexGraphicData **param0, enum HeapID heapID) { void *v0; NNSG2dScreenData *v1; diff --git a/src/applications/pokedex/ov21_021E1924.c b/src/applications/pokedex/ov21_021E1924.c index ee4d6504c4..cd2548e9c6 100644 --- a/src/applications/pokedex/ov21_021E1924.c +++ b/src/applications/pokedex/ov21_021E1924.c @@ -95,14 +95,14 @@ static void ov21_021E1D40(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A static void ov21_021E1E00(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1); static void ov21_021E1E74(UnkStruct_ov21_021E1E74 *param0); static void ov21_021E1E8C(u32 param0, enum TouchScreenButtonState param1, void *param2); -static void ov21_021E26A0(PokedexGraphicData **param0, Sprite *param1, PokedexTextData *textData, int param3, int param4, int param5, int *param6, int heapID, int param8, int param9, void **param10); +static void ov21_021E26A0(PokedexGraphicData **param0, Sprite *param1, PokedexTextData *textData, int param3, int param4, int param5, int *param6, enum HeapID heapID, int param8, int param9, void **param10); static void ov21_021E274C(Sprite *param0, PokedexTextData *textData, int param2, int param3, int param4); static void ov21_021E28D0(UnkStruct_ov21_021E2588 *param0, const UnkStruct_ov21_021E1E74 *param1); static void ov21_021E29A4(Sprite *param0, int param1, int param2); static void ov21_021E2968(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1); -static void ov21_021E2014(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData **param1, int heapID); -static void ov21_021E2044(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData **param1, int heapID); -static void ov21_021E20A4(PokedexGraphicData **param0, int heapID); +static void ov21_021E2014(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData **param1, enum HeapID heapID); +static void ov21_021E2044(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData **param1, enum HeapID heapID); +static void ov21_021E20A4(PokedexGraphicData **param0, enum HeapID heapID); static void ov21_021E2180(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData **param1, int param2); static void ov21_021E226C(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData **param1); static void ov21_021E22C8(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData **param1, int param2); @@ -607,7 +607,7 @@ static void ov21_021E1E8C(u32 param0, enum TouchScreenButtonState param1, void * } } -static void ov21_021E2014(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData **param1, int heapID) +static void ov21_021E2014(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData **param1, enum HeapID heapID) { ov21_021E20A4(param1, heapID); ov21_021E2180(param0, param1, heapID); @@ -615,7 +615,7 @@ static void ov21_021E2014(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData ** ov21_021E2478(param0, param1, heapID); } -static void ov21_021E2044(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData **param1, int heapID) +static void ov21_021E2044(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData **param1, enum HeapID heapID) { int v0; @@ -632,7 +632,7 @@ static void ov21_021E2044(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData ** } } -static void ov21_021E20A4(PokedexGraphicData **param0, int heapID) +static void ov21_021E20A4(PokedexGraphicData **param0, enum HeapID heapID) { void *v0; NNSG2dScreenData *v1; @@ -902,7 +902,7 @@ static BOOL ov21_021E2664(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData ** return 0; } -static void ov21_021E26A0(PokedexGraphicData **param0, Sprite *param1, PokedexTextData *textData, int param3, int param4, int param5, int *param6, int heapID, int param8, int param9, void **param10) +static void ov21_021E26A0(PokedexGraphicData **param0, Sprite *param1, PokedexTextData *textData, int param3, int param4, int param5, int *param6, enum HeapID heapID, int param8, int param9, void **param10) { int v0; NNSG2dPaletteData *v1; diff --git a/src/applications/pokedex/ov21_021E29DC.c b/src/applications/pokedex/ov21_021E29DC.c index 7467f6cdac..fa9a78cc51 100644 --- a/src/applications/pokedex/ov21_021E29DC.c +++ b/src/applications/pokedex/ov21_021E29DC.c @@ -109,9 +109,9 @@ static BOOL ov21_021E2EC0(int param0); static BOOL ov21_021E2EC4(UnkStruct_ov21_021E2BA8 *param0, int param1, int param2); static void ov21_021E2E10(UnkStruct_ov21_021E2BA8 *param0); static void ov21_021E2E00(UnkStruct_ov21_021E2BA8 *param0); -static void ov21_021E3080(PokedexGraphicData **param0, UnkStruct_ov21_021E326C *param1, const UnkStruct_ov21_021E2BA8 *param2, int heapID); +static void ov21_021E3080(PokedexGraphicData **param0, UnkStruct_ov21_021E326C *param1, const UnkStruct_ov21_021E2BA8 *param2, enum HeapID heapID); static void ov21_021E30BC(PokedexGraphicData **param0, UnkStruct_ov21_021E326C *param1); -static void ov21_021E30E4(PokedexGraphicData **param0, const UnkStruct_ov21_021E2BA8 *param1, int heapID); +static void ov21_021E30E4(PokedexGraphicData **param0, const UnkStruct_ov21_021E2BA8 *param1, enum HeapID heapID); static void ov21_021E3178(PokedexGraphicData **param0, UnkStruct_ov21_021E326C *param1, int param2); static void ov21_021E3224(PokedexGraphicData **param0, UnkStruct_ov21_021E326C *param1); static void ov21_021E3268(PokedexGraphicData **param0, UnkStruct_ov21_021E326C *param1, int param2); @@ -153,9 +153,9 @@ static BOOL ov21_021E3F98(PokedexGraphicData **param0, BOOL param1); static void ov21_021E3C2C(UnkStruct_ov21_021E342C *param0); static void ov21_021E3C34(UnkStruct_ov21_021E342C *param0); static void ov21_021E3C64(UnkStruct_ov21_021E342C *param0); -static void ov21_021E3900(UnkStruct_ov21_021E3900 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021E342C *param2, int heapID); +static void ov21_021E3900(UnkStruct_ov21_021E3900 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021E342C *param2, enum HeapID heapID); static void ov21_021E393C(UnkStruct_ov21_021E3900 *param0, PokedexGraphicData **param1); -static void ov21_021E3960(PokedexGraphicData **param0, const UnkStruct_ov21_021E342C *param1, int heapID); +static void ov21_021E3960(PokedexGraphicData **param0, const UnkStruct_ov21_021E342C *param1, enum HeapID heapID); static void ov21_021E39FC(UnkStruct_ov21_021E3900 *param0, PokedexGraphicData **param1, int param2); static void ov21_021E3AAC(UnkStruct_ov21_021E3900 *param0, PokedexGraphicData **param1); static void ov21_021E3AF0(UnkStruct_ov21_021E3900 *param0, PokedexGraphicData **param1, int param2); @@ -605,7 +605,7 @@ static BOOL ov21_021E2EC4(UnkStruct_ov21_021E2BA8 *param0, int param1, int param return v2; } -static void ov21_021E3080(PokedexGraphicData **param0, UnkStruct_ov21_021E326C *param1, const UnkStruct_ov21_021E2BA8 *param2, int heapID) +static void ov21_021E3080(PokedexGraphicData **param0, UnkStruct_ov21_021E326C *param1, const UnkStruct_ov21_021E2BA8 *param2, enum HeapID heapID) { ov21_021E30E4(param0, param2, heapID); ov21_021E3178(param0, param1, heapID); @@ -623,7 +623,7 @@ static void ov21_021E30BC(PokedexGraphicData **param0, UnkStruct_ov21_021E326C * Bg_ClearTilemap((*param0)->bgConfig, 2); } -static void ov21_021E30E4(PokedexGraphicData **param0, const UnkStruct_ov21_021E2BA8 *param1, int heapID) +static void ov21_021E30E4(PokedexGraphicData **param0, const UnkStruct_ov21_021E2BA8 *param1, enum HeapID heapID) { void *v0; NNSG2dScreenData *v1; @@ -1175,7 +1175,7 @@ static void ov21_021E37CC(u32 param0, enum TouchScreenButtonState param1, void * } } -static void ov21_021E3900(UnkStruct_ov21_021E3900 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021E342C *param2, int heapID) +static void ov21_021E3900(UnkStruct_ov21_021E3900 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021E342C *param2, enum HeapID heapID) { ov21_021E3960(param1, param2, heapID); ov21_021E39FC(param0, param1, heapID); @@ -1192,7 +1192,7 @@ static void ov21_021E393C(UnkStruct_ov21_021E3900 *param0, PokedexGraphicData ** Bg_ClearTilemap((*param1)->bgConfig, 5); } -static void ov21_021E3960(PokedexGraphicData **param0, const UnkStruct_ov21_021E342C *param1, int heapID) +static void ov21_021E3960(PokedexGraphicData **param0, const UnkStruct_ov21_021E342C *param1, enum HeapID heapID) { void *v0; NNSG2dScreenData *v1; diff --git a/src/applications/pokedex/ov21_021E3FFC.c b/src/applications/pokedex/ov21_021E3FFC.c index 236ca8d256..135b1683a1 100644 --- a/src/applications/pokedex/ov21_021E3FFC.c +++ b/src/applications/pokedex/ov21_021E3FFC.c @@ -92,15 +92,15 @@ static void ov21_021E43C8(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E41 static BOOL ov21_021E4440(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, BOOL param3); static void ov21_021E448C(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, BOOL param3); static BOOL ov21_021E4518(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, BOOL param3); -static void ov21_021E4590(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, const UnkStruct_ov21_021E4898 *param3, int heapID); +static void ov21_021E4590(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, const UnkStruct_ov21_021E4898 *param3, enum HeapID heapID); static void ov21_021E45DC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1); -static void ov21_021E45FC(UnkStruct_ov21_021E4108 *param0, const UnkStruct_ov21_021E40F4 *param1, int heapID); +static void ov21_021E45FC(UnkStruct_ov21_021E4108 *param0, const UnkStruct_ov21_021E40F4 *param1, enum HeapID heapID); static void ov21_021E4664(UnkStruct_ov21_021E4108 *param0); -static void ov21_021E46A8(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, int param2); +static void ov21_021E46A8(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, enum HeapID heapID); static void ov21_021E4770(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1); -static void ov21_021E47CC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, int param2); +static void ov21_021E47CC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, enum HeapID heapID); static void ov21_021E4868(UnkStruct_ov21_021E4360 *param0); -static void ov21_021E4890(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, int param3); +static void ov21_021E4890(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, enum HeapID heapID); static void ov21_021E4894(UnkStruct_ov21_021E4360 *param0); static void ov21_021E4898(UnkStruct_ov21_021E4898 *param0, UnkStruct_ov21_021E40F4 *param1); static void ov21_021E4ABC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1); @@ -489,7 +489,7 @@ static BOOL ov21_021E4518(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E41 return 0; } -static void ov21_021E4590(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, const UnkStruct_ov21_021E4898 *param3, int heapID) +static void ov21_021E4590(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, const UnkStruct_ov21_021E4898 *param3, enum HeapID heapID) { ov21_021E45FC(param1, param2, heapID); ov21_021E46A8(param0, param1, heapID); @@ -508,7 +508,7 @@ static void ov21_021E45DC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E41 ov21_021E4664(param1); } -static void ov21_021E45FC(UnkStruct_ov21_021E4108 *param0, const UnkStruct_ov21_021E40F4 *param1, int heapID) +static void ov21_021E45FC(UnkStruct_ov21_021E4108 *param0, const UnkStruct_ov21_021E40F4 *param1, enum HeapID heapID) { void *v0; NNSG2dScreenData *v1; @@ -529,23 +529,23 @@ static void ov21_021E4664(UnkStruct_ov21_021E4108 *param0) Window_SetPalette(¶m0->unk_00->window, 0); } -static void ov21_021E46A8(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, int param2) +static void ov21_021E46A8(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, enum HeapID heapID) { PokedexGraphicData *v0 = param1->unk_00; NARC *v1 = PokedexGraphics_GetNARC(param1->unk_00); - param0->unk_314[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, cry_bar_NCGR_lz, TRUE, cry_bar_NCGR_lz + 11000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); + param0->unk_314[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, cry_bar_NCGR_lz, TRUE, cry_bar_NCGR_lz + 11000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); SpriteTransfer_RequestCharAtEnd(param0->unk_314[0]); SpriteResource_ReleaseData(param0->unk_314[0]); - param0->unk_314[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, cry_bar_NCLR, FALSE, cry_bar_NCLR + 11000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param2); + param0->unk_314[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, cry_bar_NCLR, FALSE, cry_bar_NCLR + 11000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, heapID); SpriteTransfer_RequestPlttFreeSpace(param0->unk_314[1]); SpriteResource_ReleaseData(param0->unk_314[1]); - param0->unk_314[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, cry_bar_cell_NCER_lz, TRUE, cry_bar_cell_NCER_lz + 11000, 2, param2); - param0->unk_314[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, cry_bar_anim_NANR_lz, TRUE, cry_bar_anim_NANR_lz + 11000, 3, param2); + param0->unk_314[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, cry_bar_cell_NCER_lz, TRUE, cry_bar_cell_NCER_lz + 11000, 2, heapID); + param0->unk_314[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, cry_bar_anim_NANR_lz, TRUE, cry_bar_anim_NANR_lz + 11000, 3, heapID); } static void ov21_021E4770(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1) @@ -561,7 +561,7 @@ static void ov21_021E4770(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E41 SpriteResourceCollection_Remove(v0->spriteResourceCollection[3], param0->unk_314[3]); } -static void ov21_021E47CC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, int param2) +static void ov21_021E47CC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, enum HeapID heapID) { SpriteResourcesHeader v0; SpriteListTemplate v1; @@ -574,7 +574,7 @@ static void ov21_021E47CC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E41 v1.resourceData = &v0; v1.priority = 17; v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN; - v1.heapID = param2; + v1.heapID = heapID; v1.position.x = 0; v1.position.y = 0; @@ -600,7 +600,7 @@ static void ov21_021E4868(UnkStruct_ov21_021E4360 *param0) } } -static void ov21_021E4890(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, int param3) +static void ov21_021E4890(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, enum HeapID heapID) { return; } diff --git a/src/applications/pokedex/ov21_021E68F4.c b/src/applications/pokedex/ov21_021E68F4.c index 25ecb3d136..8e0b3ce743 100644 --- a/src/applications/pokedex/ov21_021E68F4.c +++ b/src/applications/pokedex/ov21_021E68F4.c @@ -90,9 +90,9 @@ static void ov21_021E728C(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData ** static void ov21_021E72E8(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1); static void ov21_021E732C(PokedexGraphicData **param0, const UnkStruct_ov21_021E6A20 *param1); static void ov21_021E7368(PokedexGraphicData **param0, int param1, int param2, int param3, int param4); -static void ov21_021E6E64(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData **param1, int heapID); -static void ov21_021E6E94(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData **param1, int heapID); -static void ov21_021E6EF0(PokedexGraphicData **param0, int heapID); +static void ov21_021E6E64(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData **param1, enum HeapID heapID); +static void ov21_021E6E94(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData **param1, enum HeapID heapID); +static void ov21_021E6EF0(PokedexGraphicData **param0, enum HeapID heapID); static void ov21_021E6F58(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData **param1, int param2); static void ov21_021E6FD8(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData **param1); static void ov21_021E700C(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData **param1, int param2); @@ -485,7 +485,7 @@ static void ov21_021E6E04(u32 param0, enum TouchScreenButtonState param1, void * } } -static void ov21_021E6E64(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData **param1, int heapID) +static void ov21_021E6E64(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData **param1, enum HeapID heapID) { ov21_021E6EF0(param1, heapID); ov21_021E6F58(param0, param1, heapID); @@ -493,7 +493,7 @@ static void ov21_021E6E64(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData ** ov21_021E70D4(param0, param1, heapID); } -static void ov21_021E6E94(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData **param1, int heapID) +static void ov21_021E6E94(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData **param1, enum HeapID heapID) { int v0; @@ -510,7 +510,7 @@ static void ov21_021E6E94(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData ** } } -static void ov21_021E6EF0(PokedexGraphicData **param0, int heapID) +static void ov21_021E6EF0(PokedexGraphicData **param0, enum HeapID heapID) { void *v0; NNSG2dScreenData *v1; @@ -645,7 +645,7 @@ static void ov21_021E71B8(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData ** } } -static void ov21_021E71D0(PokedexGraphicData **param0, Sprite *param1, PokedexTextData *textData, int param3, int param4, int param5, int *param6, int heapID, int param8, int param9, void **param10) +static void ov21_021E71D0(PokedexGraphicData **param0, Sprite *param1, PokedexTextData *textData, int param3, int param4, int param5, int *param6, enum HeapID heapID, int param8, int param9, void **param10) { int v0; NNSG2dPaletteData *v1; diff --git a/src/applications/pokedex/ov21_021E737C.c b/src/applications/pokedex/ov21_021E737C.c index eaa28232ff..571f2483a2 100644 --- a/src/applications/pokedex/ov21_021E737C.c +++ b/src/applications/pokedex/ov21_021E737C.c @@ -150,7 +150,7 @@ static void ov21_021E7CF0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74 static void ov21_021E7CF4(UnkStruct_ov21_021E7714 *param0); static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, enum HeapID heapID); static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, enum HeapID heapID); -static void ov21_021E7EC0(UnkStruct_ov21_021E747C *param0, int heapID); +static void ov21_021E7EC0(UnkStruct_ov21_021E747C *param0, enum HeapID heapID); static void ov21_021E7F20(UnkStruct_ov21_021E747C *param0); static void ov21_021E7F40(UnkStruct_ov21_021E747C *param0, int param1); static void ov21_021E7F7C(UnkStruct_ov21_021E747C *param0); @@ -748,7 +748,7 @@ static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_ MessageLoader_Free(v1); } -static void ov21_021E7EC0(UnkStruct_ov21_021E747C *param0, int heapID) +static void ov21_021E7EC0(UnkStruct_ov21_021E747C *param0, enum HeapID heapID) { SoftwareSpriteCharsTemplate v0; SoftwareSpritePaletteTemplate v1; diff --git a/src/applications/pokedex/ov21_021E8D48.c b/src/applications/pokedex/ov21_021E8D48.c index 6246b243f5..c29daf9f07 100644 --- a/src/applications/pokedex/ov21_021E8D48.c +++ b/src/applications/pokedex/ov21_021E8D48.c @@ -85,13 +85,13 @@ static void ov21_021E98F8(PaletteData *param0, PokemonSprite *param1, int param2 static BOOL ov21_021E9948(PaletteData *param0, PokemonSprite *param1); static void ov21_021E8E0C(UnkStruct_ov21_021E8D48 *param0, const UnkStruct_ov21_021E8E0C *param1); static void ov21_021E900C(UnkStruct_ov21_021E8D48 *param0); -static void ov21_021E90B0(BgConfig *param0, int heapID); +static void ov21_021E90B0(BgConfig *param0, enum HeapID heapID); static void ov21_021E9194(BgConfig *param0); -static Window *ov21_021E91B0(BgConfig *param0, int heapID); +static Window *ov21_021E91B0(BgConfig *param0, enum HeapID heapID); static void ov21_021E91F0(Window *param0); -static void ov21_021E9208(SpriteResourceCollection **param0, int heapID); +static void ov21_021E9208(SpriteResourceCollection **param0, enum HeapID heapID); static void ov21_021E9228(SpriteResourceCollection **param0); -static void ov21_021E9240(PokedexSpeciesLabel *param0, PokedexTextManager *textMan, int param2, int param3, int param4); +static void ov21_021E9240(PokedexSpeciesLabel *pokedexSpeciesLabel, PokedexTextManager *textMan, enum HeapID heapID, int species, int isNatDex); static void ov21_021E92B0(PokedexSpeciesLabel *param0); static PokemonSprite *ov21_021E99E0(PokemonSpriteManager *param0, Pokemon *param1, int param2, int param3, int param4); static void ov21_021E92C4(SpriteResource **param0, SpriteResourceCollection **param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9); @@ -116,7 +116,7 @@ static void ov21_021E9968(Window *param0, int param1, int param2); static void ov21_021E998C(Window *param0, enum HeapID heapID); static void ov21_021E9A0C(int param0); static void ov21_021E9A38(void); -static void ov21_021E9A40(UnkStruct_ov21_021E9A9C *param0, int param1, int param2, NARC *param3); +static void ov21_021E9A40(UnkStruct_ov21_021E9A9C *param0, enum HeapID heapID, int param2, NARC *param3); static void ov21_021E9A9C(UnkStruct_ov21_021E9A9C *param0); static void ov21_021E9AC8(UnkStruct_ov21_021E9A9C *param0); static void ov21_021E9AE8(UnkStruct_ov21_021E9A9C *param0, int param1); @@ -264,7 +264,7 @@ static void ov21_021E900C(UnkStruct_ov21_021E8D48 *param0) ov21_021E9A38(); } -static void ov21_021E90B0(BgConfig *param0, int heapID) +static void ov21_021E90B0(BgConfig *param0, enum HeapID heapID) { { BgTemplate v0 = { @@ -344,7 +344,7 @@ static void ov21_021E9194(BgConfig *param0) Bg_FreeTilemapBuffer(param0, BG_LAYER_MAIN_3); } -static Window *ov21_021E91B0(BgConfig *param0, int heapID) +static Window *ov21_021E91B0(BgConfig *param0, enum HeapID heapID) { Window *v0 = Window_New(heapID, 1); @@ -362,7 +362,7 @@ static void ov21_021E91F0(Window *param0) Windows_Delete(param0, 1); } -static void ov21_021E9208(SpriteResourceCollection **param0, int heapID) +static void ov21_021E9208(SpriteResourceCollection **param0, enum HeapID heapID) { int i; @@ -381,7 +381,7 @@ static void ov21_021E9228(SpriteResourceCollection **param0) } } -static void ov21_021E9240(PokedexSpeciesLabel *pokedexSpeciesLabel, PokedexTextManager *textMan, int heapID, int species, int isNatDex) +static void ov21_021E9240(PokedexSpeciesLabel *pokedexSpeciesLabel, PokedexTextManager *textMan, enum HeapID heapID, int species, int isNatDex) { PokedexDisplayBox displayBox; Window *window; @@ -763,7 +763,7 @@ static void ov21_021E9A38(void) CharTransfer_Free(); } -static void ov21_021E9A40(UnkStruct_ov21_021E9A9C *param0, int heapID, int param2, NARC *param3) +static void ov21_021E9A40(UnkStruct_ov21_021E9A9C *param0, enum HeapID heapID, int param2, NARC *param3) { int v0; diff --git a/src/applications/pokedex/pokedex_main.c b/src/applications/pokedex/pokedex_main.c index 21bda37f7d..ef9e9aeedb 100644 --- a/src/applications/pokedex/pokedex_main.c +++ b/src/applications/pokedex/pokedex_main.c @@ -603,7 +603,7 @@ BOOL PokedexMain_LoadingScreenMove(PokedexLoadingScreen *loadingScreen) return TRUE; } -void PokedexMain_DisplayNameNumberText(Window *window, int dexNumber, int species, int heapID) +void PokedexMain_DisplayNameNumberText(Window *window, int dexNumber, int species, enum HeapID heapID) { String *numStr; String *nameNumber; @@ -624,7 +624,7 @@ void PokedexMain_DisplayNameNumberText(Window *window, int dexNumber, int specie PokedexText_Free(nameNumber); } -Window *PokedexMain_DisplayNameNumber(PokedexGraphicData *pokedexgraphicData, const PokedexSortData *pokedexSortData, int heapID, int species) +Window *PokedexMain_DisplayNameNumber(PokedexGraphicData *pokedexgraphicData, const PokedexSortData *pokedexSortData, enum HeapID heapID, int species) { Window *window; @@ -637,7 +637,7 @@ Window *PokedexMain_DisplayNameNumber(PokedexGraphicData *pokedexgraphicData, co return window; } -Window *PokedexMain_DisplayNameNumberNational(PokedexTextManager *textMan, int heapID, int species) +Window *PokedexMain_DisplayNameNumberNational(PokedexTextManager *textMan, enum HeapID heapID, int species) { Window *window = PokedexTextManager_NewWindow(textMan, 15, 2); PokedexMain_DisplayNameNumberText(window, species, species, heapID); @@ -645,7 +645,7 @@ Window *PokedexMain_DisplayNameNumberNational(PokedexTextManager *textMan, int h return window; } -Window *PokedexMain_DisplayNameNumberLocal(PokedexTextManager *textMan, int heapID, int species) +Window *PokedexMain_DisplayNameNumberLocal(PokedexTextManager *textMan, enum HeapID heapID, int species) { int dexNumber = Pokemon_SinnohDexNumber(species); @@ -659,7 +659,7 @@ Window *PokedexMain_DisplayNameNumberLocal(PokedexTextManager *textMan, int heap return window; } -void PokedexMain_EntryNameNumber(PokedexGraphicData *pokedexGraphicData, const PokedexSortData *pokedexSortData, int heapID, int statusIndex, fx32 x, fx32 y) +void PokedexMain_EntryNameNumber(PokedexGraphicData *pokedexGraphicData, const PokedexSortData *pokedexSortData, enum HeapID heapID, int statusIndex, fx32 x, fx32 y) { PokedexDisplayBox displayBox; VecFx32 position; diff --git a/src/applications/pokedex/pokedex_search.c b/src/applications/pokedex/pokedex_search.c index 5e1220779d..33095ccd6e 100644 --- a/src/applications/pokedex/pokedex_search.c +++ b/src/applications/pokedex/pokedex_search.c @@ -93,7 +93,7 @@ static void LoadingScreenTransition(PokedexSearchDisplay *searchDisplay, Pokedex static void LoadingScreenAnimation(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapID heapID); static void SearchingMessage(PokedexGraphicData **param0, enum HeapID heapID); static void ReturnSearchDisplay(PokedexGraphicData **param0, PokedexSearchDisplay *searchDisplay, enum HeapID heapID); -static void DefaultDisplay(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, const int *param3, int heapID); +static void DefaultDisplay(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, const int *param3, enum HeapID heapID); static void ClearScreen(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1); static void ov21_021D8B8C(PokedexGraphicData **param0, const PokedexSearchSettings *searchSettings, enum HeapID heapID); static void GetSearchGraphics(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, enum HeapID heapID); @@ -513,7 +513,7 @@ static int ExitPokedexSearch(void *graphics, PokedexGraphicsManager *graphicsMan return 0; } -static void DefaultDisplay(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, const int *param3, int heapID) +static void DefaultDisplay(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, const int *param3, enum HeapID heapID) { Bg_ClearTilemap((*param1)->bgConfig, 2); Bg_ClearTilemap((*param1)->bgConfig, 1); diff --git a/src/applications/rowan_intro/rowan_intro_app.c b/src/applications/rowan_intro/rowan_intro_app.c index 13ee7d39fa..13c32edd6a 100644 --- a/src/applications/rowan_intro/rowan_intro_app.c +++ b/src/applications/rowan_intro/rowan_intro_app.c @@ -312,28 +312,27 @@ static const ApplicationManagerTemplate sTvApplicationTemplate = { BOOL RowanIntro_Init(ApplicationManager *appMan, int *unusedState) { RowanIntro *manager; - int heapID = HEAP_ID_ROWAN_INTRO; - Heap_Create(HEAP_ID_APPLICATION, heapID, 0x40000); + Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_ROWAN_INTRO, 0x40000); - manager = ApplicationManager_NewData(appMan, sizeof(RowanIntro), heapID); + manager = ApplicationManager_NewData(appMan, sizeof(RowanIntro), HEAP_ID_ROWAN_INTRO); memset(manager, 0, sizeof(RowanIntro)); - manager->heapID = heapID; + manager->heapID = HEAP_ID_ROWAN_INTRO; manager->saveData = ((ApplicationArgs *)ApplicationManager_Args(appMan))->saveData; manager->options = SaveData_GetOptions(manager->saveData); manager->state = RI_STATE_FIRST_FADE_BLACK_START; manager->bufferedState = RI_STATE_FIRST_FADE_BLACK_START; manager->appMan = NULL; - manager->playerNamingScreenArgs = NamingScreenArgs_Init(heapID, NAMING_SCREEN_TYPE_PLAYER, 0, TRAINER_NAME_LEN, manager->options); - manager->rivalNamingScreenArgs = NamingScreenArgs_Init(heapID, NAMING_SCREEN_TYPE_RIVAL, 0, TRAINER_NAME_LEN, manager->options); + manager->playerNamingScreenArgs = NamingScreenArgs_Init(HEAP_ID_ROWAN_INTRO, NAMING_SCREEN_TYPE_PLAYER, 0, TRAINER_NAME_LEN, manager->options); + manager->rivalNamingScreenArgs = NamingScreenArgs_Init(HEAP_ID_ROWAN_INTRO, NAMING_SCREEN_TYPE_RIVAL, 0, TRAINER_NAME_LEN, manager->options); manager->bgLayer3TilemapIndex = 0; manager->bgLayer1TilemapIndex = 0; manager->bgLayer2TilemapIndex = 0; manager->bgSubLayer3TilemapIndex = 0; manager->delayUpdateCounter = 0; - manager->bunearyPalette = Heap_Alloc(heapID, 0x20); - manager->bunearyBlendedPalette = Heap_Alloc(heapID, 0x20); + manager->bunearyPalette = Heap_Alloc(HEAP_ID_ROWAN_INTRO, 0x20); + manager->bunearyBlendedPalette = Heap_Alloc(HEAP_ID_ROWAN_INTRO, 0x20); return TRUE; } diff --git a/src/applications/title_screen.c b/src/applications/title_screen.c index cbe4cf90b5..a1bbb9e8cb 100644 --- a/src/applications/title_screen.c +++ b/src/applications/title_screen.c @@ -199,7 +199,7 @@ typedef struct TitleScreen { } TitleScreen; typedef struct TitleScreenAppData { - int heapID; + enum HeapID heapID; BgConfig *bgConfig; G3DPipelineBuffers *buffers; TitleScreenUnusedStruct unused0; diff --git a/src/battle/ov16_0226DB7C.c b/src/battle/ov16_0226DB7C.c index ba34e11da5..ea7b379087 100644 --- a/src/battle/ov16_0226DB7C.c +++ b/src/battle/ov16_0226DB7C.c @@ -16,7 +16,6 @@ typedef struct UnkStruct_ov16_0226DC24_t { } UnkStruct_ov16_0226DC24; static void ov16_0226DE10(SysTask *param0, void *param1); -void ov16_0226DB7C(SpriteSystem *param0, SpriteManager *param1, PaletteData *param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7); void ov16_0226DBFC(SpriteManager *param0, u32 param1, u32 param2, u32 param3, u32 param4); void ov16_0226DCA8(UnkStruct_ov16_0226DC24 *param0); void ov16_0226DD7C(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4); @@ -35,7 +34,7 @@ static const SpriteTemplate Unk_ov16_02270AA4 = { 0x0 }; -void ov16_0226DB7C(SpriteSystem *param0, SpriteManager *param1, PaletteData *param2, int heapID, 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) { NARC *v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, heapID); @@ -54,7 +53,7 @@ void ov16_0226DBFC(SpriteManager *param0, u32 param1, u32 param2, u32 param3, u3 SpriteManager_UnloadAnimObjById(param0, 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) { UnkStruct_ov16_0226DC24 *v0; SpriteTemplate v1; diff --git a/src/battle/ov16_0226DE44.c b/src/battle/ov16_0226DE44.c index 929b69c274..8fdb207897 100644 --- a/src/battle/ov16_0226DE44.c +++ b/src/battle/ov16_0226DE44.c @@ -66,7 +66,7 @@ void ov16_0226DEC4(SpriteManager *param0, u32 param1, u32 param2, u32 param3, u3 SpriteManager_UnloadAnimObjById(param0, 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) { UnkStruct_ov16_0226DEEC *v0; SpriteTemplate v1; diff --git a/src/battle_anim/battle_anim_system.c b/src/battle_anim/battle_anim_system.c index a36cd4adcb..f9ccb8e5b4 100644 --- a/src/battle_anim/battle_anim_system.c +++ b/src/battle_anim/battle_anim_system.c @@ -3927,7 +3927,7 @@ int BattleAnimSystem_GetBgNarcMemberIndex(int bgID, enum BgNarcMemberType type) return sBgNarcIndices[bgID][type]; } -UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *battleSys, int heapID, int param2) +UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *battleSys, enum HeapID heapID, int param2) { int v0; int v1[] = { 0, 0, 20, 10, 10, 20 }; @@ -4075,7 +4075,7 @@ UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *battleSys, int heapID, int return v2; } -UnkStruct_ov12_02223764 *ov12_02223764(BattleSystem *battleSys, int heapID) +UnkStruct_ov12_02223764 *ov12_02223764(BattleSystem *battleSys, enum HeapID heapID) { return ov12_022234F8(battleSys, heapID, 0xFF); } diff --git a/src/battle_anim/ov12_02235E94.c b/src/battle_anim/ov12_02235E94.c index 3b8b22d294..c0d0581a2b 100644 --- a/src/battle_anim/ov12_02235E94.c +++ b/src/battle_anim/ov12_02235E94.c @@ -42,7 +42,7 @@ typedef struct { } UnkStruct_02236430; typedef struct UnkStruct_ov12_02235FE0_t { - int heapID; + enum HeapID heapID; UnkStruct_ov12_02236030 unk_04; int unk_10; ParticleSystem *unk_14[9]; @@ -322,7 +322,7 @@ static int ov12_02235FC8(int param0, int param1) return Unk_ov12_0223AF00[v0][param1]; } -UnkStruct_ov12_02235FE0 *ov12_02235FE0(int heapID) +UnkStruct_ov12_02235FE0 *ov12_02235FE0(enum HeapID heapID) { UnkStruct_ov12_02235FE0 *v0 = NULL; @@ -339,7 +339,7 @@ UnkStruct_ov12_02235FE0 *ov12_02235FE0(int heapID) return v0; } -UnkStruct_ov12_02235FE0 *ov12_02236004(int heapID, const UnkStruct_ov12_02236030 *param1) +UnkStruct_ov12_02235FE0 *ov12_02236004(enum HeapID heapID, const UnkStruct_ov12_02236030 *param1) { UnkStruct_ov12_02235FE0 *v0 = NULL; diff --git a/src/battle_anim/ov12_02237EFC.c b/src/battle_anim/ov12_02237EFC.c index 17a5fb3743..175a027f80 100644 --- a/src/battle_anim/ov12_02237EFC.c +++ b/src/battle_anim/ov12_02237EFC.c @@ -16,7 +16,7 @@ typedef struct UnkStruct_ov12_02238004_t { int unk_00; - int heapID; + enum HeapID heapID; UnkStruct_ov12_02237F38 unk_08; ParticleSystem *unk_10; SPLEmitter *unk_14; @@ -26,7 +26,7 @@ typedef struct UnkStruct_ov12_02238004_t { } UnkStruct_ov12_02238004; typedef struct UnkStruct_ov12_02237F98_t { - int heapID; + enum HeapID heapID; UnkStruct_ov12_02237EFC unk_04; UnkStruct_ov12_02238004 *unk_08[16]; } UnkStruct_ov12_02237F98; @@ -36,7 +36,7 @@ static void ov12_02238054(UnkStruct_ov12_02238004 *param0, SPLEmitterCallback pa static void ov12_02238080(SPLEmitter *param0); static int ov12_02238088(int param0); -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_02237F98 *v0 = NULL; v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov12_02237F98)); @@ -129,7 +129,7 @@ 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) { UnkStruct_ov12_02238004 *v0; diff --git a/src/battle_anim/ov12_022380BC.c b/src/battle_anim/ov12_022380BC.c index afdca364b7..0ffc148328 100644 --- a/src/battle_anim/ov12_022380BC.c +++ b/src/battle_anim/ov12_022380BC.c @@ -13,7 +13,7 @@ #include "pokemon.h" #include "pokemon_sprite.h" -static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param2, int heapID); +static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param2, enum HeapID heapID); const s16 Unk_ov12_0223B0B8[][3] = { { 0x150, 0x70, 0xFFFFFFFFFFFFFE00 }, @@ -42,17 +42,17 @@ const s16 Unk_ov12_0223B0DC[][3] = { { 0x150, 0x32, 0xFFFFFFFFFFFFFE00 } }; -void ov12_022380BC(UnkStruct_ov12_022380DC *param0, int heapID) +void ov12_022380BC(UnkStruct_ov12_022380DC *param0, enum HeapID heapID) { ov12_022380DC(param0, param0->unk_00, 0, heapID); } -void ov12_022380CC(UnkStruct_ov12_022380DC *param0, int heapID) +void ov12_022380CC(UnkStruct_ov12_022380DC *param0, enum HeapID heapID) { ov12_022380DC(param0, param0->unk_04, 1, heapID); } -static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param2, int heapID) +static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param2, enum HeapID heapID) { PokemonSpriteTemplate v0; PokemonSpriteTemplate *v1; @@ -122,7 +122,7 @@ static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param } } -void ov12_022382BC(UnkStruct_ov12_022380DC *param0, int heapID) +void ov12_022382BC(UnkStruct_ov12_022380DC *param0, enum HeapID heapID) { PokemonSpriteTemplate *v0; int v1; @@ -157,7 +157,7 @@ void ov12_022382BC(UnkStruct_ov12_022380DC *param0, int heapID) PokemonSprite_SetAttribute(param0->sprites[param0->unk_00], MON_SPRITE_Y_CENTER, v6); } -void ov12_02238390(UnkStruct_ov12_022380DC *param0, int heapID) +void ov12_02238390(UnkStruct_ov12_022380DC *param0, enum HeapID heapID) { PokemonSpriteTemplate v0; PokemonSpriteTemplate *v1; diff --git a/src/battle_regulation.c b/src/battle_regulation.c index b90a2d76b2..b4e5d1cd5f 100644 --- a/src/battle_regulation.c +++ b/src/battle_regulation.c @@ -36,7 +36,7 @@ void BattleRegulation_GetName(const BattleRegulation *regulation, String *string String_CopyNumChars(string, regulation->name, BATTLE_REGULATION_NAME_LENGTH); } -String *BattleRegulation_GetNameString(const BattleRegulation *regulation, int heapID) +String *BattleRegulation_GetNameString(const BattleRegulation *regulation, enum HeapID heapID) { String *string = String_Init(BATTLE_REGULATION_NAME_LENGTH * 2, heapID); @@ -210,7 +210,7 @@ const BattleRegulation *BattleRegulation_GetByIndex(SaveData *saveData, int inde return ®ulationData->regulations[0]; } -void BattleRegulation_GetNameByIndex(SaveData *saveData, int index, String *string, int heapID) +void BattleRegulation_GetNameByIndex(SaveData *saveData, int index, String *string, enum HeapID heapID) { MessageLoader *messageLoader; BattleRegulationData *regulationData = NULL; diff --git a/src/berry_patch_manager.c b/src/berry_patch_manager.c index a8ff513462..5a423e70c8 100644 --- a/src/berry_patch_manager.c +++ b/src/berry_patch_manager.c @@ -33,7 +33,7 @@ #include "unk_020655F4.h" struct BerryPatchManager { - int heapID; + enum HeapID heapID; BerryGrowthData *growthData; NNSG3dRenderObj renderObj; NNSG3dResMdl *model; diff --git a/src/character_sprite.c b/src/character_sprite.c index 2e9664cb79..44e5831006 100644 --- a/src/character_sprite.c +++ b/src/character_sprite.c @@ -192,7 +192,7 @@ static void CharacterSprite_CopyTilesRegion(int sourceWidth, int sourceHeight, c CharacterSprite_CopyTilesRect(sourceWidth, sourceHeight, subRegion->x, subRegion->y, subRegion->width, subRegion->height, destOffset, sourceSprite, dest); } -static void CharacterSprite_LoadSpriteRect(enum NarcID narcID, int characterIdx, int heapID, int x, int y, int width, int height, void *dest) +static void CharacterSprite_LoadSpriteRect(enum NarcID narcID, int characterIdx, enum HeapID heapID, int x, int y, int width, int height, void *dest) { int numRegions; int destOffset; diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index 42e0c1aade..4a04f3afa5 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -216,7 +216,7 @@ static void StartFadeOut(ChooseStarterApp *param0); static BOOL IsFadeDone(ChooseStarterApp *param0); static u16 GetSelectedSpecies(u16 cursorPosition); static BOOL IsSelectionMade(ChooseStarterApp *param0, int param1); -static void UpdateGraphics(ChooseStarterApp *param0, int heapID); +static void UpdateGraphics(ChooseStarterApp *param0, enum HeapID heapID); static void DrawScene(ChooseStarterApp *param0); static void SetupDrawing(ChooseStarterApp *app, enum HeapID heapID); static void ov78_021D10DC(void); @@ -228,19 +228,19 @@ static void SetupBGL(BgConfig *bgl, enum HeapID heapID); static void ov78_021D12EC(BgConfig *param0); static void MakeMessageWindow(ChooseStarterApp *app, enum HeapID heapID); static void ov78_021D13A0(ChooseStarterApp *param0); -static u8 ov78_021D1FB4(Window *param0, int heapID, int param2, int param3, TextColor param4, u32 param5); -static u8 ov78_021D201C(Window *param0, int heapID, int param2, int param3, u32 param4, u32 param5, String **param6); +static u8 ov78_021D1FB4(Window *param0, enum HeapID heapID, int param2, int param3, TextColor param4, u32 param5); +static u8 ov78_021D201C(Window *param0, enum HeapID heapID, int param2, int param3, u32 param4, u32 param5, String **param6); static void ov78_021D2090(ChooseStarterApp *param0); -static void MakeSubplaneWindow(ChooseStarterApp *param0, int heapID); +static void MakeSubplaneWindow(ChooseStarterApp *param0, enum HeapID heapID); static void ov78_021D2884(ChooseStarterApp *param0); -static void ov78_021D28A8(Window *param0, int heapID, int param2, int param3, TextColor param4); +static void ov78_021D28A8(Window *param0, enum HeapID heapID, int param2, int param3, TextColor param4); static void ov78_021D2904(ChooseStarterApp *param0); static void MakeConfirmationWindow(ChooseStarterApp *param0, int param1); static void MakeSprite(ChooseStarterApp *app, enum HeapID heapID); static void ov78_021D14BC(ChooseStarterApp *param0); static void MakeSpriteDisplay(ChooseStarterApp *app, enum HeapID heapID); static void ov78_021D1518(ChooseStarterApp *param0); -static void MakeCellActors(ChooseStarterApp *param0, int heapID); +static void MakeCellActors(ChooseStarterApp *param0, enum HeapID heapID); static void ov78_021D1594(ChooseStarterApp *param0); static void MakeCamera(ChooseStarterApp *param0, int param1); static void ov78_021D1B3C(Camera *camera, VecFx32 *param1); @@ -256,10 +256,10 @@ static void ov78_021D2430(ChooseStarterCursor *param0, BOOL param1); static void ov78_021D243C(ChooseStarterCursor *param0, int param1, int param2); static void MakeSelectionMatrix(ChooseStarterApp *param0); static void SetSelectionMatrixObjects(ChooseStarterApp *param0); -static void ov78_021D1CA8(ChooseStarterApp *param0, int heapID); +static void ov78_021D1CA8(ChooseStarterApp *param0, enum HeapID heapID); static void ov78_021D1DF0(ChooseStarterApp *param0); static void ov78_021D1E28(ChooseStarterApp *param0); -static void ov78_021D1E44(ChooseStarterApp *param0, int heapID); +static void ov78_021D1E44(ChooseStarterApp *param0, enum HeapID heapID); static void MakePokemonSprite(PokemonSprite **sprite, ChooseStarterApp *app, int species); static void ov78_021D16D8(ChooseStarter3DGraphics *param0, NNSFndAllocator *param1); static void ov78_021D1708(ChooseStarter3DGraphics *param0); @@ -723,7 +723,7 @@ static void ov78_021D1518(ChooseStarterApp *param0) SoftwareSpriteManager_Free(param0->spriteDisplay); } -static void MakeCellActors(ChooseStarterApp *param0, int heapID) +static void MakeCellActors(ChooseStarterApp *param0, enum HeapID heapID) { param0->unk_248 = SpriteList_InitRendering(2, ¶m0->unk_BC, heapID); param0->unk_24C[0] = SpriteResourceCollection_New(2, 0, heapID); @@ -953,7 +953,7 @@ static BOOL IsSelectionMade(ChooseStarterApp *param0, int param1) return 0; } -static void UpdateGraphics(ChooseStarterApp *param0, int heapID) +static void UpdateGraphics(ChooseStarterApp *param0, enum HeapID heapID) { switch (ov78_021D1CA4(param0)) { case 0: @@ -1136,7 +1136,7 @@ static int ov78_021D1CA4(ChooseStarterApp *param0) return param0->unk_00; } -static void ov78_021D1CA8(ChooseStarterApp *param0, int heapID) +static void ov78_021D1CA8(ChooseStarterApp *param0, enum HeapID heapID) { switch (param0->unk_04) { case 0: @@ -1208,7 +1208,7 @@ static void ov78_021D1E28(ChooseStarterApp *param0) ov78_021D243C(¶m0->unk_658, param0->unk_7C[param0->cursorPosition][0], param0->unk_7C[param0->cursorPosition][1]); } -static void ov78_021D1E44(ChooseStarterApp *param0, int heapID) +static void ov78_021D1E44(ChooseStarterApp *param0, enum HeapID heapID) { u32 v0; @@ -1264,7 +1264,7 @@ static void ov78_021D1E44(ChooseStarterApp *param0, int heapID) } } -static u8 ov78_021D1FB4(Window *param0, int heapID, int param2, int param3, TextColor param4, u32 param5) +static u8 ov78_021D1FB4(Window *param0, enum HeapID heapID, int param2, int param3, TextColor param4, u32 param5) { MessageLoader *v0; String *v1; @@ -1284,7 +1284,7 @@ static u8 ov78_021D1FB4(Window *param0, int heapID, int param2, int param3, Text return v2; } -static u8 ov78_021D201C(Window *param0, int heapID, int param2, int param3, u32 param4, u32 param5, String **param6) +static u8 ov78_021D201C(Window *param0, enum HeapID heapID, int param2, int param3, u32 param4, u32 param5, String **param6) { MessageLoader *v0; u8 v1; @@ -1702,7 +1702,7 @@ static void ov78_021D2740(SysTask *param0, void *param1) v0->unk_04.unk_30 += v0->unk_04.unk_34; } -static void MakeSubplaneWindow(ChooseStarterApp *param0, int heapID) +static void MakeSubplaneWindow(ChooseStarterApp *param0, enum HeapID heapID) { int v0; int v1, v2; @@ -1743,7 +1743,7 @@ static void ov78_021D2884(ChooseStarterApp *param0) } } -static void ov78_021D28A8(Window *param0, int heapID, int param2, int param3, TextColor param4) +static void ov78_021D28A8(Window *param0, enum HeapID heapID, int param2, int param3, TextColor param4) { MessageLoader *v0; String *v1; diff --git a/src/dw_warp/dw_warp.c b/src/dw_warp/dw_warp.c index 26cc272611..d893a6c48f 100644 --- a/src/dw_warp/dw_warp.c +++ b/src/dw_warp/dw_warp.c @@ -52,7 +52,7 @@ static void DWWarp_DeleteCamera(DistortionWorldWarp *warp); static void DWWarp_InitModel(DistortionWorldWarp *warp); static void DWWarp_DeleteModel(DistortionWorldWarp *warp); static void Model3D_Update(DistortionWorldWarp *warp); -static G3DPipelineBuffers *DWWarp_Init3D(int heapID); +static G3DPipelineBuffers *DWWarp_Init3D(enum HeapID heapID); static void DWWarp_Setup3D(void); static void DWWarp_Exit3D(G3DPipelineBuffers *param0); static void DWWarp_CameraMove(DistortionWorldWarp *warp); @@ -313,7 +313,7 @@ static void Model3D_Update(DistortionWorldWarp *warp) NNS_G3dGePopMtx(1); } -static G3DPipelineBuffers *DWWarp_Init3D(int heapID) +static G3DPipelineBuffers *DWWarp_Init3D(enum HeapID heapID) { return G3DPipeline_Init(heapID, TEXTURE_VRAM_SIZE_256K, PALETTE_VRAM_SIZE_32K, DWWarp_Setup3D); } diff --git a/src/encounter.c b/src/encounter.c index b8bfbccbd3..915bea647a 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -652,7 +652,7 @@ void Encounter_NewVsPalParkTransfer(FieldSystem *fieldSystem, FieldBattleDTO *dt FieldSystem_CreateTask(fieldSystem, FieldTask_PalParkEncounter, encounter); } -void Encounter_NewVsFirstBattle(FieldTask *task, int trainerID, int heapID, int *resultMaskPtr) +void Encounter_NewVsFirstBattle(FieldTask *task, int trainerID, enum HeapID heapID, int *resultMaskPtr) { FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); FieldBattleDTO *dto = FieldBattleDTO_New(HEAP_ID_FIELD2, BATTLE_TYPE_TRAINER); @@ -723,7 +723,7 @@ void Encounter_NewCatchingTutorial(FieldTask *task) FieldTask_InitCall(task, FieldTask_CatchingTutorialEncounter, encounter); } -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) { u32 battleType; FieldBattleDTO *dto; diff --git a/src/error_message_reset.c b/src/error_message_reset.c index e9d378e331..7fc190e9a7 100644 --- a/src/error_message_reset.c +++ b/src/error_message_reset.c @@ -88,7 +88,6 @@ void ErrorMessageReset_PrintErrorAndReset(void) MessageLoader *errorMsgData; String *errorString; int v4; - int heapID = HEAP_ID_SYSTEM; if (sErrorMessagePrinterLock == TRUE) { return; @@ -127,19 +126,19 @@ void ErrorMessageReset_PrintErrorAndReset(void) GXS_SetVisibleWnd(GX_WNDMASK_NONE); GXLayers_SetBanks(&sErrorMessageBanksConfig); - bgConfig = BgConfig_New(heapID); + bgConfig = BgConfig_New(HEAP_ID_SYSTEM); SetAllGraphicsModes(&sErrorMessageBgModeSet); Bg_InitFromTemplate(bgConfig, BG_LAYER_MAIN_0, &sErrorMessageBgTemplate, 0); Bg_ClearTilemap(bgConfig, BG_LAYER_MAIN_0); - LoadStandardWindowGraphics(bgConfig, BG_LAYER_MAIN_0, 512 - 9, 2, 0, heapID); - Font_LoadTextPalette(PAL_LOAD_MAIN_BG, 1 * (2 * 16), heapID); - Bg_ClearTilesRange(BG_LAYER_MAIN_0, 32, 0, heapID); + LoadStandardWindowGraphics(bgConfig, BG_LAYER_MAIN_0, 512 - 9, 2, 0, HEAP_ID_SYSTEM); + Font_LoadTextPalette(PAL_LOAD_MAIN_BG, 1 * (2 * 16), HEAP_ID_SYSTEM); + Bg_ClearTilesRange(BG_LAYER_MAIN_0, 32, 0, HEAP_ID_SYSTEM); Bg_MaskPalette(BG_LAYER_MAIN_0, 0x6c21); Bg_MaskPalette(BG_LAYER_SUB_0, 0x6c21); - errorMsgData = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_NETWORK_ERRORS, heapID); - errorString = String_Init(0x180, heapID); + errorMsgData = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_NETWORK_ERRORS, HEAP_ID_SYSTEM); + errorString = String_Init(0x180, HEAP_ID_SYSTEM); Text_ResetAllPrinters(); diff --git a/src/evolution.c b/src/evolution.c index 1765f161f2..f88c4296cf 100644 --- a/src/evolution.c +++ b/src/evolution.c @@ -87,7 +87,7 @@ static const u8 Unk_020F0A2C[] = { 0x8 }; -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) { EvolutionData *v0; PokemonSpriteTemplate v1; diff --git a/src/game_opening/ov77_021D25B0.c b/src/game_opening/ov77_021D25B0.c index bbdf84ddb9..3ff95b09f5 100644 --- a/src/game_opening/ov77_021D25B0.c +++ b/src/game_opening/ov77_021D25B0.c @@ -123,7 +123,7 @@ typedef struct { } UnkStruct_ov77_021D5308; typedef struct { - int unk_00; + enum HeapID heapID; int unk_04; BOOL unk_08; BgConfig *unk_0C; @@ -287,7 +287,7 @@ static void ov77_021D25F0(void) static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) { - param0->unk_0C = BgConfig_New(param0->unk_00); + param0->unk_0C = BgConfig_New(param0->heapID); { GraphicsModes v0 = { @@ -420,7 +420,7 @@ static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) static void ov77_021D2724(UnkStruct_ov77_021D2E9C *param0) { - param0->unk_0C = BgConfig_New(param0->unk_00); + param0->unk_0C = BgConfig_New(param0->heapID); { GraphicsModes v0 = { @@ -758,7 +758,7 @@ static void ov77_021D2900(UnkStruct_ov77_021D2E9C *param0) static void ov77_021D2A00(UnkStruct_ov77_021D2E9C *param0) { - param0->unk_0C = BgConfig_New(param0->unk_00); + param0->unk_0C = BgConfig_New(param0->heapID); { GraphicsModes v0 = { @@ -799,7 +799,7 @@ static void ov77_021D2A58(UnkStruct_ov77_021D2E9C *param0) NNSGfdPlttKey v1; u32 v2, v3; - param0->unk_10 = G3DPipeline_Init(param0->unk_00, TEXTURE_VRAM_SIZE_128K, PALETTE_VRAM_SIZE_64K, ov77_021D2AA0); + param0->unk_10 = G3DPipeline_Init(param0->heapID, TEXTURE_VRAM_SIZE_128K, PALETTE_VRAM_SIZE_64K, ov77_021D2AA0); v0 = NNS_GfdAllocTexVram(0x2000 * 4, 0, 0); v1 = NNS_GfdAllocPlttVram(0x20 * 4, 0, NNS_GFD_ALLOC_FROM_LOW); @@ -904,7 +904,6 @@ static void ov77_021D2CE8(void) static int ov77_021D2D08(ApplicationManager *appMan, int *param1) { UnkStruct_ov77_021D2E9C *v0; - int heapID = HEAP_ID_76; BrightnessController_ResetAllControllers(); SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_WHITE); @@ -914,12 +913,12 @@ static int ov77_021D2D08(ApplicationManager *appMan, int *param1) GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); SetAutorepeat(4, 8); - Heap_Create(HEAP_ID_APPLICATION, heapID, 0xa0000); + Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_76, 0xa0000); - v0 = ApplicationManager_NewData(appMan, sizeof(UnkStruct_ov77_021D2E9C), heapID); + v0 = ApplicationManager_NewData(appMan, sizeof(UnkStruct_ov77_021D2E9C), HEAP_ID_76); memset(v0, 0, sizeof(UnkStruct_ov77_021D2E9C)); - v0->unk_00 = heapID; + v0->heapID = HEAP_ID_76; v0->unk_08 = 0; v0->unk_2A8 = 0; diff --git a/src/library_tv/library_tv.c b/src/library_tv/library_tv.c index 9e687c6758..ee982f1f7b 100644 --- a/src/library_tv/library_tv.c +++ b/src/library_tv/library_tv.c @@ -21,7 +21,7 @@ #define LIBRARY_TV_DURATION 90 + 150 typedef struct LibraryTV { - int heapID; + enum HeapID heapID; BgConfig *bgl; MessageLoader *msgLdr; int tvState; @@ -40,14 +40,12 @@ static void LibraryTV_UpdateScanLines(LibraryTV *ltv); BOOL LibraryTV_Init(ApplicationManager *appMan, int *state) { - int heapID = HEAP_ID_LIBRARY_TV; + Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_LIBRARY_TV, HEAP_SIZE_LIBRARY_TV); - Heap_Create(HEAP_ID_APPLICATION, heapID, HEAP_SIZE_LIBRARY_TV); - - LibraryTV *ltv = ApplicationManager_NewData(appMan, sizeof(LibraryTV), heapID); + LibraryTV *ltv = ApplicationManager_NewData(appMan, sizeof(LibraryTV), HEAP_ID_LIBRARY_TV); memset(ltv, 0, sizeof(LibraryTV)); - ltv->heapID = heapID; + ltv->heapID = HEAP_ID_LIBRARY_TV; ltv->waitTiming = 0; return TRUE; diff --git a/src/mail.c b/src/mail.c index 5a62017189..5baceb609e 100644 --- a/src/mail.c +++ b/src/mail.c @@ -73,7 +73,7 @@ BOOL Mail_IsEmpty(Mail *mail) return FALSE; } -Mail *Mail_New(int heapID) +Mail *Mail_New(enum HeapID heapID) { Mail *mail = Heap_AllocAtEnd(heapID, sizeof(Mail)); Mail_Init(mail); @@ -292,7 +292,7 @@ int sub_02028494(Mailbox *mailbox, int param1) return 0; } -Mail *sub_020284A8(Mailbox *mailbox, int param1, int slot, int heapID) +Mail *sub_020284A8(Mailbox *mailbox, int param1, int slot, enum HeapID heapID) { Mail *v0 = Mailbox_GetMailFromSlot(mailbox, param1, slot); Mail *v1 = Mail_New(heapID); diff --git a/src/main_menu/main_menu_util.c b/src/main_menu/main_menu_util.c index 7992ea047d..82dc2ce0f1 100644 --- a/src/main_menu/main_menu_util.c +++ b/src/main_menu/main_menu_util.c @@ -55,7 +55,7 @@ typedef void (*MainMenuUtilVBlankFuncPtr)(MainMenuUtilManager *utilMan); struct MainMenuUtilManager { BgConfig *bgConfig; BOOL initialized; - int heapID; + enum HeapID heapID; int screenFadeQueuedState; BOOL fadeToWhite; int savingStatus; diff --git a/src/main_menu/ov97_0222C174.c b/src/main_menu/ov97_0222C174.c index c35be21c73..6cc3203af6 100644 --- a/src/main_menu/ov97_0222C174.c +++ b/src/main_menu/ov97_0222C174.c @@ -344,7 +344,7 @@ UnkStruct_ov97_0223E0B0 Unk_ov97_0223E0B0[] = { }; typedef struct { - int heapID; + enum HeapID heapID; BgConfig *unk_04; SaveData *saveData; Pokedex *unk_0C; diff --git a/src/main_menu/wonder_cards_app.c b/src/main_menu/wonder_cards_app.c index 6d1dde49fd..3d2c4ff850 100644 --- a/src/main_menu/wonder_cards_app.c +++ b/src/main_menu/wonder_cards_app.c @@ -222,7 +222,7 @@ typedef struct StateTransitionMenuOptionTemplate { } StateTransitionMenuOptionTemplate; struct WonderCardsAppData { - int heapID; + enum HeapID heapID; MysteryGiftAppData mysteryGiftAppData; BgConfig *bgConfig; StringTemplate *strTemplate; diff --git a/src/narc.c b/src/narc.c index 084af97f9d..6d7130a086 100644 --- a/src/narc.c +++ b/src/narc.c @@ -205,7 +205,6 @@ static const char *sNarcPaths[] = { }; static void ReadFromNarcMemberByPathAndIndex(void *dest, const char *path, int memberIndex, int offset, int bytesToRead); -static void *AllocAndReadFromNarcMemberByPathAndIndex(const char *path, int memberIndex, int heapID, int offset, int bytesToRead, BOOL allocAtEnd); static void ReadFromNarcMemberByPathAndIndex(void *dest, const char *path, int memberIndex, int offset, int bytesToRead) { @@ -255,7 +254,7 @@ static void ReadFromNarcMemberByPathAndIndex(void *dest, const char *path, int m FS_CloseFile(&file); } -static void *AllocAndReadFromNarcMemberByPathAndIndex(const char *path, int memberIndex, int heapID, int offset, int bytesToRead, BOOL allocAtEnd) +static void *AllocAndReadFromNarcMemberByPathAndIndex(const char *path, int memberIndex, enum HeapID heapID, int offset, int bytesToRead, BOOL allocAtEnd) { FSFile file; u32 btafStart = 0; @@ -317,12 +316,12 @@ void NARC_ReadWholeMemberByIndexPair(void *dest, enum NarcID narcID, int memberI ReadFromNarcMemberByPathAndIndex(dest, sNarcPaths[narcID], memberIndex, 0, 0); } -void *NARC_AllocAndReadWholeMemberByIndexPair(enum NarcID narcID, int memberIndex, int heapID) +void *NARC_AllocAndReadWholeMemberByIndexPair(enum NarcID narcID, int memberIndex, enum HeapID heapID) { return AllocAndReadFromNarcMemberByPathAndIndex(sNarcPaths[narcID], memberIndex, heapID, 0, 0, FALSE); } -void *NARC_AllocAtEndAndReadWholeMemberByIndexPair(enum NarcID narcID, int memberIndex, int heapID) +void *NARC_AllocAtEndAndReadWholeMemberByIndexPair(enum NarcID narcID, int memberIndex, enum HeapID heapID) { return AllocAndReadFromNarcMemberByPathAndIndex(sNarcPaths[narcID], memberIndex, heapID, 0, 0, TRUE); } @@ -332,12 +331,12 @@ void NARC_ReadFromMemberByIndexPair(void *dest, enum NarcID narcID, int memberIn ReadFromNarcMemberByPathAndIndex(dest, sNarcPaths[narcID], memberIndex, offset, bytesToRead); } -void *NARC_AllocAndReadFromMemberByIndexPair(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) { return AllocAndReadFromNarcMemberByPathAndIndex(sNarcPaths[narcID], memberIndex, heapID, offset, bytesToRead, FALSE); } -void *NARC_AllocAtEndAndReadFromMemberByIndexPair(enum NarcID narcID, int memberIndex, int heapID, int offset, int bytesToRead) +void *NARC_AllocAtEndAndReadFromMemberByIndexPair(enum NarcID narcID, int memberIndex, enum HeapID heapID, int offset, int bytesToRead) { return AllocAndReadFromNarcMemberByPathAndIndex(sNarcPaths[narcID], memberIndex, heapID, offset, bytesToRead, TRUE); } diff --git a/src/overlay004/ov4_021D0D80.c b/src/overlay004/ov4_021D0D80.c index 857f48f363..c1eb0faba8 100644 --- a/src/overlay004/ov4_021D0D80.c +++ b/src/overlay004/ov4_021D0D80.c @@ -103,7 +103,7 @@ static void ov4_021D24AC(int param0, void *param1); static UnkStruct_ov4_0221A400 *Unk_ov4_0221A400 = NULL; -int ov4_021D0D80(SaveData *saveData, int heapID, int param2, int param3) +int ov4_021D0D80(SaveData *saveData, enum HeapID heapID, int param2, int param3) { void *v0; @@ -974,7 +974,7 @@ static void ov4_021D1E60() Unk_ov4_0221A400->unk_1084 = 0; } -void ov4_021D1E74(int heapID) +void ov4_021D1E74(enum HeapID heapID) { int v0; int v1 = 1; @@ -1531,7 +1531,7 @@ int ov4_021D2610(void) return DWC_GetNumConnectionHost(); } -void ov4_021D2618(BOOL param0, int heapID) +void ov4_021D2618(BOOL param0, enum HeapID heapID) { if (param0) { Unk_ov4_0221A400->unk_107C = 11; diff --git a/src/overlay004/ov4_021D2808.c b/src/overlay004/ov4_021D2808.c index a7edb3d22f..cb8fc7e205 100644 --- a/src/overlay004/ov4_021D2808.c +++ b/src/overlay004/ov4_021D2808.c @@ -383,14 +383,14 @@ BOOL ov4_021D2C70(int param0, void *param1, int param2) return 0; } -static void ov4_021D2C98(void **param0, void **param1, int param2, int heapID) +static void ov4_021D2C98(void **param0, void **param1, int param2, enum HeapID heapID) { *param0 = Heap_Alloc(heapID, param2 + 32); MI_CpuClear8(*param0, param2 + 32); *param1 = (UnkStruct_ov4_0221A408 *)(((u32)*param0 + 31) / 32 * 32); } -void ov4_021D2CC0(int heapID, int param1, int param2) +void ov4_021D2CC0(enum HeapID heapID, int param1, int param2) { u8 v0[3] = { 13, 13, 13 }; u32 v1; diff --git a/src/overlay005/daycare.c b/src/overlay005/daycare.c index 337a09a595..470e6d2c7e 100644 --- a/src/overlay005/daycare.c +++ b/src/overlay005/daycare.c @@ -1089,7 +1089,7 @@ extern u32 Daycare_GetCompatibilityLevel(Daycare *daycare) return v1; } -static void Egg_CreateHatchedMonInternal(Pokemon *egg, int heapID) +static void Egg_CreateHatchedMonInternal(Pokemon *egg, enum HeapID heapID) { u16 species; u16 moves[LEARNED_MOVES_MAX]; @@ -1183,7 +1183,7 @@ static void Egg_CreateHatchedMonInternal(Pokemon *egg, int heapID) Heap_Free(mon); } -void Egg_CreateHatchedMon(Pokemon *egg, int heapID) +void Egg_CreateHatchedMon(Pokemon *egg, enum HeapID heapID) { u8 isEgg, hasNickname; u8 ball, metLevel; diff --git a/src/overlay005/ov5_021D1A94.c b/src/overlay005/ov5_021D1A94.c index f6e164600b..3b57b8d826 100644 --- a/src/overlay005/ov5_021D1A94.c +++ b/src/overlay005/ov5_021D1A94.c @@ -16,7 +16,7 @@ struct UnkStruct_ov5_021D1A94_t { FieldSystem *fieldSystem; - int heapID; + enum HeapID heapID; int unk_08; UnkStruct_ov5_021D1BEC *unk_0C; SysTaskManager *unk_10; @@ -30,7 +30,7 @@ struct UnkStruct_ov5_021D1BEC_t { void *unk_10; }; -UnkStruct_ov5_021D1A94 *ov5_021D1A94(FieldSystem *fieldSystem, int heapID, int param2) +UnkStruct_ov5_021D1A94 *ov5_021D1A94(FieldSystem *fieldSystem, enum HeapID heapID, int param2) { UnkStruct_ov5_021D1A94 *v0; u32 v1; diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index 83fbb7cb75..492172cbfc 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -93,7 +93,7 @@ struct UnkStruct_ov5_021F6704_t { u16 unk_6F4; }; -static u16 *ov5_021F65FC(int param0, int param1, int *param2); +static u16 *ov5_021F65FC(enum HeapID heapID, int fileIndex, int *pokedexLength); BOOL ScrCmd_2DE(ScriptContext *ctx); static BOOL ov5_021F65D4(ScriptContext *ctx); static void ov5_021F70CC(Pokemon *param0, int *param1, int *param2); @@ -147,7 +147,7 @@ BOOL ScrCmd_2DE(ScriptContext *ctx) v6 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_SPECIES_NAME, HEAP_ID_FIELD3); v9 = ov5_021F6704(fieldSystem, 20, 1, 0, 1, FieldSystem_GetVarPointer(fieldSystem, v13), *v10, FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_WINDOW), v6, FieldSystem_GetVarPointer(fieldSystem, v14), FieldSystem_GetVarPointer(fieldSystem, v15)); - v1 = sub_020308A0(fieldSystem->saveData, 11, &v0); + v1 = sub_020308A0(fieldSystem->saveData, HEAP_ID_FIELD2, &v0); if (v0 == 1) { v3 = ov5_021F65FC(32, Unk_ov5_0220210C[v12], &v5); @@ -195,7 +195,7 @@ static BOOL ov5_021F65D4(ScriptContext *ctx) return 1; } -static u16 *ov5_021F65FC(int heapID, int fileIndex, int *pokedexLength) +static u16 *ov5_021F65FC(enum HeapID heapID, int fileIndex, int *pokedexLength) { u32 pokedexSize; u16 *pokedex = LoadMemberFromNARC_OutFileSize(NARC_INDEX_APPLICATION__ZUKANLIST__ZKN_DATA__ZUKAN_DATA, fileIndex, 0, heapID, 0, &pokedexSize); diff --git a/src/overlay006/great_marsh_binoculars.c b/src/overlay006/great_marsh_binoculars.c index 29ce915930..d4da4cb33d 100644 --- a/src/overlay006/great_marsh_binoculars.c +++ b/src/overlay006/great_marsh_binoculars.c @@ -39,7 +39,7 @@ int GreatMarshBinoculars_GetMonSpecies(FieldSystem *fieldSystem) return encounterTable[LCRNG_RandMod(MAX_GRASS_ENCOUNTERS)]; } -GreatMarshBinoculars *GreatMarshBinoculars_InitData(const int heapID, FieldSystem *fieldSystem) +GreatMarshBinoculars *GreatMarshBinoculars_InitData(const enum HeapID heapID, FieldSystem *fieldSystem) { u8 i; GreatMarshBinoculars *binocularsData = Heap_AllocAtEnd(heapID, sizeof(GreatMarshBinoculars)); diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c index 63aa5d7e59..001e2beea0 100644 --- a/src/overlay006/ov6_022426AC.c +++ b/src/overlay006/ov6_022426AC.c @@ -29,7 +29,7 @@ static const u8 Unk_ov6_02249030[] = { 0x1 }; -GreatMarshLookout_SpriteResources *GreatMarshLookout_AllocSpriteResources(const int heapID) +GreatMarshLookout_SpriteResources *GreatMarshLookout_AllocSpriteResources(const enum HeapID heapID) { return Heap_AllocAtEnd(heapID, sizeof(GreatMarshLookout_SpriteResources)); } diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c index fd52450fd6..291daa3911 100644 --- a/src/overlay017/ov17_0223F118.c +++ b/src/overlay017/ov17_0223F118.c @@ -77,7 +77,7 @@ static void NitroStaticInit(void) Overlay_LoadByID(FS_OVERLAY_ID(overlay22), 2); } -G3DPipelineBuffers *ov17_0223F140(int heapID) +G3DPipelineBuffers *ov17_0223F140(enum HeapID heapID) { return G3DPipeline_Init(heapID, TEXTURE_VRAM_SIZE_256K, PALETTE_VRAM_SIZE_32K, ov17_0223F15C); } @@ -102,7 +102,7 @@ void ov17_0223F1E0(G3DPipelineBuffers *param0) G3DPipelineBuffers_Free(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) { UnkStruct_020127E8 v0; Window v1; @@ -391,7 +391,7 @@ static void ov17_0223F6E8(SysTask *param0, void *param1) } } -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) { UnkStruct_ov17_0223F744 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov17_0223F744)); MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0223F744)); diff --git a/src/overlay017/ov17_02252AB0.c b/src/overlay017/ov17_02252AB0.c index 9228a3b6da..28956a929a 100644 --- a/src/overlay017/ov17_02252AB0.c +++ b/src/overlay017/ov17_02252AB0.c @@ -49,7 +49,7 @@ void ov17_02252B20(SpriteManager *param0, u32 param1, u32 param2, u32 param3, u3 SpriteManager_UnloadAnimObjById(param0, 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) { UnkStruct_ov17_02252B48 *v0; SpriteTemplate v1; diff --git a/src/overlay018/ov18_0221F800.c b/src/overlay018/ov18_0221F800.c index 22bb2a369d..7f52253cce 100644 --- a/src/overlay018/ov18_0221F800.c +++ b/src/overlay018/ov18_0221F800.c @@ -7,7 +7,7 @@ #include "heap.h" #include "unk_02033200.h" -void ov18_0221F800(int heapID) +void ov18_0221F800(enum HeapID heapID) { OSIntrMode v0; void *v1; diff --git a/src/overlay022/ov22_02254DE0.c b/src/overlay022/ov22_02254DE0.c index a96e8d5090..03e36a120a 100644 --- a/src/overlay022/ov22_02254DE0.c +++ b/src/overlay022/ov22_02254DE0.c @@ -17,7 +17,7 @@ static UnkStruct_ov22_02255040 *ov22_02254FE0(UnkStruct_ov22_02254DE0 *param0); static SoftwareSprite *ov22_0225500C(UnkStruct_ov22_0225500C *param0); static void ov22_02255040(UnkStruct_ov22_02255040 *param0, TouchScreenHitTable *hitTable); -UnkStruct_ov22_02254DE0 *ov22_02254DE0(int param0, int heapID) +UnkStruct_ov22_02254DE0 *ov22_02254DE0(int param0, enum HeapID heapID) { UnkStruct_ov22_02254DE0 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov22_02254DE0)); v0->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov22_02255040) * param0); diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c index d4114f6ab2..496723998a 100644 --- a/src/overlay022/ov22_02255094.c +++ b/src/overlay022/ov22_02255094.c @@ -36,9 +36,9 @@ static void ov22_02255738(void); static void ov22_02255748(UnkStruct_ov22_0225A0E4 *param0, const SoftwareSpriteManagerTemplate *param1); static void ov22_02255784(UnkStruct_ov22_0225A0E4 *param0); static void ov22_02255794(UnkStruct_ov22_0225A0E4 *param0); -static void ov22_02255C24(UnkStruct_ov22_0225A0E4 *param0, int heapID, int param2, int param3); +static void ov22_02255C24(UnkStruct_ov22_0225A0E4 *param0, enum HeapID heapID, int param2, int param3); static void ov22_02255C90(UnkStruct_ov22_0225A0E4 *param0); -static void ov22_02255BF4(UnkStruct_ov22_0225A0E4 *param0, int heapID); +static void ov22_02255BF4(UnkStruct_ov22_0225A0E4 *param0, enum HeapID heapID); static void ov22_02255C14(UnkStruct_ov22_0225A0E4 *param0); static void ov22_022559F8(UnkStruct_ov22_0225A0E4 *param0); static void ov22_02255A98(UnkStruct_ov22_0225A0E4 *param0); @@ -49,7 +49,7 @@ static void ov22_022557A0(UnkStruct_ov22_0225A0E4 *param0, SoftwareSpriteCharsTe static void ov22_02255800(UnkStruct_ov22_0225A0E4 *param0, SoftwareSpritePaletteTemplate *param1, int param2); static void ov22_02255860(UnkStruct_ov22_0225A0E4 *param0); static void ov22_02255984(UnkStruct_ov22_0225A0E4 *param0); -static void ov22_02255CB8(UnkStruct_ov22_02255CB8 *param0, int param1, int param2, int heapID); +static void ov22_02255CB8(UnkStruct_ov22_02255CB8 *param0, int param1, int param2, enum HeapID heapID); static void ov22_02255D0C(UnkStruct_ov22_02255CB8 *param0); static void ov22_02255ACC(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1); static void ov22_02255B50(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1); @@ -256,7 +256,7 @@ void ov22_022553F8(UnkStruct_ov22_0225A0E4 *param0) RenderOam_Transfer(); } -void ov22_02255410(UnkStruct_ov22_02255CB8 *param0, int heapID) +void ov22_02255410(UnkStruct_ov22_02255CB8 *param0, enum HeapID heapID) { ov22_02255CB8(param0, 100 + 18, 1 + 18, heapID); } @@ -289,7 +289,7 @@ int ov22_02255420(NNSG2dCharacterData *param0, int param1, int param2, int param return 0; } -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) { ov22_02255748(param0, param1); ov22_02255C24(param0, heapID, 0x2800, 0x20); @@ -770,7 +770,7 @@ static void ov22_02255B50(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255C } } -static void ov22_02255BF4(UnkStruct_ov22_0225A0E4 *param0, int heapID) +static void ov22_02255BF4(UnkStruct_ov22_0225A0E4 *param0, enum HeapID heapID) { param0->unk_30 = LoadMemberFromOpenNARC(param0->unk_5C, 235, 0, heapID, 0); } @@ -781,7 +781,7 @@ static void ov22_02255C14(UnkStruct_ov22_0225A0E4 *param0) param0->unk_30 = NULL; } -static void ov22_02255C24(UnkStruct_ov22_0225A0E4 *param0, int heapID, int param2, int param3) +static void ov22_02255C24(UnkStruct_ov22_0225A0E4 *param0, enum HeapID heapID, int param2, int param3) { param0->unk_20 = PokemonSpriteManager_New(heapID); param0->unk_24 = NNS_GfdAllocTexVram(param2, 0, 0); @@ -803,7 +803,7 @@ static void ov22_02255C90(UnkStruct_ov22_0225A0E4 *param0) param0->unk_2C = 0; } -static void ov22_02255CB8(UnkStruct_ov22_02255CB8 *param0, int param1, int param2, int heapID) +static void ov22_02255CB8(UnkStruct_ov22_02255CB8 *param0, int param1, int param2, enum HeapID heapID) { param0->unk_00 = Heap_Alloc(heapID, sizeof(SoftwareSpriteCharsTemplate) * param1); memset(param0->unk_00, 0, sizeof(SoftwareSpriteCharsTemplate) * param1); diff --git a/src/overlay022/ov22_022578F4.c b/src/overlay022/ov22_022578F4.c index 3d3c668dee..a34e5c1a78 100644 --- a/src/overlay022/ov22_022578F4.c +++ b/src/overlay022/ov22_022578F4.c @@ -299,7 +299,7 @@ UnkStruct_ov22_02259560 *ov22_02257C20(UnkStruct_ov22_02257964 *param0, int *par return NULL; } -void ov22_02257C88(UnkStruct_ov22_02257964 *param0, int param1, int heapID) +void ov22_02257C88(UnkStruct_ov22_02257964 *param0, int param1, enum HeapID heapID) { UnkStruct_ov22_022599A0 v0; diff --git a/src/overlay022/ov22_02259484.c b/src/overlay022/ov22_02259484.c index 6e6b161c58..e398199658 100644 --- a/src/overlay022/ov22_02259484.c +++ b/src/overlay022/ov22_02259484.c @@ -8,7 +8,7 @@ #include "heap.h" -void ov22_02259484(UnkStruct_ov22_02259484 *param0, int param1, int heapID) +void ov22_02259484(UnkStruct_ov22_02259484 *param0, int param1, enum HeapID heapID) { param0->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov22_02259560) * param1); GF_ASSERT(param0->unk_00); diff --git a/src/overlay022/ov22_0225AF8C.c b/src/overlay022/ov22_0225AF8C.c index f4e66b61a6..d173faff73 100644 --- a/src/overlay022/ov22_0225AF8C.c +++ b/src/overlay022/ov22_0225AF8C.c @@ -59,7 +59,7 @@ typedef struct { int unk_5C; int unk_60; int unk_64; - int heapID; + enum HeapID heapID; } UnkStruct_ov22_0225B4E4; static UnkStruct_ov22_0225B1BC *ov22_0225B1BC(const UnkStruct_ov22_0225B4E4 *param0); @@ -75,8 +75,8 @@ static void ov22_0225B490(UnkStruct_ov22_0225B1BC *param0, const UnkStruct_ov22_ static void ov22_0225B4E4(UnkStruct_ov22_0225B4E4 *param0, const UnkStruct_ov22_0225AF8C *param1); static void ov22_0225B4F8(UnkStruct_ov22_0225B4E4 *param0, const UnkStruct_02029C68 *param1); static void ov22_0225B540(UnkStruct_ov22_0225B4E4 *param0, const UnkStruct_02029C88 *param1); -static void ov22_0225B588(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1, const UnkStruct_ov22_0225B4E4 *param2, int heapID); -static void ov22_0225B5A8(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1, const UnkStruct_ov22_0225B4E4 *param2, int heapID); +static void ov22_0225B588(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1, const UnkStruct_ov22_0225B4E4 *param2, enum HeapID heapID); +static void ov22_0225B5A8(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1, const UnkStruct_ov22_0225B4E4 *param2, enum HeapID heapID); UnkStruct_ov22_0225B1BC *ov22_0225AF8C(const UnkStruct_ov22_0225AF8C *param0, const UnkStruct_02029C68 *param1) { @@ -445,13 +445,13 @@ static void ov22_0225B540(UnkStruct_ov22_0225B4E4 *param0, const UnkStruct_02029 param0->unk_5C = sub_0202A5B8(param1); } -static void ov22_0225B588(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1, const UnkStruct_ov22_0225B4E4 *param2, int heapID) +static void ov22_0225B588(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1, const UnkStruct_ov22_0225B4E4 *param2, enum HeapID heapID) { ov22_02255410(param1, heapID); ov22_0225B5A8(param0, param1, param2, heapID); } -static void ov22_0225B5A8(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1, const UnkStruct_ov22_0225B4E4 *param2, int heapID) +static void ov22_0225B5A8(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1, const UnkStruct_ov22_0225B4E4 *param2, enum HeapID heapID) { int v0; int v1; diff --git a/src/overlay023/underground_text_printer.c b/src/overlay023/underground_text_printer.c index 28228d4f06..564d91d02b 100644 --- a/src/overlay023/underground_text_printer.c +++ b/src/overlay023/underground_text_printer.c @@ -49,7 +49,7 @@ const ListMenuTemplate *UndergroundTextPrinter_GetListMenuTemplate(void) return &sListMenuTemplate; } -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) { int size = stringSize; UndergroundTextPrinter *textPrinter = Heap_Alloc(heapID, sizeof(UndergroundTextPrinter)); diff --git a/src/overlay059/ov59_021D2B44.c b/src/overlay059/ov59_021D2B44.c index da538cebac..85a53fc785 100644 --- a/src/overlay059/ov59_021D2B44.c +++ b/src/overlay059/ov59_021D2B44.c @@ -171,7 +171,7 @@ static void ov59_021D2B90(SaveData *saveData, UnkStruct_0202E794 *param1, UnkStr } } -UnkStruct_0202E794 *ov59_021D2C28(SaveData *saveData, int heapID, u32 param2) +UnkStruct_0202E794 *ov59_021D2C28(SaveData *saveData, enum HeapID heapID, u32 param2) { UnkStruct_0202E794 *v0 = Heap_AllocAtEnd(heapID, param2); TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData); @@ -182,7 +182,7 @@ UnkStruct_0202E794 *ov59_021D2C28(SaveData *saveData, int heapID, u32 param2) return v0; } -UnkStruct_0202E794 *ov59_021D2C70(SaveData *saveData, int heapID, u32 param2) +UnkStruct_0202E794 *ov59_021D2C70(SaveData *saveData, enum HeapID heapID, u32 param2) { UnkStruct_0202E794 *v0 = Heap_AllocAtEnd(heapID, param2); TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData); @@ -193,7 +193,7 @@ UnkStruct_0202E794 *ov59_021D2C70(SaveData *saveData, int heapID, u32 param2) return v0; } -UnkStruct_0202E794 *ov59_021D2CB4(SaveData *saveData, int heapID, u32 param2) +UnkStruct_0202E794 *ov59_021D2CB4(SaveData *saveData, enum HeapID heapID, u32 param2) { UnkStruct_0202E794 *v0 = Heap_AllocAtEnd(heapID, param2); TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData); @@ -204,7 +204,7 @@ UnkStruct_0202E794 *ov59_021D2CB4(SaveData *saveData, int heapID, u32 param2) return v0; } -UnkStruct_0202E794 *ov59_021D2CF8(SaveData *saveData, int heapID, u32 param2) +UnkStruct_0202E794 *ov59_021D2CF8(SaveData *saveData, enum HeapID heapID, u32 param2) { UnkStruct_0202E794 *v0 = Heap_AllocAtEnd(heapID, param2); TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData); @@ -215,7 +215,7 @@ UnkStruct_0202E794 *ov59_021D2CF8(SaveData *saveData, int heapID, u32 param2) return v0; } -UnkStruct_0202E794 *ov59_021D2D3C(SaveData *saveData, int heapID, u32 param2) +UnkStruct_0202E794 *ov59_021D2D3C(SaveData *saveData, enum HeapID heapID, u32 param2) { UnkStruct_0202E794 *v0 = Heap_AllocAtEnd(heapID, param2); TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData); @@ -226,7 +226,7 @@ UnkStruct_0202E794 *ov59_021D2D3C(SaveData *saveData, int heapID, u32 param2) return v0; } -UnkStruct_0202E794 *ov59_021D2D80(SaveData *saveData, int heapID, u32 param2) +UnkStruct_0202E794 *ov59_021D2D80(SaveData *saveData, enum HeapID heapID, u32 param2) { UnkStruct_0202E794 *v0 = Heap_AllocAtEnd(heapID, param2); TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData); diff --git a/src/overlay059/ov59_021D2F88.c b/src/overlay059/ov59_021D2F88.c index e1458bc28b..ffcb4be278 100644 --- a/src/overlay059/ov59_021D2F88.c +++ b/src/overlay059/ov59_021D2F88.c @@ -26,7 +26,7 @@ #include "unk_02073700.h" typedef struct { - int heapID; + enum HeapID heapID; SaveData *saveData; int unk_08; int unk_0C; @@ -35,7 +35,7 @@ typedef struct { } UnkStruct_ov59_021D2FBC; typedef u32 (*UnkFuncPtr_ov59_021D33FC)(SaveData *); -typedef void *(*UnkFuncPtr_ov59_021D33FC_1)(SaveData *, int heapID, u32); +typedef void *(*UnkFuncPtr_ov59_021D33FC_1)(SaveData *, enum HeapID heapID, u32); typedef void (*UnkFuncPtr_ov59_021D33FC_2)(const UnkStruct_ov59_021D2FBC *); typedef struct { @@ -50,7 +50,7 @@ static u32 ov59_021D2F88(SaveData *saveData) return ov59_021D2A2C(v0); } -static void *ov59_021D2F94(SaveData *saveData, int heapID, u32 param2) +static void *ov59_021D2F94(SaveData *saveData, enum HeapID heapID, u32 param2) { RecordMixedRNG *v0 = SaveData_GetRecordMixedRNG(saveData); void *v1 = Heap_AllocAtEnd(heapID, param2); @@ -72,7 +72,7 @@ static u32 ov59_021D2FD4(SaveData *saveData) return sub_02029C60(); } -static void *ov59_021D2FE0(SaveData *saveData, int heapID, u32 param2) +static void *ov59_021D2FE0(SaveData *saveData, enum HeapID heapID, u32 param2) { UnkStruct_02029C68 *v0; UnkStruct_0202A750 *v1 = sub_0202A750(saveData); @@ -108,7 +108,7 @@ static void ov59_021D3068(const UnkStruct_ov59_021D2FBC *param0) ov59_021D2F60(broadcast, param0->unk_08, param0->unk_0C, param0->unk_10, param0->unk_14); } -static void *ov59_021D3088(SaveData *saveData, int heapID, u32 param2) +static void *ov59_021D3088(SaveData *saveData, enum HeapID heapID, u32 param2) { return sub_0202E9FC(saveData, heapID); } @@ -120,7 +120,7 @@ static void ov59_021D3090(const UnkStruct_ov59_021D2FBC *param0) sub_0202ED0C(param0->saveData, param0->unk_0C, param0->unk_08, param0->unk_10, param0->heapID); } -static void *ov59_021D30B4(SaveData *saveData, int heapID, u32 param2) +static void *ov59_021D30B4(SaveData *saveData, enum HeapID heapID, u32 param2) { UnkStruct_ov96_0223B450_sub1 *v0 = Heap_AllocAtEnd(heapID, param2); MI_CpuClear8(v0, param2); diff --git a/src/overlay061/ov61_0222AE60.c b/src/overlay061/ov61_0222AE60.c index 8c17069299..ba5ecb962c 100644 --- a/src/overlay061/ov61_0222AE60.c +++ b/src/overlay061/ov61_0222AE60.c @@ -31,7 +31,7 @@ void ov61_0222AE80(const UnkStruct_ov61_0222AE80 *param0, UnkStruct_02029C68 *pa sub_0202A824(param0, 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) { String *v0; int v1; diff --git a/src/overlay061/ov61_0222B008.c b/src/overlay061/ov61_0222B008.c index ec42420164..83ccddb198 100644 --- a/src/overlay061/ov61_0222B008.c +++ b/src/overlay061/ov61_0222B008.c @@ -49,7 +49,7 @@ static int ov61_0222BBE8(UnkStruct_ov62_022349A8 *param0); static void ov61_0222BB54(UnkStruct_ov62_022349A8 *param0, String *param1); static void ov61_0222BB60(UnkStruct_ov62_022349A8 *param0, int param1, int param2); static int ov61_0222B960(UnkStruct_ov62_022349A8 *param0); -static void *ov61_0222BBF0(int heapID); +static void *ov61_0222BBF0(enum HeapID heapID); static void ov61_0222BC40(void); static BOOL ov61_0222B920(void *param0, void *param1); static BOOL ov61_0222B924(void *param0, void *param1); @@ -778,7 +778,7 @@ static int ov61_0222BBE8(UnkStruct_ov62_022349A8 *param0) static OSHeapHandle Unk_ov61_0222E760; -static void *ov61_0222BBF0(int heapID) +static void *ov61_0222BBF0(enum HeapID heapID) { void *v0; void *v1; diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index 53c0727884..cc3a9326c3 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -60,7 +60,7 @@ #include "unk_020393C8.h" #include "unk_0208B284.h" -static void ov62_022349E4(String *param0, int heapID); +static void ov62_022349E4(String *param0, enum HeapID heapID); StringTemplate *ov62_02231690(u32 heapID) { @@ -184,7 +184,7 @@ void ov62_022318E8(UnkStruct_0208C06C *param0) PaletteData_BlendMulti(param0->unk_14.unk_14, 1, 0xFFFF, 0, param0->unk_14.unk_44); } -u16 *ov62_Pokedex_Alphabetical(int heapID, int unused, int *pokedexLength) +u16 *ov62_Pokedex_Alphabetical(enum HeapID heapID, int unused, int *pokedexLength) { u32 pokedexSize; u16 *pokedexAlphabetical = LoadMemberFromNARC_OutFileSize(NARC_INDEX_APPLICATION__ZUKANLIST__ZKN_DATA__ZUKAN_DATA, 13, 0, heapID, 0, &pokedexSize); @@ -2916,7 +2916,7 @@ void ov62_022349A8(UnkStruct_0208C06C *param0, String *param1) String_Free(v1); } -static void ov62_022349E4(String *param0, int heapID) +static void ov62_022349E4(String *param0, enum HeapID heapID) { MessageLoader *v0; diff --git a/src/overlay062/ov62_02246B00.c b/src/overlay062/ov62_02246B00.c index 033091c3b4..c4a0000fcb 100644 --- a/src/overlay062/ov62_02246B00.c +++ b/src/overlay062/ov62_02246B00.c @@ -22,7 +22,7 @@ static inline void inline_ov62_02247CE0(UnkStruct_ov62_02246BF4 *param0, int param1, s16 param2, s16 param3); -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) { int v0; UnkStruct_ov62_02246B00 *v1 = NULL; diff --git a/src/overlay062/ov62_02248408.c b/src/overlay062/ov62_02248408.c index e1d091d817..0402de20aa 100644 --- a/src/overlay062/ov62_02248408.c +++ b/src/overlay062/ov62_02248408.c @@ -21,11 +21,11 @@ #include "system.h" #include "unk_0202F1D4.h" -static void ov62_0224856C(String *param0, int param1); +static void ov62_0224856C(String *param0, enum HeapID heapID); extern BattleRecording *Unk_021C07A4; -void ov62_02248408(BattleRecording *param0, FieldBattleDTO *param1, int heapID) +void ov62_02248408(BattleRecording *param0, FieldBattleDTO *param1, enum HeapID heapID) { UnkStruct_0202F298 *v0 = ¶m0->unk_E8; UnkStruct_0202F41C *v1 = ¶m0->unk_84; @@ -92,7 +92,7 @@ void ov62_02248408(BattleRecording *param0, FieldBattleDTO *param1, int heapID) Heap_Free(v8); } -static void ov62_0224856C(String *param0, int heapID) +static void ov62_0224856C(String *param0, enum HeapID heapID) { MessageLoader *v0; diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c index 6ac4f2b6ba..6fa277fbcf 100644 --- a/src/overlay075/ov75_021D0D80.c +++ b/src/overlay075/ov75_021D0D80.c @@ -54,7 +54,7 @@ enum { } UnkEnum_ov75_021D0E80; typedef struct { - int heapID; + enum HeapID heapID; int unk_04; u16 unk_08; u16 unk_0A; diff --git a/src/overlay083/ov83_0223C958.c b/src/overlay083/ov83_0223C958.c index 08fa15732e..86ae49984f 100644 --- a/src/overlay083/ov83_0223C958.c +++ b/src/overlay083/ov83_0223C958.c @@ -25,7 +25,7 @@ #include "system.h" #include "unk_0202419C.h" -static void ov83_0223CC30(BgConfig **param0, int heapID); +static void ov83_0223CC30(BgConfig **param0, enum HeapID heapID); static void ov83_0223CCCC(BgConfig **param0); static void ov83_0223CCF8(UnkStruct_ov83_0223B784 *param0); static void ov83_0223CD1C(UnkStruct_ov83_0223B784 *param0); @@ -160,7 +160,7 @@ static void ov83_0223CC10(void) GXLayers_SetBanks(&v0); } -static void ov83_0223CC30(BgConfig **param0, int heapID) +static void ov83_0223CC30(BgConfig **param0, enum HeapID heapID) { int v0 = 0, v1; diff --git a/src/overlay083/ov83_0223D4CC.c b/src/overlay083/ov83_0223D4CC.c index 66291d2f1e..44ceb5bcd4 100644 --- a/src/overlay083/ov83_0223D4CC.c +++ b/src/overlay083/ov83_0223D4CC.c @@ -34,12 +34,12 @@ typedef struct UnkStruct_ov83_0223D4CC_t { void *unk_04; } UnkStruct_ov83_0223D4CC; -static UnkStruct_ov83_0223D584 *ov83_0223D584(const CommCmdTable *param0, int param1, void *param2, int heapID); +static UnkStruct_ov83_0223D584 *ov83_0223D584(const CommCmdTable *param0, int param1, void *param2, enum HeapID heapID); static void ov83_0223D5CC(SysTask *param0, void *param1); static void ov83_0223D620(UnkStruct_ov83_0223D584 *param0); static BOOL ov83_0223D638(UnkStruct_ov83_0223D584 *param0, int param1, const void *param2, int param3); -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) { UnkStruct_ov83_0223D4CC *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov83_0223D4CC)); v0->unk_00 = param3; @@ -97,7 +97,7 @@ int ov83_0223D570(UnkStruct_ov83_0223D4CC *param0) } } -static UnkStruct_ov83_0223D584 *ov83_0223D584(const CommCmdTable *param0, int param1, void *param2, int heapID) +static UnkStruct_ov83_0223D584 *ov83_0223D584(const CommCmdTable *param0, int param1, void *param2, enum HeapID heapID) { UnkStruct_ov83_0223D584 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov83_0223D584)); memset(v0, 0, sizeof(UnkStruct_ov83_0223D584)); diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c index bdaffa1326..3ec0cb1c28 100644 --- a/src/overlay083/ov83_0223D6A8.c +++ b/src/overlay083/ov83_0223D6A8.c @@ -171,7 +171,7 @@ static SoftwareSprite *ov83_0223D720(SoftwareSpriteManager *param0, SoftwareSpri return v1; } -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) { int i; @@ -1829,7 +1829,7 @@ void ov83_0223F784(UnkStruct_ov83_0223F770 *param0) PoffinSpriteManager_DrawSprites(param0->unk_00); } -void ov83_0223F790(UnkStruct_ov83_0223F7A4 *param0, int heapID, BgConfig *param2) +void ov83_0223F790(UnkStruct_ov83_0223F7A4 *param0, enum HeapID heapID, BgConfig *param2) { param0->unk_00 = sub_02015920(heapID); param0->unk_04 = param2; diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c index 284fa297fb..b99cd95eaa 100644 --- a/src/overlay090/ov90_021D0D80.c +++ b/src/overlay090/ov90_021D0D80.c @@ -62,7 +62,7 @@ typedef struct { } UnkStruct_ov90_021D17F8; typedef struct { - int heapID; + enum HeapID heapID; int unk_04; u16 unk_08; u8 unk_0A; diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index dc5531d995..973226b151 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -65,7 +65,7 @@ typedef struct { } UnkStruct_ov92_021D1B24_sub1; typedef struct { - int heapID; + enum HeapID heapID; WiFiHistory *wiFiHistory; Options *options; UnkStruct_ov92_021D1B24_sub1 unk_0C; @@ -298,7 +298,7 @@ static const ListMenuTemplate Unk_ov92_021D29C8 = { int ov92_021D0D80(ApplicationManager *appMan, int *param1) { UnkStruct_ov92_021D1B24 *v0; - int heapID = HEAP_ID_50; + enum HeapID heapID = HEAP_ID_50; SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); @@ -664,7 +664,7 @@ int ov92_021D0EB8(ApplicationManager *appMan, int *param1) int ov92_021D1478(ApplicationManager *appMan, int *param1) { UnkStruct_ov92_021D1B24 *v0 = ApplicationManager_Data(appMan); - int heapID = v0->heapID; + enum HeapID heapID = v0->heapID; GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 0); @@ -1475,7 +1475,7 @@ static void ov92_021D26D0(UnkStruct_ov92_021D1B24 *param0) } } -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) { MessageLoader *v0; int v1 = ov92_021D16F8(param0); diff --git a/src/overlay094/screens/deposit.c b/src/overlay094/screens/deposit.c index 802c089694..e3cea7e752 100644 --- a/src/overlay094/screens/deposit.c +++ b/src/overlay094/screens/deposit.c @@ -974,7 +974,7 @@ static void ov94_022423FC(MessageLoader *gtsMessageLoader, StringTemplate *templ String_Free(offerString); } -u16 *ov94_Pokedex_Alphabetical(int heapID, int unused, int *pokedexLength) +u16 *ov94_Pokedex_Alphabetical(enum HeapID heapID, int unused, int *pokedexLength) { u32 pokedexSize; u16 *pokedexAlphabetical = LoadMemberFromNARC_OutFileSize(NARC_INDEX_APPLICATION__ZUKANLIST__ZKN_DATA__ZUKAN_DATA, 13, 0, heapID, 0, &pokedexSize); @@ -983,7 +983,7 @@ u16 *ov94_Pokedex_Alphabetical(int heapID, int unused, int *pokedexLength) return pokedexAlphabetical; } -u8 *ov94_02242548(int heapID) +u8 *ov94_02242548(enum HeapID heapID) { u32 nationalDexSize, nationalDexLength; u8 *nationalDex = Heap_Alloc(HEAP_ID_62, NATIONAL_DEX_COUNT + 1); diff --git a/src/overlay098/ov98_022499C8.c b/src/overlay098/ov98_022499C8.c index c0dd0da981..61648b5df1 100644 --- a/src/overlay098/ov98_022499C8.c +++ b/src/overlay098/ov98_022499C8.c @@ -26,7 +26,7 @@ static const struct { { 0x12a, '9' }, }; -void ov98_022499C8(String *param0, char *param1, int heapID) +void ov98_022499C8(String *param0, char *param1, enum HeapID heapID) { static const char Unk_ov98_02249D1C[] = "w"; static const char Unk_ov98_02249D20[] = "@wii.com"; @@ -65,7 +65,7 @@ void ov98_022499C8(String *param0, char *param1, int heapID) Heap_Free(v1); } -int ov98_02249A80(String *param0, int heapID) +int ov98_02249A80(String *param0, enum HeapID heapID) { charcode_t *v0; BOOL v1 = TRUE; diff --git a/src/overlay099/ov99_021D0D80.c b/src/overlay099/ov99_021D0D80.c index 163443a0d2..23d0e1c379 100644 --- a/src/overlay099/ov99_021D0D80.c +++ b/src/overlay099/ov99_021D0D80.c @@ -75,7 +75,7 @@ static void ov99_021D1380(BgConfig *param0); static void ov99_021D1720(UnkStruct_ov99_021D2CB0 *param0); static void ov99_021D1918(UnkStruct_ov99_021D2CB0 *param0); static void ov99_021D19A0(UnkStruct_ov99_021D2CB0 *param0); -static G3DPipelineBuffers *ov99_021D19AC(int heapID); +static G3DPipelineBuffers *ov99_021D19AC(enum HeapID heapID); static void ov99_021D19C8(void); static void ov99_021D1A4C(G3DPipelineBuffers *param0); static void ov99_021D16E4(UnkStruct_ov99_021D2CB0 *param0); @@ -756,7 +756,7 @@ static void ov99_021D19A0(UnkStruct_ov99_021D2CB0 *param0) Camera_Delete(param0->camera); } -static G3DPipelineBuffers *ov99_021D19AC(int heapID) +static G3DPipelineBuffers *ov99_021D19AC(enum HeapID heapID) { return G3DPipeline_Init(heapID, TEXTURE_VRAM_SIZE_128K, PALETTE_VRAM_SIZE_16K, ov99_021D19C8); } diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c index 91773485a5..e3bb4fdd45 100644 --- a/src/overlay104/ov104_0222DCE0.c +++ b/src/overlay104/ov104_0222DCE0.c @@ -406,14 +406,14 @@ u8 ov104_0222E240(u16 param0, u16 param1) return 1; } -void ov104_0222E278(FrontierDataDTO *param0, u16 param1, int heapID, int param3) +void ov104_0222E278(FrontierDataDTO *param0, u16 param1, enum HeapID heapID, int param3) { Heap_Free(BattleTower_GetTrainerData(¶m0->trDataDTO, param1, heapID, param3)); return; } -void ov104_0222E284(FieldBattleDTO *param0, FrontierTrainerDataDTO *param1, int param2, int battlerId, int heapID) +void ov104_0222E284(FieldBattleDTO *param0, FrontierTrainerDataDTO *param1, int param2, int battlerId, enum HeapID heapID) { Sentence *v0; diff --git a/src/overlay104/ov104_0222E63C.c b/src/overlay104/ov104_0222E63C.c index 76dc00a8b6..fbf7284c03 100644 --- a/src/overlay104/ov104_0222E63C.c +++ b/src/overlay104/ov104_0222E63C.c @@ -24,10 +24,10 @@ static BOOL ov104_0222E7CC(UnkStruct_ov104_022320B4 *param0, FrontierScriptContext *param1); static void ov104_0222E7FC(UnkStruct_ov104_022320B4 *param0, FrontierScriptContext *param1); static void ov104_0222E82C(UnkStruct_ov104_022320B4 *param0, u16 param1, u32 *param2, void *param3); -static void ov104_0222E830(u8 **param0, MessageLoader **param1, int param2, int heapID); +static void ov104_0222E830(u8 **param0, MessageLoader **param1, int param2, enum HeapID heapID); static void ov104_0222E904(FrontierScriptContext *param0, int param1); -UnkStruct_ov104_022320B4 *ov104_0222E63C(UnkStruct_0209B75C *param0, int heapID, int param2) +UnkStruct_ov104_022320B4 *ov104_0222E63C(UnkStruct_0209B75C *param0, enum HeapID heapID, int param2) { UnkStruct_ov104_022320B4 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov104_022320B4)); MI_CpuClear8(v0, sizeof(UnkStruct_ov104_022320B4)); @@ -153,7 +153,7 @@ static void ov104_0222E82C(UnkStruct_ov104_022320B4 *param0, u16 param1, u32 *pa } } -static void ov104_0222E830(u8 **param0, MessageLoader **param1, int param2, int heapID) +static void ov104_0222E830(u8 **param0, MessageLoader **param1, int param2, enum HeapID heapID) { int scriptID = GetFrontierSceneValue(param2, FR_SCENE_SCRIPT_ID); int bankID = GetFrontierSceneValue(param2, FR_SCENE_BANK_ID); @@ -162,7 +162,7 @@ static void ov104_0222E830(u8 **param0, MessageLoader **param1, int param2, int *param1 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, bankID, heapID); } -void ov104_0222E86C(UnkStruct_ov104_022320B4 *param0, int param1, int heapID) +void ov104_0222E86C(UnkStruct_ov104_022320B4 *param0, int param1, enum HeapID heapID) { int v0; FrontierScriptContext *v1; @@ -192,7 +192,7 @@ void ov104_0222E86C(UnkStruct_ov104_022320B4 *param0, int param1, int heapID) param0->unk_3C = v4; } -UnkStruct_ov104_0222E8C8 *ov104_0222E8C8(UnkStruct_ov104_022320B4 *param0, int heapID) +UnkStruct_ov104_0222E8C8 *ov104_0222E8C8(UnkStruct_ov104_022320B4 *param0, enum HeapID heapID) { UnkStruct_ov104_0222E8C8 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov104_0222E8C8)); *v0 = param0->unk_24; diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c index f008487852..0edd2230ea 100644 --- a/src/overlay104/ov104_0222FBE4.c +++ b/src/overlay104/ov104_0222FBE4.c @@ -167,7 +167,7 @@ static BOOL FrontierScrCmd_23(FrontierScriptContext *param0); static BOOL FrontierScrCmd_24(FrontierScriptContext *param0); static BOOL FrontierScrCmd_25(FrontierScriptContext *param0); static BOOL FrontierScrCmd_28(FrontierScriptContext *param0); -static void ov104_0223056C(u16 param0, UnkStruct_ov104_0223C634 *param1, const UnkStruct_ov104_02232B78_sub1 *param2, UnkStruct_ov63_0222D77C *param3, u8 *param4, int heapID); +static void ov104_0223056C(u16 param0, UnkStruct_ov104_0223C634 *param1, const UnkStruct_ov104_02232B78_sub1 *param2, UnkStruct_ov63_0222D77C *param3, u8 *param4, enum HeapID heapID); static BOOL FrontierScrCmd_29(FrontierScriptContext *param0); static BOOL ov104_022305C8(FrontierScriptContext *param0); static BOOL FrontierScrCmd_6C(FrontierScriptContext *param0); @@ -1185,7 +1185,7 @@ static BOOL FrontierScrCmd_28(FrontierScriptContext *param0) return 0; } -static void ov104_0223056C(u16 param0, UnkStruct_ov104_0223C634 *param1, const UnkStruct_ov104_02232B78_sub1 *param2, UnkStruct_ov63_0222D77C *param3, u8 *param4, int heapID) +static void ov104_0223056C(u16 param0, UnkStruct_ov104_0223C634 *param1, const UnkStruct_ov104_02232B78_sub1 *param2, UnkStruct_ov63_0222D77C *param3, u8 *param4, enum HeapID heapID) { UnkStruct_ov104_02232B78 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov104_02232B78)); MI_CpuClear8(v0, sizeof(UnkStruct_ov104_02232B78)); diff --git a/src/overlay104/ov104_02239C58.c b/src/overlay104/ov104_02239C58.c index c6cca37ec0..1adc1b4453 100644 --- a/src/overlay104/ov104_02239C58.c +++ b/src/overlay104/ov104_02239C58.c @@ -29,7 +29,7 @@ BOOL ov104_02239C88(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2, u16 para void ov104_02239CD0(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, u16 param2); static void ov104_02239D1C(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, FieldSystem *fieldSystem, int param3); static void ov104_02239F38(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, FieldSystem *fieldSystem, int param3); -static void ov104_02239FB0(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, FieldSystem *fieldSystem, int heapID); +static void ov104_02239FB0(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, FieldSystem *fieldSystem, enum HeapID heapID); static void ov104_0223A090(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, FieldSystem *fieldSystem, int param3); UnkStruct_0209BBA4 *ov104_02239C58(SaveData *saveData) @@ -188,7 +188,7 @@ static void ov104_02239F38(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param return; } -static void ov104_02239FB0(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, FieldSystem *fieldSystem, int heapID) +static void ov104_02239FB0(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, FieldSystem *fieldSystem, enum HeapID heapID) { static const u8 v0[] = { 0, 1, 2, 4, 3, 5, 6, 7, 8 diff --git a/src/overlay104/ov104_0223A0C4.c b/src/overlay104/ov104_0223A0C4.c index 9b7562a9d9..657554f5e2 100644 --- a/src/overlay104/ov104_0223A0C4.c +++ b/src/overlay104/ov104_0223A0C4.c @@ -632,14 +632,14 @@ u16 ov104_0223A750(BattleTower *battleTower, const u16 *param1); int BattleTower_GetPokemonDataNarcID(u8 challengeMode); int BattleTower_GetTrainerDataNarcID(u8 challengeMode); int BattleTower_GetTrainerMessagesBankID(u8 challengeMode); -static BOOL BattleTower_CreateRandomTrainerParty(BattleTower *battleTower, BattleFrontierTrainerData *trData, u16 battleTowerTrainerID, FrontierPokemonDataDTO *monDataDTO, u8 partySize, u16 *species, u16 *items, UnkStruct_0204B404 *param7, int heapID); +static BOOL BattleTower_CreateRandomTrainerParty(BattleTower *battleTower, BattleFrontierTrainerData *trData, u16 battleTowerTrainerID, FrontierPokemonDataDTO *monDataDTO, u8 partySize, u16 *species, u16 *items, UnkStruct_0204B404 *param7, enum HeapID heapID); static void ov104_0223A348(FrontierDataDTO *param0, const u8 param1); -static u32 BattleTower_CopySetToPokemonDataDTO(BattleTower *battleTower, FrontierPokemonDataDTO *monDataDTO, u16 setID, u32 otID, u32 givenPersonality, u8 ivs, u8 partyIndex, BOOL giveReservedItem, int heapID); +static u32 BattleTower_CopySetToPokemonDataDTO(BattleTower *battleTower, FrontierPokemonDataDTO *monDataDTO, u16 setID, u32 otID, u32 givenPersonality, u8 ivs, u8 partyIndex, BOOL giveReservedItem, enum HeapID heapID); static u32 BattleTower_GetBattleTypeFromChallengeMode(u8 challengeMode); -static void ov104_0223A6AC(FieldBattleDTO *param0, FrontierDataDTO *param1, int param2, int param3, int param4); +static void ov104_0223A6AC(FieldBattleDTO *param0, FrontierDataDTO *param1, int param2, int battlerId, enum HeapID heapID); static int BattleTower_AreAllConnectedGamesPlatinum(u8 challengeMode); -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) { BOOL v0 = 0; BattleFrontierTrainerData *trData = BattleTower_GetTrainerData(&opponentDataDTO->trDataDTO, battleTowerTrainerID, heapID, BattleTower_GetTrainerDataNarcID(battleTower->challengeMode)); @@ -650,7 +650,7 @@ BOOL BattleTower_CreateTrainerParty(BattleTower *battleTower, FrontierDataDTO *o return v0; } -static BOOL BattleTower_CreateRandomTrainerParty(BattleTower *battleTower, BattleFrontierTrainerData *trData, u16 battleTowerTrainerID, FrontierPokemonDataDTO *monDataDTO, u8 partySize, u16 *species, u16 *items, UnkStruct_0204B404 *param7, int heapID) +static BOOL BattleTower_CreateRandomTrainerParty(BattleTower *battleTower, BattleFrontierTrainerData *trData, u16 battleTowerTrainerID, FrontierPokemonDataDTO *monDataDTO, u8 partySize, u16 *species, u16 *items, UnkStruct_0204B404 *param7, enum HeapID heapID) { int i; u8 ivs; @@ -795,7 +795,7 @@ static const u16 sBattleTowerReservedItems[] = { ITEM_QUICK_CLAW, }; -static u32 BattleTower_CopySetToPokemonDataDTO(BattleTower *battleTower, FrontierPokemonDataDTO *monDataDTO, u16 setID, u32 otID, u32 givenPersonality, u8 ivs, u8 partyIndex, BOOL giveReservedItem, int heapID) +static u32 BattleTower_CopySetToPokemonDataDTO(BattleTower *battleTower, FrontierPokemonDataDTO *monDataDTO, u16 setID, u32 otID, u32 givenPersonality, u8 ivs, u8 partyIndex, BOOL giveReservedItem, enum HeapID heapID) { int v0; int evs; @@ -940,7 +940,7 @@ FieldBattleDTO *ov104_0223A580(BattleTower *battleTower, UnkStruct_ov104_02230BE return v3; } -static void ov104_0223A6AC(FieldBattleDTO *param0, FrontierDataDTO *param1, int param2, int battlerId, int heapID) +static void ov104_0223A6AC(FieldBattleDTO *param0, FrontierDataDTO *param1, int param2, int battlerId, enum HeapID heapID) { ov104_0222E284(param0, ¶m1->trDataDTO, param2, battlerId, heapID); Pokemon *mon = Pokemon_New(heapID); diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c index 373330ecf6..c25f03b309 100644 --- a/src/overlay104/ov104_0223C2D4.c +++ b/src/overlay104/ov104_0223C2D4.c @@ -71,7 +71,7 @@ UnkStruct_ov104_0223C4CC *ov104_0223C2D4(UnkStruct_0209B75C *param0); void ov104_0223C4CC(UnkStruct_ov104_0223C4CC *param0); static void ov104_0223C8E8(UnkStruct_ov104_0223C4CC *param0); static void ov104_0223CC10(UnkStruct_ov104_0223C4CC *param0); -static G3DPipelineBuffers *ov104_0223CF4C(int heapID); +static G3DPipelineBuffers *ov104_0223CF4C(enum HeapID heapID); static void ov104_0223CF68(void); static void ov104_0223CFEC(G3DPipelineBuffers *param0); static void ov104_0223D3B0(UnkStruct_ov104_0223C4CC *param0); @@ -758,7 +758,7 @@ static void ov104_0223CEEC(UnkStruct_ov104_0223C4CC *param0) ov63_0222D7B4(param0->unk_30); } -static G3DPipelineBuffers *ov104_0223CF4C(int heapID) +static G3DPipelineBuffers *ov104_0223CF4C(enum HeapID heapID) { return G3DPipeline_Init(heapID, TEXTURE_VRAM_SIZE_128K, PALETTE_VRAM_SIZE_16K, ov104_0223CF68); } diff --git a/src/overlay104/ov104_0223D5D0.c b/src/overlay104/ov104_0223D5D0.c index 42efc900bd..0425cc8429 100644 --- a/src/overlay104/ov104_0223D5D0.c +++ b/src/overlay104/ov104_0223D5D0.c @@ -17,7 +17,7 @@ static u32 ov104_0223D720(u32 param0, BOOL param1); static u32 ov104_0223D744(u32 param0, BOOL param1); static void ov104_0223D708(ParticleSystem *param0); -UnkStruct_ov104_0223D5F0 *ov104_0223D5D0(int heapID) +UnkStruct_ov104_0223D5F0 *ov104_0223D5D0(enum HeapID heapID) { UnkStruct_ov104_0223D5F0 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov104_0223D5F0)); MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0223D5F0)); diff --git a/src/overlay104/ov104_0223E894.c b/src/overlay104/ov104_0223E894.c index 6d80baa7da..929e472967 100644 --- a/src/overlay104/ov104_0223E894.c +++ b/src/overlay104/ov104_0223E894.c @@ -592,7 +592,7 @@ static void ov104_0223F1AC(void *param0) ov104_0223F174(v0); } -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) { UnkStruct_ov104_0223F174 *v0; int v1; diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c index 819247a347..f001706e19 100644 --- a/src/overlay110/ov110_021D0D80.c +++ b/src/overlay110/ov110_021D0D80.c @@ -659,7 +659,7 @@ static void ov110_021D1808(UnkStruct_ov110_021D0F78 *param0) Window_ScheduleCopyToVRAM(¶m0->unk_10[2]); ov110_021D13CC(param0, ¶m0->unk_10[3], 31, 1); - frontierStage = sub_020308A0(param0->saveData, 11, &v4); + frontierStage = sub_020308A0(param0->saveData, HEAP_ID_FIELD2, &v4); if (v4 != 1) { v3 = 0; diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index 04c472d6dc..8280bc2243 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -134,7 +134,7 @@ static void ov113_0225D12C(BgConfig *param0); static void ov113_0225D160(UnkStruct_ov113_0225DBCC *param0, NARC *param1); static void ov113_0225DBCC(UnkStruct_ov113_0225DBCC *param0); static void ov113_0225DC4C(UnkStruct_ov113_0225DBCC *param0); -static G3DPipelineBuffers *ov113_0225DC6C(int heapID); +static G3DPipelineBuffers *ov113_0225DC6C(enum HeapID heapID); static void ov113_0225DC88(void); static void ov113_0225DD0C(G3DPipelineBuffers *param0); static void ov113_0225D9FC(UnkStruct_ov113_0225DBCC *param0); @@ -1253,7 +1253,7 @@ static void ov113_0225DC4C(UnkStruct_ov113_0225DBCC *param0) } } -static G3DPipelineBuffers *ov113_0225DC6C(int heapID) +static G3DPipelineBuffers *ov113_0225DC6C(enum HeapID heapID) { return G3DPipeline_Init(heapID, TEXTURE_VRAM_SIZE_256K, PALETTE_VRAM_SIZE_32K, ov113_0225DC88); } diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c index c1602d07b4..04cbf6817c 100644 --- a/src/overlay117/ov117_02260668.c +++ b/src/overlay117/ov117_02260668.c @@ -57,7 +57,7 @@ #include "vram_transfer.h" static void ov117_02260DA0(void *param0); -static G3DPipelineBuffers *ov117_02260E14(int heapID); +static G3DPipelineBuffers *ov117_02260E14(enum HeapID heapID); static void ov117_02260E34(void); static void ov117_02260EB8(G3DPipelineBuffers *param0); static void ov117_02260F7C(SysTask *param0, void *param1); @@ -507,7 +507,7 @@ static void ov117_02260DA0(void *param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static G3DPipelineBuffers *ov117_02260E14(int heapID) +static G3DPipelineBuffers *ov117_02260E14(enum HeapID heapID) { return G3DPipeline_Init(heapID, TEXTURE_VRAM_SIZE_128K, PALETTE_VRAM_SIZE_32K, ov117_02260E34); } diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c index cfda228850..6512beed83 100644 --- a/src/overlay119/ov119_021D0D80.c +++ b/src/overlay119/ov119_021D0D80.c @@ -47,8 +47,8 @@ void ov119_021D0DF4(void); void ov119_021D0E78(void); static u32 ov119_021D13B4(u32 param0, BOOL param1); static u32 ov119_021D13D0(u32 param0, BOOL param1); -static ParticleSystem *ov119_021D13EC(int heapID); -static ParticleSystem *ov119_021D1434(int heapID, int param1, int param2); +static ParticleSystem *ov119_021D13EC(enum HeapID heapID); +static ParticleSystem *ov119_021D1434(enum HeapID heapID, int param1, int param2); static void ov119_021D1474(SPLEmitter *param0); void ov119_021D0D80(void) @@ -404,7 +404,7 @@ static u32 ov119_021D13D0(u32 param0, BOOL param1) return v1; } -static ParticleSystem *ov119_021D13EC(int heapID) +static ParticleSystem *ov119_021D13EC(enum HeapID heapID) { ParticleSystem *v0; void *v1; @@ -421,7 +421,7 @@ static ParticleSystem *ov119_021D13EC(int heapID) return v0; } -static ParticleSystem *ov119_021D1434(int heapID, int param1, int param2) +static ParticleSystem *ov119_021D1434(enum HeapID heapID, int param1, int param2) { ParticleSystem *v0 = ov119_021D13EC(heapID); void *v1 = ParticleSystem_LoadResourceFromNARC(param1, param2, heapID); diff --git a/src/pal_pad.c b/src/pal_pad.c index 1fb7b6ddd4..a7d8190398 100644 --- a/src/pal_pad.c +++ b/src/pal_pad.c @@ -49,7 +49,7 @@ BOOL PalPad_AreTrainersEqual(const PalPad *first, const PalPad *second) return FALSE; } -void PalPad_PushEntries(PalPad *destination, PalPad *source, int numberToCopy, int heapID) +void PalPad_PushEntries(PalPad *destination, PalPad *source, int numberToCopy, enum HeapID heapID) { int i; int diffs[5]; diff --git a/src/poffin.c b/src/poffin.c index 3a0c8f8222..506412cbe0 100644 --- a/src/poffin.c +++ b/src/poffin.c @@ -38,7 +38,7 @@ void Poffin_Clear(Poffin *poffin) poffin->dummy = 0; } -Poffin *Poffin_New(int heapID) +Poffin *Poffin_New(enum HeapID heapID) { Poffin *poffin = Heap_AllocAtEnd(heapID, sizeof(Poffin)); Poffin_Clear(poffin); @@ -334,7 +334,7 @@ void PoffinCase_CopyPoffinFromSlot(PoffinCase *poffinCase, u16 srcSlot, Poffin * return; } -Poffin *PoffinCase_AllocateForSlot(PoffinCase *poffinCase, u16 destSlot, int heapID) +Poffin *PoffinCase_AllocateForSlot(PoffinCase *poffinCase, u16 destSlot, enum HeapID heapID) { Poffin *poffin = Poffin_New(heapID); diff --git a/src/pokedex_heightweight.c b/src/pokedex_heightweight.c index e897e9ac6e..08e0cfb15c 100644 --- a/src/pokedex_heightweight.c +++ b/src/pokedex_heightweight.c @@ -8,14 +8,14 @@ #include "narc.h" #include "pokedex_data_index.h" -static int *Pokedex_Height_Array(NARC *pokedexDataNARC, int heapID); -static int *Pokedex_Weight_Array(NARC *pokedexDataNARC, int heapID); -static void Pokedex_Comparison_Pos_M_Array(NARC *pokedexDataNARC, short **trainerPos, short **pokemonPos, int heapID); -static void Pokedex_Comparison_Pos_F_Array(NARC *pokedexDataNARC, short **trainerPos, short **pokemonPos, int heapID); -static void Pokedex_Comparison_Scale_M_Array(NARC *pokedexDataNARC, short **trainerScale, short **pokemonScale, int heapID); -static void Pokedex_Comparison_Scale_F_Array(NARC *pokedexDataNARC, short **trainerScale, short **pokemonScale, int heapID); +static int *Pokedex_Height_Array(NARC *pokedexDataNARC, enum HeapID heapID); +static int *Pokedex_Weight_Array(NARC *pokedexDataNARC, enum HeapID heapID); +static void Pokedex_Comparison_Pos_M_Array(NARC *pokedexDataNARC, short **trainerPos, short **pokemonPos, enum HeapID heapID); +static void Pokedex_Comparison_Pos_F_Array(NARC *pokedexDataNARC, short **trainerPos, short **pokemonPos, enum HeapID heapID); +static void Pokedex_Comparison_Scale_M_Array(NARC *pokedexDataNARC, short **trainerScale, short **pokemonScale, enum HeapID heapID); +static void Pokedex_Comparison_Scale_F_Array(NARC *pokedexDataNARC, short **trainerScale, short **pokemonScale, enum HeapID heapID); -HeightWeightData *Pokedex_HeightWeightData(int heapID) +HeightWeightData *Pokedex_HeightWeightData(enum HeapID heapID) { HeightWeightData *HWData = Heap_Alloc(heapID, sizeof(HeightWeightData)); memset(HWData, 0, sizeof(HeightWeightData)); @@ -31,7 +31,7 @@ void Pokedex_HeightWeightData_Free(HeightWeightData *HWData) HWData = NULL; } -void Pokedex_HeightWeightData_Load(HeightWeightData *HWData, int trainerIsGirl, int heapID) +void Pokedex_HeightWeightData_Load(HeightWeightData *HWData, int trainerIsGirl, enum HeapID heapID) { GF_ASSERT(HWData); GF_ASSERT(HWData->height == NULL); @@ -117,37 +117,37 @@ short Pokedex_HeightWeightData_PokemonScale(const HeightWeightData *HWData, int return HWData->pokemonScale[species]; } -static int *Pokedex_Height_Array(NARC *pokedexDataNARC, int heapID) +static int *Pokedex_Height_Array(NARC *pokedexDataNARC, enum HeapID heapID) { void *height = LoadMemberFromOpenNARC(pokedexDataNARC, 0, 0, heapID, 0); return (int *)height; } -static int *Pokedex_Weight_Array(NARC *pokedexDataNARC, int heapID) +static int *Pokedex_Weight_Array(NARC *pokedexDataNARC, enum HeapID heapID) { void *weight = LoadMemberFromOpenNARC(pokedexDataNARC, 1, 0, heapID, 0); return (int *)weight; } -static void Pokedex_Comparison_Pos_M_Array(NARC *pokedexDataNARC, short **trainerPos, short **pokemonPos, int heapID) +static void Pokedex_Comparison_Pos_M_Array(NARC *pokedexDataNARC, short **trainerPos, short **pokemonPos, enum HeapID heapID) { *trainerPos = (short *)LoadMemberFromOpenNARC(pokedexDataNARC, 9, 0, heapID, 0); *pokemonPos = (short *)LoadMemberFromOpenNARC(pokedexDataNARC, 10, 0, heapID, 0); } -static void Pokedex_Comparison_Pos_F_Array(NARC *pokedexDataNARC, short **trainerPos, short **pokemonPos, int heapID) +static void Pokedex_Comparison_Pos_F_Array(NARC *pokedexDataNARC, short **trainerPos, short **pokemonPos, enum HeapID heapID) { *trainerPos = (short *)LoadMemberFromOpenNARC(pokedexDataNARC, 7, 0, heapID, 0); *pokemonPos = (short *)LoadMemberFromOpenNARC(pokedexDataNARC, 8, 0, heapID, 0); } -static void Pokedex_Comparison_Scale_M_Array(NARC *pokedexDataNARC, short **trainerScale, short **pokemonScale, int heapID) +static void Pokedex_Comparison_Scale_M_Array(NARC *pokedexDataNARC, short **trainerScale, short **pokemonScale, enum HeapID heapID) { *trainerScale = (short *)LoadMemberFromOpenNARC(pokedexDataNARC, 5, 0, heapID, 0); *pokemonScale = (short *)LoadMemberFromOpenNARC(pokedexDataNARC, 6, 0, heapID, 0); } -static void Pokedex_Comparison_Scale_F_Array(NARC *pokedexDataNARC, short **trainerScale, short **pokemonScale, int heapID) +static void Pokedex_Comparison_Scale_F_Array(NARC *pokedexDataNARC, short **trainerScale, short **pokemonScale, enum HeapID heapID) { *trainerScale = (short *)LoadMemberFromOpenNARC(pokedexDataNARC, 3, 0, heapID, 0); *pokemonScale = (short *)LoadMemberFromOpenNARC(pokedexDataNARC, 4, 0, heapID, 0); diff --git a/src/pokemon.c b/src/pokemon.c index 71cc911cee..93dd2e66cd 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2128,7 +2128,7 @@ static void BoxPokemon_IncreaseDataInternal(BoxPokemon *boxMon, enum PokemonData } } -SpeciesData *SpeciesData_FromMonForm(int monSpecies, int monForm, int heapID) +SpeciesData *SpeciesData_FromMonForm(int monSpecies, int monForm, enum HeapID heapID) { SpeciesData *speciesData = Heap_Alloc(heapID, sizeof(SpeciesData)); SpeciesData_LoadForm(monSpecies, monForm, speciesData); @@ -2136,7 +2136,7 @@ SpeciesData *SpeciesData_FromMonForm(int monSpecies, int monForm, int heapID) return speciesData; } -SpeciesData *SpeciesData_FromMonSpecies(int monSpecies, int heapID) +SpeciesData *SpeciesData_FromMonSpecies(int monSpecies, enum HeapID heapID) { SpeciesData *speciesData = Heap_Alloc(heapID, sizeof(SpeciesData)); SpeciesData_LoadSpecies(monSpecies, speciesData); @@ -3405,7 +3405,7 @@ static const int Unk_020F0588[] = { 0x1 }; -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) { SpriteTemplate v0; ManagedSprite *v1; @@ -4586,7 +4586,7 @@ void Pokemon_LoadLevelUpMovesOf(int monSpecies, int monForm, u16 *monLevelUpMove NARC_ReadWholeMemberByIndexPair(monLevelUpMoves, NARC_INDEX_POKETOOL__PERSONAL__WOTBL, monSpecies); } -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) { if (species == SPECIES_CHATOT) { if (Sound_CanPlayChatotCry(cryMod) == FALSE) { @@ -4606,7 +4606,7 @@ void PlayCryWithParams(ChatotCry *chatotCry, enum PokemonCryMod cryMod, u16 spec Sound_PlayPokemonCryEx(cryMod, species, pan, volume, heapID, form); } -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) { if (species == SPECIES_CHATOT) { if (Sound_CanPlayChatotCry(cryMod) == FALSE) { @@ -5037,7 +5037,7 @@ BOOL Pokemon_IsBannedFromBattleFrontier(Pokemon *pokemon) return Pokemon_IsOnBattleFrontierBanlist(species); } -BOOL sub_0207884C(BoxPokemon *boxMon, TrainerInfo *param1, int heapID) +BOOL sub_0207884C(BoxPokemon *boxMon, TrainerInfo *param1, enum HeapID heapID) { u32 v0 = TrainerInfo_ID(param1); u32 monOTID = BoxPokemon_GetValue(boxMon, MON_DATA_OT_ID, NULL); @@ -5182,7 +5182,7 @@ void PokemonSprite_LoadShadowSize(NARC *narc, u8 *shadowSize, u16 species) *shadowSize = data.shadowSize; } -BOOL Pokemon_SetBallSeal(int param0, Pokemon *mon, int heapID) +BOOL Pokemon_SetBallSeal(int param0, Pokemon *mon, enum HeapID heapID) { int v0 = param0; diff --git a/src/pokeradar.c b/src/pokeradar.c index 9358ebaf0d..2a1d88dc30 100644 --- a/src/pokeradar.c +++ b/src/pokeradar.c @@ -60,7 +60,7 @@ static BOOL CheckPatchContinueChain(const u8 patchRing, const int battleResult); static BOOL CheckPatchShiny(const int param0); static void IncWithCap(int *param0); -RadarChain *RadarChain_Init(const int heapID) +RadarChain *RadarChain_Init(const enum HeapID heapID) { RadarChain *chain = Heap_Alloc(heapID, sizeof(RadarChain)); GFXBoxTest_MakeBox(FX32_ONE * 16, FX32_ONE * 8, FX32_ONE * 16, &chain->grassPatchVolume); diff --git a/src/savedata.c b/src/savedata.c index d24a38406f..b9c1518a48 100644 --- a/src/savedata.c +++ b/src/savedata.c @@ -1045,7 +1045,7 @@ int SaveDataExtra_SaveMirror(SaveData *saveData, int extraSaveID, void *data) } } -void *SaveDataExtra_Get(SaveData *saveData, int heapID, int extraSaveID, int *loadResult) +void *SaveDataExtra_Get(SaveData *saveData, enum HeapID heapID, int extraSaveID, int *loadResult) { GF_ASSERT(extraSaveID < gExtraSaveTableSize); @@ -1103,7 +1103,7 @@ void *SaveDataExtra_Get(SaveData *saveData, int heapID, int extraSaveID, int *lo return ret; } -void *SaveDataExtra_Mirror(SaveData *saveData, int heapID, int extraSaveID, int *loadResult, BOOL *isOld) +void *SaveDataExtra_Mirror(SaveData *saveData, enum HeapID heapID, int extraSaveID, int *loadResult, BOOL *isOld) { const SaveTableEntry *saveTable; void *ret; diff --git a/src/savedata/save_table.c b/src/savedata/save_table.c index 828d9ceeab..87732bb88c 100644 --- a/src/savedata/save_table.c +++ b/src/savedata/save_table.c @@ -121,7 +121,7 @@ const SaveTableEntry gExtraSaveTable[] = { const int gExtraSaveTableSize = NELEMS(gExtraSaveTable); -HallOfFame *SaveData_HallOfFame(SaveData *saveData, int heapID, int *resultCode) +HallOfFame *SaveData_HallOfFame(SaveData *saveData, enum HeapID heapID, int *resultCode) { return SaveDataExtra_Get(saveData, heapID, EXTRA_SAVE_TABLE_ENTRY_HALL_OF_FAME, resultCode); } @@ -131,7 +131,7 @@ int SaveData_SaveHallOfFame(SaveData *saveData, HallOfFame *hof) return SaveDataExtra_Save(saveData, EXTRA_SAVE_TABLE_ENTRY_HALL_OF_FAME, hof); } -BattleRecording *SaveData_BattleRecording(SaveData *saveData, int heapID, int *resultCode, int recNum) +BattleRecording *SaveData_BattleRecording(SaveData *saveData, enum HeapID heapID, int *resultCode, int recNum) { BOOL tmp; return SaveDataExtra_Mirror(saveData, heapID, EXTRA_SAVE_TABLE_ENTRY_MY_RECORDINGS + recNum, resultCode, &tmp); @@ -142,7 +142,7 @@ int SaveData_SaveBattleRecording(SaveData *saveData, BattleRecording *rec, int r return SaveDataExtra_SaveMirror(saveData, EXTRA_SAVE_TABLE_ENTRY_MY_RECORDINGS + recNum, rec); } -BattleFrontierStage *SaveData_BattleFrontierStage(SaveData *saveData, int heapID, int *resultCode) +BattleFrontierStage *SaveData_BattleFrontierStage(SaveData *saveData, enum HeapID heapID, int *resultCode) { BOOL tmp; return SaveDataExtra_Mirror(saveData, heapID, EXTRA_SAVE_TABLE_ENTRY_FRONTIER, resultCode, &tmp); diff --git a/src/scrcmd.c b/src/scrcmd.c index 93f7dd495b..cd64820a60 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -3795,7 +3795,7 @@ static BOOL sub_02041D98(FieldSystem *fieldSystem, int param1, int param2) return TRUE; } -static UnkStruct_02041DC8 *sub_02041DC8(int heapID, FieldSystem *fieldSystem, int param2, int param3) +static UnkStruct_02041DC8 *sub_02041DC8(enum HeapID heapID, FieldSystem *fieldSystem, int param2, int param3) { UnkStruct_0202A750 *v3 = sub_0202A750(fieldSystem->saveData); diff --git a/src/screen_fade_funcs.c b/src/screen_fade_funcs.c index 7d5d881974..63461e8737 100644 --- a/src/screen_fade_funcs.c +++ b/src/screen_fade_funcs.c @@ -82,7 +82,7 @@ typedef struct { int unk_1C; int unk_20; int unk_24; - int heapID; + enum HeapID heapID; int unk_2C; HardwareWindowSettings *unk_30; ScreenFadeHBlanks *unk_34; @@ -109,7 +109,7 @@ typedef struct { int unk_20; HardwareWindowSettings *unk_24; ScreenFadeHBlanks *unk_28; - int heapID; + enum HeapID heapID; } UnkStruct_02011360; typedef struct { @@ -132,7 +132,7 @@ typedef struct { int unk_24; HardwareWindowSettings *unk_28; ScreenFadeHBlanks *unk_2C; - int heapID; + enum HeapID heapID; } UnkStruct_02011568; typedef struct { @@ -160,7 +160,7 @@ typedef struct { int unk_20; HardwareWindowSettings *unk_24; ScreenFadeHBlanks *unk_28; - int heapID; + enum HeapID heapID; } UnkStruct_0201184C; typedef struct { @@ -187,7 +187,7 @@ typedef struct { int unk_20; int unk_24; int unk_28; - int heapID; + enum HeapID heapID; HardwareWindowSettings *unk_30; ScreenFadeHBlanks *unk_34; } UnkStruct_02011AFC; @@ -214,7 +214,7 @@ typedef struct { int unk_20; int unk_24; int unk_28; - int heapID; + enum HeapID heapID; HardwareWindowSettings *unk_30; ScreenFadeHBlanks *unk_34; } UnkStruct_02011E04; @@ -254,7 +254,7 @@ typedef struct { int unk_31C; int unk_320; int unk_324; - int heapID; + enum HeapID heapID; HardwareWindowSettings *unk_32C; ScreenFadeHBlanks *unk_330; } UnkStruct_020120D4; @@ -291,7 +291,7 @@ static void sub_020101B0(UnkStruct_020101B0 *param0, UnkStruct_020101B0 *param1) static void sub_020101D4(UnkStruct_020101B0 *param0, UnkStruct_020101B0 *param1, UnkStruct_020101B0 *param2, const UnkStruct_0200FD8C *param3, const UnkStruct_0200FD8C *param4, int param5); static void sub_02010658(int param0, HardwareWindowSettings *param1, int param2); static void sub_0201035C(void *param0); -static void sub_02010588(UnkStruct_02010588 *param0, int param1, int param2, int heapID); +static void sub_02010588(UnkStruct_02010588 *param0, int param1, int param2, enum HeapID heapID); static void sub_020105EC(UnkStruct_02010588 *param0); static void sub_020105F4(UnkStruct_02010588 *param0); static UnkStruct_02010FC0 *sub_02010604(UnkStruct_02010588 *param0, int param1); @@ -315,44 +315,44 @@ static void sub_02010E48(UnkStruct_02010EA4 *param0, const UnkStruct_0200F980 *p static BOOL sub_02010EA4(UnkStruct_02010EA4 *param0); static void sub_02010F2C(ScreenFade *param0, const UnkStruct_0200FB7C *param1); static BOOL sub_02010F64(ScreenFade *param0); -static void sub_02010FC0(UnkStruct_0201109C *param0, const UnkStruct_0200FB7C *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, int heapID); +static void sub_02010FC0(UnkStruct_0201109C *param0, const UnkStruct_0200FB7C *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, enum HeapID heapID); static BOOL sub_0201109C(UnkStruct_0201109C *param0); static void sub_02011180(UnkStruct_0201109C *param0); static void sub_02011204(ScreenFade *param0, const UnkStruct_0200FC2C *param1); static BOOL sub_0201123C(ScreenFade *param0); -static void sub_02011298(UnkStruct_02011360 *param0, const UnkStruct_0200FC2C *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, int heapID); +static void sub_02011298(UnkStruct_02011360 *param0, const UnkStruct_0200FC2C *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, enum HeapID heapID); static BOOL sub_02011360(UnkStruct_02011360 *param0); static void sub_020113B0(UnkStruct_02011360 *param0); static void sub_02011408(ScreenFade *param0, const UnkStruct_0200FD34 *param1); static BOOL sub_02011440(ScreenFade *param0); -static void sub_02011494(UnkStruct_02011568 *param0, const UnkStruct_0200FD34 *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, int heapID); +static void sub_02011494(UnkStruct_02011568 *param0, const UnkStruct_0200FD34 *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, enum HeapID heapID); static BOOL sub_02011568(UnkStruct_02011568 *param0); static void sub_020115B8(UnkStruct_02011568 *param0); static void sub_020116A0(ScreenFade *param0, const UnkStruct_02011738 *param1); static BOOL sub_020116D8(ScreenFade *param0); static BOOL sub_0201184C(UnkStruct_0201184C *param0); -static void sub_02011738(UnkStruct_0201184C *param0, const UnkStruct_02011738 *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, int heapID); +static void sub_02011738(UnkStruct_0201184C *param0, const UnkStruct_02011738 *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, enum HeapID heapID); static void sub_0201189C(UnkStruct_0201184C *param0); static void sub_020118AC(UnkStruct_0201184C *param0); static void sub_02011938(UnkStruct_0201184C *param0); static void sub_020118E0(UnkStruct_02010588 *param0, UnkStruct_020101B0 *param1); static void sub_02011960(ScreenFade *param0, UnkStruct_0200FEA4 *param1); static BOOL sub_020119A0(ScreenFade *param0); -static void sub_02011A00(UnkStruct_02011AFC *param0, UnkStruct_0200FEA4 *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, int heapID); +static void sub_02011A00(UnkStruct_02011AFC *param0, UnkStruct_0200FEA4 *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, enum HeapID heapID); static BOOL sub_02011AFC(UnkStruct_02011AFC *param0); static void sub_02011B54(UnkStruct_02011AFC *param0); static void sub_02011B58(UnkStruct_02011AFC *param0); static void sub_02011C7C(UnkStruct_02011C7C *param0, int param1, int param2); static void sub_02011C94(ScreenFade *param0, UnkStruct_0200FF30 *param1); static BOOL sub_02011CD4(ScreenFade *param0); -static void sub_02011D34(UnkStruct_02011E04 *param0, UnkStruct_0200FF30 *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, int heapID); +static void sub_02011D34(UnkStruct_02011E04 *param0, UnkStruct_0200FF30 *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, enum HeapID heapID); static BOOL sub_02011E04(UnkStruct_02011E04 *param0); static void sub_02011E5C(UnkStruct_02011E04 *param0); static void sub_02011E60(UnkStruct_02011E04 *param0); static void sub_02011F2C(UnkStruct_02011F2C *param0, int param1, int param2); static void sub_02011F44(ScreenFade *param0, UnkStruct_0200FE6C *param1); static BOOL sub_02011F88(ScreenFade *param0); -static void sub_02011FE8(UnkStruct_020120D4 *param0, UnkStruct_0200FE6C *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, int heapID); +static void sub_02011FE8(UnkStruct_020120D4 *param0, UnkStruct_0200FE6C *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, enum HeapID heapID); static BOOL sub_020120D4(UnkStruct_020120D4 *param0); static void sub_02012134(UnkStruct_020120D4 *param0); static void sub_02012138(UnkStruct_020120D4 *param0); @@ -361,7 +361,7 @@ static void sub_020121C4(ScreenFade *param0, UnkStruct_0201006C *param1); static BOOL sub_02012228(ScreenFade *param0); static void sub_02012290(UnkStruct_02012290 *param0, UnkStruct_0201006C *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, int param7); static BOOL sub_02012310(UnkStruct_02012290 *param0, ScreenFade *param1); -static void sub_02012384(UnkStruct_02012290 *param0, UnkStruct_0201006C *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, int heapID); +static void sub_02012384(UnkStruct_02012290 *param0, UnkStruct_0201006C *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, enum HeapID heapID); static BOOL sub_020123F4(UnkStruct_02012290 *param0, ScreenFade *param1); BOOL sub_0200F85C(ScreenFade *param0) @@ -1628,7 +1628,7 @@ static void sub_0201035C(void *param0) } } -static void sub_02010588(UnkStruct_02010588 *param0, int param1, int param2, int heapID) +static void sub_02010588(UnkStruct_02010588 *param0, int param1, int param2, enum HeapID heapID) { switch (param1) { case 0: @@ -2023,7 +2023,7 @@ static BOOL sub_02010F64(ScreenFade *param0) return v2; } -static void sub_02010FC0(UnkStruct_0201109C *param0, const UnkStruct_0200FB7C *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, int heapID) +static void sub_02010FC0(UnkStruct_0201109C *param0, const UnkStruct_0200FB7C *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, enum HeapID heapID) { int v0; UnkStruct_02010FC0 *v1; @@ -2187,7 +2187,7 @@ static BOOL sub_0201123C(ScreenFade *param0) return v2; } -static void sub_02011298(UnkStruct_02011360 *param0, const UnkStruct_0200FC2C *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, int heapID) +static void sub_02011298(UnkStruct_02011360 *param0, const UnkStruct_0200FC2C *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, enum HeapID heapID) { UnkStruct_02010FC0 *v0; @@ -2296,7 +2296,7 @@ static BOOL sub_02011440(ScreenFade *param0) return v2; } -static void sub_02011494(UnkStruct_02011568 *param0, const UnkStruct_0200FD34 *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, int heapID) +static void sub_02011494(UnkStruct_02011568 *param0, const UnkStruct_0200FD34 *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, enum HeapID heapID) { int v0; UnkStruct_02010FC0 *v1; @@ -2448,7 +2448,7 @@ static BOOL sub_020116D8(ScreenFade *param0) return v2; } -static void sub_02011738(UnkStruct_0201184C *param0, const UnkStruct_02011738 *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, int heapID) +static void sub_02011738(UnkStruct_0201184C *param0, const UnkStruct_02011738 *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, enum HeapID heapID) { int v0; UnkStruct_02010FC0 *v1; @@ -2601,7 +2601,7 @@ static BOOL sub_020119A0(ScreenFade *param0) return v2; } -static void sub_02011A00(UnkStruct_02011AFC *param0, UnkStruct_0200FEA4 *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, int heapID) +static void sub_02011A00(UnkStruct_02011AFC *param0, UnkStruct_0200FEA4 *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, enum HeapID heapID) { UnkStruct_02010FC0 *v0; UnkStruct_02010FC0 *v1; @@ -2776,7 +2776,7 @@ static BOOL sub_02011CD4(ScreenFade *param0) return v2; } -static void sub_02011D34(UnkStruct_02011E04 *param0, UnkStruct_0200FF30 *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, int heapID) +static void sub_02011D34(UnkStruct_02011E04 *param0, UnkStruct_0200FF30 *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, enum HeapID heapID) { UnkStruct_02010FC0 *v0; UnkStruct_02010FC0 *v1; @@ -2929,7 +2929,7 @@ static BOOL sub_02011F88(ScreenFade *param0) return v2; } -static void sub_02011FE8(UnkStruct_020120D4 *param0, UnkStruct_0200FE6C *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, int heapID) +static void sub_02011FE8(UnkStruct_020120D4 *param0, UnkStruct_0200FE6C *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, enum HeapID heapID) { sub_02010728(¶m0->unk_00, param4, 1, 0, 0); @@ -3151,7 +3151,7 @@ static BOOL sub_02012310(UnkStruct_02012290 *param0, ScreenFade *param1) return v1; } -static void sub_02012384(UnkStruct_02012290 *param0, UnkStruct_0201006C *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, int heapID) +static void sub_02012384(UnkStruct_02012290 *param0, UnkStruct_0201006C *param1, int param2, int param3, int param4, HardwareWindowSettings *param5, ScreenFadeHBlanks *param6, enum HeapID heapID) { int v0; diff --git a/src/script_manager.c b/src/script_manager.c index fcc1fa9259..24079a330a 100644 --- a/src/script_manager.c +++ b/src/script_manager.c @@ -667,7 +667,7 @@ static BOOL ScriptManager_SetHiddenItem(ScriptManager *scriptManager, u16 script return TRUE; } -HiddenItemTilePosition *FieldSystem_GetNearbyHiddenItems(FieldSystem *fieldSystem, int heapID) +HiddenItemTilePosition *FieldSystem_GetNearbyHiddenItems(FieldSystem *fieldSystem, enum HeapID heapID) { HiddenItemTilePosition *hiddenItems; const BgEvent *bgEvents; diff --git a/src/sound.c b/src/sound.c index dea86516de..d54ea188c4 100644 --- a/src/sound.c +++ b/src/sound.c @@ -850,7 +850,7 @@ 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) { UNUSED(SoundSystem_Get()); void **reverseBuffer = SoundSystem_GetParam(SOUND_SYSTEM_PARAM_WAVE_OUT_REVERSE_BUFFER); diff --git a/src/sound_playback.c b/src/sound_playback.c index 5d56f8eee1..8f49779a69 100644 --- a/src/sound_playback.c +++ b/src/sound_playback.c @@ -34,13 +34,13 @@ static void Sound_Impl_ResetBGM(void); void Sound_StopAll(void); static void Sound_Impl_SetPokemonCryVolume(u16 param0, enum SoundHandleType param1, int param2); void Sound_StopPokemonCries(int param0); -void Sound_SetPokemonCryDuration(int param0, int heapID); +void Sound_SetPokemonCryDuration(int param0, enum HeapID heapID); static void Sound_Impl_CryDurationTask(SysTask *param0, void *param1); void Sound_Impl_DestroyCryDurationTask(void); static BOOL Sound_Impl_IsShayminSkyForm(u16 species, u8 form); void Sound_ClearPokemonCryParams(void); static BOOL Sound_Impl_PlayPokemonCryEcho(u16 species, s8 pitch, u8 form); -static BOOL Sound_PlayPokemonCryReversedEcho(u16 param0, s8 param1, int param2, int param3, int heapID); +static BOOL Sound_PlayPokemonCryReversedEcho(u16 param0, s8 param1, int param2, int param3, enum HeapID heapID); BOOL Sound_UpdateFanfareDelay(void); static void Sound_Impl_StopFanfare(int param0); BOOL Sound_IsBGMPausedByFanfare(void); @@ -411,7 +411,7 @@ BOOL Sound_IsPokemonCryPlaying(void) return Sound_GetNumberOfPlayingSequencesForPlayer(PLAYER_PV); } -BOOL Sound_PlayPokemonCryEx(enum PokemonCryMod cryMod, u16 species, int pan, int volume, int heapID, u8 form) +BOOL Sound_PlayPokemonCryEx(enum PokemonCryMod cryMod, u16 species, int pan, int volume, enum HeapID heapID, u8 form) { int waveOutPan, echoVolume; // Need to be declared up here to match u8 *wavePrimaryAllocated = SoundSystem_GetParam(SOUND_SYSTEM_PARAM_WAVE_OUT_PRIMARY_ALLOCATED); @@ -599,7 +599,7 @@ static void Sound_Impl_SetPokemonCryVolume(u16 species, enum SoundHandleType han Sound_AdjustVolumeForVoiceChatEx(species, handleType); } -void Sound_SetPokemonCryDuration(int duration, int heapID) +void Sound_SetPokemonCryDuration(int duration, enum HeapID heapID) { PokemonCryDurationParam *param = NULL; SysTask **task = SoundSystem_GetParam(SOUND_SYSTEM_PARAM_CRY_DURATION_TASK); @@ -666,7 +666,7 @@ void Sound_Impl_DestroyCryDurationTask() *task = NULL; } -void Sound_PlayDelayedPokemonCryEx(enum PokemonCryMod cryMod, u16 species, int pan, int volume, int heapID, u8 delay, u8 form) +void Sound_PlayDelayedPokemonCryEx(enum PokemonCryMod cryMod, u16 species, int pan, int volume, enum HeapID heapID, u8 delay, u8 form) { int *paramMod; u16 *paramWaveID; @@ -777,7 +777,7 @@ static BOOL Sound_Impl_PlayPokemonCryEcho(u16 species, s8 pitch, u8 form) return success; } -static BOOL Sound_PlayPokemonCryReversedEcho(u16 species, s8 unused, int volume, int pan, int heapID) +static BOOL Sound_PlayPokemonCryReversedEcho(u16 species, s8 unused, int volume, int pan, enum HeapID heapID) { u8 *echoEnabled = SoundSystem_GetParam(SOUND_SYSTEM_PARAM_ECHO_ENABLED); *echoEnabled = TRUE; diff --git a/src/system.c b/src/system.c index 1ea64a3ad0..7668a409c5 100644 --- a/src/system.c +++ b/src/system.c @@ -191,7 +191,7 @@ void InitVRAM(void) MI_CpuClearFast((void *)HW_DB_PLTT, HW_DB_PLTT_SIZE); } -void *ReadFileToHeap(int heapID, const char *filename) +void *ReadFileToHeap(enum HeapID heapID, const char *filename) { FSFile file; FS_InitFile(&file); diff --git a/src/trainer_data.c b/src/trainer_data.c index a2422be3df..daad3d8145 100644 --- a/src/trainer_data.c +++ b/src/trainer_data.c @@ -20,9 +20,9 @@ #include "savedata_misc.h" #include "string_gf.h" -static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, int heapID); +static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, enum HeapID heapID); -void Trainer_Encounter(FieldBattleDTO *dto, const SaveData *saveData, int heapID) +void Trainer_Encounter(FieldBattleDTO *dto, const SaveData *saveData, enum HeapID heapID) { Trainer trdata; MessageLoader *msgLoader = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_NPC_TRAINER_NAMES, heapID); @@ -95,7 +95,7 @@ u32 Trainer_LoadParam(int trainerID, enum TrainerDataParam paramID) return result; } -BOOL Trainer_HasMessageType(int trainerID, enum TrainerMessageType msgType, int heapID) +BOOL Trainer_HasMessageType(int trainerID, enum TrainerMessageType msgType, enum HeapID heapID) { NARC *narc; // must declare up here to match u16 offset, data[2]; @@ -124,7 +124,7 @@ BOOL Trainer_HasMessageType(int trainerID, enum TrainerMessageType msgType, int return result; } -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) { NARC *narc; // must declare up here to match u16 offset, data[2]; @@ -173,7 +173,7 @@ u8 TrainerClass_Gender(int trclass) * @param battler Which battler's party is to be loaded. * @param heapID Heap on which to perform any allocations. */ -static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, int heapID) +static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, enum HeapID heapID) { // must make declarations C89-style to match void *buf; diff --git a/src/trainer_info.c b/src/trainer_info.c index 51026207b6..9c4da2c8c4 100644 --- a/src/trainer_info.c +++ b/src/trainer_info.c @@ -71,7 +71,7 @@ void TrainerInfo_NameString(const TrainerInfo *info, String *name) String_CopyChars(name, info->name); } -String *TrainerInfo_NameNewString(const TrainerInfo *info, int heapID) +String *TrainerInfo_NameNewString(const TrainerInfo *info, enum HeapID heapID) { String *name = String_Init(TRAINER_NAME_LEN + 1, heapID); diff --git a/src/tv_episode_segment.c b/src/tv_episode_segment.c index 06e539cb53..d472fd5057 100644 --- a/src/tv_episode_segment.c +++ b/src/tv_episode_segment.c @@ -491,7 +491,7 @@ static void TVEpisodeSegment_SetTemplateTrainerName(StringTemplate *template, in sub_0206CD94(template, idx, ov6_02246494(param2), ov6_0224648C(param2), ov6_02246490(param2), 1); } -static void sub_0206CE08(int heapID, u16 *param1, Pokemon *mon) +static void sub_0206CE08(enum HeapID heapID, u16 *param1, Pokemon *mon) { String *string = String_Init(64, heapID); @@ -524,7 +524,7 @@ static void TVEpisodeSegment_SetTemplateOwnPokemonSpecies(StringTemplate *templa sub_0206CD94(template, idx, speciesName, 0, GAME_LANGUAGE, 1); } -static void sub_0206CED0(int heapID, Pokemon *mon, u8 *param2, u16 *param3) +static void sub_0206CED0(enum HeapID heapID, Pokemon *mon, u8 *param2, u16 *param3) { *param2 = Pokemon_GetValue(mon, MON_DATA_HAS_NICKNAME, NULL); @@ -550,7 +550,7 @@ void sub_0206CF14(TVBroadcast *broadcast, Pokemon *param1, int param2, int param SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST); } -void sub_0206CF48(TVBroadcast *broadcast, Pokemon *param1, int heapID) +void sub_0206CF48(TVBroadcast *broadcast, Pokemon *param1, enum HeapID heapID) { UnkStruct_0202E7E4 *v0 = sub_0202E7E4(broadcast); @@ -700,7 +700,7 @@ void sub_0206D12C(TVBroadcast *broadcast) SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST); } -CaptureAttempt *CaptureAttempt_New(int heapID) +CaptureAttempt *CaptureAttempt_New(enum HeapID heapID) { CaptureAttempt *captureAttempt = Heap_Alloc(heapID, sizeof(CaptureAttempt)); MI_CpuClearFast(captureAttempt, sizeof(CaptureAttempt)); diff --git a/src/unk_02012744.c b/src/unk_02012744.c index bba14864b6..b32c83383a 100644 --- a/src/unk_02012744.c +++ b/src/unk_02012744.c @@ -61,14 +61,14 @@ typedef struct UnkStruct_02012B20_t { static void sub_02012CD0(FontOAM *param0); static FontOAM *sub_02012CE0(const UnkStruct_02012744 *param0); static int sub_02012D08(int param0, int param1); -static int sub_02012DE4(int param0, int param1, int heapID, UnkStruct_02013034 *param3); -static void sub_02012E6C(const Window *param0, const UnkStruct_02013034 *param1, NNSG2dImageProxy *param2, int param3, int param4, int heapID); -static int sub_02012EE0(const Window *param0, const UnkStruct_02013034 *param1, NNSG2dImageProxy *param2, int param3, int param4, int param5, int param6, int heapID); +static int sub_02012DE4(int param0, int param1, enum HeapID heapID, UnkStruct_02013034 *param3); +static void sub_02012E6C(const Window *param0, const UnkStruct_02013034 *param1, NNSG2dImageProxy *param2, int param3, int param4, enum HeapID heapID); +static int sub_02012EE0(const Window *param0, const UnkStruct_02013034 *param1, NNSG2dImageProxy *param2, int param3, int param4, int param5, int param6, enum HeapID heapID); static int sub_02013034(const UnkStruct_02013034 *param0, int param1); static void sub_02013088(const UnkStruct_020127E8 *param0, const UnkStruct_02013034 *param1, const NNSG2dImageProxy *param2, FontOAM *param3); static Sprite *sub_02013100(const UnkStruct_020127E8 *param0, const UnkStruct_02013034 *param1, const NNSG2dImageProxy *param2); static void sub_020130DC(FontOAM *param0); -static UnkStruct_02013034 *sub_02013188(int heapID); +static UnkStruct_02013034 *sub_02013188(enum HeapID heapID); static void sub_020131A4(UnkStruct_02013034 *param0); static void sub_020131B8(UnkStruct_02013034 *param0); static void sub_020131D0(UnkStruct_02013034 *param0, UnkStruct_02013034 *param1); @@ -90,7 +90,7 @@ static const u8 Unk_020E52E4[12][2] = { { 0x1, 0x1 } }; -UnkStruct_02012744 *sub_02012744(int param0, int heapID) +UnkStruct_02012744 *sub_02012744(int param0, enum HeapID heapID) { UnkStruct_02012744 *v0; int v1; @@ -170,7 +170,7 @@ void sub_02012870(FontOAM *param0) sub_02012CD0(param0); } -int sub_02012898(const Window *param0, int param1, int heapID) +int sub_02012898(const Window *param0, int param1, enum HeapID heapID) { UnkStruct_02013034 v0; int v1; @@ -328,7 +328,7 @@ 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) { UnkStruct_02012B20 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02012B20)); @@ -381,7 +381,7 @@ void sub_02012BD8(FontOAM *param0) sub_02012870(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) { int v0; char *v1; @@ -466,7 +466,7 @@ static int sub_02012D08(int param0, int param1) return 12; } -static BOOL sub_02012D34(UnkStruct_02012D34 *param0, UnkStruct_02013034 *param1, int heapID) +static BOOL sub_02012D34(UnkStruct_02012D34 *param0, UnkStruct_02013034 *param1, enum HeapID heapID) { UnkStruct_02013034 *v0; int v1; @@ -507,7 +507,7 @@ static BOOL sub_02012D34(UnkStruct_02012D34 *param0, UnkStruct_02013034 *param1, return 0; } -static int sub_02012DE4(int param0, int param1, int heapID, UnkStruct_02013034 *param3) +static int sub_02012DE4(int param0, int param1, enum HeapID heapID, UnkStruct_02013034 *param3) { UnkStruct_02012DE4 v0; UnkStruct_02012D34 v1; @@ -545,7 +545,7 @@ static int sub_02012DE4(int param0, int param1, int heapID, UnkStruct_02013034 * return v3; } -static void sub_02012E6C(const Window *param0, const UnkStruct_02013034 *param1, NNSG2dImageProxy *param2, int param3, int param4, int heapID) +static void sub_02012E6C(const Window *param0, const UnkStruct_02013034 *param1, NNSG2dImageProxy *param2, int param3, int param4, enum HeapID heapID) { UnkStruct_02013034 *v0; int v1; @@ -570,7 +570,7 @@ static void sub_02012E6C(const Window *param0, const UnkStruct_02013034 *param1, } } -static int sub_02012EE0(const Window *param0, const UnkStruct_02013034 *param1, NNSG2dImageProxy *param2, int param3, int param4, int param5, int param6, int heapID) +static int sub_02012EE0(const Window *param0, const UnkStruct_02013034 *param1, NNSG2dImageProxy *param2, int param3, int param4, int param5, int param6, enum HeapID heapID) { char *v0; int v1; @@ -752,7 +752,7 @@ static Sprite *sub_02013100(const UnkStruct_020127E8 *param0, const UnkStruct_02 return SpriteList_Add(&v0); } -static UnkStruct_02013034 *sub_02013188(int heapID) +static UnkStruct_02013034 *sub_02013188(enum HeapID heapID) { UnkStruct_02013034 *v0 = Heap_AllocAtEnd(heapID, sizeof(UnkStruct_02013034)); GF_ASSERT(v0); diff --git a/src/unk_0201DD00.c b/src/unk_0201DD00.c index 77671544bb..95123f1314 100644 --- a/src/unk_0201DD00.c +++ b/src/unk_0201DD00.c @@ -32,7 +32,7 @@ static void sub_0201DDE4(UnkStruct_0201DDF4 *param0); static void sub_0201DE3C(UnkStruct_0201DDF4 *param0, const UnkStruct_0202144C *param1); static void sub_0201DE68(UnkStruct_0201DDF4 *param0, const UnkStruct_0202144C *param1); -UnkStruct_0201DD00 *sub_0201DD00(int param0, int heapID) +UnkStruct_0201DD00 *sub_0201DD00(int param0, enum HeapID heapID) { UnkStruct_0201DD00 *v0; int v1; diff --git a/src/unk_02020AEC.c b/src/unk_02020AEC.c index 6190d828e8..a93ca12421 100644 --- a/src/unk_02020AEC.c +++ b/src/unk_02020AEC.c @@ -141,7 +141,7 @@ void sub_02020B14(UnkStruct_020216E0 *param0) param0->unk_20 = NULL; } -void sub_02020B90(int param0, int heapID) +void sub_02020B90(int param0, enum HeapID heapID) { int v0; diff --git a/src/unk_0202854C.c b/src/unk_0202854C.c index eef9078772..864e8d1efa 100644 --- a/src/unk_0202854C.c +++ b/src/unk_0202854C.c @@ -306,7 +306,7 @@ void Underground_StoreRegisteredFlagOwnerInfo(Underground *underground, const Tr } } -TrainerInfo *Underground_GetRegisteredFlagOwnerInfo(const Underground *underground, int heapID, int offset) +TrainerInfo *Underground_GetRegisteredFlagOwnerInfo(const Underground *underground, enum HeapID heapID, int offset) { int index = underground->registeredFlagOwnerIndex - offset - 1; diff --git a/src/unk_0202CC64.c b/src/unk_0202CC64.c index 4454b88373..a83b846e72 100644 --- a/src/unk_0202CC64.c +++ b/src/unk_0202CC64.c @@ -19,7 +19,7 @@ void ChatotCry_Init(ChatotCry *param0) param0->exists = FALSE; } -ChatotCry *ChatotCry_New(int heapID) +ChatotCry *ChatotCry_New(enum HeapID heapID) { ChatotCry *cry = Heap_Alloc(heapID, sizeof(ChatotCry)); diff --git a/src/unk_0202D05C.c b/src/unk_0202D05C.c index 0d9816fc9d..1b62efa993 100644 --- a/src/unk_0202D05C.c +++ b/src/unk_0202D05C.c @@ -526,7 +526,7 @@ void sub_0202D708(UnkStruct_0202D764 *param0, UnkStruct_02049A68 *param1) param1->unk_04 = param0->unk_102; } -UnkStruct_ov90_021D1750 *sub_0202D71C(UnkStruct_0202D764 *param0, int heapID) +UnkStruct_ov90_021D1750 *sub_0202D71C(UnkStruct_0202D764 *param0, enum HeapID heapID) { UnkStruct_ov90_021D1750 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov90_021D1750) * 30); MI_CpuCopy8(param0->unk_740, v0, sizeof(UnkStruct_ov90_021D1750) * 30); diff --git a/src/unk_0202E840.c b/src/unk_0202E840.c index 4ac56744b0..137c45fabb 100644 --- a/src/unk_0202E840.c +++ b/src/unk_0202E840.c @@ -116,7 +116,7 @@ int sub_0202E91C(void) return sizeof(UnkStruct_0202E91C); } -static u32 *sub_0202E924(SaveData *saveData, int heapID) +static u32 *sub_0202E924(SaveData *saveData, enum HeapID heapID) { int v0; u32 v1; @@ -183,7 +183,7 @@ static u32 *sub_0202E924(SaveData *saveData, int heapID) return v4; } -void *sub_0202E9FC(SaveData *saveData, int heapID) +void *sub_0202E9FC(SaveData *saveData, enum HeapID heapID) { int v0; u32 v1, v2; @@ -249,7 +249,7 @@ static BOOL sub_0202EABC(UnkStruct_0202EABC *param0, const UnkStruct_0202E858 *p return 0; } -static void sub_0202EAEC(UnkStruct_0202E8C0 *param0, UnkStruct_0202EABC *param1, u32 param2, u8 param3, u8 param4, UnkStruct_0202E91C **param5, u8 param6, int param7) +static void sub_0202EAEC(UnkStruct_0202E8C0 *param0, UnkStruct_0202EABC *param1, u32 param2, u8 param3, u8 param4, UnkStruct_0202E91C **param5, u8 param6, enum HeapID heapID) { int v0, v1; UnkStruct_0202E858 *v2; @@ -332,7 +332,7 @@ static void sub_0202EAEC(UnkStruct_0202E8C0 *param0, UnkStruct_0202EABC *param1, } } -static void sub_0202ECB0(UnkStruct_0202E8C0 *param0, u32 param1, u8 param2, UnkStruct_0202E91C **param3, u8 param4, int heapID) +static void sub_0202ECB0(UnkStruct_0202E8C0 *param0, u32 param1, u8 param2, UnkStruct_0202E91C **param3, u8 param4, enum HeapID heapID) { int v0, v1; UnkStruct_0202EABC *v2 = Heap_AllocAtEnd(heapID, sizeof(UnkStruct_0202EABC)); @@ -346,7 +346,7 @@ static void sub_0202ECB0(UnkStruct_0202E8C0 *param0, u32 param1, u8 param2, UnkS Heap_Free(v2); } -void sub_0202ED0C(SaveData *saveData, int param1, u8 param2, const void **param3, int heapID) +void sub_0202ED0C(SaveData *saveData, int param1, u8 param2, const void **param3, enum HeapID heapID) { u8 v0, v1; u32 v2; @@ -383,7 +383,7 @@ void sub_0202ED0C(SaveData *saveData, int param1, u8 param2, const void **param3 return; } -UnkStruct_0202EE10 *sub_0202ED8C(SaveData *saveData, int param1, int heapID) +UnkStruct_0202EE10 *sub_0202ED8C(SaveData *saveData, int param1, enum HeapID heapID) { int v0, v1; u32 v2; @@ -409,7 +409,7 @@ UnkStruct_0202EE10 *sub_0202ED8C(SaveData *saveData, int param1, int heapID) return v3; } -UnkStruct_0202EE10 *sub_0202EE10(UnkStruct_0202E8C0 *param0, int param1, int heapID) +UnkStruct_0202EE10 *sub_0202EE10(UnkStruct_0202E8C0 *param0, int param1, enum HeapID heapID) { int v0; UnkStruct_0202EE10 *v1; diff --git a/src/unk_0202F1D4.c b/src/unk_0202F1D4.c index c6fe429c52..f41b1c3616 100644 --- a/src/unk_0202F1D4.c +++ b/src/unk_0202F1D4.c @@ -54,7 +54,7 @@ void BattleRecording_Init(BattleRecording *param0) param0->unk_00 = 0xffffffff; } -void sub_0202F1F8(SaveData *saveData, int heapID, int *param2) +void sub_0202F1F8(SaveData *saveData, enum HeapID heapID, int *param2) { if (Unk_021C07A4 != NULL) { Heap_Free(Unk_021C07A4); @@ -615,7 +615,7 @@ static void sub_0202FD30(UnkStruct_0202FD30 *param0, Party *party) Heap_Free(v1); } -UnkStruct_0202F41C *sub_0202FD88(int heapID) +UnkStruct_0202F41C *sub_0202FD88(enum HeapID heapID) { UnkStruct_0202F41C *v0; @@ -627,7 +627,7 @@ UnkStruct_0202F41C *sub_0202FD88(int heapID) return v0; } -UnkStruct_02030A80 *sub_0202FDB8(int heapID) +UnkStruct_02030A80 *sub_0202FDB8(enum HeapID heapID) { UnkStruct_02030A80 *v0; @@ -704,7 +704,7 @@ u64 sub_0202FE98(UnkStruct_0202F41C *param0, int param1, int param2) return 0; } -UnkStruct_0202F41C *sub_0202FF2C(int heapID) +UnkStruct_0202F41C *sub_0202FF2C(enum HeapID heapID) { UnkStruct_0202F41C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0202F41C)); MI_CpuClear8(v0, sizeof(UnkStruct_0202F41C)); diff --git a/src/unk_02030880.c b/src/unk_02030880.c index 9aa423913f..69e86e4f69 100644 --- a/src/unk_02030880.c +++ b/src/unk_02030880.c @@ -39,7 +39,7 @@ void Frontier_Extra_Init(BattleFrontierStage *param0) param0->unk_00 = 0xffffffff; } -BattleFrontierStage *sub_020308A0(SaveData *saveData, int heapID, int *param2) +BattleFrontierStage *sub_020308A0(SaveData *saveData, enum HeapID heapID, int *param2) { BattleFrontierStage *v0 = SaveData_BattleFrontierStage(saveData, heapID, param2); return v0; diff --git a/src/unk_02030A80.c b/src/unk_02030A80.c index ecf3ae903d..69764f11c5 100644 --- a/src/unk_02030A80.c +++ b/src/unk_02030A80.c @@ -23,7 +23,7 @@ #include "unk_0205C980.h" #include "unk_020996D0.h" -UnkStruct_02030A80 *sub_02030A80(int heapID) +UnkStruct_02030A80 *sub_02030A80(enum HeapID heapID) { UnkStruct_02030A80 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02030A80)); MI_CpuClear8(v0, sizeof(UnkStruct_02030A80)); @@ -73,7 +73,7 @@ void sub_02030AA0(UnkStruct_02030A80 *param0, SaveData *saveData) param0->unk_7C.unk_00 = SaveData_CalculateChecksum(saveData, param0, sizeof(UnkStruct_02030A80) - (sizeof(UnkStruct_0202F298_sub1))); } -String *sub_02030B94(const UnkStruct_02030A80 *param0, int heapID) +String *sub_02030B94(const UnkStruct_02030A80 *param0, enum HeapID heapID) { String *v0 = String_Init((7 * 2) + 1, heapID); @@ -139,7 +139,7 @@ int sub_02030C08(const UnkStruct_02030A80 *param0) return param0->unk_18; } -String *sub_02030C28(const UnkStruct_02030A80 *param0, Sentence *param1, int heapID) +String *sub_02030C28(const UnkStruct_02030A80 *param0, Sentence *param1, enum HeapID heapID) { int v0 = 0; diff --git a/src/unk_02038FFC.c b/src/unk_02038FFC.c index 6f71c09bca..1e9451eb19 100644 --- a/src/unk_02038FFC.c +++ b/src/unk_02038FFC.c @@ -11,7 +11,7 @@ #include "unk_0202ACE0.h" #include "unk_02099550.h" -int sub_02038FFC(int heapID) +int sub_02038FFC(enum HeapID heapID) { int v0; u8 *v1; diff --git a/src/unk_0203909C.c b/src/unk_0203909C.c index 1bee6854ec..2e52ad8daf 100644 --- a/src/unk_0203909C.c +++ b/src/unk_0203909C.c @@ -72,7 +72,7 @@ int sub_02039140(SaveData *saveData, u64 param1, int *param2) return 2; } -BOOL sub_020391DC(SaveData *saveData, int *param1, int heapID) +BOOL sub_020391DC(SaveData *saveData, int *param1, enum HeapID heapID) { int v0, v1 = 0, v2; DWCFriendData *v3 = sub_0202AED8(SaveData_GetWiFiList(saveData), 0); @@ -111,7 +111,7 @@ BOOL sub_020391DC(SaveData *saveData, int *param1, int heapID) return v1; } -void sub_02039298(SaveData *saveData, int param1, int param2, int heapID, int param4) +void sub_02039298(SaveData *saveData, int param1, int param2, enum HeapID heapID, int param4) { WiFiList *v0 = SaveData_GetWiFiList(saveData); DWCFriendData *v1 = sub_0202AED8(v0, param2); diff --git a/src/unk_02039814.c b/src/unk_02039814.c index a4cecef890..0a198c976b 100644 --- a/src/unk_02039814.c +++ b/src/unk_02039814.c @@ -73,7 +73,7 @@ static void sub_02039814(void) MI_WaitDma(GX_DEFAULT_DMAID); } -void NetworkError_DisplayNetworkError(int heapID, int networkErrorId, int errorCode) +void NetworkError_DisplayNetworkError(enum HeapID heapID, int networkErrorId, int errorCode) { BgConfig *v0; Window v1; diff --git a/src/unk_02039A64.c b/src/unk_02039A64.c index 3bad170c0f..2f90bf9e22 100644 --- a/src/unk_02039A64.c +++ b/src/unk_02039A64.c @@ -63,7 +63,7 @@ static const WindowTemplate Unk_020E5F48 = { 0x23 }; -void sub_02039A64(int heapID, int unused) +void sub_02039A64(enum HeapID heapID, int unused) { BgConfig *v0; Window v1; diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index 4e3972df9b..48cc0ac931 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -172,7 +172,7 @@ FS_EXTERN_OVERLAY(dw_warp); #include typedef struct { - int heapID; + enum HeapID heapID; PartyMenu *unk_04; PokemonSummary *unk_08; } UnkStruct_0203D444; @@ -362,7 +362,7 @@ void FieldSystem_OpenSummaryScreen(FieldSystem *fieldSystem, void *appArgs) FieldSystem_StartChildProcess(fieldSystem, &gPokemonSummaryScreenApp, appArgs); } -static PartyMenu *PartyMenu_New(int heapID, FieldSystem *fieldSystem, int type, int mode) +static PartyMenu *PartyMenu_New(enum HeapID heapID, FieldSystem *fieldSystem, int type, int mode) { PartyMenu *partyMenu = Heap_Alloc(heapID, sizeof(PartyMenu)); @@ -547,7 +547,7 @@ PartyMenu *FieldSystem_OpenPartyMenu_SelectForSpinTrade(FieldSystem *fieldSystem return partyMenu; } -PokemonSummary *sub_0203D670(FieldSystem *fieldSystem, int heapID, int mode) +PokemonSummary *sub_0203D670(FieldSystem *fieldSystem, enum HeapID heapID, int mode) { PokemonSummary *v0; SaveData *saveData; @@ -767,7 +767,7 @@ UnkStruct_02097728 *sub_0203D920(FieldSystem *fieldSystem, int param1, u8 param2 return v0; } -UnkStruct_02097728 *sub_0203D94C(FieldSystem *fieldSystem, int param1, u8 param2, int heapID) +UnkStruct_02097728 *sub_0203D94C(FieldSystem *fieldSystem, int param1, u8 param2, enum HeapID heapID) { UnkStruct_02097728 *v0; @@ -782,7 +782,7 @@ UnkStruct_02097728 *sub_0203D94C(FieldSystem *fieldSystem, int param1, u8 param2 return v0; } -UnkStruct_02097728 *sub_0203D984(FieldSystem *fieldSystem, Pokemon *param1, int heapID) +UnkStruct_02097728 *sub_0203D984(FieldSystem *fieldSystem, Pokemon *param1, enum HeapID heapID) { UnkStruct_02097728 *v0 = sub_020976BC(FieldSystem_GetSaveData(fieldSystem), param1, heapID); sub_0203D910(fieldSystem, v0); @@ -795,7 +795,7 @@ static void OpenPoffinCaseApp(FieldSystem *fieldSystem, PoffinCaseAppData *poffi FieldSystem_StartChildProcess(fieldSystem, &gPoffinCaseAppTemplate, poffinCaseAppData); } -PoffinCaseAppData *FieldSystem_LaunchPoffinCaseApp(FieldSystem *fieldSystem, int heapID) +PoffinCaseAppData *FieldSystem_LaunchPoffinCaseApp(FieldSystem *fieldSystem, enum HeapID heapID) { PoffinCaseAppData *appData = PoffinCaseAppData_New(FieldSystem_GetSaveData(fieldSystem), heapID); OpenPoffinCaseApp(fieldSystem, appData); @@ -817,7 +817,7 @@ void sub_0203D9D8(FieldSystem *fieldSystem, UnkStruct_ov90_021D0D80 *param1) FieldSystem_StartChildProcess(fieldSystem, &v0, param1); } -static UnkStruct_0203DA00 *sub_0203DA00(int heapID, SaveData *saveData, int param2, BOOL *param3, BOOL param4) +static UnkStruct_0203DA00 *sub_0203DA00(enum HeapID heapID, SaveData *saveData, int param2, BOOL *param3, BOOL param4) { UnkStruct_0203DA00 *v0; Pokemon *v1; @@ -1648,7 +1648,7 @@ void AccessoryShop_Init(FieldTask *task) FieldTask_InitCall(task, FieldTask_AccessoryShop, shop); } -void *FieldSystem_ShowDiploma(FieldSystem *fieldSystem, int heapID, BOOL isNatDex) +void *FieldSystem_ShowDiploma(FieldSystem *fieldSystem, enum HeapID heapID, BOOL isNatDex) { FS_EXTERN_OVERLAY(diploma); @@ -1668,7 +1668,7 @@ void *FieldSystem_ShowDiploma(FieldSystem *fieldSystem, int heapID, BOOL isNatDe return diplomaData; } -void *sub_0203E564(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 param3, int heapID) +void *sub_0203E564(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 param3, enum HeapID heapID) { UnkStruct_0203E564 *v0; @@ -1714,7 +1714,7 @@ PartyMenu *FieldSystem_OpenPartyMenu_SelectForItemUsage(FieldSystem *fieldSystem return partyMenu; } -void *sub_0203E608(FieldSystem *fieldSystem, int heapID) +void *sub_0203E608(FieldSystem *fieldSystem, enum HeapID heapID) { UnkStruct_0203E608 *v0; diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c index ec20a00fa3..9824150500 100644 --- a/src/unk_0204AEE8.c +++ b/src/unk_0204AEE8.c @@ -36,7 +36,7 @@ #include "unk_0202D05C.h" #include "unk_02049D08.h" -static BOOL sub_0204B470(BattleTower *battleTower, BattleFrontierTrainerData *trainerData, u16 partnerBattleTowerID, FrontierPokemonDataDTO *param3, u8 partySize, u16 *param5, u16 *param6, UnkStruct_0204B404 *param7, int param8); +static BOOL sub_0204B470(BattleTower *battleTower, BattleFrontierTrainerData *trainerData, u16 partnerBattleTowerID, FrontierPokemonDataDTO *param3, u8 partySize, u16 *param5, u16 *param6, UnkStruct_0204B404 *param7, enum HeapID heapID); static void *sub_0204B630(u16 param0, int param1); static void sub_0204B640(BattleFrontierPokemonData *param0, int param1); @@ -279,7 +279,7 @@ u16 BattleTower_GetTrainerIDForRoomAndOpponentNum(BattleTower *battleTower, u8 r return trainerID; } -static BattleFrontierTrainerData *sub_0204B184(FrontierDataDTO *param0, u16 param1, int heapID) +static BattleFrontierTrainerData *sub_0204B184(FrontierDataDTO *param0, u16 param1, enum HeapID heapID) { MessageLoader *v1 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_FRONTIER_TRAINER_NAMES, heapID); @@ -308,7 +308,7 @@ static const u16 Unk_020EBD50[] = { ITEM_QUICK_CLAW }; -static u32 sub_0204B1E8(BattleTower *battleTower, FrontierPokemonDataDTO *param1, u16 param2, u32 param3, u32 param4, u8 ivs, u8 param6, BOOL param7, int param8) +static u32 sub_0204B1E8(BattleTower *battleTower, FrontierPokemonDataDTO *param1, u16 param2, u32 param3, u32 param4, u8 ivs, u8 param6, BOOL param7, enum HeapID heapID) { int v0; u32 v2; @@ -392,12 +392,12 @@ static u32 sub_0204B1E8(BattleTower *battleTower, FrontierPokemonDataDTO *param1 } param1->friendship = friendship; - MessageLoader_GetSpeciesName(param1->species, param8, &(param1->nickname[0])); + MessageLoader_GetSpeciesName(param1->species, heapID, &(param1->nickname[0])); return v2; } -BOOL sub_0204B3B8(BattleTower *battleTower, FrontierDataDTO *param1, u16 partnerBattleTowerID, int partysize, u16 *param4, u16 *param5, UnkStruct_0204B404 *param6, int heapID) +BOOL sub_0204B3B8(BattleTower *battleTower, FrontierDataDTO *param1, u16 partnerBattleTowerID, int partysize, u16 *param4, u16 *param5, UnkStruct_0204B404 *param6, enum HeapID heapID) { BOOL v0 = FALSE; BattleFrontierTrainerData *trainerData = sub_0204B184(param1, partnerBattleTowerID, heapID); @@ -408,7 +408,7 @@ BOOL sub_0204B3B8(BattleTower *battleTower, FrontierDataDTO *param1, u16 partner return v0; } -void sub_0204B404(BattleTower *battleTower, FrontierDataDTO *param1, u16 partnerBattleTowerID, BOOL param3, const UnkStruct_0204B404 *param4, int heapID) +void sub_0204B404(BattleTower *battleTower, FrontierDataDTO *param1, u16 partnerBattleTowerID, BOOL param3, const UnkStruct_0204B404 *param4, enum HeapID heapID) { u8 ivs = 0; BattleFrontierTrainerData *v2 = sub_0204B184(param1, partnerBattleTowerID, heapID); @@ -421,7 +421,7 @@ void sub_0204B404(BattleTower *battleTower, FrontierDataDTO *param1, u16 partner Heap_Free(v2); } -static BOOL sub_0204B470(BattleTower *battleTower, BattleFrontierTrainerData *trainerData, u16 partnerBattleTowerID, FrontierPokemonDataDTO *param3, u8 partySize, u16 *param5, u16 *param6, UnkStruct_0204B404 *param7, int param8) +static BOOL sub_0204B470(BattleTower *battleTower, BattleFrontierTrainerData *trainerData, u16 partnerBattleTowerID, FrontierPokemonDataDTO *param3, u8 partySize, u16 *param5, u16 *param6, UnkStruct_0204B404 *param7, enum HeapID heapID) { int v0, v1; u8 ivs; @@ -511,7 +511,7 @@ static BOOL sub_0204B470(BattleTower *battleTower, BattleFrontierTrainerData *tr } for (v0 = 0; v0 < v8; v0++) { - v7[v0] = sub_0204B1E8(battleTower, &(param3[v0]), v6[v0], v4, 0, ivs, v0, v10, param8); + v7[v0] = sub_0204B1E8(battleTower, &(param3[v0]), v6[v0], v4, 0, ivs, v0, v10, heapID); } if (param7 == NULL) { diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c index 1b89915fc8..4bfd7e903c 100644 --- a/src/unk_0204F13C.c +++ b/src/unk_0204F13C.c @@ -73,7 +73,7 @@ void sub_0204F470(FieldTask *param0, void **param1, u8 param2); static BOOL sub_0204F4A4(FieldTask *param0); static int sub_0204F50C(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem, int param2); static int sub_0204F5D8(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem); -static int sub_0204F628(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem, int heapID); +static int sub_0204F628(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem, enum HeapID heapID); static int sub_0204F6B0(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem); BOOL ScrCmd_2CC(ScriptContext *param0) @@ -391,7 +391,7 @@ static int sub_0204F5D8(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem) return UnkEnum_0204F13C_3; } -static int sub_0204F628(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem, int heapID) +static int sub_0204F628(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem, enum HeapID heapID) { PokemonSummary *v0; SaveData *saveData; @@ -534,7 +534,7 @@ BOOL ScrCmd_324(ScriptContext *param0) return 0; } - v2 = sub_020308A0(fieldSystem->saveData, 32, &v0); + v2 = sub_020308A0(fieldSystem->saveData, HEAP_ID_FIELD3, &v0); if (v0 != 1) { v4 = 0; } else { @@ -613,7 +613,7 @@ BOOL ScrCmd_325(ScriptContext *param0) return 0; } - v1 = sub_020308A0(fieldSystem->saveData, 32, &v0); + v1 = sub_020308A0(fieldSystem->saveData, HEAP_ID_FIELD3, &v0); if (v0 != 1) { v4 = 0; } else { @@ -662,7 +662,7 @@ BOOL ScrCmd_326(ScriptContext *param0) return 0; } - v2 = sub_020308A0(fieldSystem->saveData, 32, &v0); + v2 = sub_020308A0(fieldSystem->saveData, HEAP_ID_FIELD3, &v0); if (v0 != 1) { v4 = 0; } else { diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c index 4cb1357893..9af51a8319 100644 --- a/src/unk_0204FAB4.c +++ b/src/unk_0204FAB4.c @@ -51,7 +51,7 @@ static void sub_0204FDB4(FieldTask *param0, void **param1, u8 param2); static BOOL sub_0204FDE8(FieldTask *param0); static int sub_0204FE50(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem, int param2); static int sub_0204FF1C(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem); -static int sub_0204FF6C(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem, int heapID); +static int sub_0204FF6C(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem, enum HeapID heapID); static int sub_0204FFF4(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem); BOOL ScrCmd_2D3(ScriptContext *param0); static void sub_0204FCF8(FieldTask *param0, u16 param1, u16 param2, u16 *param3); @@ -311,7 +311,7 @@ static int sub_0204FF1C(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem) return 2; } -static int sub_0204FF6C(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem, int heapID) +static int sub_0204FF6C(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem, enum HeapID heapID) { PokemonSummary *v0; SaveData *saveData; diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c index e35327c21f..4380bffc8c 100644 --- a/src/unk_0205003C.c +++ b/src/unk_0205003C.c @@ -51,7 +51,7 @@ void sub_020502E0(FieldTask *param0, void **param1, u8 param2); static BOOL sub_02050314(FieldTask *param0); static int sub_0205037C(UnkStruct_0205037C *param0, FieldSystem *fieldSystem, int param2); static int sub_02050448(UnkStruct_0205037C *param0, FieldSystem *fieldSystem); -static int sub_02050498(UnkStruct_0205037C *param0, FieldSystem *fieldSystem, int heapID); +static int sub_02050498(UnkStruct_0205037C *param0, FieldSystem *fieldSystem, enum HeapID heapID); static int sub_02050520(UnkStruct_0205037C *param0, FieldSystem *fieldSystem); BOOL ScrCmd_2DA(ScriptContext *param0); void sub_02050224(FieldTask *param0, u16 param1, u16 param2, u16 *param3); @@ -299,7 +299,7 @@ static int sub_02050448(UnkStruct_0205037C *param0, FieldSystem *fieldSystem) return 2; } -static int sub_02050498(UnkStruct_0205037C *param0, FieldSystem *fieldSystem, int heapID) +static int sub_02050498(UnkStruct_0205037C *param0, FieldSystem *fieldSystem, enum HeapID heapID) { PokemonSummary *v0; SaveData *saveData; diff --git a/src/unk_02056B30.c b/src/unk_02056B30.c index 37964cc165..feb90d45f4 100644 --- a/src/unk_02056B30.c +++ b/src/unk_02056B30.c @@ -51,7 +51,7 @@ typedef struct { u16 unk_10; int unk_14; int unk_18; - int heapID; + enum HeapID heapID; } UnkStruct_02056B30; static BOOL sub_02056B70(FieldTask *taskMan); @@ -100,7 +100,7 @@ static const UnkFuncPtr_020EC57C Unk_020EC57C[7] = { NULL }; -void sub_02056B30(FieldTask *taskMan, int param1, int param2, int param3, u16 param4, int param5, int param6, int heapID) +void sub_02056B30(FieldTask *taskMan, int param1, int param2, int param3, u16 param4, int param5, int param6, enum HeapID heapID) { UnkStruct_02056B30 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02056B30)); diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index 71086c5142..5d28f3b91a 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -114,7 +114,7 @@ static void sub_0205AAA0(UnkStruct_0205A0D8 *param0, BOOL param1); static void sub_0205AF18(UnkStruct_0205A0D8 *param0, int param1); static BOOL sub_0205AD20(UnkStruct_0205A0D8 *param0); -static void sub_0205A0D8(UnkStruct_0205A0D8 *param0, FieldSystem *fieldSystem, Party *param2, int param3, int param4, int heapID) +static void sub_0205A0D8(UnkStruct_0205A0D8 *param0, FieldSystem *fieldSystem, Party *param2, int param3, int param4, enum HeapID heapID) { PokemonSummary *v0; SaveData *saveData; @@ -145,7 +145,7 @@ static void sub_0205A0D8(UnkStruct_0205A0D8 *param0, FieldSystem *fieldSystem, P param0->unk_00 = v0; } -static void sub_0205A164(UnkStruct_0205A0D8 *param0, int heapID) +static void sub_0205A164(UnkStruct_0205A0D8 *param0, enum HeapID heapID) { int v0; PartyMenu *partyMenu = Heap_Alloc(heapID, sizeof(PartyMenu)); diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c index ff94ef11a5..583e98b833 100644 --- a/src/unk_0205C22C.c +++ b/src/unk_0205C22C.c @@ -51,7 +51,7 @@ static void sub_0205C7BC(UnkStruct_0205C680 *param0, MapObject *param1); static void sub_0205C7E4(MapObjectManager *param0, int param1, int param2); static void sub_0205C444(UnkStruct_0205C680 param0[], int param1, int param2); void sub_0205C970(UnkStruct_0205C95C *param0); -UnkStruct_0205C95C *sub_0205C95C(int heapID); +UnkStruct_0205C95C *sub_0205C95C(enum HeapID heapID); static void sub_0205C944(UnkStruct_0205C95C *param0); static void sub_0205C924(UnkStruct_0205C924 *param0); static void sub_0205C900(UnkStruct_0205C95C *param0); @@ -532,7 +532,7 @@ static void sub_0205C944(UnkStruct_0205C95C *param0) } } -UnkStruct_0205C95C *sub_0205C95C(int heapID) +UnkStruct_0205C95C *sub_0205C95C(enum HeapID heapID) { UnkStruct_0205C95C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0205C95C)); diff --git a/src/unk_0205C980.c b/src/unk_0205C980.c index dd97c62ba9..69fff5f5ea 100644 --- a/src/unk_0205C980.c +++ b/src/unk_0205C980.c @@ -98,7 +98,7 @@ int sub_0205CA14(int gender, int param1, int param2) return 0; } -u16 *sub_0205CA4C(int heapID) +u16 *sub_0205CA4C(enum HeapID heapID) { u8 *v0, *v1; NNSG2dPaletteData *v2, *v3; diff --git a/src/unk_0206B9D8.c b/src/unk_0206B9D8.c index a34ac146af..56e9250c24 100644 --- a/src/unk_0206B9D8.c +++ b/src/unk_0206B9D8.c @@ -66,7 +66,7 @@ typedef struct { u16 unk_02; } UnkStruct_0206BD88; -static int sub_0206B9D8(UnkStruct_0206B9D8 *param0, FieldSystem *fieldSystem, int heapID) +static int sub_0206B9D8(UnkStruct_0206B9D8 *param0, FieldSystem *fieldSystem, enum HeapID heapID) { u8 v0; SaveData *saveData; @@ -125,7 +125,7 @@ static int sub_0206BA84(UnkStruct_0206B9D8 *param0, FieldSystem *fieldSystem) return 2; } -static int sub_0206BAE0(UnkStruct_0206B9D8 *param0, FieldSystem *fieldSystem, int heapID) +static int sub_0206BAE0(UnkStruct_0206B9D8 *param0, FieldSystem *fieldSystem, enum HeapID heapID) { PokemonSummary *v0; SaveData *saveData; diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c index e34e5dd4a8..73fa01811c 100644 --- a/src/unk_0206F314.c +++ b/src/unk_0206F314.c @@ -64,7 +64,7 @@ typedef struct { } UnkStruct_020F02D0; typedef struct { - int heapID; + enum HeapID heapID; int *unk_04; int unk_08; int unk_0C; diff --git a/src/unk_020711C8.c b/src/unk_020711C8.c index 9b1d47bcbc..e00c09ad54 100644 --- a/src/unk_020711C8.c +++ b/src/unk_020711C8.c @@ -9,7 +9,7 @@ #include "party.h" #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) { UnkStruct_020711C8 *v0 = Heap_AllocAtEnd(heapID, sizeof(UnkStruct_020711C8)); v0->unk_00 = Party_GetPokemonBySlotIndex(SaveData_GetParty(saveData), param1); diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c index c5401f8f71..e7ae186525 100644 --- a/src/unk_020722AC.c +++ b/src/unk_020722AC.c @@ -67,7 +67,7 @@ typedef struct { } UnkStruct_02072334_sub1; typedef struct { - int heapID; + enum HeapID heapID; int *unk_04; SysTask *unk_08; SysTaskFunc unk_0C; @@ -130,7 +130,7 @@ static void sub_020727F8(SysTask *param0, void *param1); static void sub_02072878(SysTask *param0, void *param1); static void sub_02072EA4(UnkStruct_02072334 *param0, SysTaskFunc param1, SysTaskFunc param2); static void sub_02072EB8(UnkStruct_02072EB8 *param0, u8 param1); -static void sub_02072ED0(UnkStruct_02072EB8 *param0, u8 param1, int heapID); +static void sub_02072ED0(UnkStruct_02072EB8 *param0, u8 param1, enum HeapID heapID); static void sub_02072F04(UnkStruct_02072EB8 *param0, u8 param1); static void sub_020729B4(UnkStruct_02072334 *param0); static void sub_02072BBC(ListMenu *param0, u32 param1, u8 param2); @@ -139,7 +139,7 @@ static void sub_02072C98(UnkStruct_02072334 *param0, u8 param1, u8 param2); static void sub_02072DA4(ListMenu *param0, u32 param1, u8 param2); static void sub_02072DB8(UnkStruct_02072334 *param0); static void sub_02072E4C(UnkStruct_02072334 *param0); -static void sub_02072F30(UnkStruct_02072334 *param0, SaveData *saveData, int heapID); +static void sub_02072F30(UnkStruct_02072334 *param0, SaveData *saveData, enum HeapID heapID); static void sub_02073020(UnkStruct_02072334 *param0, u8 param1); static BOOL sub_02073060(UnkStruct_02072334 *param0); static void sub_020730B8(UnkStruct_02072334 *param0, u8 param1, BOOL param2); @@ -871,7 +871,7 @@ static void sub_02072EB8(UnkStruct_02072EB8 *param0, u8 param1) } } -static void sub_02072ED0(UnkStruct_02072EB8 *param0, u8 param1, int heapID) +static void sub_02072ED0(UnkStruct_02072EB8 *param0, u8 param1, enum HeapID heapID) { u8 v0 = 0; @@ -892,7 +892,7 @@ static void sub_02072F04(UnkStruct_02072EB8 *param0, u8 param1) } } -static void sub_02072F30(UnkStruct_02072334 *param0, SaveData *saveData, int heapID) +static void sub_02072F30(UnkStruct_02072334 *param0, SaveData *saveData, enum HeapID heapID) { u8 i = 0, v1 = 0, v2 = 0xFF, v3 = 0; int v4; diff --git a/src/unk_0207C63C.c b/src/unk_0207C63C.c index 5bb5307667..6c58242ee7 100644 --- a/src/unk_0207C63C.c +++ b/src/unk_0207C63C.c @@ -24,8 +24,8 @@ BOOL sub_0207C8E0(UnkStruct_0207C8C4 *param0); void sub_0207C8F4(UnkStruct_0207C8C4 *param0); static u32 sub_0207C794(u32 param0, BOOL param1); static u32 sub_0207C7B0(u32 param0, BOOL param1); -static ParticleSystem *sub_0207C7CC(int heapID); -static ParticleSystem *sub_0207C814(int heapID, int param1, int param2); +static ParticleSystem *sub_0207C7CC(enum HeapID heapID); +static ParticleSystem *sub_0207C814(enum HeapID heapID, int param1, int param2); static void sub_0207C83C(ParticleSystem *param0); static void sub_0207C854(SPLEmitter *param0); @@ -43,7 +43,7 @@ void sub_0207C664(void) G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, 7, 8); } -G3DPipelineBuffers *sub_0207C690(int heapID) +G3DPipelineBuffers *sub_0207C690(enum HeapID heapID) { return G3DPipeline_Init(heapID, TEXTURE_VRAM_SIZE_256K, PALETTE_VRAM_SIZE_32K, sub_0207C6AC); } @@ -124,7 +124,7 @@ static u32 sub_0207C7B0(u32 param0, BOOL param1) return v1; } -static ParticleSystem *sub_0207C7CC(int heapID) +static ParticleSystem *sub_0207C7CC(enum HeapID heapID) { ParticleSystem *v0; void *v1; @@ -141,7 +141,7 @@ static ParticleSystem *sub_0207C7CC(int heapID) return v0; } -static ParticleSystem *sub_0207C814(int heapID, int param1, int param2) +static ParticleSystem *sub_0207C814(enum HeapID heapID, int param1, int param2) { ParticleSystem *v0 = sub_0207C7CC(heapID); void *v1 = ParticleSystem_LoadResourceFromNARC(param1, param2, heapID); diff --git a/src/unk_020890F4.c b/src/unk_020890F4.c index e0b2680159..d600108845 100644 --- a/src/unk_020890F4.c +++ b/src/unk_020890F4.c @@ -151,7 +151,7 @@ static int sub_0208927C(ApplicationManager *appMan, int *param1) return 1; } -static UnkStruct_02089438 *sub_020893B4(int heapID, int param1, int param2[], Options *options, u32 param4, u32 param5) +static UnkStruct_02089438 *sub_020893B4(enum HeapID heapID, int param1, int param2[], Options *options, u32 param4, u32 param5) { int i; UnkStruct_02089438 *v1 = NULL; @@ -173,7 +173,7 @@ static UnkStruct_02089438 *sub_020893B4(int heapID, int param1, int param2[], Op return v1; } -UnkStruct_02089438 *sub_02089400(int heapID, int param1, int param2[], Options *options, u32 param4, u32 param5) +UnkStruct_02089438 *sub_02089400(enum HeapID heapID, int param1, int param2[], Options *options, u32 param4, u32 param5) { UnkStruct_02089438 *v0 = sub_020893B4(heapID, param1, param2, options, param4, param5); @@ -182,7 +182,7 @@ UnkStruct_02089438 *sub_02089400(int heapID, int param1, int param2[], Options * return v0; } -UnkStruct_02089438 *sub_0208941C(int heapID, int param1, int param2[], Options *options, u32 param4, u32 param5, u32 param6, u32 param7) +UnkStruct_02089438 *sub_0208941C(enum HeapID heapID, int param1, int param2[], Options *options, u32 param4, u32 param5, u32 param6, u32 param7) { UnkStruct_02089438 *v0 = sub_020893B4(heapID, param1, param2, options, param4, param5); diff --git a/src/unk_0208B284.c b/src/unk_0208B284.c index 7871117083..7f8660d5bc 100644 --- a/src/unk_0208B284.c +++ b/src/unk_0208B284.c @@ -42,7 +42,7 @@ UnkStruct_0208B878 *sub_0208B284(UnkStruct_0208B284 param0, SpriteSystem *param1 { UnkStruct_0208B878 *v0 = Heap_Alloc(param0.heapID, sizeof(UnkStruct_0208B878)); v0->unk_10.unk_00 = param0.unk_00; - v0->unk_10.heapID = param0.heapID; + v0->unk_10.heapID = (enum HeapID)param0.heapID; // Needed for matching. v0->unk_10.unk_08 = param0.unk_08; v0->unk_10.unk_0C = param0.unk_0C; v0->unk_10.unk_10 = param0.unk_10; diff --git a/src/unk_0208BA78.c b/src/unk_0208BA78.c index 7a13bb38e7..8b6de2fd31 100644 --- a/src/unk_0208BA78.c +++ b/src/unk_0208BA78.c @@ -58,8 +58,8 @@ static int sub_0208BBA8(ApplicationManager *appMan, int *param1); static int sub_0208BBB4(ApplicationManager *appMan, int *param1); static int sub_0208BBC0(ApplicationManager *appMan, int *param1); static int sub_0208BC08(ApplicationManager *appMan, int *param1); -static BOOL sub_0208BC3C(UnkStruct_0208BC3C *param0, int heapID); -static BOOL sub_0208BC8C(UnkStruct_0208BC3C *param0, int heapID); +static BOOL sub_0208BC3C(UnkStruct_0208BC3C *param0, enum HeapID heapID); +static BOOL sub_0208BC8C(UnkStruct_0208BC3C *param0, enum HeapID heapID); static BOOL sub_0208BE80(int param0); UnkStruct_0208C06C *sub_0208BA78(ApplicationManager *appMan) @@ -218,7 +218,7 @@ static int sub_0208BC08(ApplicationManager *appMan, int *param1) return 1; } -static BOOL sub_0208BC3C(UnkStruct_0208BC3C *param0, int heapID) +static BOOL sub_0208BC3C(UnkStruct_0208BC3C *param0, enum HeapID heapID) { switch (param0->unk_00) { case 0: @@ -242,7 +242,7 @@ static BOOL sub_0208BC3C(UnkStruct_0208BC3C *param0, int heapID) return 0; } -static BOOL sub_0208BC8C(UnkStruct_0208BC3C *param0, int heapID) +static BOOL sub_0208BC8C(UnkStruct_0208BC3C *param0, enum HeapID heapID) { switch (param0->unk_00) { case 0: diff --git a/src/unk_0208C098.c b/src/unk_0208C098.c index d642ebba9f..2177ec3293 100644 --- a/src/unk_0208C098.c +++ b/src/unk_0208C098.c @@ -149,7 +149,7 @@ u8 sub_0208C15C(s16 *param0, u16 param1) return 0; } -void App_LoadGraphicMember(BgConfig *bgConfig, int heapID, NARC *narc, int unused, int memberIndex, int bgLayer, enum GraphicMemberType memberType, u16 memberSize, u16 offset) +void App_LoadGraphicMember(BgConfig *bgConfig, enum HeapID heapID, NARC *narc, int unused, int memberIndex, int bgLayer, enum GraphicMemberType memberType, u16 memberSize, u16 offset) { u32 narcSize; void *dest; diff --git a/src/unk_02092494.c b/src/unk_02092494.c index 9e485c21a7..cedb9d9f57 100644 --- a/src/unk_02092494.c +++ b/src/unk_02092494.c @@ -24,13 +24,13 @@ static void InitializeSpecialMetInfoString(PokemonInfoDisplayStruct *param0, int static void InitializeIVsString(PokemonInfoDisplayStruct *param0); static void InitializeFlavorAffinityString(PokemonInfoDisplayStruct *param0); static void InitializeFriendshipLevelString(PokemonInfoDisplayStruct *param0); -static void AssignTrainerInfoToBoxPokemon(BoxPokemon *boxMon, TrainerInfo *param1, int param2); +static void AssignTrainerInfoToBoxPokemon(BoxPokemon *boxMon, TrainerInfo *param1, enum HeapID heapID); static void BoxPokemon_SetMetLocationAndDate(BoxPokemon *boxMon, int metLocation, int isHatch); static void BoxPokemon_ResetMetLocationAndDate(BoxPokemon *boxMon, int isHatch); static void BoxPokemon_SetMetLevelToCurrentLevel(BoxPokemon *boxMon); static void BoxPokemon_SetFatefulEncounterFlag(BoxPokemon *boxMon); -PokemonInfoDisplayStruct *sub_02092494(Pokemon *param0, BOOL param1, int heapID) +PokemonInfoDisplayStruct *sub_02092494(Pokemon *param0, BOOL param1, enum HeapID heapID) { PokemonInfoDisplayStruct *v0 = Heap_Alloc(heapID, sizeof(PokemonInfoDisplayStruct)); v0->heapID = heapID; @@ -747,12 +747,12 @@ static int DeterminePokemonStatus(Pokemon *param0, BOOL param1, int param2) return v0; } -void UpdateMonStatusAndTrainerInfo(Pokemon *mon, TrainerInfo *trainerInfo, int sel, int metLocation, int heapID) +void UpdateMonStatusAndTrainerInfo(Pokemon *mon, TrainerInfo *trainerInfo, int sel, int metLocation, enum HeapID heapID) { UpdateBoxMonStatusAndTrainerInfo(&mon->box, trainerInfo, sel, metLocation, heapID); } -void UpdateBoxMonStatusAndTrainerInfo(BoxPokemon *boxMon, TrainerInfo *trainerInfo, int sel, int metLocation, int heapID) +void UpdateBoxMonStatusAndTrainerInfo(BoxPokemon *boxMon, TrainerInfo *trainerInfo, int sel, int metLocation, enum HeapID heapID) { switch (sel) { case 0: @@ -850,7 +850,7 @@ void UpdateBoxMonStatusAndTrainerInfo(BoxPokemon *boxMon, TrainerInfo *trainerIn } } -static void AssignTrainerInfoToBoxPokemon(BoxPokemon *boxMon, TrainerInfo *trainerInfo, int heapID) +static void AssignTrainerInfoToBoxPokemon(BoxPokemon *boxMon, TrainerInfo *trainerInfo, enum HeapID heapID) { int v0 = TrainerInfo_ID(trainerInfo); int v1 = TrainerInfo_Gender(trainerInfo); diff --git a/src/unk_02094EDC.c b/src/unk_02094EDC.c index 31e9bdbeb2..af8ec30f24 100644 --- a/src/unk_02094EDC.c +++ b/src/unk_02094EDC.c @@ -624,7 +624,7 @@ void sub_02095338(UnkStruct_02095C48 *param0) } } -void sub_02095380(const UnkStruct_ov6_02248BE8 *param0, Pokemon *param1, int heapID) +void sub_02095380(const UnkStruct_ov6_02248BE8 *param0, Pokemon *param1, enum HeapID heapID) { int i; u16 v1; @@ -671,7 +671,7 @@ void sub_02095380(const UnkStruct_ov6_02248BE8 *param0, Pokemon *param1, int hea } } -PokemonSprite *sub_02095484(PokemonSpriteManager *param0, int param1, Pokemon *param2, int param3, PokemonSpriteData *pokemonSpriteData, int heapID, int param6, int param7, int param8) +PokemonSprite *sub_02095484(PokemonSpriteManager *param0, int param1, Pokemon *param2, int param3, PokemonSpriteData *pokemonSpriteData, enum HeapID heapID, int param6, int param7, int param8) { PokemonSpriteTemplate v0; PokemonSprite *v1; @@ -692,7 +692,7 @@ PokemonSprite *sub_02095484(PokemonSpriteManager *param0, int param1, Pokemon *p return v1; } -void sub_020954F0(UnkStruct_02095C48 *param0, int heapID, int param2, enum PokemonContestType contestType, enum PokemonContestRank contestRank) +void sub_020954F0(UnkStruct_02095C48 *param0, enum HeapID heapID, int param2, enum PokemonContestType contestType, enum PokemonContestRank contestRank) { int v0, v1; u8 v2 = 0, v3 = 0; diff --git a/src/unk_02097624.c b/src/unk_02097624.c index 71e42310c3..40db43f3f3 100644 --- a/src/unk_02097624.c +++ b/src/unk_02097624.c @@ -28,7 +28,7 @@ FS_EXTERN_OVERLAY(overlay20); FS_EXTERN_OVERLAY(overlay75); typedef struct { - int heapID; + enum HeapID heapID; u16 unk_04; u16 unk_06; void *unk_08; @@ -54,7 +54,7 @@ const ApplicationManagerTemplate Unk_020F64B0 = { 0xFFFFFFFF }; -UnkStruct_02097728 *sub_02097624(SaveData *saveData, int param1, u8 param2, u8 param3, int heapID) +UnkStruct_02097728 *sub_02097624(SaveData *saveData, int param1, u8 param2, u8 param3, enum HeapID heapID) { UnkStruct_02097728 *v0; int v2; @@ -79,7 +79,7 @@ UnkStruct_02097728 *sub_02097624(SaveData *saveData, int param1, u8 param2, u8 p return v0; } -UnkStruct_02097728 *sub_0209767C(SaveData *saveData, int param1, u16 param2, int heapID) +UnkStruct_02097728 *sub_0209767C(SaveData *saveData, int param1, u16 param2, enum HeapID heapID) { UnkStruct_02097728 *v0 = Heap_AllocAtEnd(heapID, sizeof(UnkStruct_02097728)); MI_CpuClear8(v0, sizeof(UnkStruct_02097728)); @@ -97,7 +97,7 @@ UnkStruct_02097728 *sub_0209767C(SaveData *saveData, int param1, u16 param2, int return v0; } -UnkStruct_02097728 *sub_020976BC(SaveData *saveData, Pokemon *param1, int heapID) +UnkStruct_02097728 *sub_020976BC(SaveData *saveData, Pokemon *param1, enum HeapID heapID) { UnkStruct_02097728 *v0 = Heap_AllocAtEnd(heapID, sizeof(UnkStruct_02097728)); MI_CpuClear8(v0, sizeof(UnkStruct_02097728)); @@ -110,7 +110,7 @@ UnkStruct_02097728 *sub_020976BC(SaveData *saveData, Pokemon *param1, int heapID return v0; } -UnkStruct_02097728 *sub_020976F4(SaveData *saveData, u8 param1, int heapID) +UnkStruct_02097728 *sub_020976F4(SaveData *saveData, u8 param1, enum HeapID heapID) { UnkStruct_02097728 *v0 = Heap_AllocAtEnd(heapID, sizeof(UnkStruct_02097728)); MI_CpuClear8(v0, sizeof(UnkStruct_02097728)); @@ -157,7 +157,7 @@ void sub_02097770(UnkStruct_02097728 *param0) Heap_Free(param0); } -int sub_02097788(Mailbox *mailbox, Pokemon *mon, int heapID) +int sub_02097788(Mailbox *mailbox, Pokemon *mon, enum HeapID heapID) { int item = ITEM_NONE; int slot = Mail_GetEmptySlotInArray(mailbox, 0); @@ -178,7 +178,7 @@ int sub_02097788(Mailbox *mailbox, Pokemon *mon, int heapID) return slot; } -int sub_020977E4(Mailbox *mailbox, u16 param1, Pokemon *mon, int heapID) +int sub_020977E4(Mailbox *mailbox, u16 param1, Pokemon *mon, enum HeapID heapID) { int item = 0; Mail *mail = sub_020284A8(mailbox, 0, param1, heapID); @@ -197,7 +197,7 @@ int sub_020977E4(Mailbox *mailbox, u16 param1, Pokemon *mon, int heapID) return param1; } -UnkStruct_020978D8 *sub_02097834(const Mail *mail, int heapID) +static UnkStruct_020978D8 *sub_02097834(const Mail *mail, enum HeapID heapID) { u16 i; UnkStruct_020978D8 *v1 = Heap_Alloc(heapID, sizeof(UnkStruct_020978D8)); diff --git a/src/unk_02098218.c b/src/unk_02098218.c index 64990ac64f..6450a35a2a 100644 --- a/src/unk_02098218.c +++ b/src/unk_02098218.c @@ -211,11 +211,10 @@ static BOOL sub_0209843C(FieldTask *param0) TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(FieldSystem_GetSaveData(fieldSystem)); int v4 = 6; int location = MapHeader_GetMapLabelTextID(fieldSystem->location->mapId); - int heapID = HEAP_ID_FIELD2; int isEgg = FALSE; Pokemon_SetValue(mon, MON_DATA_IS_EGG, &isEgg); - UpdateMonStatusAndTrainerInfo(mon, trainerInfo, v4, location, heapID); + UpdateMonStatusAndTrainerInfo(mon, trainerInfo, v4, location, HEAP_ID_FIELD2); Pokemon_SetValue(mon, MON_DATA_SPECIES_NAME, NULL); } diff --git a/src/unk_02099550.c b/src/unk_02099550.c index 5958a31fd0..d26cc607dc 100644 --- a/src/unk_02099550.c +++ b/src/unk_02099550.c @@ -36,7 +36,7 @@ void sub_02099580(void) Overlay_UnloadByID(FS_OVERLAY_ID(overlay18)); } -static void sub_02099590(SaveData *saveData, int heapID) +static void sub_02099590(SaveData *saveData, enum HeapID heapID) { sub_02099550(); sub_02099570(); diff --git a/src/unk_02099604.c b/src/unk_02099604.c index 40e5bc14fa..c51ee2d886 100644 --- a/src/unk_02099604.c +++ b/src/unk_02099604.c @@ -15,7 +15,7 @@ FS_EXTERN_OVERLAY(overlay82); -static UnkStruct_ov82_0223B164 *sub_02099604(int param0, SaveData *saveData, int heapID, JournalEntry *journalEntry) +static UnkStruct_ov82_0223B164 *sub_02099604(int param0, SaveData *saveData, enum HeapID heapID, JournalEntry *journalEntry) { UnkStruct_ov82_0223B164 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov82_0223B164)); MI_CpuClear8(v0, sizeof(UnkStruct_ov82_0223B164)); @@ -48,7 +48,7 @@ static void sub_0209964C(FieldSystem *fieldSystem, UnkStruct_ov82_0223B164 *para } } -UnkStruct_ov82_0223B164 *sub_02099674(FieldSystem *fieldSystem, int param1, int heapID) +UnkStruct_ov82_0223B164 *sub_02099674(FieldSystem *fieldSystem, int param1, enum HeapID heapID) { UnkStruct_ov82_0223B164 *v0 = sub_02099604(param1, FieldSystem_GetSaveData(fieldSystem), heapID, fieldSystem->journalEntry); sub_0209964C(fieldSystem, v0); @@ -56,7 +56,7 @@ UnkStruct_ov82_0223B164 *sub_02099674(FieldSystem *fieldSystem, int param1, int return v0; } -UnkStruct_ov82_0223B164 *sub_020996A0(FieldSystem *fieldSystem, int heapID, BOOL param2) +UnkStruct_ov82_0223B164 *sub_020996A0(FieldSystem *fieldSystem, enum HeapID heapID, BOOL param2) { UnkStruct_ov82_0223B164 *v0 = sub_02099604(1, FieldSystem_GetSaveData(fieldSystem), heapID, fieldSystem->journalEntry); v0->unk_20 = 1; diff --git a/src/unk_02099DFC.c b/src/unk_02099DFC.c index f6bac883ca..a26f8c5ece 100644 --- a/src/unk_02099DFC.c +++ b/src/unk_02099DFC.c @@ -23,7 +23,7 @@ FS_EXTERN_OVERLAY(game_opening); typedef struct { - int heapID; + enum HeapID heapID; int unk_04; int unk_08; int unk_0C; @@ -80,14 +80,13 @@ static const WindowTemplate Unk_020F89EC = { int sub_02099DFC(ApplicationManager *appMan, int *param1) { UnkStruct_02099DFC *v0; - int heapID = HEAP_ID_88; - Heap_Create(HEAP_ID_APPLICATION, heapID, 0x20000); + Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_88, 0x20000); - v0 = ApplicationManager_NewData(appMan, sizeof(UnkStruct_02099DFC), heapID); + v0 = ApplicationManager_NewData(appMan, sizeof(UnkStruct_02099DFC), HEAP_ID_88); memset(v0, 0, sizeof(UnkStruct_02099DFC)); - v0->heapID = heapID; + v0->heapID = HEAP_ID_88; v0->unk_04 = 0; v0->saveData = ((ApplicationArgs *)ApplicationManager_Args(appMan))->saveData; diff --git a/src/unk_0209A2C4.c b/src/unk_0209A2C4.c index d2be5fc523..bab75e15a0 100644 --- a/src/unk_0209A2C4.c +++ b/src/unk_0209A2C4.c @@ -23,7 +23,7 @@ FS_EXTERN_OVERLAY(main_menu); typedef struct { - int heapID; + enum HeapID heapID; int unk_04; int unk_08; int unk_0C; @@ -68,14 +68,13 @@ const ApplicationManagerTemplate Unk_020F8AB4 = { int sub_0209A2C4(ApplicationManager *appMan, int *param1) { UnkStruct_0209A3D0 *v0; - int heapID = HEAP_ID_88; - Heap_Create(HEAP_ID_APPLICATION, heapID, 0x20000); + Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_88, 0x20000); - v0 = ApplicationManager_NewData(appMan, sizeof(UnkStruct_0209A3D0), heapID); + v0 = ApplicationManager_NewData(appMan, sizeof(UnkStruct_0209A3D0), HEAP_ID_88); memset(v0, 0, sizeof(UnkStruct_0209A3D0)); - v0->heapID = heapID; + v0->heapID = HEAP_ID_88; v0->unk_04 = 0; v0->saveData = ((ApplicationArgs *)ApplicationManager_Args(appMan))->saveData; diff --git a/src/unk_0209A74C.c b/src/unk_0209A74C.c index 2c8240fab8..331dfc9a51 100644 --- a/src/unk_0209A74C.c +++ b/src/unk_0209A74C.c @@ -65,7 +65,7 @@ static const WindowTemplate Unk_020F8AC4 = { 0x23 }; -void sub_0209A74C(int heapID) +void sub_0209A74C(enum HeapID heapID) { BgConfig *v0; Window v1; @@ -140,7 +140,7 @@ void sub_0209A74C(int heapID) PM_ForceToPowerOff(); } -void sub_0209A8E0(int heapID) +void sub_0209A8E0(enum HeapID heapID) { BgConfig *v0; Window v1; diff --git a/src/unk_0209AA74.c b/src/unk_0209AA74.c index 80d8e79c01..b19c9c2e8f 100644 --- a/src/unk_0209AA74.c +++ b/src/unk_0209AA74.c @@ -65,7 +65,7 @@ static const WindowTemplate Unk_020F8B20 = { 0x23 }; -void sub_0209AA74(int heapID, int param1) +void sub_0209AA74(enum HeapID heapID, int param1) { BgConfig *v0; Window v1; diff --git a/src/unk_0209C370.c b/src/unk_0209C370.c index 868e05bafb..f09730582d 100644 --- a/src/unk_0209C370.c +++ b/src/unk_0209C370.c @@ -2,7 +2,7 @@ #include "heap.h" -u8 *sub_0209C370(int heapID) +u8 *sub_0209C370(enum HeapID heapID) { u8 *v0 = Heap_Alloc(heapID, sizeof(void *)); MI_CpuClear8(v0, sizeof(void *));