From a177c127cb098b45c419dcc2bdc7a0ef28ed49da Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 16 Jan 2026 19:37:55 -0300 Subject: [PATCH] Convert multiple `u32 heapID` to `enum HeapID heapID` (#895) --- .../applications/poketch/poketch_animation.h | 2 +- include/applications/poketch/poketch_button.h | 4 +- include/applications/poketch/poketch_task.h | 2 +- include/bag.h | 2 +- include/bag_context.h | 4 +- include/bg_window.h | 10 +- include/easy3d_object.h | 4 +- include/font.h | 8 +- include/font_manager.h | 2 +- include/font_special_chars.h | 2 +- include/game_options.h | 2 +- include/graphics.h | 50 +- include/item.h | 6 +- include/journal.h | 90 ++-- include/map_header_util.h | 2 +- include/message.h | 2 +- include/move_reminder_data.h | 4 +- include/narc.h | 4 +- include/overlay005/fishing.h | 2 +- include/overlay005/ov5_021DF440.h | 4 +- include/overlay005/ov5_021EF4BC.h | 2 +- include/overlay005/ov5_021F0EB0.h | 4 +- include/overlay005/signpost.h | 2 +- include/overlay005/sprite_resource_manager.h | 4 +- include/overlay006/npc_trade.h | 4 +- include/overlay006/ov6_0223E140.h | 10 +- include/overlay006/ov6_02247100.h | 8 +- include/overlay006/ov6_02248948.h | 4 +- include/overlay010/struct_ov10_0221F800.h | 2 +- include/overlay013/battle_bag.h | 2 +- include/overlay013/battle_party.h | 2 +- include/overlay013/battle_sub_menu_cursor.h | 4 +- include/overlay017/ov17_0223F118.h | 2 +- include/overlay062/ov62_02231690.h | 2 +- include/overlay063/ov63_0222AE60.h | 8 +- include/overlay063/ov63_0222BCE8.h | 4 +- include/overlay063/ov63_0222BE18.h | 4 +- include/overlay063/ov63_0222CCE4.h | 6 +- include/overlay063/ov63_0222D1C0.h | 2 +- include/overlay063/ov63_0222D77C.h | 6 +- include/overlay065/ov65_02235060.h | 2 +- include/overlay066/ov66_0222DDF0.h | 4 +- include/overlay066/ov66_022343A8.h | 4 +- include/overlay066/ov66_02234EA8.h | 4 +- include/overlay070/ov70_02261E10.h | 4 +- include/overlay070/ov70_02262DA8.h | 4 +- include/overlay070/ov70_02269190.h | 4 +- include/overlay070/ov70_0226CE54.h | 4 +- include/overlay104/ov104_0223E894.h | 6 +- include/overlay105/ov105_02245DC4.h | 2 +- include/overlay115/ov115_02260BBC.h | 2 +- include/palette.h | 10 +- include/pokedex_memory.h | 3 +- include/pokemon.h | 2 +- include/string_template.h | 2 +- include/tv_episode_segment.h | 2 +- include/unk_0200679C.h | 4 +- include/unk_02014A84.h | 4 +- include/unk_02014D38.h | 4 +- include/unk_0201567C.h | 2 +- include/unk_02015920.h | 2 +- include/unk_0202854C.h | 2 +- include/unk_0206C660.h | 2 +- include/unk_0207064C.h | 2 +- include/unk_0207E060.h | 2 +- include/unk_0208C098.h | 2 +- include/unk_0209747C.h | 2 +- include/unk_0209BDF8.h | 4 +- include/unk_0209C194.h | 2 +- src/applications/poketch/poketch_animation.c | 2 +- src/applications/poketch/poketch_task.c | 2 +- src/bag.c | 2 +- src/bag_context.c | 4 +- src/bg_window.c | 6 +- src/easy3d_object.c | 4 +- src/font.c | 11 +- src/font_manager.c | 10 +- src/font_special_chars.c | 2 +- src/game_options.c | 2 +- src/graphics.c | 50 +- src/item.c | 6 +- src/journal.c | 96 ++-- src/main_menu/gba_migrator.c | 2 +- src/map_header_util.c | 2 +- src/move_reminder_data.c | 4 +- src/narc.c | 4 +- src/overlay005/encounter_effect_core.c | 2 +- src/overlay005/fishing.c | 2 +- src/overlay005/ov5_021DF440.c | 12 +- src/overlay005/ov5_021EF4BC.c | 2 +- src/overlay005/ov5_021F0EB0.c | 4 +- src/overlay005/signpost.c | 2 +- src/overlay005/sprite_resource_manager.c | 4 +- src/overlay006/hm_cut_in.c | 12 +- src/overlay006/npc_trade.c | 14 +- src/overlay006/ov6_0223E140.c | 28 +- src/overlay006/ov6_02247100.c | 12 +- src/overlay006/ov6_02248948.c | 2 +- src/overlay013/battle_bag.c | 4 +- src/overlay013/battle_party.c | 4 +- src/overlay013/battle_sub_menu_cursor.c | 2 +- src/overlay017/ov17_0223F118.c | 2 +- src/overlay022/ov22_022597BC.c | 8 +- src/overlay023/secret_bases.c | 2 +- src/overlay062/ov62_02231690.c | 2 +- src/overlay063/ov63_0222AE60.c | 72 +-- src/overlay063/ov63_0222BCE8.c | 2 +- src/overlay063/ov63_0222BE18.c | 2 +- src/overlay063/ov63_0222CCE4.c | 12 +- src/overlay063/ov63_0222D1C0.c | 2 +- src/overlay063/ov63_0222D77C.c | 4 +- src/overlay064/ov64_0222DCE0.c | 202 ++++---- src/overlay065/ov65_0222DCE0.c | 66 +-- src/overlay065/ov65_02235060.c | 14 +- src/overlay065/ov65_0223648C.c | 480 +++++++++--------- src/overlay066/ov66_0222DDF0.c | 18 +- src/overlay066/ov66_0223177C.c | 2 +- src/overlay066/ov66_022343A8.c | 6 +- src/overlay066/ov66_02234EA8.c | 2 +- src/overlay067/ov67_0225C700.c | 8 +- src/overlay068/ov68_0225C700.c | 64 +-- src/overlay069/ov69_0225C700.c | 8 +- src/overlay070/ov70_0225D9A4.c | 115 +++-- src/overlay070/ov70_02261E10.c | 2 +- src/overlay070/ov70_02262DA8.c | 6 +- src/overlay070/ov70_02269190.c | 2 +- src/overlay070/ov70_0226CE54.c | 2 +- src/overlay101/ov101_021D7E48.c | 2 +- src/overlay104/ov104_0223C2D4.c | 6 +- src/overlay104/ov104_0223E894.c | 6 +- src/overlay105/ov105_02245DC4.c | 2 +- src/overlay112/ov112_0225C700.c | 40 +- src/overlay114/ov114_0225C700.c | 11 +- src/overlay115/ov115_02260BBC.c | 2 +- src/overlay115/ov115_02260CEC.c | 5 +- src/palette.c | 10 +- src/pokedex_memory.c | 2 +- src/pokemon.c | 2 +- src/scrcmd_strings.c | 4 +- src/sprite_resource.c | 4 +- src/tv_episode_segment.c | 6 +- src/unk_0200679C.c | 2 +- src/unk_02014A84.c | 2 +- src/unk_02014D38.c | 6 +- src/unk_0201567C.c | 2 +- src/unk_02015920.c | 16 +- src/unk_0202854C.c | 2 +- src/unk_0206C660.c | 2 +- src/unk_0207064C.c | 2 +- src/unk_0207DA28.c | 16 +- src/unk_0207E060.c | 2 +- src/unk_0208C098.c | 2 +- src/unk_0209747C.c | 2 +- src/unk_0209BDF8.c | 2 +- src/unk_0209C194.c | 2 +- 155 files changed, 996 insertions(+), 967 deletions(-) diff --git a/include/applications/poketch/poketch_animation.h b/include/applications/poketch/poketch_animation.h index 497ba82579..96c1ecc635 100644 --- a/include/applications/poketch/poketch_animation.h +++ b/include/applications/poketch/poketch_animation.h @@ -23,7 +23,7 @@ typedef struct PoketchAnimation_SpriteData { void *compressedAnim; NNSG2dCellDataBank *cell; NNSG2dAnimBankData *anim; - u32 heapID; + enum HeapID heapID; } PoketchAnimation_SpriteData; PoketchAnimation_AnimationManager *PoketchAnimation_SetupAnimationManager(NNSG2dOamManagerInstance *oamMan, u32 heapID); diff --git a/include/applications/poketch/poketch_button.h b/include/applications/poketch/poketch_button.h index 904532153b..92c620fbf1 100644 --- a/include/applications/poketch/poketch_button.h +++ b/include/applications/poketch/poketch_button.h @@ -1,6 +1,8 @@ #ifndef POKEPLATINUM_POKETCH_BUTTON_H #define POKEPLATINUM_POKETCH_BUTTON_H +#include "constants/heap.h" + #include "touch_screen.h" #define BUTTON_TIMER_MAX 0xffff @@ -49,7 +51,7 @@ typedef struct PoketchButton { typedef struct PoketchButtonManager { const TouchScreenHitTable *hitTable; PoketchButtonCallback callback; - u32 heapID; + enum HeapID heapID; u32 numButtons; void *buttonCallbackData; PoketchButton *buttons; diff --git a/include/applications/poketch/poketch_task.h b/include/applications/poketch/poketch_task.h index 2c650ab2ba..0f05ee0c32 100644 --- a/include/applications/poketch/poketch_task.h +++ b/include/applications/poketch/poketch_task.h @@ -30,7 +30,7 @@ typedef struct PoketchTaskManager { void PoketchTask_InitActiveTaskList(u32 *activeList, u32 numTaskSlots); BOOL PoketchTask_TaskIsNotActive(u32 *activeList, u32 taskId); BOOL PoketchTask_NoActiveTasks(u32 *activeList); -void PoketchTask_Start(const PoketchTask *appTasks, u32 taskId, void *taskData, const void *constTaskData, u32 *activeList, u32 taskPriority, u32 heapID); +void PoketchTask_Start(const PoketchTask *appTasks, u32 taskId, void *taskData, const void *constTaskData, u32 *activeList, u32 taskPriority, enum HeapID heapID); void PoketchTask_EndTask(u32 *activeList, PoketchTaskManager *task); void *PoketchTask_GetTaskData(PoketchTaskManager *taskMan); const void *PoketchTask_GetConstTaskData(PoketchTaskManager *taskMan); diff --git a/include/bag.h b/include/bag.h index b1c1a6d51f..1526d67a81 100644 --- a/include/bag.h +++ b/include/bag.h @@ -92,7 +92,7 @@ void Pocket_Sort(BagItem *pocket, const u32 size); // Same as Pocket_SortEmpty, void *BagContext_CreateWithPockets(Bag *bag, const u8 *pockets, enum HeapID heapID); BagItem *Bag_GetItemSlot(Bag *bag, u16 pocketID, u16 slot); Bag *SaveData_GetBag(SaveData *saveData); -BagCursor *BagCursor_New(u32 heapID); +BagCursor *BagCursor_New(enum HeapID heapID); void BagCursor_GetFieldPocketPosition(BagCursor *cursor, u32 pocket, u8 *outIndex, u8 *outScroll); u16 BagCursor_GetFieldPocket(BagCursor *cursor); void BagCursor_SetFieldPocketPosition(BagCursor *cursor, u32 pocket, u8 index, u8 scroll); diff --git a/include/bag_context.h b/include/bag_context.h index 586f532da6..759e33c150 100644 --- a/include/bag_context.h +++ b/include/bag_context.h @@ -150,7 +150,7 @@ u8 BagContext_GetSoldAmount(BagContext *bagContext); * @param heapID * @return Whether a string was loaded into dstString. */ -BOOL BagContext_FormatUsageMessage(SaveData *saveData, String *dstString, u16 item, u32 heapID); +BOOL BagContext_FormatUsageMessage(SaveData *saveData, String *dstString, u16 item, enum HeapID heapID); /** * @brief Loads the message describing the reason an item couldn't be used. @@ -161,6 +161,6 @@ BOOL BagContext_FormatUsageMessage(SaveData *saveData, String *dstString, u16 it * @param error The reason the item couldn't be used. Member of `enum ItemUseCheckResult` * @param heapID */ -void BagContext_FormatErrorMessage(TrainerInfo *playerInfo, String *dstString, u16 unused, enum ItemUseCheckResult error, u32 heapID); +void BagContext_FormatErrorMessage(TrainerInfo *playerInfo, String *dstString, u16 unused, enum ItemUseCheckResult error, enum HeapID heapID); #endif // POKEPLATINUM_BAG_CONTEXT_H diff --git a/include/bg_window.h b/include/bg_window.h index 42668ea3b1..e8cd58b3be 100644 --- a/include/bg_window.h +++ b/include/bg_window.h @@ -4,6 +4,8 @@ #include #include +#include "constants/heap.h" + #define TILEMAP_COPY_SRC_FLAT 0 // source dimensions are equal to dest dimensions #define TILEMAP_COPY_SRC_RECT 1 // dest dimensions carve a window from source @@ -129,7 +131,7 @@ typedef struct Background { } Background; typedef struct BgConfig { - u32 heapID; + enum HeapID heapID; u16 scrollScheduled; u16 bufferTransferScheduled; Background bgs[8]; @@ -168,7 +170,7 @@ typedef struct GraphicsModes { void SetAllGraphicsModes(const GraphicsModes *graphicsModes); void SetScreenGraphicsModes(const GraphicsModes *graphicsModes, u8 screen); -BgConfig *BgConfig_New(u32 heapID); +BgConfig *BgConfig_New(enum HeapID heapID); u32 BgConfig_GetHeapID(BgConfig *bgConfig); void Bg_InitFromTemplate(BgConfig *bgConfig, u8 bgLayer, const BgTemplate *bgTemplate, u8 bgType); void Bg_SetControlParam(BgConfig *bgConfig, u8 bgLayer, enum BgControlParam bgControlParam, u8 val); @@ -184,7 +186,7 @@ void Bg_CopyTilemapBufferRangeToVRAM(BgConfig *bgConfig, u8 bgLayer, void *src, void Bg_LoadTilemapBuffer(BgConfig *bgConfig, u8 bgLayer, void *src, u32 size); void Bg_LoadTiles(BgConfig *bgConfig, u8 bgLayer, void *src, u32 size, u32 tileStart); void Bg_LoadTilesToVRAM(BgConfig *bgConfig, u8 bgLayer, void *src, u32 size, u32 offset); -void Bg_ClearTilesRange(u8 bgLayer, u32 size, u32 offset, u32 heapID); +void Bg_ClearTilesRange(u8 bgLayer, u32 size, u32 offset, enum HeapID heapID); void Bg_FillTilesRange(BgConfig *bgConfig, u32 bgLayer, u32 fillVal, u32 numTiles, u32 offset); void Bg_LoadPalette(u8 bgLayer, void *src, u16 size, u16 offset); void Bg_MaskPalette(u8 bgLayer, u16 mask); @@ -214,7 +216,7 @@ void Bitmap_BlitRect8bpp(const Bitmap *src, const Bitmap *dest, u16 srcX, u16 sr void Bitmap_FillRect4bpp(const Bitmap *bitmap, u16 x, u16 y, u16 width, u16 height, u8 fillVal); void Bitmap_FillRect8bpp(const Bitmap *bitmap, u16 x, u16 y, u16 width, u16 height, u8 fillVal); -Window *Window_New(u32 heapID, u8 numWindows); +Window *Window_New(enum HeapID heapID, u8 numWindows); void Window_Init(Window *window); u8 Window_IsInUse(Window *window); void Window_Add(BgConfig *bgConfig, Window *window, u8 bgLayer, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palette, u16 baseTile); diff --git a/include/easy3d_object.h b/include/easy3d_object.h index 895009f073..e3bc5009f7 100644 --- a/include/easy3d_object.h +++ b/include/easy3d_object.h @@ -39,11 +39,11 @@ typedef struct Easy3DObject { u8 padding_76[2]; } Easy3DObject; -void Easy3DModel_Load(Easy3DModel *model, enum NarcID narcID, u32 memberIndex, u32 heapID); +void Easy3DModel_Load(Easy3DModel *model, enum NarcID narcID, u32 memberIndex, enum HeapID heapID); void Easy3DModel_LoadFrom(Easy3DModel *model, NARC *narc, u32 memberIndex, u32 heapID); void Easy3DModel_Release(Easy3DModel *model); -void Easy3DAnim_LoadFrom(Easy3DAnim *anim, const Easy3DModel *model, NARC *narc, u32 memberIndex, u32 heapID, NNSFndAllocator *allocator); +void Easy3DAnim_LoadFrom(Easy3DAnim *anim, const Easy3DModel *model, NARC *narc, u32 memberIndex, enum HeapID heapID, NNSFndAllocator *allocator); void Easy3DAnim_LoadFromData(Easy3DAnim *anim, const Easy3DModel *model, void *data, NNSFndAllocator *allocator); void Easy3DAnim_Release(Easy3DAnim *anim, NNSFndAllocator *allocator); void Easy3DAnim_UpdateLooped(Easy3DAnim *anim, fx32 frameDelta); diff --git a/include/font.h b/include/font.h index 05aa6a5416..2dd9a5294e 100644 --- a/include/font.h +++ b/include/font.h @@ -46,8 +46,8 @@ typedef struct FontAttributes { } FontAttributes; void Fonts_Init(void); -void Font_InitManager(enum Font font, u32 heapID); -void Font_UseImmediateGlyphAccess(enum Font font, u32 heapID); +void Font_InitManager(enum Font font, enum HeapID heapID); +void Font_UseImmediateGlyphAccess(enum Font font, enum HeapID heapID); void Font_UseLazyGlyphAccess(enum Font font); void Font_Free(enum Font font); const TextGlyph *Font_TryLoadGlyph(enum Font font, charcode_t c); @@ -56,8 +56,8 @@ u32 Font_CalcCharArrayWidth(enum Font font, const charcode_t *str, u32 letterSpa u32 Font_CalcStringWidth(enum Font font, const String *string, u32 letterSpacing); u32 Font_AreAllCharsValid(enum Font font, String *string, String *tmpbuf); u8 Font_GetAttribute(u8 font, u8 attribute); -void Font_LoadTextPalette(enum PaletteLoadLocation palLocation, u32 palSlotOffset, u32 heapID); -void Font_LoadScreenIndicatorsPalette(enum PaletteLoadLocation palLocation, u32 palSlotOffset, u32 heapID); +void Font_LoadTextPalette(enum PaletteLoadLocation palLocation, u32 palSlotOffset, enum HeapID heapID); +void Font_LoadScreenIndicatorsPalette(enum PaletteLoadLocation palLocation, u32 palSlotOffset, enum HeapID heapID); u32 Font_CalcMaxLineWidth(enum Font font, const String *string, u32 letterSpacing); u32 Font_CalcCenterAlignment(enum Font font, const String *string, u32 letterSpacing, u32 windowWidth); u32 Font_CalcStringWidthWithCursorControl(enum Font font, const String *string); diff --git a/include/font_manager.h b/include/font_manager.h index 1eec0cf3d7..17dfdaa0b0 100644 --- a/include/font_manager.h +++ b/include/font_manager.h @@ -49,7 +49,7 @@ struct FontManager { u8 *glyphWidths; }; -FontManager *FontManager_New(enum NarcID narcID, u32 arcFileIdx, enum GlyphAccessMode glyphAccessMode, BOOL isMonospace, u32 heapID); +FontManager *FontManager_New(enum NarcID narcID, u32 arcFileIdx, enum GlyphAccessMode glyphAccessMode, BOOL isMonospace, enum HeapID heapID); void FontManager_Delete(FontManager *fontManager); void FontManager_SwitchGlyphAccessMode(FontManager *fontManager, enum GlyphAccessMode glyphAccessMode, u32 heapID); void FontManager_TryLoadGlyph(const FontManager *fontManager, charcode_t c, TextGlyph *outGlyph); diff --git a/include/font_special_chars.h b/include/font_special_chars.h index caea2bd990..8108b9e92e 100644 --- a/include/font_special_chars.h +++ b/include/font_special_chars.h @@ -21,7 +21,7 @@ typedef struct FontSpecialCharsContext { u32 bgColor; } FontSpecialCharsContext; -FontSpecialCharsContext *FontSpecialChars_Init(u32 fgColor, u32 shadowColor, u32 bgColor, u32 heapID); +FontSpecialCharsContext *FontSpecialChars_Init(u32 fgColor, u32 shadowColor, u32 bgColor, enum HeapID heapID); void FontSpecialChars_Free(FontSpecialCharsContext *context); void FontSpecialChars_DrawPartyScreenLevelText(FontSpecialCharsContext *context, enum NonNumericSpecialChar tableIdx, Window *window, u32 x, u32 y); void FontSpecialChars_DrawPartyScreenHPText(FontSpecialCharsContext *context, s32 displayValue, u32 digits, enum PaddingMode paddingMode, Window *window, u32 x, u32 y); diff --git a/include/game_options.h b/include/game_options.h index 39ae3ec9df..1389e674f6 100644 --- a/include/game_options.h +++ b/include/game_options.h @@ -15,7 +15,7 @@ typedef struct Options { u16 : 1; } Options; -Options *Options_New(u32 heapID); +Options *Options_New(enum HeapID heapID); void Options_Copy(const Options *src, Options *dest); void Options_Init(Options *options); void Options_SetSystemButtonMode(SaveData *saveData, enum OptionsButtonMode mode); diff --git a/include/graphics.h b/include/graphics.h index 52f77945fa..d60eca43b4 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -25,37 +25,37 @@ enum ImageMappingLayout { }; void *LoadCompressedMemberFromNARC(enum NarcID narcID, u32 narcMemberIdx, u32 heapID); -void *LoadMemberFromNARC(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, u32 heapID, BOOL allocAtEnd); -void *LoadMemberFromNARC_OutFileSize(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, u32 heapID, BOOL allocAtEnd, u32 *fileSize); -void *LoadMemberFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, u32 heapID, BOOL allocAtEnd); -void *LoadMemberFromOpenNARC_OutFileSize(NARC *narc, u32 narcMemberIdx, BOOL compressed, u32 heapID, BOOL allocAtEnd, u32 *fileSize); +void *LoadMemberFromNARC(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, enum HeapID heapID, BOOL allocAtEnd); +void *LoadMemberFromNARC_OutFileSize(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, enum HeapID heapID, BOOL allocAtEnd, u32 *fileSize); +void *LoadMemberFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, enum HeapID heapID, BOOL allocAtEnd); +void *LoadMemberFromOpenNARC_OutFileSize(NARC *narc, u32 narcMemberIdx, BOOL compressed, enum HeapID heapID, BOOL allocAtEnd, u32 *fileSize); u32 Graphics_LoadTilesToBgLayer(enum NarcID narcID, u32 narcMemberIdx, BgConfig *bgConfig, u32 bgLayer, u32 offset, u32 size, BOOL compressed, u32 heapID); -void Graphics_LoadTilemapToBgLayer(enum NarcID narcID, u32 narcMemberIdx, BgConfig *bgConfig, u32 bgLayer, u32 offset, u32 size, BOOL compressed, u32 heapID); -void Graphics_LoadPalette(enum NarcID narcID, u32 narcMemberIdx, enum PaletteLoadLocation loadLocation, u32 palOffset, u32 size, u32 heapID); -void Graphics_LoadPaletteWithSrcOffset(enum NarcID narcID, u32 narcMemberIdx, enum PaletteLoadLocation loadLocation, u32 srcOffset, u32 palOffset, u32 size, u32 heapID); -u32 Graphics_LoadObjectTiles(enum NarcID narcID, u32 narcMemberIdx, enum DSScreen display, u32 offset, u32 size, BOOL compressed, u32 heapID); -void Graphics_LoadPartialPalette(enum NarcID narcID, u32 narcMemberIdx, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, u32 heapID, NNSG2dImagePaletteProxy *paletteProxy); -u32 Graphics_LoadImageMapping(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, enum ImageMappingLayout layout, u32 size, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, u32 heapID, NNSG2dImageProxy *imageProxy); -void Graphics_LoadImageMappingAndSetVramMode(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, enum ImageMappingLayout layout, u32 size, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, u32 heapID, NNSG2dImageProxy *imageProxy); +void Graphics_LoadTilemapToBgLayer(enum NarcID narcID, u32 narcMemberIdx, BgConfig *bgConfig, u32 bgLayer, u32 offset, u32 size, BOOL compressed, enum HeapID heapID); +void Graphics_LoadPalette(enum NarcID narcID, u32 narcMemberIdx, enum PaletteLoadLocation loadLocation, u32 palOffset, u32 size, enum HeapID heapID); +void Graphics_LoadPaletteWithSrcOffset(enum NarcID narcID, u32 narcMemberIdx, enum PaletteLoadLocation loadLocation, u32 srcOffset, u32 palOffset, u32 size, enum HeapID heapID); +u32 Graphics_LoadObjectTiles(enum NarcID narcID, u32 narcMemberIdx, enum DSScreen display, u32 offset, u32 size, BOOL compressed, enum HeapID heapID); +void Graphics_LoadPartialPalette(enum NarcID narcID, u32 narcMemberIdx, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, enum HeapID heapID, NNSG2dImagePaletteProxy *paletteProxy); +u32 Graphics_LoadImageMapping(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, enum ImageMappingLayout layout, u32 size, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, enum HeapID heapID, NNSG2dImageProxy *imageProxy); +void Graphics_LoadImageMappingAndSetVramMode(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, enum ImageMappingLayout layout, u32 size, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, enum HeapID heapID, NNSG2dImageProxy *imageProxy); -void *Graphics_GetCharData(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, NNSG2dCharacterData **outCharData, u32 heapID); -void *Graphics_GetScrnData(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, NNSG2dScreenData **outScreenData, u32 heapID); -void *Graphics_GetPlttData(enum NarcID narcID, u32 narcMemberIdx, NNSG2dPaletteData **outPaletteData, u32 heapID); -void *Graphics_GetCellBank(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, NNSG2dCellDataBank **outCellBank, u32 heapID); -void *Graphics_GetAnimBank(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, NNSG2dAnimBankData **outAnimBank, u32 heapID); +void *Graphics_GetCharData(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, NNSG2dCharacterData **outCharData, enum HeapID heapID); +void *Graphics_GetScrnData(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, NNSG2dScreenData **outScreenData, enum HeapID heapID); +void *Graphics_GetPlttData(enum NarcID narcID, u32 narcMemberIdx, NNSG2dPaletteData **outPaletteData, enum HeapID heapID); +void *Graphics_GetCellBank(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, NNSG2dCellDataBank **outCellBank, enum HeapID heapID); +void *Graphics_GetAnimBank(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, NNSG2dAnimBankData **outAnimBank, enum HeapID heapID); u32 Graphics_LoadTilesToBgLayerFromOpenNARC(NARC *narc, u32 narcMemberIdx, BgConfig *bgConfig, u32 bgLayer, u32 offset, u32 size, BOOL compressed, u32 heapID); -void Graphics_LoadTilemapToBgLayerFromOpenNARC(NARC *narc, u32 narcMemberIdx, BgConfig *bgConfig, u32 bgLayer, u32 offset, u32 size, BOOL compressed, u32 heapID); +void Graphics_LoadTilemapToBgLayerFromOpenNARC(NARC *narc, u32 narcMemberIdx, BgConfig *bgConfig, u32 bgLayer, u32 offset, u32 size, BOOL compressed, enum HeapID heapID); void Graphics_LoadPaletteFromOpenNARC(NARC *narc, u32 narcMemberIdx, enum PaletteLoadLocation loadLocation, u32 offset, u32 size, u32 heapID); -void Graphics_LoadPaletteWithSrcOffsetFromOpenNARC(NARC *narc, u32 narcMemberIdx, enum PaletteLoadLocation loadLocation, u32 srcOffset, u32 offset, u32 size, u32 heapID); -void Graphics_LoadPartialPaletteFromOpenNARC(NARC *narc, u32 narcMemberIdx, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, u32 heapID, NNSG2dImagePaletteProxy *paletteProxy); -u32 Graphics_LoadImageMappingFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, enum ImageMappingLayout layout, u32 size, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, u32 heapID, NNSG2dImageProxy *imageProxy); +void Graphics_LoadPaletteWithSrcOffsetFromOpenNARC(NARC *narc, u32 narcMemberIdx, enum PaletteLoadLocation loadLocation, u32 srcOffset, u32 offset, u32 size, enum HeapID heapID); +void Graphics_LoadPartialPaletteFromOpenNARC(NARC *narc, u32 narcMemberIdx, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, enum HeapID heapID, NNSG2dImagePaletteProxy *paletteProxy); +u32 Graphics_LoadImageMappingFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, enum ImageMappingLayout layout, u32 size, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, enum HeapID heapID, NNSG2dImageProxy *imageProxy); -void *Graphics_GetCharDataFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, NNSG2dCharacterData **outCharData, u32 heapID); -void *Graphics_GetScrnDataFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, NNSG2dScreenData **outScreenData, u32 heapID); -void *Graphics_GetPlttDataFromOpenNARC(NARC *narc, u32 narcMemberIdx, NNSG2dPaletteData **outPaletteData, u32 heapID); -void *Graphics_GetCellBankFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, NNSG2dCellDataBank **outCellBank, u32 heapID); -void *Graphics_GetAnimBankFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, NNSG2dAnimBankData **outAnimBank, u32 heapID); +void *Graphics_GetCharDataFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, NNSG2dCharacterData **outCharData, enum HeapID heapID); +void *Graphics_GetScrnDataFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, NNSG2dScreenData **outScreenData, enum HeapID heapID); +void *Graphics_GetPlttDataFromOpenNARC(NARC *narc, u32 narcMemberIdx, NNSG2dPaletteData **outPaletteData, enum HeapID heapID); +void *Graphics_GetCellBankFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, NNSG2dCellDataBank **outCellBank, enum HeapID heapID); +void *Graphics_GetAnimBankFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, NNSG2dAnimBankData **outAnimBank, enum HeapID heapID); #endif // POKEPLATINUM_GRAPHICS_H diff --git a/include/item.h b/include/item.h index 2ab4d4801d..e12253a419 100644 --- a/include/item.h +++ b/include/item.h @@ -199,7 +199,7 @@ u16 Item_IconNANRFile(void); * @param heapID ID of the heap to own the allocated memory. * @return The loaded data structure. */ -void *Item_Load(u16 item, enum ItemFileType type, u32 heapID); +void *Item_Load(u16 item, enum ItemFileType type, enum HeapID heapID); /** * @brief Load the name of the item into a string buffer. @@ -208,7 +208,7 @@ void *Item_Load(u16 item, enum ItemFileType type, u32 heapID); * @param item The item whose name we should load. * @param heapID ID of the heap to own memory needed for the text archive. */ -void Item_LoadName(String *dst, u16 item, u32 heapID); +void Item_LoadName(String *dst, u16 item, enum HeapID heapID); /** * @brief Load the description of the item into a string buffer. @@ -227,7 +227,7 @@ void Item_LoadDescription(String *dst, u16 item, u16 heapID); * @param heapID The heap on which to load the item data. * @return Parameter value from the loaded item. */ -s32 Item_LoadParam(u16 item, enum ItemDataParam param, u32 heapID); +s32 Item_LoadParam(u16 item, enum ItemDataParam param, enum HeapID heapID); /** * @brief Get a param value from a loaded item. diff --git a/include/journal.h b/include/journal.h index dd111ad2ba..9abebc0411 100644 --- a/include/journal.h +++ b/include/journal.h @@ -76,52 +76,52 @@ JournalEntry *SaveData_GetJournal(SaveData *saveData); JournalEntry *Journal_GetSavedPage(JournalEntry *journalEntry, BOOL journalAcquired); BOOL Journal_CheckOpenOnContinue(JournalEntry *journalEntry, BOOL journalAcquired); void JournalEntry_SaveData(JournalEntry *journalEntry, void *data, u8 dataType); -void *JournalEntry_CreateTitle(u16 mapID, u32 heapID); -void *JournalEntry_CreateEventRestedAtHome(u32 heapID); -void *JournalEntry_CreateEventLeftResearchLab(u32 heapID); -void *JournalEntry_CreateEventUsedPCBox(u32 heapID); -void *JournalEntry_CreateEventShoppedAtMart(u32 heapID); -void *JournalEntry_CreateEventLotsOfShopping(u32 heapID); -void *JournalEntry_CreateEventSoldALittle(u32 heapID); -void *JournalEntry_CreateEventSoldALot(u32 heapID); -void *JournalEntry_CreateEventBusinessAtMart(u32 heapID); -void *JournalEntry_CreateEventGymTooTough(u16 defeatedGym, u32 heapID); -void *JournalEntry_CreateEventGymLeader(u16 trainerType, u16 trainerID, u32 heapID); -void *JournalEntry_CreateEventEliteFour(u16 trainerID, u32 heapID); -void *JournalEntry_CreateEventChampion(u16 trainerID, u32 heapID); -void *JournalEntry_CreateEventArrivedInLocation(u16 mapID, u32 heapID); -void *JournalEntry_CreateEventLeftCave(u16 mapLabelTextID, u32 heapID); -void *JournalEntry_CreateEventLeftBuilding(u16 mapLabelTextID, u32 heapID); -void *JournalEntry_CreateEventGameCorner(u32 heapID); -void *JournalEntry_CreateEventSafariGame(u32 heapID); -void *JournalEntry_CreateEventObtainedItem(u16 item, u32 heapID); -void *JournalEntry_CreateEventUsedMove(u8 moveIndex, u16 mapID, u32 heapID); -void *JournalEntry_CreateEventDugUnderground(u32 heapID); -void *JournalEntry_CreateEventBuiltSecretBase(u32 heapID); -void *JournalEntry_CreateEventBattleFacility(u32 heapID, u32 eventType); -void *JournalEntry_CreateEventMonCaught(const PlayTime *playTime, u16 species, u8 gender, u8 timeOfDay, u32 heapID); -void *JournalEntry_CreateEventMonDefeated(const PlayTime *playTime, u16 species, u8 gender, u8 timeOfDay, u32 heapID); -void *JournalEntry_CreateEventStandardTrainer(u16 mapID, u16 trainerID, u32 heapID); -void *JournalEntry_CreateEventSingleBattle(u16 *opponentName, u8 opponentGender, u8 battleResult, u32 heapID); -void *JournalEntry_CreateEventDoubleBattle(u16 *opponentName, u8 opponentGender, u8 battleResult, u32 heapID); -void *JournalEntry_CreateEventMultiBattle(u16 *opponentName1, u16 *opponentName2, u8 opponentGender1, u8 opponentGender2, u8 battleResult, u32 heapID); -void *JournalEntry_CreateEventMixSingleBattle(u16 *opponentName, u8 opponentGender, u8 battleResult, u32 heapID); -void *JournalEntry_CreateEventGreetedInUnionRoom(u16 *trainerName, u8 trainerGender, u32 heapID); -void *JournalEntry_CreateEventGotPokemonFromTrade(u16 *otName, u8 otGender, u16 *pokemonName, u8 pokemonGender, u32 heapID); -void *JournalEntry_CreateEventDrewPictures(u32 heapID); -void *JournalEntry_CreateEventUnionBattle(u16 *opponentName, u8 opponentGender, u8 battleResult, u32 heapID); -void *JournalEntry_CreateEventMixedRecords(u32 heapID); -void *JournalEntry_CreateEventPlacedInContest(u8 placement, u32 heapID); -void *JournalEntry_CreateEventMadePoffins(u32 heapID); -void *JournalEntry_CreateEventGotPokemonGTS(u16 *otName, u8 otGender, u16 *pokemonName, u8 pokemonGender, u32 heapID); -void *JournalEntry_CreateEventBattleRoom(u32 heapID); -void *JournalEntry_CreateEventMisc(u32 heapID, u32 eventType); -void *JournalEntry_CreateEventInteraction(const u16 *playerName, u8 playerGender, u32 heapID, u32 eventType); -void *JournalEntry_CreateEventPlazaMinigame(int minigame, u32 heapID, u32 eventType); +void *JournalEntry_CreateTitle(u16 mapID, enum HeapID heapID); +void *JournalEntry_CreateEventRestedAtHome(enum HeapID heapID); +void *JournalEntry_CreateEventLeftResearchLab(enum HeapID heapID); +void *JournalEntry_CreateEventUsedPCBox(enum HeapID heapID); +void *JournalEntry_CreateEventShoppedAtMart(enum HeapID heapID); +void *JournalEntry_CreateEventLotsOfShopping(enum HeapID heapID); +void *JournalEntry_CreateEventSoldALittle(enum HeapID heapID); +void *JournalEntry_CreateEventSoldALot(enum HeapID heapID); +void *JournalEntry_CreateEventBusinessAtMart(enum HeapID heapID); +void *JournalEntry_CreateEventGymTooTough(u16 defeatedGym, enum HeapID heapID); +void *JournalEntry_CreateEventGymLeader(u16 trainerType, u16 trainerID, enum HeapID heapID); +void *JournalEntry_CreateEventEliteFour(u16 trainerID, enum HeapID heapID); +void *JournalEntry_CreateEventChampion(u16 trainerID, enum HeapID heapID); +void *JournalEntry_CreateEventArrivedInLocation(u16 mapID, enum HeapID heapID); +void *JournalEntry_CreateEventLeftCave(u16 mapLabelTextID, enum HeapID heapID); +void *JournalEntry_CreateEventLeftBuilding(u16 mapLabelTextID, enum HeapID heapID); +void *JournalEntry_CreateEventGameCorner(enum HeapID heapID); +void *JournalEntry_CreateEventSafariGame(enum HeapID heapID); +void *JournalEntry_CreateEventObtainedItem(u16 item, enum HeapID heapID); +void *JournalEntry_CreateEventUsedMove(u8 moveIndex, u16 mapID, enum HeapID heapID); +void *JournalEntry_CreateEventDugUnderground(enum HeapID heapID); +void *JournalEntry_CreateEventBuiltSecretBase(enum HeapID heapID); +void *JournalEntry_CreateEventBattleFacility(enum HeapID heapID, u32 eventType); +void *JournalEntry_CreateEventMonCaught(const PlayTime *playTime, u16 species, u8 gender, u8 timeOfDay, enum HeapID heapID); +void *JournalEntry_CreateEventMonDefeated(const PlayTime *playTime, u16 species, u8 gender, u8 timeOfDay, enum HeapID heapID); +void *JournalEntry_CreateEventStandardTrainer(u16 mapID, u16 trainerID, enum HeapID heapID); +void *JournalEntry_CreateEventSingleBattle(u16 *opponentName, u8 opponentGender, u8 battleResult, enum HeapID heapID); +void *JournalEntry_CreateEventDoubleBattle(u16 *opponentName, u8 opponentGender, u8 battleResult, enum HeapID heapID); +void *JournalEntry_CreateEventMultiBattle(u16 *opponentName1, u16 *opponentName2, u8 opponentGender1, u8 opponentGender2, u8 battleResult, enum HeapID heapID); +void *JournalEntry_CreateEventMixSingleBattle(u16 *opponentName, u8 opponentGender, u8 battleResult, enum HeapID heapID); +void *JournalEntry_CreateEventGreetedInUnionRoom(u16 *trainerName, u8 trainerGender, enum HeapID heapID); +void *JournalEntry_CreateEventGotPokemonFromTrade(u16 *otName, u8 otGender, u16 *pokemonName, u8 pokemonGender, enum HeapID heapID); +void *JournalEntry_CreateEventDrewPictures(enum HeapID heapID); +void *JournalEntry_CreateEventUnionBattle(u16 *opponentName, u8 opponentGender, u8 battleResult, enum HeapID heapID); +void *JournalEntry_CreateEventMixedRecords(enum HeapID heapID); +void *JournalEntry_CreateEventPlacedInContest(u8 placement, enum HeapID heapID); +void *JournalEntry_CreateEventMadePoffins(enum HeapID heapID); +void *JournalEntry_CreateEventGotPokemonGTS(u16 *otName, u8 otGender, u16 *pokemonName, u8 pokemonGender, enum HeapID heapID); +void *JournalEntry_CreateEventBattleRoom(enum HeapID heapID); +void *JournalEntry_CreateEventMisc(enum HeapID heapID, u32 eventType); +void *JournalEntry_CreateEventInteraction(const u16 *playerName, u8 playerGender, enum HeapID heapID, u32 eventType); +void *JournalEntry_CreateEventPlazaMinigame(int minigame, enum HeapID heapID, u32 eventType); void JournalEntry_GetData(JournalEntry *journalEntry, void *dest, u8 dataType, u8 page); -void JournalEntry_CreateAndSaveEventMapTransition(TrainerInfo *trainerInfo, JournalEntry *journalEntry, u32 currMapID, u32 prevMapID, u32 heapID); +void JournalEntry_CreateAndSaveEventMapTransition(TrainerInfo *trainerInfo, JournalEntry *journalEntry, u32 currMapID, u32 prevMapID, enum HeapID heapID); u32 Journal_DoesBuildingUseExitedMessage(u32 mapLabelTextID); -void JournalEntry_CreateAndSaveEventArrivedInLocation(JournalEntry *journalEntry, u32 mapID, u32 heapID); -void JournalEntry_CreateAndSaveEventTrainer(JournalEntry *journalEntry, u16 mapID, u16 trainerID, u32 heapID); +void JournalEntry_CreateAndSaveEventArrivedInLocation(JournalEntry *journalEntry, u32 mapID, enum HeapID heapID); +void JournalEntry_CreateAndSaveEventTrainer(JournalEntry *journalEntry, u16 mapID, u16 trainerID, enum HeapID heapID); #endif // POKEPLATINUM_JOURNAL_H diff --git a/include/map_header_util.h b/include/map_header_util.h index aa70b8181d..f6d47d04bd 100644 --- a/include/map_header_util.h +++ b/include/map_header_util.h @@ -7,6 +7,6 @@ #include "string_gf.h" u32 MapHeader_LoadString(MessageLoader *msgLoader, u32 entryID, String *string); -void MapHeader_LoadName(enum MapHeader headerID, u32 heapID, String *string); +void MapHeader_LoadName(enum MapHeader headerID, enum HeapID heapID, String *string); #endif // POKEPLATINUM_MAP_HEADER_UTIL_H diff --git a/include/message.h b/include/message.h index c1ec22d9ae..d792290798 100644 --- a/include/message.h +++ b/include/message.h @@ -43,7 +43,7 @@ enum MessageLoaderMode { * @param heapID Which heap will own the allocation. * @return Allocated message data. */ -MessageBank *MessageBank_Load(enum NarcID narcID, u32 param1, u32 param2); +MessageBank *MessageBank_Load(enum NarcID narcID, u32 param1, u32 heapID); /** * @brief Free allocated message data back to the heap. diff --git a/include/move_reminder_data.h b/include/move_reminder_data.h index fe48979e59..cb2fa38660 100644 --- a/include/move_reminder_data.h +++ b/include/move_reminder_data.h @@ -18,9 +18,9 @@ typedef struct MoveReminderData { u8 moveSlot; } MoveReminderData; -MoveReminderData *MoveReminderData_Alloc(u32 heapID); +MoveReminderData *MoveReminderData_Alloc(enum HeapID heapID); void MoveReminderData_Free(MoveReminderData *data); -u16 *MoveReminderData_GetMoves(Pokemon *mon, u32 heapID); +u16 *MoveReminderData_GetMoves(Pokemon *mon, enum HeapID heapID); BOOL MoveReminderData_HasMoves(u16 *moves); #endif // POKEPLATINUM_MOVE_REMINDER_DATA_H diff --git a/include/narc.h b/include/narc.h index 65cdc8aa7b..d6f153e9f7 100644 --- a/include/narc.h +++ b/include/narc.h @@ -85,7 +85,7 @@ u32 NARC_GetMemberSizeByIndexPair(enum NarcID narcID, int memberIndex); * * @returns: Pointer to the newly-allocated NARC */ -NARC *NARC_ctor(enum NarcID narcID, u32 heapID); +NARC *NARC_ctor(enum NarcID narcID, enum HeapID heapID); /* * Closes the wrapped FSFile and returns the NARC allocation to the heap from whence it came. @@ -103,7 +103,7 @@ void NARC_dtor(NARC *narc); * * @returns: Pointer to the allocated buffer which contains the data that was read. */ -void *NARC_AllocAndReadWholeMember(NARC *narc, u32 memberIndex, u32 heapID); +void *NARC_AllocAndReadWholeMember(NARC *narc, u32 memberIndex, enum HeapID heapID); /* * Reads NARC member to preallocated buffer dest, which should be large enough to hold the data. diff --git a/include/overlay005/fishing.h b/include/overlay005/fishing.h index f951f69aad..d26797a494 100644 --- a/include/overlay005/fishing.h +++ b/include/overlay005/fishing.h @@ -7,7 +7,7 @@ #include "field_task.h" #include "sys_task_manager.h" -void *FishingContext_Init(FieldSystem *fieldSystem, u32 heapID, enum EncounterFishingRodType rodType); +void *FishingContext_Init(FieldSystem *fieldSystem, enum HeapID heapID, enum EncounterFishingRodType rodType); BOOL FieldTask_Fishing(FieldTask *param0); SysTask *StartFishingTask(FieldSystem *fieldSystem, enum EncounterFishingRodType rodType, BOOL isFishEncountered); void FishingSysTask_Free(SysTask *param0); diff --git a/include/overlay005/ov5_021DF440.h b/include/overlay005/ov5_021DF440.h index 1015d9593e..cde9d20b70 100644 --- a/include/overlay005/ov5_021DF440.h +++ b/include/overlay005/ov5_021DF440.h @@ -14,9 +14,9 @@ #include "overworld_anim_manager.h" #include "simple3d.h" -UnkStruct_ov5_021DF47C *ov5_021DF440(FieldSystem *fieldSystem, u32 param1, u32 heapID); +UnkStruct_ov5_021DF47C *ov5_021DF440(FieldSystem *fieldSystem, u32 param1, enum HeapID heapID); void ov5_021DF47C(UnkStruct_ov5_021DF47C *param0, u32 param1); -void ov5_021DF488(UnkStruct_ov5_021DF47C *param0, u32 heapID, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); +void ov5_021DF488(UnkStruct_ov5_021DF47C *param0, enum HeapID heapID, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); void ov5_021DF4A8(UnkStruct_ov5_021DF47C *param0, u32 param1); void ov5_021DF4C8(UnkStruct_ov5_021DF47C *param0, const u32 *param1); int ov5_021DF4E4(UnkStruct_ov5_021DF47C *param0, u32 param1); diff --git a/include/overlay005/ov5_021EF4BC.h b/include/overlay005/ov5_021EF4BC.h index e6d2803fdf..db1a007e17 100644 --- a/include/overlay005/ov5_021EF4BC.h +++ b/include/overlay005/ov5_021EF4BC.h @@ -5,7 +5,7 @@ #include "hblank_system.h" -UnkStruct_ov5_021EF4F8 *ov5_021EF4BC(u32 heapID, HBlankSystem *param1); +UnkStruct_ov5_021EF4F8 *ov5_021EF4BC(enum HeapID heapID, HBlankSystem *param1); void ov5_021EF4F8(UnkStruct_ov5_021EF4F8 *param0); void Field_DoPoisonEffect(UnkStruct_ov5_021EF4F8 *param0); diff --git a/include/overlay005/ov5_021F0EB0.h b/include/overlay005/ov5_021F0EB0.h index 29f607cc09..825414c838 100644 --- a/include/overlay005/ov5_021F0EB0.h +++ b/include/overlay005/ov5_021F0EB0.h @@ -1,11 +1,13 @@ #ifndef POKEPLATINUM_OV5_021F0EB0_H #define POKEPLATINUM_OV5_021F0EB0_H +#include "constants/heap.h" + #include "field/field_system_decl.h" #include "sys_task_manager.h" -SysTask *ov5_021F0EB0(FieldSystem *fieldSystem, u32 heapID); +SysTask *ov5_021F0EB0(FieldSystem *fieldSystem, enum HeapID heapID); BOOL ov5_021F0EF0(SysTask *param0); void ov5_021F0EFC(SysTask *param0); void ov5_021F0F10(SysTask *param0, int param1, fx32 param2, u32 param3); diff --git a/include/overlay005/signpost.h b/include/overlay005/signpost.h index 36c944795e..d8f6cde648 100644 --- a/include/overlay005/signpost.h +++ b/include/overlay005/signpost.h @@ -13,7 +13,7 @@ typedef struct Signpost { u8 active : 1; } Signpost; -void *Signpost_Init(u32 heapID); +void *Signpost_Init(enum HeapID heapID); void Signpost_Free(Signpost *signpost); void Signpost_SetTypeAndNARCMemberIdx(Signpost *signpost, u16 signpostType, u16 signpostNARCMemberIdx); void Signpost_SetCommand(Signpost *signpost, u8 param1); diff --git a/include/overlay005/sprite_resource_manager.h b/include/overlay005/sprite_resource_manager.h index 6ea36144a4..58822a4f88 100644 --- a/include/overlay005/sprite_resource_manager.h +++ b/include/overlay005/sprite_resource_manager.h @@ -17,10 +17,10 @@ typedef struct SpriteResourceManager { u16 heapID; } SpriteResourceManager; -void SpriteResourceManager_Init(SpriteResourceManager *spriteManager, const SpriteResourceDataPaths *resourcePaths, u32 maxSprites, u32 heapID); +void SpriteResourceManager_Init(SpriteResourceManager *spriteManager, const SpriteResourceDataPaths *resourcePaths, u32 maxSprites, enum HeapID heapID); void SpriteResourceManager_Free(SpriteResourceManager *spriteManager); Sprite *SpriteResourceManager_CreateSprite(SpriteResourceManager *spriteManager, const SpriteTemplateFromResourceHeader *template); -void SpriteResourceManager_SetCapacities(SpriteResourceManager *spriteManager, SpriteResourceCapacities *capacities, u32 maxElements, u32 heapID); +void SpriteResourceManager_SetCapacities(SpriteResourceManager *spriteManager, SpriteResourceCapacities *capacities, u32 maxElements, enum HeapID heapID); void SpriteResourceManager_AddPalette(SpriteResourceManager *spriteManager, int data, int size, int offset, int vramType, int paletteIdx, int id); void SpriteResourceManager_LoadPalette(SpriteResourceManager *spriteManager, NARC *narc, int memberIdx, BOOL compressed, int paletteIdx, int vramType, int id); void SpriteResourceManager_AddCell(SpriteResourceManager *spriteManager, int data, int size, int offset, int id); diff --git a/include/overlay006/npc_trade.h b/include/overlay006/npc_trade.h index 48258d49d6..ad27654cf1 100644 --- a/include/overlay006/npc_trade.h +++ b/include/overlay006/npc_trade.h @@ -34,10 +34,10 @@ typedef struct NpcTradeData { Pokemon *mon; TrainerInfo *trainerInfo; u32 npcTradeID; - u32 heapID; + enum HeapID heapID; } NpcTradeData; -NpcTradeData *NpcTrade_Init(u32 heapID, u32 entryID); +NpcTradeData *NpcTrade_Init(enum HeapID heapID, u32 entryID); void NpcTrade_Free(NpcTradeData *data); u32 NpcTrade_GetSpecies(const NpcTradeData *data); u32 NpcTrade_GetRequestedSpecies(const NpcTradeData *data); diff --git a/include/overlay006/ov6_0223E140.h b/include/overlay006/ov6_0223E140.h index 7c498d1440..eef54b707b 100644 --- a/include/overlay006/ov6_0223E140.h +++ b/include/overlay006/ov6_0223E140.h @@ -38,31 +38,31 @@ int ov6_02240060(const UnkStruct_ov6_02240000 *param0); UnkStruct_ov6_022400A8 *ov6_02240074(FieldSystem *fieldSystem); void ov6_022400A8(UnkStruct_ov6_022400A8 *param0); void ov6_022400C4(UnkStruct_ov6_022400A8 *param0); -UnkStruct_ov6_022401B8 *ov6_02240104(u32 heapID, FieldSystem *fieldSystem); +UnkStruct_ov6_022401B8 *ov6_02240104(enum HeapID heapID, FieldSystem *fieldSystem); void ov6_022401B8(UnkStruct_ov6_022401B8 *param0); void ov6_022401D0(UnkStruct_ov6_022401B8 *param0, u32 param1); BOOL ov6_02240214(UnkStruct_ov6_022401B8 *param0); void ov6_02240228(UnkStruct_ov6_022401B8 *param0); -UnkStruct_ov6_02240774 *ov6_02240768(u32 heapID); +UnkStruct_ov6_02240774 *ov6_02240768(enum HeapID heapID); void ov6_02240774(UnkStruct_ov6_02240774 *param0); void ov6_0224077C(UnkStruct_ov6_02240774 *param0, u16 param1, u16 param2, u16 param3); void ov6_022407A8(UnkStruct_ov6_02240774 *param0); void ov6_022407B0(UnkStruct_ov6_02240774 *param0); -UnkStruct_ov6_02240A00 *ov6_022409F4(u32 heapID); +UnkStruct_ov6_02240A00 *ov6_022409F4(enum HeapID heapID); void ov6_02240A00(UnkStruct_ov6_02240A00 *param0); void ov6_02240A08(UnkStruct_ov6_02240A00 *param0); void ov6_02240A10(UnkStruct_ov6_02240A00 *param0); void ov6_02240A18(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32 param3); void ov6_02240A50(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32 param3); void ov6_02240A8C(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32 param3); -UnkStruct_ov6_02240774 *ov6_02240AC8(u32 heapID); +UnkStruct_ov6_02240774 *ov6_02240AC8(enum HeapID heapID); void ov6_02240AD4(UnkStruct_ov6_02240774 *param0); void ov6_02240ADC(UnkStruct_ov6_02240774 *param0); void ov6_02240AE4(UnkStruct_ov6_02240774 *param0); void ov6_02240AEC(UnkStruct_ov6_02240774 *param0, fx32 param1, fx32 param2, fx32 param3); void ov6_02240B24(UnkStruct_ov6_02240774 *param0, fx32 param1, fx32 param2, fx32 param3); void ov6_02240B60(UnkStruct_ov6_02240774 *param0, fx32 param1, fx32 param2, fx32 param3); -UnkStruct_ov6_02240C44 *ov6_02240B9C(u32 heapID, FieldSystem *fieldSystem); +UnkStruct_ov6_02240C44 *ov6_02240B9C(enum HeapID heapID, FieldSystem *fieldSystem); void ov6_02240C44(UnkStruct_ov6_02240C44 *param0, u32 param1); BOOL ov6_02240C7C(UnkStruct_ov6_02240C44 *param0); void ov6_02240C94(UnkStruct_ov6_02240C44 *param0); diff --git a/include/overlay006/ov6_02247100.h b/include/overlay006/ov6_02247100.h index dd888c95cd..7ee566df5a 100644 --- a/include/overlay006/ov6_02247100.h +++ b/include/overlay006/ov6_02247100.h @@ -6,13 +6,13 @@ #include "field_task.h" #include "pokemon.h" -void *ov6_02247100(FieldSystem *fieldSystem, u32 heapID); +void *ov6_02247100(FieldSystem *fieldSystem, enum HeapID heapID); BOOL ov6_02247120(FieldTask *task); -void *ov6_022472C8(FieldSystem *fieldSystem, u32 heapID, int param2); +void *ov6_022472C8(FieldSystem *fieldSystem, enum HeapID heapID, int param2); BOOL ov6_022472E8(FieldTask *task); -void *ov6_02247488(FieldSystem *, Pokemon *, u32 heapID); +void *ov6_02247488(FieldSystem *, Pokemon *, enum HeapID heapID); BOOL ov6_022474AC(FieldTask *task); -void *ov6_02247530(FieldSystem *fieldSystem, Pokemon *param1, u32 heapID); +void *ov6_02247530(FieldSystem *fieldSystem, Pokemon *param1, enum HeapID heapID); BOOL ov6_02247554(FieldTask *task); #endif // POKEPLATINUM_OV6_02247100_H diff --git a/include/overlay006/ov6_02248948.h b/include/overlay006/ov6_02248948.h index 1dbc251342..d7e71652a6 100644 --- a/include/overlay006/ov6_02248948.h +++ b/include/overlay006/ov6_02248948.h @@ -1,8 +1,10 @@ #ifndef POKEPLATINUM_OV6_02248948_H #define POKEPLATINUM_OV6_02248948_H +#include "constants/heap.h" + #include "field/field_system_decl.h" -void ov6_0224899C(FieldSystem *fieldSystem, u16 *param1, u32 param2, u32 heapID); +void ov6_0224899C(FieldSystem *fieldSystem, u16 *param1, u32 param2, enum HeapID heapID); #endif // POKEPLATINUM_OV6_02248948_H diff --git a/include/overlay010/struct_ov10_0221F800.h b/include/overlay010/struct_ov10_0221F800.h index 7bc5ba9d84..ec99a5c89c 100644 --- a/include/overlay010/struct_ov10_0221F800.h +++ b/include/overlay010/struct_ov10_0221F800.h @@ -9,7 +9,7 @@ typedef struct { FieldBattleDTO *unk_00; Party *unk_04[4]; String *unk_14[4]; - u32 heapID; + enum HeapID heapID; u8 unk_28; u8 unk_29; u8 unk_2A; diff --git a/include/overlay013/battle_bag.h b/include/overlay013/battle_bag.h index 313c929518..113a3e36c5 100644 --- a/include/overlay013/battle_bag.h +++ b/include/overlay013/battle_bag.h @@ -65,7 +65,7 @@ typedef struct BattleBagContext { BattleSystem *battleSystem; TrainerInfo *trainerInfo; Bag *bag; - u32 heapID; + enum HeapID heapID; s32 battler; BOOL isInCatchTutorial; u32 embargoRemainingTurns; diff --git a/include/overlay013/battle_party.h b/include/overlay013/battle_party.h index 73996690e7..9a6712445f 100644 --- a/include/overlay013/battle_party.h +++ b/include/overlay013/battle_party.h @@ -174,7 +174,7 @@ typedef struct BattlePartyContext { Party *party; void *unused1; BattleSystem *battleSystem; - u32 heapID; + enum HeapID heapID; u8 unused2; u8 selectedPartyIndex; u8 doubleBattleFirstSelectedPartySlot; diff --git a/include/overlay013/battle_sub_menu_cursor.h b/include/overlay013/battle_sub_menu_cursor.h index af51739392..a641257d15 100644 --- a/include/overlay013/battle_sub_menu_cursor.h +++ b/include/overlay013/battle_sub_menu_cursor.h @@ -1,6 +1,8 @@ #ifndef POKEPLATINUM_BATTLE_SUB_MENU_CURSOR_H #define POKEPLATINUM_BATTLE_SUB_MENU_CURSOR_H +#include "constants/heap.h" + #include "battle/struct_ov16_0226DC24_decl.h" #include "grid_menu_cursor_position.h" @@ -18,7 +20,7 @@ typedef struct BattleSubMenuCursor { u32 enabledPositionsMask; } BattleSubMenuCursor; -BattleSubMenuCursor *MakeBattleSubMenuCursor(u32 heapID); +BattleSubMenuCursor *MakeBattleSubMenuCursor(enum HeapID heapID); void DeleteBattleSubMenuCursor(BattleSubMenuCursor *cursor); UnkStruct_ov16_0226DC24 *GetBattleSubMenuCursorSprites(BattleSubMenuCursor *cursor); BOOL IsBattleSubMenuCursorVisible(BattleSubMenuCursor *cursor); diff --git a/include/overlay017/ov17_0223F118.h b/include/overlay017/ov17_0223F118.h index 4c9de9fe35..327f0dff58 100644 --- a/include/overlay017/ov17_0223F118.h +++ b/include/overlay017/ov17_0223F118.h @@ -20,7 +20,7 @@ void ov17_0223F1E0(G3DPipelineBuffers *param0); 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); +String *ov17_0223F310(u32 param0, enum HeapID heapID); void ov17_0223F334(UnkStruct_02095C48 *param0, int param1); void ov17_0223F374(UnkStruct_02095C48 *param0); void ov17_0223F560(SpriteSystem *param0, SpriteManager *param1, PaletteData *param2, int param3, int param4, int param5, int param6); diff --git a/include/overlay062/ov62_02231690.h b/include/overlay062/ov62_02231690.h index e9c60ceb30..d234987815 100644 --- a/include/overlay062/ov62_02231690.h +++ b/include/overlay062/ov62_02231690.h @@ -19,7 +19,7 @@ #include "sprite_system.h" #include "string_gf.h" -StringTemplate *ov62_02231690(u32 heapID); +StringTemplate *ov62_02231690(enum HeapID heapID); int ov62_022316A0(UnkStruct_0208C06C *param0); int ov62_022316D0(UnkStruct_0208C06C *param0); int ov62_02231710(UnkStruct_0208C06C *param0, int param1); diff --git a/include/overlay063/ov63_0222AE60.h b/include/overlay063/ov63_0222AE60.h index 3782e16ea8..42f328a796 100644 --- a/include/overlay063/ov63_0222AE60.h +++ b/include/overlay063/ov63_0222AE60.h @@ -10,15 +10,15 @@ UnkStruct_ov63_0222AE60 *ov63_0222AE60(SpriteList *param0, PaletteData *param1, u32 param2, u32 heapID); void ov63_0222AF14(UnkStruct_ov63_0222AE60 *param0); -void ov63_0222AF94(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 param4); +void ov63_0222AF94(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 heapID); void ov63_0222AFD0(UnkStruct_ov63_0222AE60 *param0, u32 param1); BOOL ov63_0222AFE4(const UnkStruct_ov63_0222AE60 *param0, u32 param1); void ov63_0222AFF8(UnkStruct_ov63_0222AE60 *param0); -void ov63_0222B02C(UnkStruct_ov63_0222AE60 *param0, u32 param1, int param2, u32 param3); +void ov63_0222B02C(UnkStruct_ov63_0222AE60 *param0, u32 param1, int param2, u32 heapID); void ov63_0222B078(UnkStruct_ov63_0222AE60 *param0); -void ov63_0222B0A0(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, u32 param3); +void ov63_0222B0A0(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, u32 heapID); void ov63_0222B0B8(UnkStruct_ov63_0222AE60 *param0); -UnkStruct_ov63_0222BB38 *ov63_0222B0C0(UnkStruct_ov63_0222AE60 *param0, const UnkStruct_ov64_022302EC *param1, u32 param2, u32 param3); +UnkStruct_ov63_0222BB38 *ov63_0222B0C0(UnkStruct_ov63_0222AE60 *param0, const UnkStruct_ov64_022302EC *param1, u32 param2, u32 heapID); void ov63_0222B210(UnkStruct_ov63_0222BB38 *param0); const Sprite *ov63_0222B234(const UnkStruct_ov63_0222BB38 *param0); void ov63_0222B238(UnkStruct_ov63_0222BB38 *param0, s16 param1, s16 param2); diff --git a/include/overlay063/ov63_0222BCE8.h b/include/overlay063/ov63_0222BCE8.h index 88e4141733..c0c3eae041 100644 --- a/include/overlay063/ov63_0222BCE8.h +++ b/include/overlay063/ov63_0222BCE8.h @@ -1,10 +1,12 @@ #ifndef POKEPLATINUM_OV63_0222BCE8_H #define POKEPLATINUM_OV63_0222BCE8_H +#include "constants/heap.h" + #include "overlay063/struct_ov63_0222BCE8_decl.h" #include "overlay063/union_ov63_0222BDAC.h" -UnkStruct_ov63_0222BCE8 *ov63_0222BCE8(u16 param0, u16 param1, u32 heapID); +UnkStruct_ov63_0222BCE8 *ov63_0222BCE8(u16 param0, u16 param1, enum HeapID heapID); void ov63_0222BD30(UnkStruct_ov63_0222BCE8 *param0); u16 ov63_0222BD48(const UnkStruct_ov63_0222BCE8 *param0); u16 ov63_0222BD4C(const UnkStruct_ov63_0222BCE8 *param0); diff --git a/include/overlay063/ov63_0222BE18.h b/include/overlay063/ov63_0222BE18.h index cd488b83f7..9311376af9 100644 --- a/include/overlay063/ov63_0222BE18.h +++ b/include/overlay063/ov63_0222BE18.h @@ -1,13 +1,15 @@ #ifndef POKEPLATINUM_OV63_0222BE18_H #define POKEPLATINUM_OV63_0222BE18_H +#include "constants/heap.h" + #include "overlay063/struct_ov63_0222BE18_decl.h" #include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay063/struct_ov63_0222CC3C.h" #include "overlay063/struct_ov63_0222CCB8.h" #include "overlay065/struct_ov65_022376D0.h" -UnkStruct_ov63_0222BE18 *ov63_0222BE18(u32 param0, u32 heapID); +UnkStruct_ov63_0222BE18 *ov63_0222BE18(u32 param0, enum HeapID heapID); void ov63_0222BE58(UnkStruct_ov63_0222BE18 *param0); void ov63_0222BE70(UnkStruct_ov63_0222BE18 *param0, const UnkStruct_ov63_0222CCB8 *param1); void ov63_0222BE84(UnkStruct_ov63_0222BE18 *param0); diff --git a/include/overlay063/ov63_0222CCE4.h b/include/overlay063/ov63_0222CCE4.h index 0e1e04366f..3253a14a35 100644 --- a/include/overlay063/ov63_0222CCE4.h +++ b/include/overlay063/ov63_0222CCE4.h @@ -12,12 +12,12 @@ UnkStruct_ov63_0222CD2C *ov63_0222CCE4(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3, u32 heapID); UnkStruct_ov63_0222CD2C *ov63_0222CD2C(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3, int param4, u32 param5, u32 heapID); void ov63_0222CD9C(UnkStruct_ov63_0222CD2C *param0); -void ov63_0222CDE8(UnkStruct_ov63_0222CD2C *param0, u32 param1, int param2, u32 param3); +void ov63_0222CDE8(UnkStruct_ov63_0222CD2C *param0, u32 param1, int param2, u32 heapID); void ov63_0222CE0C(UnkStruct_ov63_0222CD2C *param0, u32 param1); BOOL ov63_0222CE18(const UnkStruct_ov63_0222CD2C *param0, u32 param1); void ov63_0222CE24(UnkStruct_ov63_0222CD2C *param0); -void ov63_0222CE30(UnkStruct_ov63_0222CD2C *param0, int param1, u32 param2); -UnkStruct_ov63_0222CE44 *ov63_0222CE44(UnkStruct_ov63_0222CD2C *param0, const UnkStruct_ov63_0222BEC0 *param1, BOOL param2, u32 param3); +void ov63_0222CE30(UnkStruct_ov63_0222CD2C *param0, int param1, u32 heapID); +UnkStruct_ov63_0222CE44 *ov63_0222CE44(UnkStruct_ov63_0222CD2C *param0, const UnkStruct_ov63_0222BEC0 *param1, BOOL param2, u32 heapID); void ov63_0222CECC(UnkStruct_ov63_0222CE44 *param0); void ov63_0222CEE4(UnkStruct_ov63_0222CD2C *param0); void ov63_0222CF14(UnkStruct_ov63_0222CE44 *param0); diff --git a/include/overlay063/ov63_0222D1C0.h b/include/overlay063/ov63_0222D1C0.h index 7fc686d27b..b3ed54dbd1 100644 --- a/include/overlay063/ov63_0222D1C0.h +++ b/include/overlay063/ov63_0222D1C0.h @@ -8,7 +8,7 @@ #include "bg_window.h" #include "sprite_util.h" -UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(G2dRenderer *param0, BgConfig *param1, const UnkStruct_ov65_0223582C *param2, u32 heapID); +UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(G2dRenderer *param0, BgConfig *param1, const UnkStruct_ov65_0223582C *param2, enum HeapID heapID); void ov63_0222D214(UnkStruct_ov63_0222D1C0 *param0); void ov63_0222D228(UnkStruct_ov63_0222D1C0 *param0, const UnkStruct_ov63_0222D160 *param1); diff --git a/include/overlay063/ov63_0222D77C.h b/include/overlay063/ov63_0222D77C.h index 21469d50f9..5cc1b7c5fa 100644 --- a/include/overlay063/ov63_0222D77C.h +++ b/include/overlay063/ov63_0222D77C.h @@ -1,16 +1,18 @@ #ifndef POKEPLATINUM_OV63_0222D77C_H #define POKEPLATINUM_OV63_0222D77C_H +#include "constants/heap.h" + #include "overlay063/struct_ov63_0222CCB8.h" #include "overlay063/struct_ov63_0222D77C_decl.h" #include "overlay063/struct_ov63_0222D848_decl.h" #include "overlay063/struct_ov63_0222D894.h" -UnkStruct_ov63_0222D77C *ov63_0222D77C(u32 param0, u32 heapID); +UnkStruct_ov63_0222D77C *ov63_0222D77C(u32 param0, enum HeapID heapID); void ov63_0222D7B4(UnkStruct_ov63_0222D77C *param0); void ov63_0222D7C8(UnkStruct_ov63_0222D77C *param0, const UnkStruct_ov63_0222CCB8 *param1); BOOL ov63_0222D810(UnkStruct_ov63_0222D77C *param0, UnkStruct_ov63_0222CCB8 *param1); -UnkStruct_ov63_0222D848 *ov63_0222D848(u32 param0, u32 heapID); +UnkStruct_ov63_0222D848 *ov63_0222D848(u32 param0, enum HeapID heapID); void ov63_0222D880(UnkStruct_ov63_0222D848 *param0); void ov63_0222D894(UnkStruct_ov63_0222D848 *param0, const UnkStruct_ov63_0222D894 *param1); BOOL ov63_0222D8D0(UnkStruct_ov63_0222D848 *param0, UnkStruct_ov63_0222D894 *param1); diff --git a/include/overlay065/ov65_02235060.h b/include/overlay065/ov65_02235060.h index 4e6099527c..30aa6e6c87 100644 --- a/include/overlay065/ov65_02235060.h +++ b/include/overlay065/ov65_02235060.h @@ -7,7 +7,7 @@ #include "bg_window.h" #include "narc.h" -void ov65_02235060(UnkStruct_ov65_02235130 *param0, u32 param1, NARC *param2, BgConfig *param3, u32 param4, u32 param5); +void ov65_02235060(UnkStruct_ov65_02235130 *param0, enum HeapID heapID, NARC *param2, BgConfig *param3, u32 param4, u32 param5); void ov65_02235130(UnkStruct_ov65_02235130 *param0); BOOL ov65_02235194(const UnkStruct_ov65_02235130 *param0); u32 ov65_02235198(UnkStruct_ov65_02235130 *param0); diff --git a/include/overlay066/ov66_0222DDF0.h b/include/overlay066/ov66_0222DDF0.h index 27be672905..73cd73faab 100644 --- a/include/overlay066/ov66_0222DDF0.h +++ b/include/overlay066/ov66_0222DDF0.h @@ -18,7 +18,7 @@ #include "savedata.h" #include "trainer_info.h" -UnkStruct_ov66_0222DFF8 *ov66_0222DDF0(SaveData *saveData, u32 heapID); +UnkStruct_ov66_0222DFF8 *ov66_0222DDF0(SaveData *saveData, enum HeapID heapID); void ov66_0222DEEC(UnkStruct_ov66_0222DFF8 *param0); void ov66_0222DF58(UnkStruct_ov66_0222DFF8 *param0); void ov66_0222DFF4(UnkStruct_ov66_0222DFF8 *param0); @@ -69,7 +69,7 @@ void ov66_0222E500(UnkStruct_ov66_0222DFF8 *param0, int param1, s32 param2); void ov66_0222E528(UnkStruct_ov66_0222DFF8 *param0, u32 param1); void ov66_0222E56C(UnkStruct_ov66_0222DFF8 *param0, int param1, int param2); void ov66_0222E5D8(UnkStruct_ov66_0222DFF8 *param0, u32 param1, u32 param2); -void ov66_0222E640(const UnkStruct_ov66_0222E71C *param0, TrainerInfo *param1, u32 param2); +void ov66_0222E640(const UnkStruct_ov66_0222E71C *param0, TrainerInfo *param1, enum HeapID heapID); u32 ov66_0222E71C(const UnkStruct_ov66_0222E71C *param0); int ov66_0222E728(const UnkStruct_ov66_0222E71C *param0, u32 param1); s32 ov66_0222E760(const UnkStruct_ov66_0222E71C *param0, u32 param1); diff --git a/include/overlay066/ov66_022343A8.h b/include/overlay066/ov66_022343A8.h index 40e919b6dc..23b07c7783 100644 --- a/include/overlay066/ov66_022343A8.h +++ b/include/overlay066/ov66_022343A8.h @@ -3,12 +3,14 @@ #include +#include "constants/heap.h" + #include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay063/struct_ov63_0222CC3C.h" #include "overlay066/struct_ov66_02234548_decl.h" #include "overlay066/struct_ov66_02234798_decl.h" -UnkStruct_ov66_02234548 *ov66_022343A8(u32 param0, u32 param1, u32 heapID, u32 heapID2); +UnkStruct_ov66_02234548 *ov66_022343A8(u32 param0, u32 param1, enum HeapID heapID, u32 heapID2); void ov66_02234548(UnkStruct_ov66_02234548 *param0); void ov66_02234590(UnkStruct_ov66_02234548 *param0); void ov66_022345C4(UnkStruct_ov66_02234548 *param0); diff --git a/include/overlay066/ov66_02234EA8.h b/include/overlay066/ov66_02234EA8.h index 7978fe8b02..986271607a 100644 --- a/include/overlay066/ov66_02234EA8.h +++ b/include/overlay066/ov66_02234EA8.h @@ -1,8 +1,10 @@ #ifndef POKEPLATINUM_OV66_02234EA8_H #define POKEPLATINUM_OV66_02234EA8_H +#include "constants/heap.h" + #include "overlay066/struct_ov66_02231428.h" -UnkStruct_ov66_02231428 ov66_02234EA8(u16 param0, u8 param1, UnkStruct_ov66_02231428 param2, u32 param3); +UnkStruct_ov66_02231428 ov66_02234EA8(u16 param0, u8 param1, UnkStruct_ov66_02231428 param2, enum HeapID heapID); #endif // POKEPLATINUM_OV66_02234EA8_H diff --git a/include/overlay070/ov70_02261E10.h b/include/overlay070/ov70_02261E10.h index 53c170c613..a7a9fc6b85 100644 --- a/include/overlay070/ov70_02261E10.h +++ b/include/overlay070/ov70_02261E10.h @@ -3,12 +3,14 @@ #include +#include "constants/heap.h" + #include "overlay070/struct_ov70_0225C894_decl.h" #include "overlay070/struct_ov70_02261E10_decl.h" #include "enums.h" -UnkStruct_ov70_02261E10 *ov70_02261E10(int param0, int param1, const UnkStruct_ov70_0225C894 *param2, u32 heapID, u32 heapID2); +UnkStruct_ov70_02261E10 *ov70_02261E10(int param0, int param1, const UnkStruct_ov70_0225C894 *param2, enum HeapID heapID, u32 heapID2); void ov70_022621AC(UnkStruct_ov70_02261E10 *param0); void ov70_02262210(UnkStruct_ov70_02261E10 *param0); void ov70_02262298(UnkStruct_ov70_02261E10 *param0); diff --git a/include/overlay070/ov70_02262DA8.h b/include/overlay070/ov70_02262DA8.h index 2bd503c6ad..4d58085eb7 100644 --- a/include/overlay070/ov70_02262DA8.h +++ b/include/overlay070/ov70_02262DA8.h @@ -1,12 +1,14 @@ #ifndef POKEPLATINUM_OV70_02262DA8_H #define POKEPLATINUM_OV70_02262DA8_H +#include "constants/heap.h" + #include "overlay070/struct_ov70_0225DEE8_decl.h" #include "overlay070/struct_ov70_022630A4_decl.h" #include "overlay070/struct_ov70_02263344_decl.h" #include "overlay070/struct_ov70_0226DA18.h" -UnkStruct_ov70_022630A4 *ov70_02262DA8(UnkStruct_ov70_0225DEE8 *param0, u32 heapID); +UnkStruct_ov70_022630A4 *ov70_02262DA8(UnkStruct_ov70_0225DEE8 *param0, enum HeapID heapID); void ov70_02262DF4(UnkStruct_ov70_022630A4 *param0); void ov70_02262E20(UnkStruct_ov70_022630A4 *param0); void ov70_02262E2C(UnkStruct_ov70_022630A4 *param0); diff --git a/include/overlay070/ov70_02269190.h b/include/overlay070/ov70_02269190.h index 64bd0a361a..fa753729e4 100644 --- a/include/overlay070/ov70_02269190.h +++ b/include/overlay070/ov70_02269190.h @@ -1,13 +1,15 @@ #ifndef POKEPLATINUM_OV70_02269190_H #define POKEPLATINUM_OV70_02269190_H +#include "constants/heap.h" + #include "overlay066/struct_ov66_0222DFF8_decl.h" #include "overlay070/struct_ov70_0225C894_decl.h" #include "overlay070/struct_ov70_0225CA20_decl.h" #include "overlay070/struct_ov70_02260AD4_decl.h" #include "overlay070/struct_ov70_02269204_decl.h" -UnkStruct_ov70_02269204 *ov70_02269190(UnkStruct_ov66_0222DFF8 *param0, UnkStruct_ov70_0225C894 *param1, UnkStruct_ov70_02260AD4 *param2, UnkStruct_ov70_0225CA20 *param3, u32 heapID, u32 heapID2); +UnkStruct_ov70_02269204 *ov70_02269190(UnkStruct_ov66_0222DFF8 *param0, UnkStruct_ov70_0225C894 *param1, UnkStruct_ov70_02260AD4 *param2, UnkStruct_ov70_0225CA20 *param3, enum HeapID heapID, u32 heapID2); void ov70_02269204(UnkStruct_ov70_02269204 *param0); void ov70_02269220(UnkStruct_ov70_02269204 *param0); void ov70_02269240(UnkStruct_ov70_02269204 *param0); diff --git a/include/overlay070/ov70_0226CE54.h b/include/overlay070/ov70_0226CE54.h index 24afea5d13..717602be37 100644 --- a/include/overlay070/ov70_0226CE54.h +++ b/include/overlay070/ov70_0226CE54.h @@ -1,10 +1,12 @@ #ifndef POKEPLATINUM_OV70_0226CE54_H #define POKEPLATINUM_OV70_0226CE54_H +#include "constants/heap.h" + #include "overlay070/struct_ov70_0225DEE8_decl.h" #include "overlay070/struct_ov70_0226CF38_decl.h" -UnkStruct_ov70_0226CF38 *ov70_0226CE54(UnkStruct_ov70_0225DEE8 *param0, u32 heapID); +UnkStruct_ov70_0226CF38 *ov70_0226CE54(UnkStruct_ov70_0225DEE8 *param0, enum HeapID heapID); void ov70_0226CF38(UnkStruct_ov70_0226CF38 *param0); void ov70_0226CF40(UnkStruct_ov70_0226CF38 *param0); BOOL ov70_0226CFFC(const UnkStruct_ov70_0226CF38 *param0, u32 param1, int param2); diff --git a/include/overlay104/ov104_0223E894.h b/include/overlay104/ov104_0223E894.h index d05095a860..2dbd26b9b8 100644 --- a/include/overlay104/ov104_0223E894.h +++ b/include/overlay104/ov104_0223E894.h @@ -17,16 +17,16 @@ void ov104_0223E9EC(UnkStruct_ov104_0223E9EC *param0, int param1, int param2, in BOOL ov104_0223E9F8(UnkStruct_ov104_0223E9EC *param0); void ov104_0223EA28(UnkStruct_ov104_0223EA38 *param0, int param1, int param2, int param3); BOOL ov104_0223EA38(UnkStruct_ov104_0223EA38 *param0); -UnkStruct_ov104_0223EA84 *ov104_0223EA64(u32 heapID); +UnkStruct_ov104_0223EA84 *ov104_0223EA64(enum HeapID heapID); void ov104_0223EA7C(UnkStruct_ov104_0223EA84 *param0); void ov104_0223EA84(UnkStruct_ov104_0223EA84 *param0, int param1, int param2, int param3, int param4, int param5, Window *param6, u32 param7, u32 param8, u8 param9); BOOL ov104_0223EADC(UnkStruct_ov104_0223EA84 *param0); -UnkStruct_ov104_0223EBD0 *ov104_0223EBA0(u32 heapID); +UnkStruct_ov104_0223EBD0 *ov104_0223EBA0(enum HeapID heapID); void ov104_0223EBD0(UnkStruct_ov104_0223EBD0 *param0); void ov104_0223EBF0(UnkStruct_ov104_0223EBD0 *param0, u8 param1, u8 param2, Window *param3, u8 param4); 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_0223F094(UnkStruct_ov104_0223F094 *param0, enum HeapID 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, enum HeapID heapID); void ov104_0223F258(UnkStruct_ov104_0223F174 *param0); diff --git a/include/overlay105/ov105_02245DC4.h b/include/overlay105/ov105_02245DC4.h index 6543a2c1fe..1819701b48 100644 --- a/include/overlay105/ov105_02245DC4.h +++ b/include/overlay105/ov105_02245DC4.h @@ -4,7 +4,7 @@ #include "overlay105/struct_ov105_02245AAC.h" #include "overlay105/struct_ov105_02245E1C_decl.h" -UnkStruct_ov105_02245E1C *ov105_02245DC4(UnkStruct_ov105_02245AAC *param0, u32 param1, int param2, int param3, u32 heapID); +UnkStruct_ov105_02245E1C *ov105_02245DC4(UnkStruct_ov105_02245AAC *param0, u32 param1, int param2, int param3, enum HeapID heapID); void *ov105_02245E1C(UnkStruct_ov105_02245E1C *param0); void ov105_02245E30(UnkStruct_ov105_02245E1C *param0, int param1, int param2); BOOL ov105_02245E48(UnkStruct_ov105_02245E1C *param0); diff --git a/include/overlay115/ov115_02260BBC.h b/include/overlay115/ov115_02260BBC.h index 7739c684b4..12a2eccc61 100644 --- a/include/overlay115/ov115_02260BBC.h +++ b/include/overlay115/ov115_02260BBC.h @@ -6,7 +6,7 @@ #include "overlay115/struct_ov115_02265AD0.h" #include "overlay115/struct_ov115_02265AD4.h" -UnkStruct_ov115_02260BE4 *ov115_02260BBC(u32 heapID, u32 param1, u32 param2, const UnkStruct_ov115_02262F50 *param3); +UnkStruct_ov115_02260BE4 *ov115_02260BBC(enum HeapID heapID, u32 param1, u32 param2, const UnkStruct_ov115_02262F50 *param3); void ov115_02260BE4(UnkStruct_ov115_02260BE4 *param0); BOOL ov115_02260BEC(UnkStruct_ov115_02260BE4 *param0); BOOL ov115_02260C54(const UnkStruct_ov115_02260BE4 *param0); diff --git a/include/palette.h b/include/palette.h index b0666ead9a..c63f1fdfc7 100644 --- a/include/palette.h +++ b/include/palette.h @@ -105,7 +105,7 @@ typedef struct PaletteData { u8 forceExit; } PaletteData; -void LoadPaletteFromFile(enum NarcID narcID, u32 narcMemberIdx, u32 heapID, u32 size, u16 start, void *dest); +void LoadPaletteFromFile(enum NarcID narcID, u32 narcMemberIdx, enum HeapID heapID, u32 size, u16 start, void *dest); void BlendPalette(const u16 *src, u16 *dest, u16 size, u8 fraction, u16 target); void BlendPalettes(const u16 *sources, u16 *dests, u16 toBlend, u8 fraction, u16 target); void TintPalette(u16 *palette, int numColorsToTint, int tintR, int tintG, int tintB); @@ -113,12 +113,12 @@ void TintPalette(u16 *palette, int numColorsToTint, int tintR, int tintG, int ti PaletteData *PaletteData_New(enum HeapID heapID); void PaletteData_Free(PaletteData *paletteData); void PaletteData_InitBuffer(PaletteData *paletteData, enum PaletteBufferID bufferID, void *unfaded, void *faded, u32 size); -void PaletteData_AllocBuffer(PaletteData *paletteData, enum PaletteBufferID bufferID, u32 size, u32 heapID); +void PaletteData_AllocBuffer(PaletteData *paletteData, enum PaletteBufferID bufferID, u32 size, enum HeapID heapID); void PaletteData_FreeBuffer(PaletteData *paletteData, enum PaletteBufferID bufferID); void PaletteData_LoadBuffer(PaletteData *paletteData, const void *src, enum PaletteBufferID bufferID, u16 destStart, u16 srcSize); -void PaletteData_LoadBufferFromFile(PaletteData *paletteData, enum NarcID narcID, u32 narcMemberIdx, u32 heapID, enum PaletteBufferID bufferID, u32 srcSize, u16 destStart, u16 srcStart); -void PaletteData_LoadBufferFromFileStart(PaletteData *paletteData, enum NarcID narcID, u32 narcMemberIdx, u32 heapID, enum PaletteBufferID bufferID, u32 srcSize, u16 destStart); -void PaletteData_LoadBufferFromFileStartWithTint(PaletteData *paletteData, enum NarcID narcID, u32 narcMemberIdx, u32 heapID, enum PaletteBufferID bufferID, u32 size, u16 start, int r, int g, int b); +void PaletteData_LoadBufferFromFile(PaletteData *paletteData, enum NarcID narcID, u32 narcMemberIdx, enum HeapID heapID, enum PaletteBufferID bufferID, u32 srcSize, u16 destStart, u16 srcStart); +void PaletteData_LoadBufferFromFileStart(PaletteData *paletteData, enum NarcID narcID, u32 narcMemberIdx, enum HeapID heapID, enum PaletteBufferID bufferID, u32 srcSize, u16 destStart); +void PaletteData_LoadBufferFromFileStartWithTint(PaletteData *paletteData, enum NarcID narcID, u32 narcMemberIdx, enum HeapID heapID, enum PaletteBufferID bufferID, u32 size, u16 start, int r, int g, int b); void PaletteData_LoadBufferFromHardware(PaletteData *paletteData, enum PaletteBufferID bufferID, u16 start, u32 size); void PaletteData_CopyBuffer(PaletteData *palette, enum PaletteBufferID srcBufferID, u16 srcStart, enum PaletteBufferID destBufferID, u16 destStart, u16 size); u16 *PaletteData_GetUnfadedBuffer(PaletteData *palette, enum PaletteBufferID bufferID); diff --git a/include/pokedex_memory.h b/include/pokedex_memory.h index 10b015e463..cf7b952a21 100644 --- a/include/pokedex_memory.h +++ b/include/pokedex_memory.h @@ -1,6 +1,7 @@ #ifndef POKEPLATINUM_POKEDEX_MEMORY_H #define POKEPLATINUM_POKEDEX_MEMORY_H +#include "constants/heap.h" typedef struct PokedexMemory { u32 currentSpecies; u32 bootMode; @@ -12,7 +13,7 @@ enum PokedexBootMode { POKEDEX_BOOT_DEFAULT }; -PokedexMemory *PokedexMemory_New(u32 heapID); +PokedexMemory *PokedexMemory_New(enum HeapID heapID); void PokedexMemory_Free(PokedexMemory *pokedexMemory); u32 PokedexMemory_GetCurrentSpecies(const PokedexMemory *pokedexMemory); void PokedexMemory_SetCurrentSpecies(PokedexMemory *pokedexMemory, u32 species); diff --git a/include/pokemon.h b/include/pokemon.h index af5d020b21..29c1604383 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -83,7 +83,7 @@ int Pokemon_StructSize(void); * @param heapID * @return A new empty but encrypted Pokemon struct */ -Pokemon *Pokemon_New(u32 heapID); +Pokemon *Pokemon_New(enum HeapID heapID); /** * @brief Decrypts a Pokemon data structure. PartyPokemon data is encrypted using the pokemons personality value, BoxPokemon data using a checksum value diff --git a/include/string_template.h b/include/string_template.h index e8c8e3f280..30a60ba6aa 100644 --- a/include/string_template.h +++ b/include/string_template.h @@ -30,7 +30,7 @@ typedef struct StringTemplateArg { typedef struct StringTemplate { u32 maxArgs; - u32 heapID; + enum HeapID heapID; StringTemplateArg *args; String *templateBuf; } StringTemplate; diff --git a/include/tv_episode_segment.h b/include/tv_episode_segment.h index 060969dfb8..3df0e9a543 100644 --- a/include/tv_episode_segment.h +++ b/include/tv_episode_segment.h @@ -31,7 +31,7 @@ void sub_0206D104(TVBroadcast *broadcast); void sub_0206D12C(TVBroadcast *broadcast); 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 CaptureAttempt_Init(CaptureAttempt *captureAttempt, Pokemon *mon, int resultMask, int ballsThrown, enum HeapID heapID); void FieldSystem_SaveTVEpisodeSegment_CatchThatPokemonShow(FieldSystem *fieldSystem, const CaptureAttempt *captureAttempt, int resultMask); void FieldSystem_SaveTVEpisodeSegment_WhatsFishing(FieldSystem *fieldSystem, BOOL caughtFish, u16 fishingRodItemID, Pokemon *mon); void FieldSystem_SaveTVEpisodeSegment_LoveThatGroupCorner_NewGroup(FieldSystem *fieldSystem); diff --git a/include/unk_0200679C.h b/include/unk_0200679C.h index a3598adcb3..39f96393b7 100644 --- a/include/unk_0200679C.h +++ b/include/unk_0200679C.h @@ -1,9 +1,11 @@ #ifndef POKEPLATINUM_UNK_0200679C_H #define POKEPLATINUM_UNK_0200679C_H +#include "constants/heap.h" + #include "sys_task_manager.h" -SysTask *SysTask_StartAndAllocateParam(SysTaskFunc callback, int paramSize, u32 priority, const u32 heapID); +SysTask *SysTask_StartAndAllocateParam(SysTaskFunc callback, int paramSize, u32 priority, const enum HeapID heapID); void SysTask_FinishAndFreeParam(SysTask *task); #endif // POKEPLATINUM_UNK_0200679C_H diff --git a/include/unk_02014A84.h b/include/unk_02014A84.h index 3d39ceaffd..adb36fc24c 100644 --- a/include/unk_02014A84.h +++ b/include/unk_02014A84.h @@ -1,6 +1,8 @@ #ifndef POKEPLATINUM_UNK_02014A84_H #define POKEPLATINUM_UNK_02014A84_H +#include "constants/heap.h" + #include "struct_defs/sentence.h" #include "string_gf.h" @@ -9,7 +11,7 @@ void sub_02014A84(Sentence *sentence); void sub_02014A9C(Sentence *sentence, u32 param1); void sub_02014AB4(Sentence *sentence); void sub_02014AC4(Sentence *sentence, int param1); -String *sub_02014B34(const Sentence *sentence, u32 heapID); +String *sub_02014B34(const Sentence *sentence, enum HeapID heapID); String *sub_02014BA0(const Sentence *sentence, u32 param1); BOOL sub_02014BBC(const Sentence *sentence); BOOL sub_02014BD0(const Sentence *sentence); diff --git a/include/unk_02014D38.h b/include/unk_02014D38.h index 203011f450..584c585b35 100644 --- a/include/unk_02014D38.h +++ b/include/unk_02014D38.h @@ -8,7 +8,7 @@ #include "savedata.h" #include "string_gf.h" -UnkStruct_02014D38 *sub_02014D38(u32 heapID); +UnkStruct_02014D38 *sub_02014D38(enum HeapID heapID); void sub_02014D70(UnkStruct_02014D38 *param0); void sub_02014D90(UnkStruct_02014D38 *param0, u16 param1, String *param2); void sub_02014DB8(u16 param0, String *param1); @@ -23,7 +23,7 @@ BOOL sub_02014F48(UnkStruct_02014EC4 *param0); u16 sub_02014F64(u32 param0); BOOL sub_02014F8C(const UnkStruct_02014EC4 *param0, int param1); void sub_02014F98(UnkStruct_02014EC4 *param0, int param1); -UnkStruct_02014FB0 *sub_02014FB0(u32 param0); +UnkStruct_02014FB0 *sub_02014FB0(enum HeapID heapID); void sub_02014FF0(UnkStruct_02014FB0 *param0); u32 sub_02015004(const UnkStruct_02014FB0 *param0); u16 sub_02015008(const UnkStruct_02014FB0 *param0, u32 param1); diff --git a/include/unk_0201567C.h b/include/unk_0201567C.h index e30bda506b..1c0c6786c0 100644 --- a/include/unk_0201567C.h +++ b/include/unk_0201567C.h @@ -22,7 +22,7 @@ struct UnkStruct_020157E4 { u8 unk_4F; }; -UnkStruct_020157E4 *sub_0201567C(PaletteData *param0, u16 param1, u16 param2, u32 heapID); +UnkStruct_020157E4 *sub_0201567C(PaletteData *param0, u16 param1, u16 param2, enum HeapID heapID); void sub_02015738(UnkStruct_020157E4 *param0, u8 param1); void sub_02015760(UnkStruct_020157E4 *param0); diff --git a/include/unk_02015920.h b/include/unk_02015920.h index 485e944d6c..06908eb2a7 100644 --- a/include/unk_02015920.h +++ b/include/unk_02015920.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02015920_decl.h" #include "struct_defs/struct_02015958.h" -UnkStruct_02015920 *sub_02015920(u32 heapID); +UnkStruct_02015920 *sub_02015920(enum HeapID heapID); void sub_02015938(UnkStruct_02015920 *param0); void sub_02015958(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1); u32 sub_020159C0(UnkStruct_02015920 *param0); diff --git a/include/unk_0202854C.h b/include/unk_0202854C.h index 7ed99fe459..63d0227dfc 100644 --- a/include/unk_0202854C.h +++ b/include/unk_0202854C.h @@ -20,7 +20,7 @@ enum BaseFlagType { int Underground_SaveSize(void); int SecretBase_Size(void); int UndergroundRecord_Size(void); -UndergroundRecord *UndergroundRecord_Init(u32 heapID); +UndergroundRecord *UndergroundRecord_Init(enum HeapID heapID); void Underground_Init(Underground *underground); void Underground_UpdateBuriedSphereSizes(SaveData *saveData, int daysPassed); void sub_02028758(SaveData *saveData, s32 param1, BOOL param2); diff --git a/include/unk_0206C660.h b/include/unk_0206C660.h index 3f55728df1..0df62dfedb 100644 --- a/include/unk_0206C660.h +++ b/include/unk_0206C660.h @@ -5,6 +5,6 @@ #include "field_task.h" -void sub_0206C740(FieldTask *param0, NpcTradeData *data, int param2, u32 heapID); +void sub_0206C740(FieldTask *param0, NpcTradeData *data, int param2, enum HeapID heapID); #endif // POKEPLATINUM_UNK_0206C660_H diff --git a/include/unk_0207064C.h b/include/unk_0207064C.h index 7ecd022c1e..02cf2e5302 100644 --- a/include/unk_0207064C.h +++ b/include/unk_0207064C.h @@ -6,7 +6,7 @@ #include "field_task.h" #include "pokemon.h" -void *sub_0207064C(u32 heapID, FieldSystem *fieldSystem, Pokemon *mon, u16 mapID, s16 param4, s16 param5); +void *sub_0207064C(enum HeapID heapID, FieldSystem *fieldSystem, Pokemon *mon, u16 mapID, s16 param4, s16 param5); BOOL sub_02070680(FieldTask *param0); #endif // POKEPLATINUM_UNK_0207064C_H diff --git a/include/unk_0207E060.h b/include/unk_0207E060.h index cc48b4116a..478b10ca81 100644 --- a/include/unk_0207E060.h +++ b/include/unk_0207E060.h @@ -5,7 +5,7 @@ #include "trainer_info.h" -UnkStruct_0207E060 *sub_0207E060(const TrainerInfo *info, u32 heapID); +UnkStruct_0207E060 *sub_0207E060(const TrainerInfo *info, enum HeapID heapID); void sub_0207E0B0(UnkStruct_0207E060 *param0); #endif // POKEPLATINUM_UNK_0207E060_H diff --git a/include/unk_0208C098.h b/include/unk_0208C098.h index 0faff1d259..0f1e73d51d 100644 --- a/include/unk_0208C098.h +++ b/include/unk_0208C098.h @@ -55,7 +55,7 @@ u8 App_BarColor(u32 cur, u32 max); * @return The color to be used for the health bar's current value. */ u8 HealthBar_Color(u16 curHP, u16 maxHP, u32 barSize); -void App_StartScreenFade(u8 fadeOut, u32 heapID); +void App_StartScreenFade(u8 fadeOut, enum HeapID heapID); u8 sub_0208C15C(s16 *param0, u16 param1); 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); diff --git a/include/unk_0209747C.h b/include/unk_0209747C.h index 0bc2c20e13..c028cdb9bf 100644 --- a/include/unk_0209747C.h +++ b/include/unk_0209747C.h @@ -8,7 +8,7 @@ #include "savedata.h" -UnkStruct_0209747C *sub_0209747C(u32 param0, u32 param1, SaveData *saveData, u32 heapID); +UnkStruct_0209747C *sub_0209747C(u32 param0, u32 param1, SaveData *saveData, enum HeapID heapID); void sub_020974EC(UnkStruct_0209747C *param0); void sub_020974F4(UnkStruct_0209747C *param0, u16 param1); void sub_020974F8(UnkStruct_0209747C *param0, u16 param1, u16 param2); diff --git a/include/unk_0209BDF8.h b/include/unk_0209BDF8.h index 9a51599b33..6338ef0b18 100644 --- a/include/unk_0209BDF8.h +++ b/include/unk_0209BDF8.h @@ -1,10 +1,12 @@ #ifndef POKEPLATINUM_UNK_0209BDF8_H #define POKEPLATINUM_UNK_0209BDF8_H +#include "constants/heap.h" + #include "struct_decls/struct_0209C194_decl.h" #include "struct_defs/struct_0209BDF8.h" -UnkStruct_0209BDF8 *sub_0209BDF8(UnkStruct_0209C194 *param0, u32 heapID); +UnkStruct_0209BDF8 *sub_0209BDF8(UnkStruct_0209C194 *param0, enum HeapID heapID); void sub_0209BE38(UnkStruct_0209BDF8 *param0); void sub_0209BE50(UnkStruct_0209BDF8 *param0); void sub_0209BE64(UnkStruct_0209BDF8 *param0); diff --git a/include/unk_0209C194.h b/include/unk_0209C194.h index cba32abfc9..780e4e7e13 100644 --- a/include/unk_0209C194.h +++ b/include/unk_0209C194.h @@ -6,7 +6,7 @@ #include "field/field_system_decl.h" -UnkStruct_0209C194 *sub_0209C194(UnkStruct_0209C194_1 *param0, u32 heapID); +UnkStruct_0209C194 *sub_0209C194(UnkStruct_0209C194_1 *param0, enum HeapID heapID); void sub_0209C1D0(UnkStruct_0209C194 *param0); BOOL sub_0209C1E8(UnkStruct_0209C194 *param0); void *sub_0209C1EC(FieldSystem *fieldSystem); diff --git a/src/applications/poketch/poketch_animation.c b/src/applications/poketch/poketch_animation.c index 327fc584b5..34f44a3452 100644 --- a/src/applications/poketch/poketch_animation.c +++ b/src/applications/poketch/poketch_animation.c @@ -42,7 +42,7 @@ struct PoketchAnimation_AnimationManager { u16 numSlots; u16 nextUnusedSlotIdx; GXOamAttr *oam; - u32 heapID; + enum HeapID heapID; }; static void PoketchAnimation_PopulateAnimatedSpritePtrArray(PoketchAnimation_AnimatedSpriteData **animatedSpritePtrArray, PoketchAnimation_AnimatedSpriteData *animatedSpritePool, u32 numSlots); diff --git a/src/applications/poketch/poketch_task.c b/src/applications/poketch/poketch_task.c index 5d6d07764a..8a9de3b5f2 100644 --- a/src/applications/poketch/poketch_task.c +++ b/src/applications/poketch/poketch_task.c @@ -87,7 +87,7 @@ BOOL PoketchTask_NoActiveTasks(u32 *activeList) return TRUE; } -void PoketchTask_Start(const PoketchTask *appTasks, u32 taskId, void *taskData, const void *constTaskData, u32 *activeTasks, u32 taskPriority, u32 heapID) +void PoketchTask_Start(const PoketchTask *appTasks, u32 taskId, void *taskData, const void *constTaskData, u32 *activeTasks, u32 taskPriority, enum HeapID heapID) { for (u32 slot = 0; appTasks[slot].taskId != POKETCH_EMPTY_TASK; slot++) { if (appTasks[slot].taskId == taskId) { diff --git a/src/bag.c b/src/bag.c index e5abe7005d..c88d705263 100644 --- a/src/bag.c +++ b/src/bag.c @@ -406,7 +406,7 @@ Bag *SaveData_GetBag(SaveData *saveData) return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_BAG); } -BagCursor *BagCursor_New(u32 heapID) +BagCursor *BagCursor_New(enum HeapID heapID) { BagCursor *cursor = Heap_Alloc(heapID, sizeof(BagCursor)); MI_CpuClear16(cursor, sizeof(BagCursor)); diff --git a/src/bag_context.c b/src/bag_context.c index 4bef17a44d..a274aee798 100644 --- a/src/bag_context.c +++ b/src/bag_context.c @@ -137,7 +137,7 @@ static u32 GetNumBattlePoints(SaveData *saveData) return sub_0202D230(sub_0202D750(saveData), 0, 0); } -BOOL BagContext_FormatUsageMessage(SaveData *saveData, String *dstString, u16 item, u32 heapID) +BOOL BagContext_FormatUsageMessage(SaveData *saveData, String *dstString, u16 item, enum HeapID heapID) { MessageLoader *msgLoader; StringTemplate *template; @@ -174,7 +174,7 @@ BOOL BagContext_FormatUsageMessage(SaveData *saveData, String *dstString, u16 it return TRUE; } -void BagContext_FormatErrorMessage(TrainerInfo *playerInfo, String *dstString, u16 unused, enum ItemUseCheckResult error, u32 heapID) +void BagContext_FormatErrorMessage(TrainerInfo *playerInfo, String *dstString, u16 unused, enum ItemUseCheckResult error, enum HeapID heapID) { MessageLoader *msgLoader; StringTemplate *template; diff --git a/src/bg_window.c b/src/bg_window.c index 52366e460b..bd3dd8ff8c 100644 --- a/src/bg_window.c +++ b/src/bg_window.c @@ -44,7 +44,7 @@ static void UpdateBgAffineRotationCenterWithVal(Background *bg, enum BgAffineUpd static void RunScheduledScrolls(BgConfig *bgConfig); static void RunScheduledTilemapTransfers(BgConfig *bgConfig); -BgConfig *BgConfig_New(u32 heapID) +BgConfig *BgConfig_New(enum HeapID heapID) { BgConfig *bgConfig = Heap_Alloc(heapID, sizeof(BgConfig)); @@ -912,7 +912,7 @@ static void LoadBgVRAMChar(u8 bgLayer, void *src, u32 offset, u32 size) } } -void Bg_ClearTilesRange(u8 bgLayer, u32 size, u32 offset, u32 heapID) +void Bg_ClearTilesRange(u8 bgLayer, u32 size, u32 offset, enum HeapID heapID) { u32 *buf = (u32 *)Heap_AllocAtEnd(heapID, size); @@ -1582,7 +1582,7 @@ void Bitmap_FillRect8bpp(const Bitmap *bitmap, u16 x, u16 y, u16 width, u16 heig } } -Window *Window_New(u32 heapID, u8 winCount) +Window *Window_New(enum HeapID heapID, u8 winCount) { Window *windows = (Window *)Heap_Alloc(heapID, sizeof(Window) * winCount); diff --git a/src/easy3d_object.c b/src/easy3d_object.c index 5989d8273c..293fba2f01 100644 --- a/src/easy3d_object.c +++ b/src/easy3d_object.c @@ -14,7 +14,7 @@ static void Easy3DModel_BindTexture(SysTask *task, void *param); static void Easy3DModel_LoadInternal(Easy3DModel *model); static void Easy3DAnim_LoadInternal(Easy3DAnim *anim, const Easy3DModel *model, void *data, NNSFndAllocator *allocator); -void Easy3DModel_Load(Easy3DModel *model, enum NarcID narcID, u32 memberIndex, u32 heapID) +void Easy3DModel_Load(Easy3DModel *model, enum NarcID narcID, u32 memberIndex, enum HeapID heapID) { model->data = LoadMemberFromNARC(narcID, memberIndex, FALSE, heapID, 0); Easy3DModel_LoadInternal(model); @@ -57,7 +57,7 @@ void Easy3DModel_Release(Easy3DModel *model) memset(model, 0, sizeof(Easy3DModel)); } -void Easy3DAnim_LoadFrom(Easy3DAnim *anim, const Easy3DModel *model, NARC *narc, u32 memberIndex, u32 heapID, NNSFndAllocator *allocator) +void Easy3DAnim_LoadFrom(Easy3DAnim *anim, const Easy3DModel *model, NARC *narc, u32 memberIndex, enum HeapID heapID, NNSFndAllocator *allocator) { void *data = LoadMemberFromOpenNARC(narc, memberIndex, FALSE, heapID, 0); diff --git a/src/font.c b/src/font.c index 7bbacd2396..ebb6e31b2d 100644 --- a/src/font.c +++ b/src/font.c @@ -3,6 +3,7 @@ #include #include +#include "constants/heap.h" #include "constants/narc.h" #include "charcode.h" @@ -98,7 +99,7 @@ void Fonts_Init(void) Text_SetFontAttributesPtr(sFontAttributes); } -void Font_InitManager(enum Font font, u32 heapID) +void Font_InitManager(enum Font font, enum HeapID heapID) { sFontWork->fontManagers[font] = FontManager_New(NARC_INDEX_GRAPHIC__PL_FONT, sFontArchiveData[font].arcFileIdx, @@ -107,7 +108,7 @@ void Font_InitManager(enum Font font, u32 heapID) heapID); } -void Font_UseImmediateGlyphAccess(enum Font font, u32 heapID) +void Font_UseImmediateGlyphAccess(enum Font font, enum HeapID heapID) { GF_ASSERT(font < FONT_MAX); GF_ASSERT(sFontWork->fontManagers[font]); @@ -120,7 +121,7 @@ void Font_UseLazyGlyphAccess(enum Font font) GF_ASSERT(font < FONT_MAX); GF_ASSERT(sFontWork->fontManagers[font]); - FontManager_SwitchGlyphAccessMode(sFontWork->fontManagers[font], GLYPH_ACCESS_MODE_LAZY, 0); + FontManager_SwitchGlyphAccessMode(sFontWork->fontManagers[font], GLYPH_ACCESS_MODE_LAZY, HEAP_ID_SYSTEM); } void Font_Free(enum Font font) @@ -231,7 +232,7 @@ u8 Font_GetAttribute(u8 font, u8 attribute) return result; } -void Font_LoadTextPalette(enum PaletteLoadLocation palLocation, u32 palSlotOffset, u32 heapID) +void Font_LoadTextPalette(enum PaletteLoadLocation palLocation, u32 palSlotOffset, enum HeapID heapID) { Graphics_LoadPalette(NARC_INDEX_GRAPHIC__PL_FONT, font_NCLR, @@ -241,7 +242,7 @@ void Font_LoadTextPalette(enum PaletteLoadLocation palLocation, u32 palSlotOffse heapID); } -void Font_LoadScreenIndicatorsPalette(enum PaletteLoadLocation palLocation, u32 palSlotOffset, u32 heapID) +void Font_LoadScreenIndicatorsPalette(enum PaletteLoadLocation palLocation, u32 palSlotOffset, enum HeapID heapID) { Graphics_LoadPalette(NARC_INDEX_GRAPHIC__PL_FONT, screen_indicators_NCLR, diff --git a/src/font_manager.c b/src/font_manager.c index a282b9c386..91769a110e 100644 --- a/src/font_manager.c +++ b/src/font_manager.c @@ -11,9 +11,9 @@ #include "render_text.h" #include "text.h" -static void FontManager_Init(FontManager *fontManager, enum NarcID narcID, u32 arcFileIdx, BOOL isMonospace, u32 heapID); +static void FontManager_Init(FontManager *fontManager, enum NarcID narcID, u32 arcFileIdx, BOOL isMonospace, enum HeapID heapID); static void FontManager_FreeWidthsAndNARC(FontManager *fontManager); -static void FontManager_LoadGlyphs(FontManager *fontManager, enum GlyphAccessMode glyphAccessMode, u32 heapID); +static void FontManager_LoadGlyphs(FontManager *fontManager, enum GlyphAccessMode glyphAccessMode, enum HeapID heapID); static void FontManager_LoadGlyphImmediate(FontManager *fontManager, u32 heapID); static void FontManager_LoadGlyphLazy(FontManager *fontManager, u32 heapID); static void FontManager_FreeGlyphs(FontManager *fontManager); @@ -45,7 +45,7 @@ static void (*const sFreeGlyphFuncs[])(FontManager *fontManager) = { [GLYPH_ACCESS_MODE_LAZY] = FontManager_FreeGlyphLazy }; -FontManager *FontManager_New(enum NarcID narcID, u32 arcFileIdx, enum GlyphAccessMode glyphAccessMode, BOOL isMonospace, u32 heapID) +FontManager *FontManager_New(enum NarcID narcID, u32 arcFileIdx, enum GlyphAccessMode glyphAccessMode, BOOL isMonospace, enum HeapID heapID) { FontManager *fontManager = Heap_Alloc(heapID, sizeof(FontManager)); @@ -72,7 +72,7 @@ void FontManager_SwitchGlyphAccessMode(FontManager *fontManager, enum GlyphAcces } } -static void FontManager_Init(FontManager *fontManager, enum NarcID narcID, u32 arcFileIdx, BOOL isMonospace, u32 heapID) +static void FontManager_Init(FontManager *fontManager, enum NarcID narcID, u32 arcFileIdx, BOOL isMonospace, enum HeapID heapID) { fontManager->narc = NARC_ctor(narcID, heapID); @@ -115,7 +115,7 @@ static void FontManager_FreeWidthsAndNARC(FontManager *fontManager) } } -static void FontManager_LoadGlyphs(FontManager *fontManager, enum GlyphAccessMode glyphAccessMode, u32 heapID) +static void FontManager_LoadGlyphs(FontManager *fontManager, enum GlyphAccessMode glyphAccessMode, enum HeapID heapID) { fontManager->glyphAccessMode = glyphAccessMode; sLoadGlyphFuncs[glyphAccessMode](fontManager, heapID); diff --git a/src/font_special_chars.c b/src/font_special_chars.c index 72823d6969..9f8e02a8bb 100644 --- a/src/font_special_chars.c +++ b/src/font_special_chars.c @@ -28,7 +28,7 @@ static const struct { [SPECIAL_CHAR_LEVEL_UNUSED] = { .offset = 21 * TILE_SIZE_4BPP, .width = TILES_TO_PIXELS(2) } }; -FontSpecialCharsContext *FontSpecialChars_Init(u32 fgColor, u32 shadowColor, u32 bgColor, u32 heapID) +FontSpecialCharsContext *FontSpecialChars_Init(u32 fgColor, u32 shadowColor, u32 bgColor, enum HeapID heapID) { FontSpecialCharsContext *context = Heap_Alloc(heapID, sizeof(FontSpecialCharsContext)); diff --git a/src/game_options.c b/src/game_options.c index dcccb520b9..d8ec606bea 100644 --- a/src/game_options.c +++ b/src/game_options.c @@ -9,7 +9,7 @@ #include "system.h" #include "text.h" -Options *Options_New(u32 heapID) +Options *Options_New(enum HeapID heapID) { Options *options = Heap_Alloc(heapID, sizeof(Options)); Options_Init(options); diff --git a/src/graphics.c b/src/graphics.c index 94718b7d27..c95b5b4151 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -26,72 +26,72 @@ u32 Graphics_LoadTilesToBgLayer(enum NarcID narcID, u32 narcMemberIdx, BgConfig return LoadTilesToBgLayer(ncgrBuffer, bgConfig, bgLayer, offset, size); } -void Graphics_LoadTilemapToBgLayer(enum NarcID narcID, u32 narcMemberIdx, BgConfig *bgConfig, u32 bgLayer, u32 offset, u32 size, BOOL compressed, u32 heapID) +void Graphics_LoadTilemapToBgLayer(enum NarcID narcID, u32 narcMemberIdx, BgConfig *bgConfig, u32 bgLayer, u32 offset, u32 size, BOOL compressed, enum HeapID heapID) { void *nscrBuffer = LoadMemberFromNARC(narcID, narcMemberIdx, compressed, heapID, TRUE); LoadTilemapToBgLayer(nscrBuffer, bgConfig, bgLayer, offset, size); } -void Graphics_LoadPalette(enum NarcID narcID, u32 narcMemberIdx, enum PaletteLoadLocation loadLocation, u32 palOffset, u32 size, u32 heapID) +void Graphics_LoadPalette(enum NarcID narcID, u32 narcMemberIdx, enum PaletteLoadLocation loadLocation, u32 palOffset, u32 size, enum HeapID heapID) { Graphics_LoadPaletteWithSrcOffset(narcID, narcMemberIdx, loadLocation, 0, palOffset, size, heapID); } -void Graphics_LoadPaletteWithSrcOffset(enum NarcID narcID, u32 narcMemberIdx, enum PaletteLoadLocation loadLocation, u32 srcOffset, u32 palOffset, u32 size, u32 heapID) +void Graphics_LoadPaletteWithSrcOffset(enum NarcID narcID, u32 narcMemberIdx, enum PaletteLoadLocation loadLocation, u32 srcOffset, u32 palOffset, u32 size, enum HeapID heapID) { void *nclrBuffer = LoadMemberFromNARC(narcID, narcMemberIdx, FALSE, heapID, TRUE); LoadPaletteWithSrcOffset(nclrBuffer, loadLocation, srcOffset, palOffset, size); } -u32 Graphics_LoadObjectTiles(enum NarcID narcID, u32 narcMemberIdx, enum DSScreen display, u32 offset, u32 size, BOOL compressed, u32 heapID) +u32 Graphics_LoadObjectTiles(enum NarcID narcID, u32 narcMemberIdx, enum DSScreen display, u32 offset, u32 size, BOOL compressed, enum HeapID heapID) { void *ncgrBuffer = LoadMemberFromNARC(narcID, narcMemberIdx, compressed, heapID, TRUE); return LoadObjectTiles(ncgrBuffer, display, offset, size); } -void Graphics_LoadPartialPalette(enum NarcID narcID, u32 narcMemberIdx, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, u32 heapID, NNSG2dImagePaletteProxy *paletteProxy) +void Graphics_LoadPartialPalette(enum NarcID narcID, u32 narcMemberIdx, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, enum HeapID heapID, NNSG2dImagePaletteProxy *paletteProxy) { void *nclrBuffer = LoadMemberFromNARC(narcID, narcMemberIdx, FALSE, heapID, TRUE); LoadPartialPalette(nclrBuffer, vramType, baseAddr, paletteProxy); } -u32 Graphics_LoadImageMapping(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, enum ImageMappingLayout layout, u32 size, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, u32 heapID, NNSG2dImageProxy *imageProxy) +u32 Graphics_LoadImageMapping(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, enum ImageMappingLayout layout, u32 size, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, enum HeapID heapID, NNSG2dImageProxy *imageProxy) { void *ncgrBuffer = LoadMemberFromNARC(narcID, narcMemberIdx, compressed, heapID, TRUE); return LoadImageMapping(ncgrBuffer, layout, size, vramType, baseAddr, imageProxy); } -void Graphics_LoadImageMappingAndSetVramMode(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, enum ImageMappingLayout layout, u32 size, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, u32 heapID, NNSG2dImageProxy *imageProxy) +void Graphics_LoadImageMappingAndSetVramMode(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, enum ImageMappingLayout layout, u32 size, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, enum HeapID heapID, NNSG2dImageProxy *imageProxy) { void *ncgrBuffer = LoadMemberFromNARC(narcID, narcMemberIdx, compressed, heapID, TRUE); LoadImageMappingAndSetVramMode(ncgrBuffer, layout, size, vramType, baseAddr, imageProxy); } -void *Graphics_GetCharData(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, NNSG2dCharacterData **outCharData, u32 heapID) +void *Graphics_GetCharData(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, NNSG2dCharacterData **outCharData, enum HeapID heapID) { void *ncgrBuffer = LoadMemberFromNARC(narcID, narcMemberIdx, compressed, heapID, FALSE); return GetCharacterData(ncgrBuffer, outCharData); } -void *Graphics_GetScrnData(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, NNSG2dScreenData **outScreenData, u32 heapID) +void *Graphics_GetScrnData(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, NNSG2dScreenData **outScreenData, enum HeapID heapID) { void *nscrBuffer = LoadMemberFromNARC(narcID, narcMemberIdx, compressed, heapID, FALSE); return GetScreenData(nscrBuffer, outScreenData); } -void *Graphics_GetPlttData(enum NarcID narcID, u32 narcMemberIdx, NNSG2dPaletteData **outPaletteData, u32 heapID) +void *Graphics_GetPlttData(enum NarcID narcID, u32 narcMemberIdx, NNSG2dPaletteData **outPaletteData, enum HeapID heapID) { void *nclrBuffer = LoadMemberFromNARC(narcID, narcMemberIdx, FALSE, heapID, FALSE); return GetPaletteData(nclrBuffer, outPaletteData); } -void *Graphics_GetCellBank(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, NNSG2dCellDataBank **outCellBank, u32 heapID) +void *Graphics_GetCellBank(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, NNSG2dCellDataBank **outCellBank, enum HeapID heapID) { void *ncerBuffer = LoadMemberFromNARC(narcID, narcMemberIdx, compressed, heapID, FALSE); return GetCellBank(ncerBuffer, outCellBank); } -void *Graphics_GetAnimBank(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, NNSG2dAnimBankData **outAnimBank, u32 heapID) +void *Graphics_GetAnimBank(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, NNSG2dAnimBankData **outAnimBank, enum HeapID heapID) { void *nanrBuffer = LoadMemberFromNARC(narcID, narcMemberIdx, compressed, heapID, FALSE); return GetAnimBank(nanrBuffer, outAnimBank); @@ -102,7 +102,7 @@ void *LoadCompressedMemberFromNARC(enum NarcID narcID, u32 narcMemberIdx, u32 he return LoadMemberFromNARC(narcID, narcMemberIdx, TRUE, heapID, FALSE); } -void *LoadMemberFromNARC(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, u32 heapID, BOOL allocAtEnd) +void *LoadMemberFromNARC(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, enum HeapID heapID, BOOL allocAtEnd) { void *data; @@ -136,7 +136,7 @@ void *LoadMemberFromNARC(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, return data; } -void *LoadMemberFromNARC_OutFileSize(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, u32 heapID, BOOL allocAtEnd, u32 *fileSize) +void *LoadMemberFromNARC_OutFileSize(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed, enum HeapID heapID, BOOL allocAtEnd, u32 *fileSize) { void *data; *fileSize = NARC_GetMemberSizeByIndexPair(narcID, narcMemberIdx); @@ -178,7 +178,7 @@ u32 Graphics_LoadTilesToBgLayerFromOpenNARC(NARC *narc, u32 narcMemberIdx, BgCon return LoadTilesToBgLayer(ncgrBuffer, bgConfig, bgLayer, offset, size); } -void Graphics_LoadTilemapToBgLayerFromOpenNARC(NARC *narc, u32 narcMemberIdx, BgConfig *bgConfig, u32 bgLayer, u32 offset, u32 size, BOOL compressed, u32 heapID) +void Graphics_LoadTilemapToBgLayerFromOpenNARC(NARC *narc, u32 narcMemberIdx, BgConfig *bgConfig, u32 bgLayer, u32 offset, u32 size, BOOL compressed, enum HeapID heapID) { void *nscrBuffer = LoadMemberFromOpenNARC(narc, narcMemberIdx, compressed, heapID, TRUE); LoadTilemapToBgLayer(nscrBuffer, bgConfig, bgLayer, offset, size); @@ -189,61 +189,61 @@ void Graphics_LoadPaletteFromOpenNARC(NARC *narc, u32 narcMemberIdx, enum Palett Graphics_LoadPaletteWithSrcOffsetFromOpenNARC(narc, narcMemberIdx, loadLocation, FALSE, offset, size, heapID); } -void Graphics_LoadPaletteWithSrcOffsetFromOpenNARC(NARC *narc, u32 narcMemberIdx, enum PaletteLoadLocation loadLocation, u32 srcOffset, u32 offset, u32 size, u32 heapID) +void Graphics_LoadPaletteWithSrcOffsetFromOpenNARC(NARC *narc, u32 narcMemberIdx, enum PaletteLoadLocation loadLocation, u32 srcOffset, u32 offset, u32 size, enum HeapID heapID) { void *nclrBuffer = LoadMemberFromOpenNARC(narc, narcMemberIdx, FALSE, heapID, TRUE); LoadPaletteWithSrcOffset(nclrBuffer, loadLocation, srcOffset, offset, size); } -void Graphics_LoadPartialPaletteFromOpenNARC(NARC *narc, u32 narcMemberIdx, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, u32 heapID, NNSG2dImagePaletteProxy *paletteProxy) +void Graphics_LoadPartialPaletteFromOpenNARC(NARC *narc, u32 narcMemberIdx, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, enum HeapID heapID, NNSG2dImagePaletteProxy *paletteProxy) { void *nclrBuffer = LoadMemberFromOpenNARC(narc, narcMemberIdx, FALSE, heapID, TRUE); LoadPartialPalette(nclrBuffer, vramType, baseAddr, paletteProxy); } -u32 Graphics_LoadImageMappingFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, enum ImageMappingLayout layout, u32 size, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, u32 heapID, NNSG2dImageProxy *imageProxy) +u32 Graphics_LoadImageMappingFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, enum ImageMappingLayout layout, u32 size, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, enum HeapID heapID, NNSG2dImageProxy *imageProxy) { void *ncgrBuffer = LoadMemberFromOpenNARC(narc, narcMemberIdx, compressed, heapID, TRUE); return LoadImageMapping(ncgrBuffer, layout, size, vramType, baseAddr, imageProxy); } -void *Graphics_GetCharDataFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, NNSG2dCharacterData **outCharData, u32 heapID) +void *Graphics_GetCharDataFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, NNSG2dCharacterData **outCharData, enum HeapID heapID) { void *ncgrBuffer = LoadMemberFromOpenNARC(narc, narcMemberIdx, compressed, heapID, FALSE); return GetCharacterData(ncgrBuffer, outCharData); } -void *Graphics_GetScrnDataFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, NNSG2dScreenData **outScreenData, u32 heapID) +void *Graphics_GetScrnDataFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, NNSG2dScreenData **outScreenData, enum HeapID heapID) { void *nscrBuffer = LoadMemberFromOpenNARC(narc, narcMemberIdx, compressed, heapID, FALSE); return GetScreenData(nscrBuffer, outScreenData); } -void *Graphics_GetPlttDataFromOpenNARC(NARC *narc, u32 narcMemberIdx, NNSG2dPaletteData **outPaletteData, u32 heapID) +void *Graphics_GetPlttDataFromOpenNARC(NARC *narc, u32 narcMemberIdx, NNSG2dPaletteData **outPaletteData, enum HeapID heapID) { void *nclrBuffer = LoadMemberFromOpenNARC(narc, narcMemberIdx, FALSE, heapID, FALSE); return GetPaletteData(nclrBuffer, outPaletteData); } -void *Graphics_GetCellBankFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, NNSG2dCellDataBank **outCellBank, u32 heapID) +void *Graphics_GetCellBankFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, NNSG2dCellDataBank **outCellBank, enum HeapID heapID) { void *ncerBuffer = LoadMemberFromOpenNARC(narc, narcMemberIdx, compressed, heapID, 0); return GetCellBank(ncerBuffer, outCellBank); } -void *Graphics_GetAnimBankFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, NNSG2dAnimBankData **outAnimBank, u32 heapID) +void *Graphics_GetAnimBankFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, NNSG2dAnimBankData **outAnimBank, enum HeapID heapID) { void *nanrBuffer = LoadMemberFromOpenNARC(narc, narcMemberIdx, compressed, heapID, 0); return GetAnimBank(nanrBuffer, outAnimBank); } -void *LoadMemberFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, u32 heapID, BOOL allocAtEnd) +void *LoadMemberFromOpenNARC(NARC *narc, u32 narcMemberIdx, BOOL compressed, enum HeapID heapID, BOOL allocAtEnd) { u32 tmp; return LoadMemberFromOpenNARC_OutFileSize(narc, narcMemberIdx, compressed, heapID, allocAtEnd, &tmp); } -void *LoadMemberFromOpenNARC_OutFileSize(NARC *narc, u32 narcMemberIdx, BOOL compressed, u32 heapID, BOOL allocAtEnd, u32 *fileSize) +void *LoadMemberFromOpenNARC_OutFileSize(NARC *narc, u32 narcMemberIdx, BOOL compressed, enum HeapID heapID, BOOL allocAtEnd, u32 *fileSize) { void *data; *fileSize = NARC_GetMemberSize(narc, narcMemberIdx); diff --git a/src/item.c b/src/item.c index f2b7b3e059..e0a6ecdfee 100644 --- a/src/item.c +++ b/src/item.c @@ -3110,7 +3110,7 @@ u16 Item_IconNANRFile(void) return 0; // TODO: Use NAIX generated from item_icon.narc } -void *Item_Load(u16 item, enum ItemFileType type, u32 heapID) +void *Item_Load(u16 item, enum ItemFileType type, enum HeapID heapID) { if (item > NUM_ITEMS) { item = ITEM_NONE; @@ -3128,7 +3128,7 @@ void *Item_Load(u16 item, enum ItemFileType type, u32 heapID) return NULL; } -void Item_LoadName(String *dst, u16 item, u32 heapID) +void Item_LoadName(String *dst, u16 item, enum HeapID heapID) { MessageLoader *msgData = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_ITEM_NAMES, heapID); @@ -3144,7 +3144,7 @@ void Item_LoadDescription(String *dst, u16 item, u16 heapID) MessageLoader_Free(msgData); } -s32 Item_LoadParam(u16 item, enum ItemDataParam param, u32 heapID) +s32 Item_LoadParam(u16 item, enum ItemDataParam param, enum HeapID heapID) { ItemData *itemData = (ItemData *)Item_Load(item, 0, heapID); s32 val = Item_Get(itemData, param); diff --git a/src/journal.c b/src/journal.c index 2cc39a0992..29b63e5d75 100644 --- a/src/journal.c +++ b/src/journal.c @@ -578,7 +578,7 @@ static void JournalEntry_SaveOnlineEventMinigame(u8 *onlineEvent, JournalEntryOn onlineEvent[1] = journalEntryOnlineEvent->result; } -void *JournalEntry_CreateTitle(u16 mapID, u32 heapID) +void *JournalEntry_CreateTitle(u16 mapID, enum HeapID heapID) { JournalEntryTitle *journalEntryTitle = Heap_Alloc(heapID, sizeof(JournalEntryTitle)); RTCDate currDate; @@ -594,7 +594,7 @@ void *JournalEntry_CreateTitle(u16 mapID, u32 heapID) return journalEntryTitle; } -static JournalEntryLocationEvent *JournalEntry_CreateLocationEvent(u32 heapID) +static JournalEntryLocationEvent *JournalEntry_CreateLocationEvent(enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = Heap_Alloc(heapID, sizeof(JournalEntryLocationEvent)); @@ -602,7 +602,7 @@ static JournalEntryLocationEvent *JournalEntry_CreateLocationEvent(u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventRestedAtHome(u32 heapID) +void *JournalEntry_CreateEventRestedAtHome(enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -610,7 +610,7 @@ void *JournalEntry_CreateEventRestedAtHome(u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventLeftResearchLab(u32 heapID) +void *JournalEntry_CreateEventLeftResearchLab(enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -618,7 +618,7 @@ void *JournalEntry_CreateEventLeftResearchLab(u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventUsedPCBox(u32 heapID) +void *JournalEntry_CreateEventUsedPCBox(enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -626,7 +626,7 @@ void *JournalEntry_CreateEventUsedPCBox(u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventShoppedAtMart(u32 heapID) +void *JournalEntry_CreateEventShoppedAtMart(enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -634,7 +634,7 @@ void *JournalEntry_CreateEventShoppedAtMart(u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventLotsOfShopping(u32 heapID) +void *JournalEntry_CreateEventLotsOfShopping(enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -642,7 +642,7 @@ void *JournalEntry_CreateEventLotsOfShopping(u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventSoldALittle(u32 heapID) +void *JournalEntry_CreateEventSoldALittle(enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -650,7 +650,7 @@ void *JournalEntry_CreateEventSoldALittle(u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventSoldALot(u32 heapID) +void *JournalEntry_CreateEventSoldALot(enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -658,7 +658,7 @@ void *JournalEntry_CreateEventSoldALot(u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventBusinessAtMart(u32 heapID) +void *JournalEntry_CreateEventBusinessAtMart(enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -666,7 +666,7 @@ void *JournalEntry_CreateEventBusinessAtMart(u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventGymTooTough(u16 gymTooTough, u32 heapID) +void *JournalEntry_CreateEventGymTooTough(u16 gymTooTough, enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -676,7 +676,7 @@ void *JournalEntry_CreateEventGymTooTough(u16 gymTooTough, u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventGymLeader(u16 gymDefeated, u16 trainerID, u32 heapID) +void *JournalEntry_CreateEventGymLeader(u16 gymDefeated, u16 trainerID, enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -687,7 +687,7 @@ void *JournalEntry_CreateEventGymLeader(u16 gymDefeated, u16 trainerID, u32 heap return journalEntryLocationEvent; } -void *JournalEntry_CreateEventEliteFour(u16 trainerID, u32 heapID) +void *JournalEntry_CreateEventEliteFour(u16 trainerID, enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -697,7 +697,7 @@ void *JournalEntry_CreateEventEliteFour(u16 trainerID, u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventChampion(u16 trainerID, u32 heapID) +void *JournalEntry_CreateEventChampion(u16 trainerID, enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -707,7 +707,7 @@ void *JournalEntry_CreateEventChampion(u16 trainerID, u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventArrivedInLocation(u16 mapID, u32 heapID) +void *JournalEntry_CreateEventArrivedInLocation(u16 mapID, enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -717,7 +717,7 @@ void *JournalEntry_CreateEventArrivedInLocation(u16 mapID, u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventLeftCave(u16 mapLabelTextID, u32 heapID) +void *JournalEntry_CreateEventLeftCave(u16 mapLabelTextID, enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -727,7 +727,7 @@ void *JournalEntry_CreateEventLeftCave(u16 mapLabelTextID, u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventLeftBuilding(u16 mapLabelTextID, u32 heapID) +void *JournalEntry_CreateEventLeftBuilding(u16 mapLabelTextID, enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -737,7 +737,7 @@ void *JournalEntry_CreateEventLeftBuilding(u16 mapLabelTextID, u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventGameCorner(u32 heapID) +void *JournalEntry_CreateEventGameCorner(enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -745,7 +745,7 @@ void *JournalEntry_CreateEventGameCorner(u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventSafariGame(u32 heapID) +void *JournalEntry_CreateEventSafariGame(enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -753,7 +753,7 @@ void *JournalEntry_CreateEventSafariGame(u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventObtainedItem(u16 item, u32 heapID) +void *JournalEntry_CreateEventObtainedItem(u16 item, enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -763,7 +763,7 @@ void *JournalEntry_CreateEventObtainedItem(u16 item, u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventUsedMove(u8 moveIndex, u16 mapID, u32 heapID) +void *JournalEntry_CreateEventUsedMove(u8 moveIndex, u16 mapID, enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -773,7 +773,7 @@ void *JournalEntry_CreateEventUsedMove(u8 moveIndex, u16 mapID, u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventDugUnderground(u32 heapID) +void *JournalEntry_CreateEventDugUnderground(enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -781,7 +781,7 @@ void *JournalEntry_CreateEventDugUnderground(u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventBuiltSecretBase(u32 heapID) +void *JournalEntry_CreateEventBuiltSecretBase(enum HeapID heapID) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -789,7 +789,7 @@ void *JournalEntry_CreateEventBuiltSecretBase(u32 heapID) return journalEntryLocationEvent; } -void *JournalEntry_CreateEventBattleFacility(u32 heapID, u32 eventType) +void *JournalEntry_CreateEventBattleFacility(enum HeapID heapID, u32 eventType) { JournalEntryLocationEvent *journalEntryLocationEvent = JournalEntry_CreateLocationEvent(heapID); @@ -797,7 +797,7 @@ void *JournalEntry_CreateEventBattleFacility(u32 heapID, u32 eventType) return journalEntryLocationEvent; } -static JournalEntryMon *JournalEntry_CreateMon(u32 heapID) +static JournalEntryMon *JournalEntry_CreateMon(enum HeapID heapID) { JournalEntryMon *journalEntryMon = Heap_Alloc(heapID, sizeof(JournalEntryMon)); @@ -805,7 +805,7 @@ static JournalEntryMon *JournalEntry_CreateMon(u32 heapID) return journalEntryMon; } -void *JournalEntry_CreateEventMonCaught(const PlayTime *playTime, u16 species, u8 gender, u8 timeOfDay, u32 heapID) +void *JournalEntry_CreateEventMonCaught(const PlayTime *playTime, u16 species, u8 gender, u8 timeOfDay, enum HeapID heapID) { JournalEntryMon *journalEntryMon = JournalEntry_CreateMon(heapID); u8 v1; @@ -828,7 +828,7 @@ void *JournalEntry_CreateEventMonCaught(const PlayTime *playTime, u16 species, u return journalEntryMon; } -void *JournalEntry_CreateEventMonDefeated(const PlayTime *playTime, u16 species, u8 gender, u8 timeOfDay, u32 heapID) +void *JournalEntry_CreateEventMonDefeated(const PlayTime *playTime, u16 species, u8 gender, u8 timeOfDay, enum HeapID heapID) { JournalEntryMon *journalEntryMon = JournalEntry_CreateMon(heapID); u8 v1; @@ -851,7 +851,7 @@ void *JournalEntry_CreateEventMonDefeated(const PlayTime *playTime, u16 species, return journalEntryMon; } -void *JournalEntry_CreateEventStandardTrainer(u16 mapID, u16 trainerID, u32 heapID) +void *JournalEntry_CreateEventStandardTrainer(u16 mapID, u16 trainerID, enum HeapID heapID) { JournalEntryTrainer *journalEntryTrainer = Heap_Alloc(heapID, sizeof(JournalEntryTrainer)); @@ -862,7 +862,7 @@ void *JournalEntry_CreateEventStandardTrainer(u16 mapID, u16 trainerID, u32 heap return journalEntryTrainer; } -static JournalEntryOnlineEvent *JournalEntry_CreateOnlineEvent(u32 heapID) +static JournalEntryOnlineEvent *JournalEntry_CreateOnlineEvent(enum HeapID heapID) { JournalEntryOnlineEvent *journalEntryOnlineEvent = Heap_Alloc(heapID, sizeof(JournalEntryOnlineEvent)); @@ -887,7 +887,7 @@ static void JournalEntry_StringCopy(const u16 *src, u16 *dst, u32 strLength) } } -void *JournalEntry_CreateEventSingleBattle(u16 *opponentName, u8 opponentGender, u8 battleResult, u32 heapID) +void *JournalEntry_CreateEventSingleBattle(u16 *opponentName, u8 opponentGender, u8 battleResult, enum HeapID heapID) { JournalEntryOnlineEvent *journalEntryOnlineEvent = JournalEntry_CreateOnlineEvent(heapID); @@ -899,7 +899,7 @@ void *JournalEntry_CreateEventSingleBattle(u16 *opponentName, u8 opponentGender, return journalEntryOnlineEvent; } -void *JournalEntry_CreateEventDoubleBattle(u16 *opponentName, u8 opponentGender, u8 battleResult, u32 heapID) +void *JournalEntry_CreateEventDoubleBattle(u16 *opponentName, u8 opponentGender, u8 battleResult, enum HeapID heapID) { JournalEntryOnlineEvent *journalEntryOnlineEvent = JournalEntry_CreateOnlineEvent(heapID); @@ -911,7 +911,7 @@ void *JournalEntry_CreateEventDoubleBattle(u16 *opponentName, u8 opponentGender, return journalEntryOnlineEvent; } -void *JournalEntry_CreateEventMultiBattle(u16 *opponentName1, u16 *opponentName2, u8 opponentGender1, u8 opponentGender2, u8 battleResult, u32 heapID) +void *JournalEntry_CreateEventMultiBattle(u16 *opponentName1, u16 *opponentName2, u8 opponentGender1, u8 opponentGender2, u8 battleResult, enum HeapID heapID) { JournalEntryOnlineEvent *journalEntryOnlineEvent = JournalEntry_CreateOnlineEvent(heapID); @@ -926,7 +926,7 @@ void *JournalEntry_CreateEventMultiBattle(u16 *opponentName1, u16 *opponentName2 return journalEntryOnlineEvent; } -void *JournalEntry_CreateEventMixSingleBattle(u16 *opponentName, u8 opponentGender, u8 battleResult, u32 heapID) +void *JournalEntry_CreateEventMixSingleBattle(u16 *opponentName, u8 opponentGender, u8 battleResult, enum HeapID heapID) { JournalEntryOnlineEvent *journalEntryOnlineEvent = JournalEntry_CreateOnlineEvent(heapID); @@ -938,7 +938,7 @@ void *JournalEntry_CreateEventMixSingleBattle(u16 *opponentName, u8 opponentGend return journalEntryOnlineEvent; } -void *JournalEntry_CreateEventGreetedInUnionRoom(u16 *playerName, u8 playerGender, u32 heapID) +void *JournalEntry_CreateEventGreetedInUnionRoom(u16 *playerName, u8 playerGender, enum HeapID heapID) { JournalEntryOnlineEvent *journalEntryOnlineEvent = JournalEntry_CreateOnlineEvent(heapID); @@ -949,7 +949,7 @@ void *JournalEntry_CreateEventGreetedInUnionRoom(u16 *playerName, u8 playerGende return journalEntryOnlineEvent; } -void *JournalEntry_CreateEventGotPokemonFromTrade(u16 *otName, u8 otGender, u16 *pokemonName, u8 pokemonGender, u32 heapID) +void *JournalEntry_CreateEventGotPokemonFromTrade(u16 *otName, u8 otGender, u16 *pokemonName, u8 pokemonGender, enum HeapID heapID) { JournalEntryOnlineEvent *journalEntryOnlineEvent = JournalEntry_CreateOnlineEvent(heapID); @@ -963,7 +963,7 @@ void *JournalEntry_CreateEventGotPokemonFromTrade(u16 *otName, u8 otGender, u16 return journalEntryOnlineEvent; } -void *JournalEntry_CreateEventDrewPictures(u32 heapID) +void *JournalEntry_CreateEventDrewPictures(enum HeapID heapID) { JournalEntryOnlineEvent *journalEntryOnlineEvent = JournalEntry_CreateOnlineEvent(heapID); @@ -971,7 +971,7 @@ void *JournalEntry_CreateEventDrewPictures(u32 heapID) return journalEntryOnlineEvent; } -void *JournalEntry_CreateEventUnionBattle(u16 *opponentName, u8 opponentGender, u8 battleResult, u32 heapID) +void *JournalEntry_CreateEventUnionBattle(u16 *opponentName, u8 opponentGender, u8 battleResult, enum HeapID heapID) { JournalEntryOnlineEvent *journalEntryOnlineEvent = JournalEntry_CreateOnlineEvent(heapID); @@ -983,7 +983,7 @@ void *JournalEntry_CreateEventUnionBattle(u16 *opponentName, u8 opponentGender, return journalEntryOnlineEvent; } -void *JournalEntry_CreateEventMixedRecords(u32 heapID) +void *JournalEntry_CreateEventMixedRecords(enum HeapID heapID) { JournalEntryOnlineEvent *journalEntryOnlineEvent = JournalEntry_CreateOnlineEvent(heapID); @@ -991,7 +991,7 @@ void *JournalEntry_CreateEventMixedRecords(u32 heapID) return journalEntryOnlineEvent; } -void *JournalEntry_CreateEventPlacedInContest(u8 placement, u32 heapID) +void *JournalEntry_CreateEventPlacedInContest(u8 placement, enum HeapID heapID) { JournalEntryOnlineEvent *journalEntryOnlineEvent = JournalEntry_CreateOnlineEvent(heapID); @@ -1001,7 +1001,7 @@ void *JournalEntry_CreateEventPlacedInContest(u8 placement, u32 heapID) return journalEntryOnlineEvent; } -void *JournalEntry_CreateEventMadePoffins(u32 heapID) +void *JournalEntry_CreateEventMadePoffins(enum HeapID heapID) { JournalEntryOnlineEvent *journalEntryOnlineEvent = JournalEntry_CreateOnlineEvent(heapID); @@ -1009,7 +1009,7 @@ void *JournalEntry_CreateEventMadePoffins(u32 heapID) return journalEntryOnlineEvent; } -void *JournalEntry_CreateEventGotPokemonGTS(u16 *otName, u8 otGender, u16 *pokemonName, u8 pokemonGender, u32 heapID) +void *JournalEntry_CreateEventGotPokemonGTS(u16 *otName, u8 otGender, u16 *pokemonName, u8 pokemonGender, enum HeapID heapID) { JournalEntryOnlineEvent *journalEntryOnlineEvent = JournalEntry_CreateOnlineEvent(heapID); @@ -1023,7 +1023,7 @@ void *JournalEntry_CreateEventGotPokemonGTS(u16 *otName, u8 otGender, u16 *pokem return journalEntryOnlineEvent; } -void *JournalEntry_CreateEventBattleRoom(u32 heapID) +void *JournalEntry_CreateEventBattleRoom(enum HeapID heapID) { JournalEntryOnlineEvent *journalEntryOnlineEvent = JournalEntry_CreateOnlineEvent(heapID); @@ -1031,7 +1031,7 @@ void *JournalEntry_CreateEventBattleRoom(u32 heapID) return journalEntryOnlineEvent; } -void *JournalEntry_CreateEventMisc(u32 heapID, u32 eventType) +void *JournalEntry_CreateEventMisc(enum HeapID heapID, u32 eventType) { JournalEntryOnlineEvent *journalEntryOnlineEvent = JournalEntry_CreateOnlineEvent(heapID); @@ -1039,7 +1039,7 @@ void *JournalEntry_CreateEventMisc(u32 heapID, u32 eventType) return journalEntryOnlineEvent; } -void *JournalEntry_CreateEventInteraction(const u16 *playerName, u8 playerGender, u32 heapID, u32 eventType) +void *JournalEntry_CreateEventInteraction(const u16 *playerName, u8 playerGender, enum HeapID heapID, u32 eventType) { JournalEntryOnlineEvent *journalEntryOnlineEvent = JournalEntry_CreateOnlineEvent(heapID); @@ -1050,7 +1050,7 @@ void *JournalEntry_CreateEventInteraction(const u16 *playerName, u8 playerGender return journalEntryOnlineEvent; } -void *JournalEntry_CreateEventPlazaMinigame(int minigame, u32 heapID, u32 eventType) +void *JournalEntry_CreateEventPlazaMinigame(int minigame, enum HeapID heapID, u32 eventType) { JournalEntryOnlineEvent *journalEntryOnlineEvent = JournalEntry_CreateOnlineEvent(heapID); @@ -1278,7 +1278,7 @@ static void JournalEntry_GetOnlineEventMinigame(u8 *onlineEvent, JournalEntryOnl journalEntryOnlineEvent->result = onlineEvent[1]; } -void JournalEntry_CreateAndSaveEventMapTransition(TrainerInfo *trainerInfo, JournalEntry *journalEntry, u32 currMapID, u32 prevMapID, u32 heapID) +void JournalEntry_CreateAndSaveEventMapTransition(TrainerInfo *trainerInfo, JournalEntry *journalEntry, u32 currMapID, u32 prevMapID, enum HeapID heapID) { void *data = NULL; u32 i; @@ -1352,13 +1352,13 @@ static u8 JournalEntry_GetGymTooTough(TrainerInfo *trainerInfo, u32 mapID) return GYM_NONE; } -void JournalEntry_CreateAndSaveEventArrivedInLocation(JournalEntry *journalEntry, u32 mapID, u32 heapID) +void JournalEntry_CreateAndSaveEventArrivedInLocation(JournalEntry *journalEntry, u32 mapID, enum HeapID heapID) { void *data = JournalEntry_CreateEventArrivedInLocation((u16)mapID, heapID); JournalEntry_SaveData(journalEntry, data, JOURNAL_LOCATION); } -void JournalEntry_CreateAndSaveEventTrainer(JournalEntry *journalEntry, u16 mapID, u16 trainerID, u32 heapID) +void JournalEntry_CreateAndSaveEventTrainer(JournalEntry *journalEntry, u16 mapID, u16 trainerID, enum HeapID heapID) { void *data; u8 trainerType = JournalEntry_TrainerType(trainerID); diff --git a/src/main_menu/gba_migrator.c b/src/main_menu/gba_migrator.c index f6cb09ea58..1a709f629c 100644 --- a/src/main_menu/gba_migrator.c +++ b/src/main_menu/gba_migrator.c @@ -625,7 +625,7 @@ static void ov97_02234190(TouchScreenRect *rect, int param1, int param2, int par rect->rect.right = param1 + param3 / 2; } -static void *ov97_022341B4(u32 narcID, u32 memberIndex, NNSG2dCharacterData **param2, u32 heapID) +static void *ov97_022341B4(u32 narcID, u32 memberIndex, NNSG2dCharacterData **param2, enum HeapID heapID) { void *v0 = Heap_AllocAtEnd(heapID, 4096); diff --git a/src/map_header_util.c b/src/map_header_util.c index 66ecf9e54d..83da4b2558 100644 --- a/src/map_header_util.c +++ b/src/map_header_util.c @@ -15,7 +15,7 @@ u32 MapHeader_LoadString(MessageLoader *msgLoader, u32 entryID, String *string) return width; } -void MapHeader_LoadName(enum MapHeader headerID, u32 heapID, String *string) +void MapHeader_LoadName(enum MapHeader headerID, enum HeapID heapID, String *string) { u32 mapLabelTextID; MessageLoader *msgLoader = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_LOCATION_NAMES, heapID); diff --git a/src/move_reminder_data.c b/src/move_reminder_data.c index e4ad40c834..6b8ca469d6 100644 --- a/src/move_reminder_data.c +++ b/src/move_reminder_data.c @@ -11,7 +11,7 @@ #define GET_LEVEL(move) ((move & 0xfe00) >> 9) #define GET_MOVE(move) ((move & 0x1ff) >> 0) -MoveReminderData *MoveReminderData_Alloc(u32 heapID) +MoveReminderData *MoveReminderData_Alloc(enum HeapID heapID) { MoveReminderData *data = Heap_Alloc(heapID, sizeof(MoveReminderData)); memset(data, 0, sizeof(MoveReminderData)); @@ -23,7 +23,7 @@ void MoveReminderData_Free(MoveReminderData *data) Heap_Free(data); } -u16 *MoveReminderData_GetMoves(Pokemon *mon, u32 heapID) +u16 *MoveReminderData_GetMoves(Pokemon *mon, enum HeapID heapID) { u8 h, i, j; diff --git a/src/narc.c b/src/narc.c index 6d7130a086..53a6ef24da 100644 --- a/src/narc.c +++ b/src/narc.c @@ -385,7 +385,7 @@ u32 NARC_GetMemberSizeByIndexPair(enum NarcID narcID, int memberIndex) return chunkSize; } -NARC *NARC_ctor(enum NarcID narcID, u32 heapID) +NARC *NARC_ctor(enum NarcID narcID, enum HeapID heapID) { NARC *narc = Heap_Alloc(heapID, sizeof(NARC)); @@ -420,7 +420,7 @@ void NARC_dtor(NARC *param0) Heap_Free(param0); } -void *NARC_AllocAndReadWholeMember(NARC *narc, u32 memberIndex, u32 heapID) +void *NARC_AllocAndReadWholeMember(NARC *narc, u32 memberIndex, enum HeapID heapID) { u32 fileStart; u32 fileEnd; diff --git a/src/overlay005/encounter_effect_core.c b/src/overlay005/encounter_effect_core.c index 193c962447..6c7d05e548 100644 --- a/src/overlay005/encounter_effect_core.c +++ b/src/overlay005/encounter_effect_core.c @@ -2858,7 +2858,7 @@ static BOOL ov5_021E51B4(UnkStruct_ov5_021E5128 *param0) return v2; } -static String *EncounterEffect_GetGymLeaderName(u32 trainerClass, u32 heapID) +static String *EncounterEffect_GetGymLeaderName(u32 trainerClass, enum HeapID heapID) { StringTemplate *template; MessageLoader *messageLoader; diff --git a/src/overlay005/fishing.c b/src/overlay005/fishing.c index 160ade2914..323f9b2efb 100644 --- a/src/overlay005/fishing.c +++ b/src/overlay005/fishing.c @@ -105,7 +105,7 @@ static int HasCaughtFish(SysTask *task); BOOL (*const sFishingActions[])(FishingTask *, PlayerAvatar *, MapObject *); const int sRodTypeHookTimingWindow[]; -void *FishingContext_Init(FieldSystem *fieldSystem, u32 heapID, enum EncounterFishingRodType rodType) +void *FishingContext_Init(FieldSystem *fieldSystem, enum HeapID heapID, enum EncounterFishingRodType rodType) { FishingContext *fishingContext = Heap_AllocAtEnd(heapID, sizeof(FishingContext)); diff --git a/src/overlay005/ov5_021DF440.c b/src/overlay005/ov5_021DF440.c index c592232b2e..f482fad9c2 100644 --- a/src/overlay005/ov5_021DF440.c +++ b/src/overlay005/ov5_021DF440.c @@ -35,7 +35,7 @@ typedef struct UnkStruct_ov5_021DF8FC_t UnkStruct_ov5_021DF8FC; typedef struct UnkStruct_ov5_021DF8C8_t UnkStruct_ov5_021DF8C8; typedef struct UnkStruct_ov5_021DF47C_t { - u32 heapID; + enum HeapID heapID; u32 unk_04; u32 unk_08; u32 unk_0C; @@ -52,7 +52,7 @@ typedef struct UnkStruct_ov5_021DF6AC_t { } UnkStruct_ov5_021DF6AC; typedef struct UnkStruct_ov5_021DF8FC_t { - u32 heapID; + enum HeapID heapID; u16 unk_04; u16 unk_06; u16 unk_08; @@ -92,7 +92,7 @@ static const UnkStruct_ov5_021FF85C *ov5_021DF6D0(u32 param0); static void ov5_021DF6F8(UnkStruct_ov5_021DF47C *renderManager); static void ov5_021DF708(UnkStruct_ov5_021DF47C *renderManager); static void ov5_021DF71C(UnkStruct_ov5_021DF47C *renderManager); -static void ov5_021DF754(UnkStruct_ov5_021DF47C *param0, u32 heapID, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); +static void ov5_021DF754(UnkStruct_ov5_021DF47C *param0, enum HeapID heapID, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); static void ov5_021DF7C4(UnkStruct_ov5_021DF47C *renderManager); static void ov5_021DF8C8(UnkStruct_ov5_021DF47C *renderManager, UnkStruct_ov5_021DF8FC *graphicsManager, u32 objectCount); static void ov5_021DF8FC(UnkStruct_ov5_021DF8FC *graphicsManager); @@ -103,7 +103,7 @@ static void ov5_021DFA88(UnkStruct_ov5_021DF47C *renderManager, u32 slotID, Text static void ov5_021DFAC0(SysTask *param0, void *param1); static void ov5_021DFADC(SysTask *param0, void *param1); -UnkStruct_ov5_021DF47C *ov5_021DF440(FieldSystem *fieldSystem, u32 param1, u32 heapID) +UnkStruct_ov5_021DF47C *ov5_021DF440(FieldSystem *fieldSystem, u32 param1, enum HeapID heapID) { UnkStruct_ov5_021DF47C *v0 = Heap_Alloc(heapID, (sizeof(UnkStruct_ov5_021DF47C))); memset(v0, 0, (sizeof(UnkStruct_ov5_021DF47C))); @@ -125,7 +125,7 @@ void ov5_021DF47C(UnkStruct_ov5_021DF47C *param0, u32 param1) ov5_021DF6F8(param0); } -void ov5_021DF488(UnkStruct_ov5_021DF47C *param0, u32 heapID, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) +void ov5_021DF488(UnkStruct_ov5_021DF47C *param0, enum HeapID heapID, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) { ov5_021DF754(param0, heapID, param2, param3, param4, param5, param6, param7, param8); } @@ -408,7 +408,7 @@ void ov5_021DF74C(OverworldAnimManager *param0) OverworldAnimManager_Finish(param0); } -static void ov5_021DF754(UnkStruct_ov5_021DF47C *param0, u32 heapID, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) +static void ov5_021DF754(UnkStruct_ov5_021DF47C *param0, enum HeapID heapID, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) { UnkStruct_ov5_021DF8FC *v0; UnkStruct_ov5_021EDDAC v1; diff --git a/src/overlay005/ov5_021EF4BC.c b/src/overlay005/ov5_021EF4BC.c index 029be0bfed..0299c70ace 100644 --- a/src/overlay005/ov5_021EF4BC.c +++ b/src/overlay005/ov5_021EF4BC.c @@ -36,7 +36,7 @@ static void ov5_021EF6CC(UnkStruct_ov5_021EF4F8 *param0); static void ov5_021EF6F0(UnkStruct_ov5_021EF4F8 *param0); static void ov5_021EF710(UnkStruct_ov5_021EF4F8 *param0); -UnkStruct_ov5_021EF4F8 *ov5_021EF4BC(u32 heapID, HBlankSystem *param1) +UnkStruct_ov5_021EF4F8 *ov5_021EF4BC(enum HeapID heapID, HBlankSystem *param1) { UnkStruct_ov5_021EF4F8 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov5_021EF4F8)); memset(v0, 0, sizeof(UnkStruct_ov5_021EF4F8)); diff --git a/src/overlay005/ov5_021F0EB0.c b/src/overlay005/ov5_021F0EB0.c index 773f12b56f..74162cdab0 100644 --- a/src/overlay005/ov5_021F0EB0.c +++ b/src/overlay005/ov5_021F0EB0.c @@ -11,7 +11,7 @@ #include "sys_task_manager.h" typedef struct { - u32 heapID; + enum HeapID heapID; int unk_04; int unk_08; int unk_0C; @@ -34,7 +34,7 @@ static int ov5_021F0FF8(UnkStruct_ov5_021F0FB8 *param0); static void (*const Unk_ov5_0220020C[4])(UnkStruct_ov5_021F0FB8 *); -SysTask *ov5_021F0EB0(FieldSystem *fieldSystem, u32 heapID) +SysTask *ov5_021F0EB0(FieldSystem *fieldSystem, enum HeapID heapID) { SysTask *task; UnkStruct_ov5_021F0FB8 *v1 = Heap_AllocAtEnd(heapID, (sizeof(UnkStruct_ov5_021F0FB8))); diff --git a/src/overlay005/signpost.c b/src/overlay005/signpost.c index ca523e1c76..9b9d817eed 100644 --- a/src/overlay005/signpost.c +++ b/src/overlay005/signpost.c @@ -16,7 +16,7 @@ static void Signpost_Remove(FieldSystem *fieldSystem); static BOOL Signpost_ScrollIn(FieldSystem *fieldSystem); static BOOL Signpost_ScrollOut(FieldSystem *fieldSystem); -void *Signpost_Init(u32 heapID) +void *Signpost_Init(enum HeapID heapID) { void *signpost = Heap_Alloc(heapID, sizeof(Signpost)); diff --git a/src/overlay005/sprite_resource_manager.c b/src/overlay005/sprite_resource_manager.c index 06bd984c55..e5cbb031c7 100644 --- a/src/overlay005/sprite_resource_manager.c +++ b/src/overlay005/sprite_resource_manager.c @@ -16,7 +16,7 @@ static BOOL SpriteResourceList_AddResource(SpriteResourceList *resourceList, Spr static void SpriteResourceManager_AddResourceByType(SpriteResourceManager *spriteManager, int data, int size, int offset, int resourceType, int id); static void SpriteResourceManager_LoadResourceByType(SpriteResourceManager *spriteManager, NARC *narc, int memberIdx, BOOL compressed, enum SpriteResourceType type, int id); -void SpriteResourceManager_Init(SpriteResourceManager *spriteManager, const SpriteResourceDataPaths *resourcePaths, u32 maxSprites, u32 heapID) +void SpriteResourceManager_Init(SpriteResourceManager *spriteManager, const SpriteResourceDataPaths *resourcePaths, u32 maxSprites, enum HeapID heapID) { SpriteResourceTable *resourceTable; void *fileData; @@ -111,7 +111,7 @@ Sprite *SpriteResourceManager_CreateSprite(SpriteResourceManager *spriteManager, return sprite; } -void SpriteResourceManager_SetCapacities(SpriteResourceManager *spriteManager, SpriteResourceCapacities *capacities, u32 maxElements, u32 heapID) +void SpriteResourceManager_SetCapacities(SpriteResourceManager *spriteManager, SpriteResourceCapacities *capacities, u32 maxElements, enum HeapID heapID) { u32 resourceTypeIndex; diff --git a/src/overlay006/hm_cut_in.c b/src/overlay006/hm_cut_in.c index 2b9f489839..d4331c4bdb 100644 --- a/src/overlay006/hm_cut_in.c +++ b/src/overlay006/hm_cut_in.c @@ -258,8 +258,8 @@ static void CutIn_LoadSpriteResources(HMCutIn *cutIn, NARC *narc); static void CutIn_BuildPokemonSpriteTemplate(HMCutIn *cutIn, PokemonSpriteTemplate *spriteTemplate); static SpriteResource *CutIn_GetParticleCharResource(HMCutIn *cutIn, NARC *narc); static SpriteResource *CutIn_GetPlayerMalePlttResource(HMCutIn *cutIn, NARC *narc); -static void *CutIn_GetPokemonSpriteSource(Pokemon *pokemon, PokemonSpriteTemplate *spriteTemplate, u32 heapID); -static void *CutIn_GetPokemonPaletteSource(PokemonSpriteTemplate *spriteTemplate, u32 heapID); +static void *CutIn_GetPokemonSpriteSource(Pokemon *pokemon, PokemonSpriteTemplate *spriteTemplate, enum HeapID heapID); +static void *CutIn_GetPokemonPaletteSource(PokemonSpriteTemplate *spriteTemplate, enum HeapID heapID); static Sprite *CutIn_InitPlayerSprite(HMCutIn *cutIn, const VecFx32 *position); static void CutIn_LoadBgPalette(NARC *narc, u32 memberIndex, NNSG2dPaletteData **paletteData); static void CutIn_LoadBgPatternChar(BgConfig *bgConfig, NARC *narc, u32 memberIndex, NNSG2dCharacterData **charData); @@ -330,7 +330,7 @@ static void CutIn_SetTaskUnk_254Done(HMCutIn *cutIn); // Utilities static Sprite *CreateSprite(HMCutIn *cutIn, const VecFx32 *position, u32 charResourceID, u32 plttResourceID, u32 cellResourceID, u32 animResourceID, int headerPriority, int listPriority); -static void *FlyLanding_AllocFromHeapAtEnd(u32 heapID, int size); +static void *FlyLanding_AllocFromHeapAtEnd(enum HeapID heapID, int size); typedef int (*CutInTaskFunc)(HMCutIn *); static const CutInTaskFunc sCutInTaskFuncs[]; @@ -2085,7 +2085,7 @@ static void CutIn_BuildPokemonSpriteTemplate(HMCutIn *cutIn, PokemonSpriteTempla Pokemon_BuildSpriteTemplate(spriteTemplate, cutIn->pokemon, 2); } -static void *CutIn_GetPokemonSpriteSource(Pokemon *pokemon, PokemonSpriteTemplate *spriteTemplate, u32 heapID) +static void *CutIn_GetPokemonSpriteSource(Pokemon *pokemon, PokemonSpriteTemplate *spriteTemplate, enum HeapID heapID) { void *spriteSource = Heap_Alloc(HEAP_ID_FIELD1, (32 * 10) * 10); @@ -2097,7 +2097,7 @@ static void *CutIn_GetPokemonSpriteSource(Pokemon *pokemon, PokemonSpriteTemplat return spriteSource; } -static void *CutIn_GetPokemonPaletteSource(PokemonSpriteTemplate *spriteTemplate, u32 heapID) +static void *CutIn_GetPokemonPaletteSource(PokemonSpriteTemplate *spriteTemplate, enum HeapID heapID) { void *paletteSource = CharacterSprite_LoadPalette(spriteTemplate->narcID, spriteTemplate->palette, heapID); return paletteSource; @@ -3037,7 +3037,7 @@ static BOOL (*const sFlyLandingFuncs[])(FlyLandingEnv *) = { FlyLanding_DoNothing }; -static void *FlyLanding_AllocFromHeapAtEnd(u32 heapID, int size) +static void *FlyLanding_AllocFromHeapAtEnd(enum HeapID heapID, int size) { void *ptr = Heap_AllocAtEnd(heapID, size); diff --git a/src/overlay006/npc_trade.c b/src/overlay006/npc_trade.c index 2db4cd1bdb..2be8371e55 100644 --- a/src/overlay006/npc_trade.c +++ b/src/overlay006/npc_trade.c @@ -21,11 +21,11 @@ #include "unk_020559DC.h" #include "unk_02092494.h" -static inline String *NpcTrade_GetOtName(u32 heapID, u32 npcTradeID); -static String *NpcTrade_GetNickname(u32 heapID, u32 npcTradeID); -static void NpcTrade_CreateMon(Pokemon *mon, NpcTradeMon *npcTrade, u32 level, u32 npcTradeID, u32 heapID, u32 mapID); +static inline String *NpcTrade_GetOtName(enum HeapID heapID, u32 npcTradeID); +static String *NpcTrade_GetNickname(enum HeapID heapID, u32 npcTradeID); +static void NpcTrade_CreateMon(Pokemon *mon, NpcTradeMon *npcTrade, u32 level, u32 npcTradeID, enum HeapID heapID, u32 mapID); -NpcTradeData *NpcTrade_Init(u32 heapID, u32 npcTradeID) +NpcTradeData *NpcTrade_Init(enum HeapID heapID, u32 npcTradeID) { GF_ASSERT(npcTradeID < MAX_NPC_TRADES); @@ -101,12 +101,12 @@ void ov6_02246254(FieldSystem *fieldSystem, NpcTradeData *data, int slot, TradeA } } -static inline String *NpcTrade_GetOtName(u32 heapID, u32 npcTradeID) +static inline String *NpcTrade_GetOtName(enum HeapID heapID, u32 npcTradeID) { return NpcTrade_GetNickname(heapID, MAX_NPC_TRADES + npcTradeID); } -static String *NpcTrade_GetNickname(u32 heapID, u32 npcTradeID) +static String *NpcTrade_GetNickname(enum HeapID heapID, u32 npcTradeID) { MessageLoader *loader = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_NPC_TRADE_NAMES, heapID); String *string = MessageLoader_GetNewString(loader, npcTradeID); @@ -114,7 +114,7 @@ static String *NpcTrade_GetNickname(u32 heapID, u32 npcTradeID) return string; } -static void NpcTrade_CreateMon(Pokemon *mon, NpcTradeMon *npcTradeMon, u32 level, u32 npcTradeID, u32 heapID, u32 mapID) +static void NpcTrade_CreateMon(Pokemon *mon, NpcTradeMon *npcTradeMon, u32 level, u32 npcTradeID, enum HeapID heapID, u32 mapID) { Pokemon_InitWith(mon, npcTradeMon->species, level, INIT_IVS_RANDOM, TRUE, npcTradeMon->personality, OTID_SET, npcTradeMon->otID); diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c index f68eeafb05..791b93f22c 100644 --- a/src/overlay006/ov6_0223E140.c +++ b/src/overlay006/ov6_0223E140.c @@ -211,7 +211,7 @@ typedef struct UnkStruct_ov6_022401B8_t { UnkStruct_ov6_02240240 unk_08; UnkStruct_ov6_02240260 unk_34; NNSFndAllocator unk_10C; - u32 heapID; + enum HeapID heapID; } UnkStruct_ov6_022401B8; typedef struct { @@ -283,13 +283,13 @@ static void ov6_0223FDC4(Easy3DObject *param0, BOOL param1); static void ov6_0223FDCC(Easy3DObject *param0, fx32 param1, fx32 param2, fx32 param3); static void ov6_0223FDD4(Easy3DObject *param0, fx32 param1, fx32 param2, fx32 param3); static void ov6_0223FDDC(Easy3DObject *param0, u16 param1, u32 param2); -static UnkStruct_ov6_0223FDE4 *ov6_0223FDE4(u32 heapID); +static UnkStruct_ov6_0223FDE4 *ov6_0223FDE4(enum HeapID heapID); static void ov6_0223FF7C(UnkStruct_ov6_0223FDE4 *param0); static BOOL ov6_0223FFC8(UnkStruct_ov6_0223FDE4 *param0); static void ov6_0223FFE4(UnkStruct_ov6_0223FDE4 *param0, fx32 param1, fx32 param2); static void ov6_02240064(SysTask *param0, void *param1); static void ov6_02240240(UnkStruct_ov6_02240240 *param0, FieldSystem *fieldSystem, u32 param2); -static void ov6_02240260(UnkStruct_ov6_02240260 *param0, u32 heapID, NNSFndAllocator *param2); +static void ov6_02240260(UnkStruct_ov6_02240260 *param0, enum HeapID heapID, NNSFndAllocator *param2); static void ov6_022402E4(UnkStruct_ov6_02240260 *param0, fx32 param1, fx32 param2, fx32 param3); static void ov6_02240340(UnkStruct_ov6_02240260 *param0, NNSFndAllocator *param1); static void ov6_02240600(UnkStruct_ov6_02240260 *param0); @@ -303,7 +303,7 @@ static void ov6_022407E8(UnkStruct_ov6_022407B8 *param0, fx32 param1, fx32 param static void ov6_0224085C(UnkStruct_ov6_022407B8 *param0); static void ov6_0224089C(UnkStruct_ov6_022407B8 *param0); static UnkStruct_ov6_022407B8 *ov6_022408A8(UnkStruct_ov6_02240774 *param0); -static UnkStruct_ov6_02240A00 *ov6_022408C8(u32 heapID, u32 param1); +static UnkStruct_ov6_02240A00 *ov6_022408C8(enum HeapID heapID, u32 param1); static void ov6_02240968(UnkStruct_ov6_02240A00 *param0); static void ov6_02240994(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32 param3, u16 param4, u16 param5, u16 param6); static void ov6_022409D4(UnkStruct_ov6_02240A00 *param0); @@ -1747,7 +1747,7 @@ static void ov6_0223FD58(Easy3DModel *param0, u32 param1, u32 param2, u32 param3 Easy3DModel_Load(param0, param1, param2, param3); } -static void ov6_0223FD60(Easy3DModel *param0, NARC *param1, u32 param2, u32 heapID) +static void ov6_0223FD60(Easy3DModel *param0, NARC *param1, u32 param2, enum HeapID heapID) { Easy3DModel_LoadFrom(param0, param1, param2, heapID); } @@ -1817,7 +1817,7 @@ static void ov6_0223FDDC(Easy3DObject *param0, u16 param1, u32 param2) Easy3DObject_SetRotation(param0, param1, param2); } -UnkStruct_ov6_0223FDE4 *ov6_0223FDE4(u32 heapID) +UnkStruct_ov6_0223FDE4 *ov6_0223FDE4(enum HeapID heapID) { UnkStruct_ov6_0223FDE4 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov6_0223FDE4)); memset(v0, 0, sizeof(UnkStruct_ov6_0223FDE4)); @@ -2029,7 +2029,7 @@ void ov6_022400C4(UnkStruct_ov6_022400A8 *param0) NNS_G3dGePopMtx(1); } -UnkStruct_ov6_022401B8 *ov6_02240104(u32 heapID, FieldSystem *fieldSystem) +UnkStruct_ov6_022401B8 *ov6_02240104(enum HeapID heapID, FieldSystem *fieldSystem) { UnkStruct_ov6_022401B8 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov6_022401B8)); memset(v0, 0, sizeof(UnkStruct_ov6_022401B8)); @@ -2102,7 +2102,7 @@ static void ov6_02240240(UnkStruct_ov6_02240240 *param0, FieldSystem *fieldSyste param0->unk_28 = 0; } -static void ov6_02240260(UnkStruct_ov6_02240260 *param0, u32 heapID, NNSFndAllocator *param2) +static void ov6_02240260(UnkStruct_ov6_02240260 *param0, enum HeapID heapID, NNSFndAllocator *param2) { int v0; NARC *v1 = NARC_ctor(NARC_INDEX_ARC__DEMO_TENGAN_GRA, heapID); @@ -2383,7 +2383,7 @@ static void ov6_02240600(UnkStruct_ov6_02240260 *param0) ov6_0223FDBC(¶m0->unk_08); } -static UnkStruct_ov6_02240774 *ov6_0224060C(u32 heapID, u32 param1) +static UnkStruct_ov6_02240774 *ov6_0224060C(enum HeapID heapID, u32 param1) { UnkStruct_ov6_02240774 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov6_02240774)); memset(v0, 0, sizeof(UnkStruct_ov6_02240774)); @@ -2456,7 +2456,7 @@ static void ov6_02240750(UnkStruct_ov6_02240774 *param0) } } -UnkStruct_ov6_02240774 *ov6_02240768(u32 heapID) +UnkStruct_ov6_02240774 *ov6_02240768(enum HeapID heapID) { return ov6_0224060C(heapID, 6); } @@ -2548,7 +2548,7 @@ static UnkStruct_ov6_022407B8 *ov6_022408A8(UnkStruct_ov6_02240774 *param0) return NULL; } -static UnkStruct_ov6_02240A00 *ov6_022408C8(u32 heapID, u32 param1) +static UnkStruct_ov6_02240A00 *ov6_022408C8(enum HeapID heapID, u32 param1) { UnkStruct_ov6_02240A00 *v0; int v1; @@ -2613,7 +2613,7 @@ static void ov6_022409EC(UnkStruct_ov6_02240A00 *param0) ov6_0223FDBC(¶m0->unk_00); } -UnkStruct_ov6_02240A00 *ov6_022409F4(u32 heapID) +UnkStruct_ov6_02240A00 *ov6_022409F4(enum HeapID heapID) { return ov6_022408C8(heapID, 0); } @@ -2649,7 +2649,7 @@ void ov6_02240A8C(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32 ov6_02240994(param0, param1 + -811008, param2 + 356351, param3 + -2162696, 59165, 21301, 31122); } -UnkStruct_ov6_02240774 *ov6_02240AC8(u32 heapID) +UnkStruct_ov6_02240774 *ov6_02240AC8(enum HeapID heapID) { return ov6_0224060C(heapID, 6); } @@ -2752,7 +2752,7 @@ void include_unk_ov6_02248F30(void) Unk_ov6_02248F30[0]; } -UnkStruct_ov6_02240C44 *ov6_02240B9C(u32 heapID, FieldSystem *fieldSystem) +UnkStruct_ov6_02240C44 *ov6_02240B9C(enum HeapID heapID, FieldSystem *fieldSystem) { UnkStruct_ov6_02240C44 *v0; int v1; diff --git a/src/overlay006/ov6_02247100.c b/src/overlay006/ov6_02247100.c index 0182b7d6b3..cc3d301ba4 100644 --- a/src/overlay006/ov6_02247100.c +++ b/src/overlay006/ov6_02247100.c @@ -39,7 +39,7 @@ typedef struct { Pokemon *unk_20; } UnkStruct_ov6_02247100; -static void *ov6_02247590(u32 heapID, u32 param1); +static void *ov6_02247590(enum HeapID heapID, u32 param1); static void ov6_0224732C(FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param1); int (*const Unk_ov6_022495CC[])(FieldTask *, FieldSystem *, UnkStruct_ov6_02247100 *); @@ -50,7 +50,7 @@ const MapObjectAnimCmd Unk_ov6_02249608[]; const MapObjectAnimCmd Unk_ov6_022495DC[]; const MapObjectAnimCmd Unk_ov6_0224966C[]; -void *ov6_02247100(FieldSystem *fieldSystem, u32 heapID) +void *ov6_02247100(FieldSystem *fieldSystem, enum HeapID heapID) { UnkStruct_ov6_02247100 *v0 = ov6_02247590(heapID, sizeof(UnkStruct_ov6_02247100)); @@ -170,7 +170,7 @@ static int (*const Unk_ov6_022495CC[])(FieldTask *, FieldSystem *, UnkStruct_ov6 ov6_02247288 }; -void *ov6_022472C8(FieldSystem *fieldSystem, u32 heapID, int param2) +void *ov6_022472C8(FieldSystem *fieldSystem, enum HeapID heapID, int param2) { UnkStruct_ov6_02247100 *v0 = ov6_02247590(heapID, sizeof(UnkStruct_ov6_02247100)); @@ -289,7 +289,7 @@ static int (*const Unk_ov6_022495BC[])(FieldTask *, FieldSystem *, UnkStruct_ov6 ov6_02247458 }; -void *ov6_02247488(FieldSystem *fieldSystem, Pokemon *param1, u32 heapID) +void *ov6_02247488(FieldSystem *fieldSystem, Pokemon *param1, enum HeapID heapID) { UnkStruct_ov6_02247100 *v0 = ov6_02247590(heapID, sizeof(UnkStruct_ov6_02247100)); @@ -348,7 +348,7 @@ static int (*const Unk_ov6_022495F0[])(FieldTask *, FieldSystem *, UnkStruct_ov6 ov6_02247288 }; -void *ov6_02247530(FieldSystem *fieldSystem, Pokemon *param1, u32 heapID) +void *ov6_02247530(FieldSystem *fieldSystem, Pokemon *param1, enum HeapID heapID) { UnkStruct_ov6_02247100 *v0 = ov6_02247590(heapID, sizeof(UnkStruct_ov6_02247100)); @@ -377,7 +377,7 @@ BOOL ov6_02247554(FieldTask *task) return 0; } -static void *ov6_02247590(u32 heapID, u32 param1) +static void *ov6_02247590(enum HeapID heapID, u32 param1) { void *v0 = Heap_AllocAtEnd(heapID, param1); diff --git a/src/overlay006/ov6_02248948.c b/src/overlay006/ov6_02248948.c index b3002a5c27..f32710d0cb 100644 --- a/src/overlay006/ov6_02248948.c +++ b/src/overlay006/ov6_02248948.c @@ -60,7 +60,7 @@ static void ov6_02248948(SysTask *param0, void *param1) } } -void ov6_0224899C(FieldSystem *fieldSystem, u16 *param1, u32 param2, u32 heapID) +void ov6_0224899C(FieldSystem *fieldSystem, u16 *param1, u32 param2, enum HeapID heapID) { UnkStruct_ov6_02248948 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov6_02248948)); diff --git a/src/overlay013/battle_bag.c b/src/overlay013/battle_bag.c index 524a028a35..5af2d922e6 100644 --- a/src/overlay013/battle_bag.c +++ b/src/overlay013/battle_bag.c @@ -94,7 +94,7 @@ static u8 TryUseItem(BattleBag *battleBag); static void SetupBackgroundScroll(BattleBag *battleBag, enum BattleBagScreen screen); static void ChangeBattleBagScreen(BattleBag *battleBag, u8 screen); static int CheckTouchRectIsPressed(BattleBag *battleBag, const TouchScreenRect *rect); -static void UseBagItem(BattleSystem *battleSys, u16 item, u16 category, u32 heapID); +static void UseBagItem(BattleSystem *battleSys, u16 item, u16 category, enum HeapID heapID); static const TouchScreenRect sMenuTouchRects[] = { [BATTLE_BAG_MENU_SCREEN_BUTTON_RECOVER_HP_POCKET] = { 8, 79, 0, 127 }, @@ -816,7 +816,7 @@ int BattleBagTask_GetSelectedPartySlot(BattleBag *battleBag) return BattleContext_Get(battleBag->context->battleSystem, BattleSystem_Context(battleBag->context->battleSystem), BATTLECTX_SELECTED_PARTY_SLOT, battleBag->context->battler); } -static void UseBagItem(BattleSystem *battleSys, u16 item, u16 category, u32 heapID) +static void UseBagItem(BattleSystem *battleSys, u16 item, u16 category, enum HeapID heapID) { Bag_TryRemoveItem(BattleSystem_Bag(battleSys), item, 1, heapID); Bag_SetLastBattleItemUsed(BattleSystem_BagCursor(battleSys), item, category); diff --git a/src/overlay013/battle_party.c b/src/overlay013/battle_party.c index c8c0de371e..1901f0cc17 100644 --- a/src/overlay013/battle_party.c +++ b/src/overlay013/battle_party.c @@ -150,7 +150,7 @@ static BOOL CheckSelectedMoveIsHM(BattleParty *battleParty); static void ClearMoveStats(BattleParty *battleParty); static void ClearMoveContestStats(BattleParty *battleParty); static u8 CheckSelectedPokemonIsEgg(BattleParty *battleParty); -static void UseBagItem(BattleSystem *battleSys, u16 item, u16 category, u32 heapID); +static void UseBagItem(BattleSystem *battleSys, u16 item, u16 category, enum HeapID heapID); static const TouchScreenRect sPartyPokemonScreenTouchRects[] = { [BATTLE_POKEMON_PARTY_SCREEN_BUTTON_POKEMON_1] = { .rect.top = 0, .rect.bottom = 47, .rect.left = 0, .rect.right = 127 }, @@ -1748,7 +1748,7 @@ static void ClearMoveContestStats(BattleParty *battleParty) Bg_ScheduleTilemapTransfer(battleParty->background, BG_LAYER_SUB_3); } -static void UseBagItem(BattleSystem *battleSys, u16 item, u16 category, u32 heapID) +static void UseBagItem(BattleSystem *battleSys, u16 item, u16 category, enum HeapID heapID) { if (item != ITEM_BLUE_FLUTE && item != ITEM_RED_FLUTE && item != ITEM_YELLOW_FLUTE) { Bag_TryRemoveItem(BattleSystem_Bag(battleSys), item, 1, heapID); diff --git a/src/overlay013/battle_sub_menu_cursor.c b/src/overlay013/battle_sub_menu_cursor.c index 6773393cd9..370e542d87 100644 --- a/src/overlay013/battle_sub_menu_cursor.c +++ b/src/overlay013/battle_sub_menu_cursor.c @@ -11,7 +11,7 @@ #define NULL_POSITION_INDEX 0xff #define ALL_POSITIONS_ENABLED_MASK 0xffffffff -BattleSubMenuCursor *MakeBattleSubMenuCursor(u32 heapID) +BattleSubMenuCursor *MakeBattleSubMenuCursor(enum HeapID heapID) { BattleSubMenuCursor *cursor = Heap_Alloc(heapID, sizeof(BattleSubMenuCursor)); memset(cursor, 0, sizeof(BattleSubMenuCursor)); diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c index 291daa3911..f76b6de94a 100644 --- a/src/overlay017/ov17_0223F118.c +++ b/src/overlay017/ov17_0223F118.c @@ -179,7 +179,7 @@ void ov17_0223F2F8(UnkStruct_ov17_0223F2E4 *param0, int param1, int param2, int FontOAM_SetXY(param0->unk_00, param1, param2); } -String *ov17_0223F310(u32 param0, u32 heapID) +String *ov17_0223F310(u32 param0, enum HeapID heapID) { MessageLoader *v0 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_CONTEST_JUDGE_NAMES, heapID); String *v1 = MessageLoader_GetNewString(v0, param0); diff --git a/src/overlay022/ov22_022597BC.c b/src/overlay022/ov22_022597BC.c index 623af7858d..2587012b8a 100644 --- a/src/overlay022/ov22_022597BC.c +++ b/src/overlay022/ov22_022597BC.c @@ -48,8 +48,8 @@ static void ov22_02259980(const NNSG2dScreenData *param0, int param1); static void ov22_022599A0(UnkStruct_ov22_022599A0 *param0, int *param1, int *param2); static void ov22_02259A4C(SysTask *param0, void *param1); static void ov22_02259ABC(BgConfig *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4, int param5, int param6, int param7, int param8); -static void ov22_02259B3C(enum NarcID narcID, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 heapID); -static void ov22_02259B8C(enum NarcID narcID, u32 param1, int param2, u32 param3, u32 param4, u32 heapID); +static void ov22_02259B3C(enum NarcID narcID, u32 param1, BgConfig *param2, u32 param3, u32 param4, enum HeapID heapID); +static void ov22_02259B8C(enum NarcID narcID, u32 param1, int param2, u32 param3, u32 param4, enum HeapID heapID); static void ov22_02259BD4(SysTask *param0, void *param1); static void ov22_02259C10(SysTask *param0, void *param1); @@ -222,7 +222,7 @@ static void ov22_02259ABC(BgConfig *param0, int param1, const NNSG2dScreenData * Bg_ScheduleTilemapTransfer(param0, param1); } -static void ov22_02259B3C(enum NarcID narcID, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 heapID) +static void ov22_02259B3C(enum NarcID narcID, u32 param1, BgConfig *param2, u32 param3, u32 param4, enum HeapID heapID) { UnkStruct_ov22_02259B3C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov22_02259B3C)); memset(v0, 0, sizeof(UnkStruct_ov22_02259B3C)); @@ -235,7 +235,7 @@ static void ov22_02259B3C(enum NarcID narcID, u32 param1, BgConfig *param2, u32 SysTask_ExecuteAfterVBlank(ov22_02259BD4, v0, 128); } -static void ov22_02259B8C(enum NarcID narcID, u32 param1, int param2, u32 param3, u32 param4, u32 heapID) +static void ov22_02259B8C(enum NarcID narcID, u32 param1, int param2, u32 param3, u32 param4, enum HeapID heapID) { UnkStruct_ov22_02259B8C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov22_02259B8C)); memset(v0, 0, sizeof(UnkStruct_ov22_02259B8C)); diff --git a/src/overlay023/secret_bases.c b/src/overlay023/secret_bases.c index ab6b6f6c6b..7f07206861 100644 --- a/src/overlay023/secret_bases.c +++ b/src/overlay023/secret_bases.c @@ -1083,7 +1083,7 @@ static int SecretBases_CountPlayersInBase(int ownerNetID, BOOL useServerLocation return count; } -static Menu *SecretBases_MakeLeaveOpenOrCloseMenu(BgConfig *bgConfig, const WindowTemplate *windowTemplate, u16 tile, u8 palette, u32 heapID) +static Menu *SecretBases_MakeLeaveOpenOrCloseMenu(BgConfig *bgConfig, const WindowTemplate *windowTemplate, u16 tile, u8 palette, enum HeapID heapID) { MessageLoader *loader = UndergroundTextPrinter_GetMessageLoader(CommManUnderground_GetCommonTextPrinter()); StringList *choices = StringList_New(2, heapID); diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index cc3a9326c3..a5c65ba963 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -62,7 +62,7 @@ static void ov62_022349E4(String *param0, enum HeapID heapID); -StringTemplate *ov62_02231690(u32 heapID) +StringTemplate *ov62_02231690(enum HeapID heapID) { return StringTemplate_New(4, 64, heapID); } diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c index 940998395c..0251df3495 100644 --- a/src/overlay063/ov63_0222AE60.c +++ b/src/overlay063/ov63_0222AE60.c @@ -61,24 +61,24 @@ typedef struct { } UnkStruct_ov63_0222D9A0; static void ov63_0222BC80(UnkStruct_ov63_0222AE60 *param0, SpriteResource *param1, u32 param2); -static void ov63_0222B374(UnkStruct_ov63_0222AE60 *param0, int param1, u32 param2); +static void ov63_0222B374(UnkStruct_ov63_0222AE60 *param0, int param1, u32 heapID); static void ov63_0222B404(UnkStruct_ov63_0222AE60 *param0, int param1); static u32 ov63_0222B450(u32 param0); static BOOL ov63_0222B47C(u32 param0, int param1); static u32 ov63_0222B49C(int param0, u32 param1, BOOL param2); -static void ov63_0222B4CC(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 param4, int param5); -static void ov63_0222B510(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 param4); -static void ov63_0222B664(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 param4); +static void ov63_0222B4CC(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 heapID, int param5); +static void ov63_0222B510(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 heapID); +static void ov63_0222B664(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 heapID); static void ov63_0222B738(UnkStruct_ov63_0222AE60 *param0, u32 param1); static void ov63_0222B76C(UnkStruct_ov63_0222AE60 *param0, u32 param1); static void ov63_0222B7AC(UnkStruct_ov63_0222AE60 *param0, u32 param1); static BOOL ov63_0222B7D4(const UnkStruct_ov63_0222AE60 *param0, u32 param1); -static void ov63_0222B7E8(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2); +static void ov63_0222B7E8(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 heapID); static void ov63_0222B914(UnkStruct_ov63_0222AE60 *param0); static BOOL ov63_0222B96C(const UnkStruct_ov63_0222B96C *param0); -static void ov63_0222B97C(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2); +static void ov63_0222B97C(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 heapID); static void ov63_0222B9EC(UnkStruct_ov63_0222AE60 *param0); -static void ov63_0222BA20(UnkStruct_ov63_0222AE60 *param0, u32 param1); +static void ov63_0222BA20(UnkStruct_ov63_0222AE60 *param0, u32 heapID); static void ov63_0222BAB0(UnkStruct_ov63_0222AE60 *param0); static UnkStruct_ov63_0222BB38 *ov63_0222BB00(UnkStruct_ov63_0222AE60 *param0); static BOOL ov63_0222BC70(const UnkStruct_ov63_0222BB38 *param0); @@ -352,14 +352,14 @@ void ov63_0222AF14(UnkStruct_ov63_0222AE60 *param0) Heap_Free(param0); } -void ov63_0222AF94(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 param4) +void ov63_0222AF94(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 heapID) { u32 v0; BOOL v1 = ov63_0222B47C(param1, param3); GF_ASSERT(v1); v0 = ov63_0222B450(param1); - ov63_0222B4CC(param0, v0, param2, param3, param4, 0); + ov63_0222B4CC(param0, v0, param2, param3, heapID, 0); } void ov63_0222AFD0(UnkStruct_ov63_0222AE60 *param0, u32 param1) @@ -389,17 +389,17 @@ void ov63_0222AFF8(UnkStruct_ov63_0222AE60 *param0) } } -void ov63_0222B02C(UnkStruct_ov63_0222AE60 *param0, u32 param1, int param2, u32 param3) +void ov63_0222B02C(UnkStruct_ov63_0222AE60 *param0, u32 param1, int param2, u32 heapID) { int v0; GF_ASSERT(param2 != 0); - ov63_0222B97C(param0, param1, param3); - ov63_0222BA20(param0, param3); + ov63_0222B97C(param0, param1, heapID); + ov63_0222BA20(param0, heapID); for (v0 = 0; v0 < 16; v0++) { - ov63_0222B4CC(param0, Unk_ov63_0222D910[v0], param1, param2, param3, 1); + ov63_0222B4CC(param0, Unk_ov63_0222D910[v0], param1, param2, heapID, 1); } } @@ -415,9 +415,9 @@ void ov63_0222B078(UnkStruct_ov63_0222AE60 *param0) } } -void ov63_0222B0A0(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, u32 param3) +void ov63_0222B0A0(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, u32 heapID) { - ov63_0222B7E8(param0, param1, param3); + ov63_0222B7E8(param0, param1, heapID); param0->unk_227C = param2; } @@ -426,7 +426,7 @@ void ov63_0222B0B8(UnkStruct_ov63_0222AE60 *param0) ov63_0222B914(param0); } -UnkStruct_ov63_0222BB38 *ov63_0222B0C0(UnkStruct_ov63_0222AE60 *param0, const UnkStruct_ov64_022302EC *param1, u32 param2, u32 param3) +UnkStruct_ov63_0222BB38 *ov63_0222B0C0(UnkStruct_ov63_0222AE60 *param0, const UnkStruct_ov64_022302EC *param1, u32 param2, u32 heapID) { UnkStruct_ov63_0222BB38 *v0; AffineSpriteListTemplate v1; @@ -446,7 +446,7 @@ UnkStruct_ov63_0222BB38 *ov63_0222B0C0(UnkStruct_ov63_0222AE60 *param0, const Un v1.affineScale.y = FX32_ONE; v1.affineScale.z = FX32_ONE; v1.priority = param1->unk_04; - v1.heapID = param3; + v1.heapID = heapID; if ((param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_MAX) || (param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_2DMAIN)) { v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN; @@ -479,7 +479,7 @@ UnkStruct_ov63_0222BB38 *ov63_0222B0C0(UnkStruct_ov63_0222AE60 *param0, const Un v1.affineScale.y = FX32_ONE; v1.affineScale.z = FX32_ONE; v1.priority = param0->unk_227C; - v1.heapID = param3; + v1.heapID = heapID; if ((param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_MAX) || (param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_2DMAIN)) { v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN; @@ -631,7 +631,7 @@ void ov63_0222B33C(UnkStruct_ov63_0222BB38 *param0) } } -static void ov63_0222B374(UnkStruct_ov63_0222AE60 *param0, int param1, u32 param2) +static void ov63_0222B374(UnkStruct_ov63_0222AE60 *param0, int param1, u32 heapID) { int v0; u32 v1; @@ -657,7 +657,7 @@ static void ov63_0222B374(UnkStruct_ov63_0222AE60 *param0, int param1, u32 param for (v0 = 0; v0 < 4; v0++) { v1 = 2 + (v0 % 2); v2 = 0x100 + (param1 * 2) + Unk_ov63_0222D900[v0]; - param0->unk_2118[param1].unk_00[v0] = SpriteResourceCollection_AddFrom(param0->unk_2280[v1], param0->unk_2294[0], v3[param1][v0], 0, v2, v1, param2); + param0->unk_2118[param1].unk_00[v0] = SpriteResourceCollection_AddFrom(param0->unk_2280[v1], param0->unk_2294[0], v3[param1][v0], 0, v2, v1, heapID); } } @@ -717,26 +717,26 @@ u32 ov63_0222B49C(int param0, u32 param1, BOOL param2) return 0x100 + (param0 * 2) + Unk_ov63_0222D900[v0]; } -static void ov63_0222B4CC(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 param4, int param5) +static void ov63_0222B4CC(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 heapID, int param5) { GF_ASSERT(param0->unk_10[param1].unk_04[0] == NULL); if (param5 == 0) { - ov63_0222B510(param0, param1, param2, param3, param4); + ov63_0222B510(param0, param1, param2, param3, heapID); } else { - ov63_0222B664(param0, param1, param2, param3, param4); + ov63_0222B664(param0, param1, param2, param3, heapID); } } -static void ov63_0222B510(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 param4) +static void ov63_0222B510(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 heapID) { NNSG2dCharacterData *v0; BOOL v1; BOOL v2; u32 v3, v4; - param0->unk_10[param1].unk_04[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_2280[0], param0->unk_2294[0], ((((param1) * 2) + 13) + 1), 0, 0x200 + param1, param2, param4); - param0->unk_10[param1].unk_04[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_2280[1], param0->unk_2294[0], (((param1) * 2) + 13), 0, 0x200 + param1, param2, 1, param4); + param0->unk_10[param1].unk_04[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_2280[0], param0->unk_2294[0], ((((param1) * 2) + 13) + 1), 0, 0x200 + param1, param2, heapID); + param0->unk_10[param1].unk_04[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_2280[1], param0->unk_2294[0], (((param1) * 2) + 13), 0, 0x200 + param1, param2, 1, heapID); v0 = SpriteResource_GetTileData(param0->unk_10[param1].unk_04[0]); @@ -783,13 +783,13 @@ static void ov63_0222B510(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param SpriteResourcesHeader_Init(¶m0->unk_10[param1].unk_14, 0x200 + param1, 0x200 + param1, v3, v4, 0xffffffff, 0xffffffff, 0, 0, param0->unk_2280[0], param0->unk_2280[1], param0->unk_2280[2], param0->unk_2280[3], NULL, NULL); } -static void ov63_0222B664(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 param4) +static void ov63_0222B664(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 heapID) { NNSG2dCharacterData *v0; BOOL v1; u32 v2 = param1 - 2; - param0->unk_10[param1].unk_04[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_2280[0], param0->unk_2294[1], (1 + ((param1)-2)), 0, 0x200 + param1, param2, param4); + param0->unk_10[param1].unk_04[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_2280[0], param0->unk_2294[1], (1 + ((param1)-2)), 0, 0x200 + param1, param2, heapID); if (param3 == 2) { v0 = SpriteResource_GetTileData(param0->unk_10[param1].unk_04[0]); @@ -851,7 +851,7 @@ static BOOL ov63_0222B7D4(const UnkStruct_ov63_0222AE60 *param0, u32 param1) return 1; } -static void ov63_0222B7E8(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2) +static void ov63_0222B7E8(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 heapID) { int v0; BOOL v1; @@ -879,10 +879,10 @@ static void ov63_0222B7E8(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param GF_ASSERT(v2 == 1); for (v0 = 0; v0 < 2; v0++) { - param0->unk_2248.unk_00[v0 + 2] = SpriteResourceCollection_AddFrom(param0->unk_2280[v0 + 2], param0->unk_2294[0], 0 + v0, 0, 0x120, 2 + v0, param2); + param0->unk_2248.unk_00[v0 + 2] = SpriteResourceCollection_AddFrom(param0->unk_2280[v0 + 2], param0->unk_2294[0], 0 + v0, 0, 0x120, 2 + v0, heapID); } - param0->unk_2248.unk_00[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_2280[0], param0->unk_2294[0], 2, 0, 0x120, param1, param2); + param0->unk_2248.unk_00[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_2280[0], param0->unk_2294[0], 2, 0, 0x120, param1, heapID); v1 = SpriteTransfer_RequestCharAtEndWithHardwareMappingType(param0->unk_2248.unk_00[0]); GF_ASSERT(v1); @@ -918,13 +918,13 @@ static BOOL ov63_0222B96C(const UnkStruct_ov63_0222B96C *param0) return 0; } -static void ov63_0222B97C(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2) +static void ov63_0222B97C(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 heapID) { BOOL v0; GF_ASSERT(param0->unk_2290 == NULL); - param0->unk_2290 = SpriteResourceCollection_AddPaletteFrom(param0->unk_2280[1], param0->unk_2294[1], 0, 0, 0x402, param1, 8, param2); + param0->unk_2290 = SpriteResourceCollection_AddPaletteFrom(param0->unk_2280[1], param0->unk_2294[1], 0, 0, 0x402, param1, 8, heapID); v0 = SpriteTransfer_RequestPlttFreeSpace(param0->unk_2290); GF_ASSERT(v0); @@ -946,15 +946,15 @@ static void ov63_0222B9EC(UnkStruct_ov63_0222AE60 *param0) param0->unk_2290 = NULL; } -static void ov63_0222BA20(UnkStruct_ov63_0222AE60 *param0, u32 param1) +static void ov63_0222BA20(UnkStruct_ov63_0222AE60 *param0, u32 heapID) { int v0; GF_ASSERT(param0->unk_2148[0].unk_00[0] == NULL); for (v0 = 0; v0 < 16; v0++) { - param0->unk_2148[v0].unk_00[0] = SpriteResourceCollection_AddFrom(param0->unk_2280[2], param0->unk_2294[1], (17 + ((v0) * 2)), 0, 0x180 + v0, 2, param1); - param0->unk_2148[v0].unk_00[1] = SpriteResourceCollection_AddFrom(param0->unk_2280[3], param0->unk_2294[1], ((17 + ((v0) * 2)) + 1), 0, 0x180 + v0, 3, param1); + param0->unk_2148[v0].unk_00[0] = SpriteResourceCollection_AddFrom(param0->unk_2280[2], param0->unk_2294[1], (17 + ((v0) * 2)), 0, 0x180 + v0, 2, heapID); + param0->unk_2148[v0].unk_00[1] = SpriteResourceCollection_AddFrom(param0->unk_2280[3], param0->unk_2294[1], ((17 + ((v0) * 2)) + 1), 0, 0x180 + v0, 3, heapID); } } diff --git a/src/overlay063/ov63_0222BCE8.c b/src/overlay063/ov63_0222BCE8.c index 4a8176ec16..e5d4758bf5 100644 --- a/src/overlay063/ov63_0222BCE8.c +++ b/src/overlay063/ov63_0222BCE8.c @@ -13,7 +13,7 @@ typedef struct UnkStruct_ov63_0222BCE8_t { UnkUnion_ov63_0222BDAC *unk_04; } UnkStruct_ov63_0222BCE8; -UnkStruct_ov63_0222BCE8 *ov63_0222BCE8(u16 param0, u16 param1, u32 heapID) +UnkStruct_ov63_0222BCE8 *ov63_0222BCE8(u16 param0, u16 param1, enum HeapID heapID) { UnkStruct_ov63_0222BCE8 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222BCE8)); GF_ASSERT(v0); diff --git a/src/overlay063/ov63_0222BE18.c b/src/overlay063/ov63_0222BE18.c index 620c1ab15a..6b887b380a 100644 --- a/src/overlay063/ov63_0222BE18.c +++ b/src/overlay063/ov63_0222BE18.c @@ -53,7 +53,7 @@ static void ov63_0222CA48(UnkStruct_ov63_0222BEC0 *param0); static UnkStruct_ov63_0222CC3C ov63_0222C9E4(UnkStruct_ov63_0222CC3C param0, int param1); static BOOL ov63_0222CA14(UnkStruct_ov63_0222BEC0 *param0); -UnkStruct_ov63_0222BE18 *ov63_0222BE18(u32 param0, u32 heapID) +UnkStruct_ov63_0222BE18 *ov63_0222BE18(u32 param0, enum HeapID heapID) { UnkStruct_ov63_0222BE18 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222BE18)); GF_ASSERT(v0); diff --git a/src/overlay063/ov63_0222CCE4.c b/src/overlay063/ov63_0222CCE4.c index f339ea1f3e..4d380feaca 100644 --- a/src/overlay063/ov63_0222CCE4.c +++ b/src/overlay063/ov63_0222CCE4.c @@ -73,10 +73,10 @@ void ov63_0222CD9C(UnkStruct_ov63_0222CD2C *param0) Heap_Free(param0); } -void ov63_0222CDE8(UnkStruct_ov63_0222CD2C *param0, u32 param1, int param2, u32 param3) +void ov63_0222CDE8(UnkStruct_ov63_0222CD2C *param0, u32 param1, int param2, u32 heapID) { if (ov63_0222AFE4(param0->unk_00, param1) == 0) { - ov63_0222AF94(param0->unk_00, param1, param0->unk_0B, param2, param3); + ov63_0222AF94(param0->unk_00, param1, param0->unk_0B, param2, heapID); } } @@ -95,12 +95,12 @@ void ov63_0222CE24(UnkStruct_ov63_0222CD2C *param0) ov63_0222AFF8(param0->unk_00); } -void ov63_0222CE30(UnkStruct_ov63_0222CD2C *param0, int param1, u32 param2) +void ov63_0222CE30(UnkStruct_ov63_0222CD2C *param0, int param1, u32 heapID) { - ov63_0222B02C(param0->unk_00, param0->unk_0B, param1, param2); + ov63_0222B02C(param0->unk_00, param0->unk_0B, param1, heapID); } -UnkStruct_ov63_0222CE44 *ov63_0222CE44(UnkStruct_ov63_0222CD2C *param0, const UnkStruct_ov63_0222BEC0 *param1, BOOL param2, u32 param3) +UnkStruct_ov63_0222CE44 *ov63_0222CE44(UnkStruct_ov63_0222CD2C *param0, const UnkStruct_ov63_0222BEC0 *param1, BOOL param2, u32 heapID) { UnkStruct_ov63_0222CE44 *v0; UnkStruct_ov64_022302EC v1; @@ -123,7 +123,7 @@ UnkStruct_ov63_0222CE44 *ov63_0222CE44(UnkStruct_ov63_0222CD2C *param0, const Un v1.unk_06 = param0->unk_0A; v2 = ov63_0222BF90(param1, 7); - v0->unk_04 = ov63_0222B0C0(param0->unk_00, &v1, v2, param3); + v0->unk_04 = ov63_0222B0C0(param0->unk_00, &v1, v2, heapID); ov63_0222CF14(v0); diff --git a/src/overlay063/ov63_0222D1C0.c b/src/overlay063/ov63_0222D1C0.c index 4d87c853c8..d24281f53c 100644 --- a/src/overlay063/ov63_0222D1C0.c +++ b/src/overlay063/ov63_0222D1C0.c @@ -31,7 +31,7 @@ static void ov63_0222D4F8(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 static u8 ov63_0222D688(u8 param0, u8 param1); static const void *ov63_0222D6BC(const u8 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, UnkStruct_ov63_0222CC3C *param6); -UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(G2dRenderer *param0, BgConfig *param1, const UnkStruct_ov65_0223582C *param2, u32 heapID) +UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(G2dRenderer *param0, BgConfig *param1, const UnkStruct_ov65_0223582C *param2, enum HeapID heapID) { UnkStruct_ov63_0222D1C0 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222D1C0)); memset(v0, 0, sizeof(UnkStruct_ov63_0222D1C0)); diff --git a/src/overlay063/ov63_0222D77C.c b/src/overlay063/ov63_0222D77C.c index 94a7b76046..fd247bdcc1 100644 --- a/src/overlay063/ov63_0222D77C.c +++ b/src/overlay063/ov63_0222D77C.c @@ -22,7 +22,7 @@ typedef struct UnkStruct_ov63_0222D848_t { u16 unk_0A; } UnkStruct_ov63_0222D848; -UnkStruct_ov63_0222D77C *ov63_0222D77C(u32 param0, u32 heapID) +UnkStruct_ov63_0222D77C *ov63_0222D77C(u32 param0, enum HeapID heapID) { UnkStruct_ov63_0222D77C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222D77C)); GF_ASSERT(v0); @@ -67,7 +67,7 @@ BOOL ov63_0222D810(UnkStruct_ov63_0222D77C *param0, UnkStruct_ov63_0222CCB8 *par return 1; } -UnkStruct_ov63_0222D848 *ov63_0222D848(u32 param0, u32 heapID) +UnkStruct_ov63_0222D848 *ov63_0222D848(u32 param0, enum HeapID heapID) { UnkStruct_ov63_0222D848 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222D848)); GF_ASSERT(v0); diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index d3fcf27f3b..149ff5df0d 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -236,9 +236,9 @@ typedef struct { } UnkStruct_ov64_0222DFD0; static void ov64_0222DF3C(void *param0); -static void ov64_0222DF48(UnkStruct_ov64_0222DFD0 *param0, u32 heapID); +static void ov64_0222DF48(UnkStruct_ov64_0222DFD0 *param0, enum HeapID heapID); static void ov64_0222DFD0(UnkStruct_ov64_0222DFD0 *param0); -static void ov64_0222E040(UnkStruct_ov64_0222E060 *param0, void *param1, u32 heapID); +static void ov64_0222E040(UnkStruct_ov64_0222E060 *param0, void *param1, enum HeapID heapID); static void ov64_0222E060(UnkStruct_ov64_0222E060 *param0); static void ov64_0222E074(UnkStruct_ov64_0222E060 *param0, u8 param1, u8 param2); static void ov64_0222E07C(UnkStruct_ov64_0222E060 *param0, const String *param1, const String *param2); @@ -246,65 +246,65 @@ static u32 ov64_0222E09C(UnkStruct_ov64_0222E060 *param0, String *param1, String static void ov64_0222E158(UnkStruct_ov64_0222E060 *param0, const u16 *param1); static void ov64_0222E160(UnkStruct_ov64_0222E060 *param0, u32 param1); static void ov64_0222E164(UnkStruct_ov64_0222E060 *param0); -static void ov64_0222E1A4(UnkStruct_ov64_0222E21C *param0, const UnkStruct_ov64_0222E060 *param1, u32 heapID); +static void ov64_0222E1A4(UnkStruct_ov64_0222E21C *param0, const UnkStruct_ov64_0222E060 *param1, enum HeapID heapID); static void ov64_0222E21C(UnkStruct_ov64_0222E21C *param0); static void ov64_0222E228(UnkStruct_ov64_0222E21C *param0); static void ov64_0222E23C(UnkStruct_ov64_0222E21C *param0); static void ov64_0222E270(void); -static void ov64_0222E290(UnkStruct_ov64_0222E21C *param0, u32 heapID); +static void ov64_0222E290(UnkStruct_ov64_0222E21C *param0, enum HeapID heapID); static void ov64_0222E3AC(UnkStruct_ov64_0222E21C *param0); -static void ov64_0222E3D8(UnkStruct_ov64_0222E21C *param0, u32 heapID); +static void ov64_0222E3D8(UnkStruct_ov64_0222E21C *param0, enum HeapID heapID); static void ov64_0222E570(UnkStruct_ov64_0222E21C *param0); -static void ov64_0222E5D8(UnkStruct_ov64_0222E21C *param0, u32 heapID); +static void ov64_0222E5D8(UnkStruct_ov64_0222E21C *param0, enum HeapID heapID); static void ov64_0222E604(UnkStruct_ov64_0222E21C *param0); -static void ov64_0222E620(UnkStruct_ov64_0222E21C *param0, const UnkStruct_ov64_0222E060 *param1, u32 heapID); +static void ov64_0222E620(UnkStruct_ov64_0222E21C *param0, const UnkStruct_ov64_0222E060 *param1, enum HeapID heapID); static void ov64_0222E6B4(UnkStruct_ov64_0222E21C *param0); -static void ov64_0222E6D8(UnkStruct_ov64_0222E21C *param0, u32 heapID); +static void ov64_0222E6D8(UnkStruct_ov64_0222E21C *param0, enum HeapID heapID); static void ov64_0222E71C(UnkStruct_ov64_0222E21C *param0); static void ov64_0222E738(UnkStruct_ov64_0222E21C *param0, u32 param1); static void ov64_0222E7C8(UnkStruct_ov64_0222E21C *param0); static void ov64_0222E7F8(UnkStruct_ov64_0222E21C *param0, u64 param1); static void ov64_0222E970(UnkStruct_ov64_0222E21C *param0, u32 param1); static void ov64_0222E990(UnkStruct_ov64_0222E21C *param0, u32 param1); -static void ov64_0222E9A4(UnkStruct_ov64_0222E21C *param0, u32 heapID); +static void ov64_0222E9A4(UnkStruct_ov64_0222E21C *param0, enum HeapID heapID); static void ov64_0222EA0C(UnkStruct_ov64_0222E21C *param0); static void ov64_0222EA28(UnkStruct_ov64_0222E21C *param0, BOOL param1); static void ov64_0222EA48(UnkStruct_ov64_0222E21C *param0, BOOL param1); -static void ov64_0222EA68(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); -static int ov64_0222EA70(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); +static void ov64_0222EA68(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); +static int ov64_0222EA70(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); static void ov64_0222EC8C(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); -static void ov64_0222EC94(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); +static void ov64_0222EC94(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); static void ov64_0222EE00(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); static void ov64_0222EE20(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); static BOOL ov64_0222EE84(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); static void ov64_0222EF08(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E21C *param1); static void ov64_0222EF4C(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1); static void ov64_0222EF64(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E21C *param1); -static void ov64_0222EFBC(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, u32 heapID); +static void ov64_0222EFBC(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, enum HeapID heapID); static BOOL ov64_0222F038(const UnkStruct_ov64_0222F038 *param0); static void ov64_0222F050(UnkStruct_ov64_0222F038 *param0); static BOOL ov64_0222F068(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1); -static void ov64_0222F09C(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); -static int ov64_0222F0C4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); +static void ov64_0222F09C(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); +static int ov64_0222F0C4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); static void ov64_0222F40C(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); -static void ov64_0222F414(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); +static void ov64_0222F414(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); static void ov64_0222F5F4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); -static void ov64_0222F668(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); +static void ov64_0222F668(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); static void ov64_0222F6E8(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); static u32 ov64_0222F798(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); -static void ov64_0222F8F8(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); -static BOOL ov64_0222F948(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); -static void ov64_0222FA70(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); -static u32 ov64_0222FB24(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); -static BOOL ov64_0222FBA4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); -static void ov64_0222FC1C(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); -static BOOL ov64_0222FC48(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); -static void ov64_0222FC80(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3, u32 param4, u32 param5, u32 heapID); +static void ov64_0222F8F8(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); +static BOOL ov64_0222F948(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); +static void ov64_0222FA70(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); +static u32 ov64_0222FB24(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); +static BOOL ov64_0222FBA4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); +static void ov64_0222FC1C(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); +static BOOL ov64_0222FC48(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); +static void ov64_0222FC80(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3, u32 param4, u32 param5, enum HeapID heapID); static void ov64_0222FCF0(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2); static void ov64_0222FD7C(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, u32 param3); static void ov64_0222FDD0(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, u32 param3); static void ov64_0222FE5C(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, int param2); -static void ov64_0222FE70(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, u32 heapID); +static void ov64_0222FE70(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, enum HeapID heapID); static BOOL ov64_0222FEFC(const UnkStruct_ov64_0222F0C4 *param0); static void ov64_0222FF18(UnkStruct_ov64_0222F0C4 *param0); static u32 ov64_0222FF38(const UnkStruct_ov64_0222F0C4 *param0); @@ -316,32 +316,32 @@ static void ov64_02230074(UnkStruct_ov64_02230074 *param0, UnkStruct_ov64_0222E2 static void ov64_022300D8(UnkStruct_ov64_02230074 *param0, UnkStruct_ov64_0222E21C *param1); static void ov64_022300E4(UnkStruct_ov64_02230074 *param0, UnkStruct_ov64_0222E21C *param1, const UnkStruct_ov64_022300E4 *param2); static void ov64_02230130(UnkStruct_ov64_02230074 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2); -static void ov64_022301B4(UnkStruct_ov64_02230074 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, UnkStruct_ov63_0222AE60 *param3, const UnkStruct_ov64_022300E4 *param4, const UnkStruct_ov64_022301B4 *param5, u32 param6, u32 heapID); +static void ov64_022301B4(UnkStruct_ov64_02230074 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, UnkStruct_ov63_0222AE60 *param3, const UnkStruct_ov64_022300E4 *param4, const UnkStruct_ov64_022301B4 *param5, u32 param6, enum HeapID heapID); static void ov64_02230240(UnkStruct_ov64_02230074 *param0, UnkStruct_ov64_0222E21C *param1, const UnkStruct_ov64_022300E4 *param2); static void ov64_022302CC(UnkStruct_ov64_02230074 *param0, UnkStruct_ov64_0222E21C *param1); -static void ov64_022302EC(UnkStruct_ov64_02230074 *param0, UnkStruct_ov63_0222AE60 *param1, UnkStruct_ov64_0222E21C *param2, const UnkStruct_ov64_022300E4 *param3, u32 param4, WiFiList *param5, u32 param6, u32 heapID); +static void ov64_022302EC(UnkStruct_ov64_02230074 *param0, UnkStruct_ov63_0222AE60 *param1, UnkStruct_ov64_0222E21C *param2, const UnkStruct_ov64_022300E4 *param3, u32 param4, WiFiList *param5, u32 param6, enum HeapID heapID); static void ov64_022303CC(UnkStruct_ov64_02230074 *param0, UnkStruct_ov64_0222E21C *param1, const UnkStruct_ov64_022300E4 *param2, u32 param3); -static void ov64_02230444(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3); -static int ov64_0223044C(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222DFD0 *param1, UnkStruct_ov64_0222E060 *param2, UnkStruct_ov64_0222E21C *param3, u32 param4); +static void ov64_02230444(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); +static int ov64_0223044C(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222DFD0 *param1, UnkStruct_ov64_0222E060 *param2, UnkStruct_ov64_0222E21C *param3, enum HeapID heapID); static void ov64_022305CC(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); -static void ov64_022305D4(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); +static void ov64_022305D4(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); static void ov64_022305D8(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); -static NamingScreenArgs *ov64_022305DC(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, u32 heapID); -static void ov64_02230620(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); +static NamingScreenArgs *ov64_022305DC(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, enum HeapID heapID); +static void ov64_02230620(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); static int ov64_02230628(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); static void ov64_02230678(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); -static void ov64_02230680(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); +static void ov64_02230680(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); static void ov64_02230804(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); static void ov64_0223081C(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); static void ov64_0223087C(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E21C *param1); -static void ov64_022308DC(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); -static int ov64_02230904(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); +static void ov64_022308DC(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); +static int ov64_02230904(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); static void ov64_02230A50(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); static void ov64_02230A58(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3); static BOOL ov64_02230A9C(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3); -static void ov64_02230B1C(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); +static void ov64_02230B1C(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); static void ov64_02230BA0(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); -static void ov64_02230BD8(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID); +static void ov64_02230BD8(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); static void ov64_02230C1C(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E21C *param1); static void ov64_02230C50(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3, u32 param4, u32 param5); static void ov64_02230C8C(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, u32 param3); @@ -349,27 +349,27 @@ static void ov64_02230D50(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E2 static void ov64_02230D98(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, u32 param3); static void ov64_02230DE4(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, u32 param3); static BOOL ov64_02230EA8(UnkStruct_ov64_0222E060 *param0, int param1); -static void ov64_02230F24(UnkStruct_ov64_02230F60 *param0, UnkStruct_ov64_0222E21C *param1, u32 heapID); +static void ov64_02230F24(UnkStruct_ov64_02230F60 *param0, UnkStruct_ov64_0222E21C *param1, enum HeapID heapID); static void ov64_02230F60(UnkStruct_ov64_02230F60 *param0); -static void ov64_02230F78(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E21C *param1, const UnkStruct_ov64_0223221C *param2, u32 param3, u32 heapID); +static void ov64_02230F78(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E21C *param1, const UnkStruct_ov64_0223221C *param2, u32 param3, enum HeapID heapID); static void ov64_02230F98(UnkStruct_ov64_02230F98 *param0); -static void ov64_02230F9C(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, u32 param3, const UnkStruct_ov64_0223222E *param4, u32 heapID); +static void ov64_02230F9C(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, u32 param3, const UnkStruct_ov64_0223222E *param4, enum HeapID heapID); static void ov64_02231058(UnkStruct_ov64_02230F98 *param0, u32 param1); static void ov64_02231080(UnkStruct_ov64_02230F98 *param0, u32 param1); static void ov64_022310A4(UnkStruct_ov64_02230F98 *param0, u32 param1); static void ov64_022310D4(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3, const UnkStruct_ov64_02230F60 *param4, u32 param5); static void ov64_02231144(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E21C *param1); -static void ov64_02231164(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3); -static void ov64_02231528(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3); -static void ov64_02231664(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3); -static void ov64_02231A00(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3); -static void ov64_02231BE0(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3); -static void ov64_02231D58(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3); -static void ov64_02231E94(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3); +static void ov64_02231164(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); +static void ov64_02231528(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); +static void ov64_02231664(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); +static void ov64_02231A00(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); +static void ov64_02231BE0(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); +static void ov64_02231D58(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); +static void ov64_02231E94(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID); static void ov64_02232038(UnkStruct_ov64_0222E21C *param0, const UnkStruct_ov64_0223221C *param1); static void ov64_022320B8(UnkStruct_ov64_02230F98 *param0, u32 param1, u32 param2, UnkStruct_ov64_0222E060 *param3, UnkStruct_ov64_0222E21C *param4, u32 entryID, u32 xOffset, u32 yOffset, TextColor color, String *string, String *fmtString, u32 param11); static void ov64_02232138(UnkStruct_ov64_02230904 *param0, s32 param1); -static BOOL ov64_0223217C(UnkStruct_ov64_0222E060 *param0, u32 heapID); +static BOOL ov64_0223217C(UnkStruct_ov64_0222E060 *param0, enum HeapID heapID); static const UnkStruct_ov64_0223221C Unk_ov64_0223221C[3] = { { 0x0, 0x0, 0x20, 0x18 }, @@ -692,7 +692,7 @@ static void ov64_0222DF3C(void *param0) ov64_0222E228(&v0->unk_04); } -static void ov64_0222DF48(UnkStruct_ov64_0222DFD0 *param0, u32 heapID) +static void ov64_0222DF48(UnkStruct_ov64_0222DFD0 *param0, enum HeapID heapID) { ov64_0222E1A4(¶m0->unk_04, ¶m0->unk_28C, heapID); @@ -719,7 +719,7 @@ static void ov64_0222DFD0(UnkStruct_ov64_0222DFD0 *param0) ov64_0222E23C(¶m0->unk_04); } -static void ov64_0222E040(UnkStruct_ov64_0222E060 *param0, void *param1, u32 heapID) +static void ov64_0222E040(UnkStruct_ov64_0222E060 *param0, void *param1, enum HeapID heapID) { param0->saveData = param1; param0->unk_2C.unk_00 = String_Init(128, heapID); @@ -831,7 +831,7 @@ static void ov64_0222E164(UnkStruct_ov64_0222E060 *param0) } } -static void ov64_0222E1A4(UnkStruct_ov64_0222E21C *param0, const UnkStruct_ov64_0222E060 *param1, u32 heapID) +static void ov64_0222E1A4(UnkStruct_ov64_0222E21C *param0, const UnkStruct_ov64_0222E060 *param1, enum HeapID heapID) { gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); @@ -893,7 +893,7 @@ static void ov64_0222E270(void) GXLayers_SetBanks(&v0); } -static void ov64_0222E290(UnkStruct_ov64_0222E21C *param0, u32 heapID) +static void ov64_0222E290(UnkStruct_ov64_0222E21C *param0, enum HeapID heapID) { int v0; @@ -939,7 +939,7 @@ static void ov64_0222E3AC(UnkStruct_ov64_0222E21C *param0) param0->unk_00 = NULL; } -static void ov64_0222E3D8(UnkStruct_ov64_0222E21C *param0, u32 heapID) +static void ov64_0222E3D8(UnkStruct_ov64_0222E21C *param0, enum HeapID heapID) { int v0; BOOL v1; @@ -1008,7 +1008,7 @@ static void ov64_0222E570(UnkStruct_ov64_0222E21C *param0) VramTransfer_Free(); } -static void ov64_0222E5D8(UnkStruct_ov64_0222E21C *param0, u32 heapID) +static void ov64_0222E5D8(UnkStruct_ov64_0222E21C *param0, enum HeapID heapID) { param0->unk_214 = StringTemplate_Default(heapID); param0->unk_218 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0675, heapID); @@ -1020,7 +1020,7 @@ static void ov64_0222E604(UnkStruct_ov64_0222E21C *param0) StringTemplate_Free(param0->unk_214); } -static void ov64_0222E620(UnkStruct_ov64_0222E21C *param0, const UnkStruct_ov64_0222E060 *param1, u32 heapID) +static void ov64_0222E620(UnkStruct_ov64_0222E21C *param0, const UnkStruct_ov64_0222E060 *param1, enum HeapID heapID) { int v0 = Options_Frame(SaveData_GetOptions(param1->saveData)); @@ -1041,7 +1041,7 @@ static void ov64_0222E6B4(UnkStruct_ov64_0222E21C *param0) Window_Remove(¶m0->unk_220); } -static void ov64_0222E6D8(UnkStruct_ov64_0222E21C *param0, u32 heapID) +static void ov64_0222E6D8(UnkStruct_ov64_0222E21C *param0, enum HeapID heapID) { static const u8 v0[2] = { 2, @@ -1101,7 +1101,7 @@ static void ov64_0222E7F8(UnkStruct_ov64_0222E21C *param0, u64 param1) StringTemplate_SetNumber(param0->unk_214, 3, v0, 4, 2, 1); } -static void ov64_0222E880(UnkStruct_ov64_0222E21C *param0, SaveData *saveData, u32 param2, u32 heapID) +static void ov64_0222E880(UnkStruct_ov64_0222E21C *param0, SaveData *saveData, u32 param2, enum HeapID heapID) { WiFiList *v0 = SaveData_GetWiFiList(saveData); TrainerInfo *v1 = TrainerInfo_New(heapID); @@ -1111,7 +1111,7 @@ static void ov64_0222E880(UnkStruct_ov64_0222E21C *param0, SaveData *saveData, u Heap_Free(v1); } -static void ov64_0222E8C0(UnkStruct_ov64_0222E21C *param0, SaveData *saveData, u32 param2, u32 heapID) +static void ov64_0222E8C0(UnkStruct_ov64_0222E21C *param0, SaveData *saveData, u32 param2, enum HeapID heapID) { TrainerInfo *v0 = TrainerInfo_New(heapID); WiFiList *v1 = SaveData_GetWiFiList(saveData); @@ -1154,7 +1154,7 @@ static void ov64_0222E990(UnkStruct_ov64_0222E21C *param0, u32 param1) StringTemplate_SetPlazaMinigameName(param0->unk_214, 0, param1); } -static void ov64_0222E9A4(UnkStruct_ov64_0222E21C *param0, u32 heapID) +static void ov64_0222E9A4(UnkStruct_ov64_0222E21C *param0, enum HeapID heapID) { static AffineSpriteListTemplate v0[2] = { { NULL, @@ -1216,12 +1216,12 @@ static void ov64_0222EA48(UnkStruct_ov64_0222E21C *param0, BOOL param1) } } -static void ov64_0222EA68(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_0222EA68(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { ov64_0222EC94(param0, param1, param2, heapID); } -static int ov64_0222EA70(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static int ov64_0222EA70(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { BOOL v0; @@ -1358,7 +1358,7 @@ static void ov64_0222EC8C(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E0 ov64_0222EE00(param0, param1, param2); } -static void ov64_0222EC94(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_0222EC94(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { static const u8 entryIDs[4] = { 0x1, @@ -1512,7 +1512,7 @@ static void ov64_0222EF64(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E2 Window_ClearAndScheduleCopyToVRAM(¶m0->unk_04); } -static void ov64_0222EFBC(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, u32 heapID) +static void ov64_0222EFBC(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, enum HeapID heapID) { String *v0 = String_Init(128, heapID); @@ -1562,13 +1562,13 @@ static BOOL ov64_0222F068(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E0 return 0; } -static void ov64_0222F09C(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_0222F09C(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { param0->unk_DC = Options_TextFrameDelay(SaveData_GetOptions(param1->saveData)); ov64_0222F414(param0, param1, param2, heapID); } -static int ov64_0222F0C4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static int ov64_0222F0C4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { u32 v0; WiFiList *v1; @@ -1765,7 +1765,7 @@ static void ov64_0222F40C(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E0 ov64_0222F5F4(param0, param1, param2); } -static void ov64_0222F414(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_0222F414(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { static const u16 Unk_ov64_022321BC[3] = { 0x1, @@ -1849,7 +1849,7 @@ static void ov64_0222F5F4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E0 } } -static void ov64_0222F668(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_0222F668(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { int v0; @@ -1993,7 +1993,7 @@ static u32 ov64_0222F798(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E06 return 0; } -static void ov64_0222F8F8(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_0222F8F8(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { u16 v0; @@ -2010,7 +2010,7 @@ static void ov64_0222F8F8(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E0 Sound_PlayEffect(SEQ_SE_DP_SELECT5); } -static BOOL ov64_0222F948(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static BOOL ov64_0222F948(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { u32 v0; s32 v1; @@ -2065,7 +2065,7 @@ static BOOL ov64_0222F948(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E0 return 0; } -static void ov64_0222FA70(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_0222FA70(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { ListMenuTemplate v0; WiFiList *v1; @@ -2094,7 +2094,7 @@ static void ov64_0222FA70(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E0 ov64_0222EA28(param2, 0); } -static u32 ov64_0222FB24(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static u32 ov64_0222FB24(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { u32 v0; u32 v1 = 6; @@ -2132,7 +2132,7 @@ static u32 ov64_0222FB24(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E06 return v1; } -static BOOL ov64_0222FBA4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static BOOL ov64_0222FBA4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { WiFiList *v0; DWCFriendData *v1; @@ -2155,7 +2155,7 @@ static BOOL ov64_0222FBA4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E0 return 0; } -static void ov64_0222FC1C(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_0222FC1C(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { u32 v0 = ov64_0222FF38(param0); @@ -2163,7 +2163,7 @@ static void ov64_0222FC1C(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E0 ov64_0222FE70(param0, param2, 52, heapID); } -static BOOL ov64_0222FC48(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static BOOL ov64_0222FC48(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { if (ov64_0222FEFC(param0) == 0) { return 0; @@ -2173,7 +2173,7 @@ static BOOL ov64_0222FC48(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E0 return 1; } -static void ov64_0222FC80(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3, u32 param4, u32 param5, u32 heapID) +static void ov64_0222FC80(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3, u32 param4, u32 param5, enum HeapID heapID) { if (0 == param5) { param0->unk_00 = param3; @@ -2226,7 +2226,7 @@ static void ov64_0222FE5C(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E0 param0->unk_AA = 0; } -static void ov64_0222FE70(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, u32 heapID) +static void ov64_0222FE70(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, enum HeapID heapID) { String *v0; @@ -2367,7 +2367,7 @@ static void ov64_02230130(UnkStruct_ov64_02230074 *param0, UnkStruct_ov64_0222E2 Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[0]); } -static void ov64_022301B4(UnkStruct_ov64_02230074 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, UnkStruct_ov63_0222AE60 *param3, const UnkStruct_ov64_022300E4 *param4, const UnkStruct_ov64_022301B4 *param5, u32 param6, u32 heapID) +static void ov64_022301B4(UnkStruct_ov64_02230074 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, UnkStruct_ov63_0222AE60 *param3, const UnkStruct_ov64_022300E4 *param4, const UnkStruct_ov64_022301B4 *param5, u32 param6, enum HeapID heapID) { int v0; int v1; @@ -2415,7 +2415,7 @@ static void ov64_022302CC(UnkStruct_ov64_02230074 *param0, UnkStruct_ov64_0222E2 } } -static void ov64_022302EC(UnkStruct_ov64_02230074 *param0, UnkStruct_ov63_0222AE60 *param1, UnkStruct_ov64_0222E21C *param2, const UnkStruct_ov64_022300E4 *param3, u32 param4, WiFiList *param5, u32 param6, u32 heapID) +static void ov64_022302EC(UnkStruct_ov64_02230074 *param0, UnkStruct_ov63_0222AE60 *param1, UnkStruct_ov64_0222E21C *param2, const UnkStruct_ov64_022300E4 *param3, u32 param4, WiFiList *param5, u32 param6, enum HeapID heapID) { int v0; int v1; @@ -2452,12 +2452,12 @@ static void ov64_022303CC(UnkStruct_ov64_02230074 *param0, UnkStruct_ov64_0222E2 Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[2]); } -static void ov64_02230444(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_02230444(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { ov64_022305D4(param0, param1, param2, heapID); } -static int ov64_0223044C(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222DFD0 *param1, UnkStruct_ov64_0222E060 *param2, UnkStruct_ov64_0222E21C *param3, u32 heapID) +static int ov64_0223044C(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222DFD0 *param1, UnkStruct_ov64_0222E060 *param2, UnkStruct_ov64_0222E21C *param3, enum HeapID heapID) { int v0[4]; @@ -2541,7 +2541,7 @@ static void ov64_022305CC(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E0 ov64_022305D8(param0, param1, param2); } -static void ov64_022305D4(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_022305D4(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { return; } @@ -2551,7 +2551,7 @@ static void ov64_022305D8(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E0 return; } -static NamingScreenArgs *ov64_022305DC(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, u32 heapID) +static NamingScreenArgs *ov64_022305DC(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, enum HeapID heapID) { NamingScreenArgs *v0; @@ -2572,7 +2572,7 @@ static NamingScreenArgs *ov64_022305DC(UnkStruct_ov64_02230444 *param0, UnkStruc return v0; } -static void ov64_02230620(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_02230620(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { ov64_02230680(param0, param1, param2, heapID); } @@ -2602,7 +2602,7 @@ static void ov64_02230678(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E0 ov64_02230804(param0, param1, param2); } -static void ov64_02230680(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_02230680(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { Window_Init(¶m0->unk_00); Window_Add(param2->unk_00, ¶m0->unk_00, BG_LAYER_MAIN_3, 5, 13, 23, 8, 7, 1); @@ -2670,14 +2670,14 @@ static void ov64_0223087C(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E2 Bg_ScheduleTilemapTransfer(param1->unk_00, Unk_ov64_02232258[3]); } -static void ov64_022308DC(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_022308DC(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { param0->unk_10 = SystemFlag_HandleFirstArrivalToZone(SaveData_GetVarsFlags(param1->saveData), HANDLE_FLAG_CHECK, FIRST_ARRIVAL_BATTLE_PARK); ov64_02230B1C(param0, param1, param2, heapID); } -static int ov64_02230904(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static int ov64_02230904(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { BOOL v0; @@ -2832,7 +2832,7 @@ static BOOL ov64_02230A9C(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E0 return 0; } -static void ov64_02230B1C(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_02230B1C(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { int v0, v1; static const u32 v2[3] = { @@ -2867,7 +2867,7 @@ static void ov64_02230BA0(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E0 ov64_02230F60(¶m0->unk_DC); } -static void ov64_02230BD8(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_02230BD8(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { ov64_0222E880(param2, param1->saveData, param1->unk_08.unk_04[param1->unk_07], heapID); ov64_0222E738(param2, 13); @@ -2985,7 +2985,7 @@ static BOOL ov64_02230EA8(UnkStruct_ov64_0222E060 *param0, int param1) return 0; } -static void ov64_02230F24(UnkStruct_ov64_02230F60 *param0, UnkStruct_ov64_0222E21C *param1, u32 heapID) +static void ov64_02230F24(UnkStruct_ov64_02230F60 *param0, UnkStruct_ov64_0222E21C *param1, enum HeapID heapID) { static const u8 v0[7] = { 4, @@ -3012,7 +3012,7 @@ static void ov64_02230F60(UnkStruct_ov64_02230F60 *param0) } } -static void ov64_02230F78(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E21C *param1, const UnkStruct_ov64_0223221C *param2, u32 param3, u32 heapID) +static void ov64_02230F78(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E21C *param1, const UnkStruct_ov64_0223221C *param2, u32 param3, enum HeapID heapID) { int v0; @@ -3030,7 +3030,7 @@ static void ov64_02230F98(UnkStruct_ov64_02230F98 *param0) return; } -static void ov64_02230F9C(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, u32 param3, const UnkStruct_ov64_0223222E *param4, u32 heapID) +static void ov64_02230F9C(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, u32 param3, const UnkStruct_ov64_0223222E *param4, enum HeapID heapID) { int v0; u16 v1; @@ -3078,7 +3078,7 @@ static void ov64_022310A4(UnkStruct_ov64_02230F98 *param0, u32 param1) static void ov64_022310D4(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3, const UnkStruct_ov64_02230F60 *param4, u32 param5) { - static void (*v0[7])(UnkStruct_ov64_02230F98 *, UnkStruct_ov64_0222E060 *, UnkStruct_ov64_0222E21C *, u32) = { + static void (*v0[7])(UnkStruct_ov64_02230F98 *, UnkStruct_ov64_0222E060 *, UnkStruct_ov64_0222E21C *, enum HeapID) = { ov64_02231164, ov64_02231E94, ov64_02231528, @@ -3107,7 +3107,7 @@ static void ov64_02231144(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E2 ov64_02232038(param1, ¶m0->unk_00); } -static void ov64_02231164(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_02231164(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { WiFiList *wifiList = SaveData_GetWiFiList(param1->saveData); @@ -3179,7 +3179,7 @@ static void ov64_02231164(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 String_Free(fmtString); } -static void ov64_02231528(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_02231528(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { BattleFrontier *frontier = SaveData_GetBattleFrontier(param1->saveData); @@ -3209,7 +3209,7 @@ static void ov64_02231528(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 String_Free(fmtString); } -static void ov64_02231664(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_02231664(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { BattleFrontier *frontier = SaveData_GetBattleFrontier(param1->saveData); @@ -3275,7 +3275,7 @@ static void ov64_02231664(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 String_Free(fmtString); } -static void ov64_02231A00(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_02231A00(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { BattleFrontier *frontier = SaveData_GetBattleFrontier(param1->saveData); @@ -3314,7 +3314,7 @@ static void ov64_02231A00(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 String_Free(fmtString); } -static void ov64_02231BE0(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_02231BE0(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { BattleFrontier *frontier = SaveData_GetBattleFrontier(param1->saveData); @@ -3350,7 +3350,7 @@ static void ov64_02231BE0(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 String_Free(fmtString); } -static void ov64_02231D58(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_02231D58(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { BattleFrontier *frontier = SaveData_GetBattleFrontier(param1->saveData); @@ -3382,7 +3382,7 @@ static void ov64_02231D58(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 String_Free(fmtString); } -static void ov64_02231E94(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID) +static void ov64_02231E94(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { BattleFrontier *unused = SaveData_GetBattleFrontier(param1->saveData); WiFiList *wifiList = SaveData_GetWiFiList(param1->saveData); @@ -3464,7 +3464,7 @@ static void ov64_02232138(UnkStruct_ov64_02230904 *param0, s32 param1) } } -static BOOL ov64_0223217C(UnkStruct_ov64_0222E060 *param0, u32 heapID) +static BOOL ov64_0223217C(UnkStruct_ov64_0222E060 *param0, enum HeapID heapID) { if (!Bag_GetItemQuantity(SaveData_GetBag(param0->saveData), ITEM_POFFIN_CASE, heapID)) { return 0; diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 0f8b14d90e..3a856f22d9 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -125,12 +125,12 @@ static void ov65_0222EAD0(Window *param0, UnkStruct_ov65_0222E99C *param1, u16 p static void ov65_0222EB1C(Window *param0, UnkStruct_ov65_0222E99C *param1, u16 param2, u16 param3, u32 param4); static int ov65_0222EBAC(u32 param0); static int ov65_0222EBB8(void); -static void ov65_02232F90(UnkStruct_ov65_0222EBE0 *param0, u32 heapID); -static void ov65_02232FB0(UnkStruct_ov65_0222EBE0 *param0, u32 param1, u32 heapID); +static void ov65_02232F90(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID); +static void ov65_02232FB0(UnkStruct_ov65_0222EBE0 *param0, u32 param1, enum HeapID heapID); static BOOL ov65_02232FCC(const UnkStruct_ov65_0222EBE0 *param0); -static void ov65_02232FE0(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID); +static void ov65_02232FE0(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, enum HeapID heapID); static void ov65_02233068(UnkStruct_ov65_0222EBE0 *param0); -static u32 ov65_022330C0(UnkStruct_ov65_0222EBE0 *param0, u32 heapID); +static u32 ov65_022330C0(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID); static void ov65_022331E0(UnkStruct_ov65_0222EBE0 *param0); static BOOL ov65_02233208(UnkStruct_ov65_0222EBE0 *param0, u32 param1); static u32 ov65_02233240(const UnkStruct_ov65_0222EBE0 *param0); @@ -139,23 +139,23 @@ static void ov65_0223327C(UnkStruct_ov65_0222EBE0 *param0, u32 param1); static void ov65_02233638(UnkStruct_ov65_0222EBE0 *param0, u32 param1, u32 param2); static void ov65_0223366C(UnkStruct_ov65_0222EBE0 *param0, u32 param1); static u32 ov65_0223368C(const UnkStruct_ov65_0222EBE0 *param0, u32 param1); -static void ov65_022336A4(UnkStruct_ov65_0222EBE0 *param0, u32 heapID); +static void ov65_022336A4(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID); static void ov65_022336C4(UnkStruct_ov65_0222EBE0 *param0); static void ov65_022332C4(u32 param0, enum TouchScreenButtonState param1, void *param2); static void ov65_02234A10(UnkStruct_ov65_0222EBE0 *param0); -static void ov65_022332FC(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID); +static void ov65_022332FC(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, enum HeapID heapID); static void ov65_02233570(UnkStruct_ov65_0222EBE0 *param0); static void ov65_022335F8(NNSG2dScreenData *param0, u8 param1); static void ov65_022336D4(UnkStruct_ov65_0222EBE0 *param0); static void ov65_0223370C(UnkStruct_ov65_0222EBE0 *param0); -static void ov65_02233874(UnkStruct_ov65_0222EBE0 *param0, u32 heapID); -static void ov65_02233940(UnkStruct_ov65_0222EBE0 *param0, u32 param1); -static void ov65_02233E20(UnkStruct_ov65_0222EBE0 *param0, u32 param1); -static void ov65_02233EF0(UnkStruct_ov65_0222EBE0 *param0, u32 param1); -static void ov65_0223416C(UnkStruct_ov65_0222EBE0 *param0, u32 param1); -static void ov65_022342A8(UnkStruct_ov65_0222EBE0 *param0, u32 heapID); -static void ov65_022343CC(UnkStruct_ov65_0222EBE0 *param0, u32 param1); -static void ov65_0223449C(UnkStruct_ov65_0222EBE0 *param0, u32 param1); +static void ov65_02233874(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID); +static void ov65_02233940(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID); +static void ov65_02233E20(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID); +static void ov65_02233EF0(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID); +static void ov65_0223416C(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID); +static void ov65_022342A8(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID); +static void ov65_022343CC(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID); +static void ov65_0223449C(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID); static void ov65_02234628(UnkStruct_ov65_0222EBE0 *param0); static void ov65_02234694(UnkStruct_ov65_0222EBE0 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5); static void ov65_022346C4(UnkStruct_ov65_0222EBE0 *param0, String *param1, u32 param2, u32 param3); @@ -164,7 +164,7 @@ static void ov65_02234788(UnkStruct_ov65_0222EBE0 *param0, u8 param1, u8 param2, static u32 ov65_0223484C(u32 param0, TextColor *param1); static void ov65_02234900(UnkStruct_ov65_0222EBE0 *param0, Window *param1, u32 param2, u32 param3, u32 param4); static void ov65_0223498C(UnkStruct_ov65_0222EBE0 *param0, Window *param1, u32 param2, u32 param3, u32 param4); -static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID); +static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, enum HeapID heapID); static void ov65_02234CFC(UnkStruct_ov65_0222EBE0 *param0); static void ov65_02234D6C(UnkStruct_ov65_0222EBE0 *param0); static void ov65_02234DA0(UnkStruct_ov65_0222EBE0 *param0); @@ -2474,7 +2474,7 @@ static int ov65_02230164(UnkStruct_ov65_0222EBE0 *param0) return v0; } -static void ov65_02230298(UnkStruct_ov65_0222EBE0 *param0, u32 heapID) +static void ov65_02230298(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID) { int v0; u32 v1; @@ -2487,7 +2487,7 @@ static void ov65_02230298(UnkStruct_ov65_0222EBE0 *param0, u32 heapID) } } -static void ov65_022302B0(UnkStruct_ov65_0222EBE0 *param0, u32 heapID) +static void ov65_022302B0(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID) { ov65_02230164(param0); ov65_02230298(param0, heapID); @@ -4828,14 +4828,14 @@ static void ov65_02232F50(UnkStruct_ov65_0222EBE0 *param0) } } -static void ov65_02232F90(UnkStruct_ov65_0222EBE0 *param0, u32 heapID) +static void ov65_02232F90(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID) { ov65_0223324C(param0); ov65_02235370(¶m0->unk_3EC); ov65_022336A4(param0, heapID); } -static void ov65_02232FB0(UnkStruct_ov65_0222EBE0 *param0, u32 param1, u32 heapID) +static void ov65_02232FB0(UnkStruct_ov65_0222EBE0 *param0, u32 param1, enum HeapID heapID) { if (ov65_02233240(param0) == param1) { ov65_02232F90(param0, heapID); @@ -4851,7 +4851,7 @@ static BOOL ov65_02232FCC(const UnkStruct_ov65_0222EBE0 *param0) return 1; } -static void ov65_02232FE0(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID) +static void ov65_02232FE0(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, enum HeapID heapID) { static const TouchScreenHitTable v0[8] = { { 0, 47, 0, 119 }, @@ -4902,7 +4902,7 @@ static void ov65_02233068(UnkStruct_ov65_0222EBE0 *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0); } -static u32 ov65_022330C0(UnkStruct_ov65_0222EBE0 *param0, u32 heapID) +static u32 ov65_022330C0(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID) { u32 v0, v1; u32 v2; @@ -5057,7 +5057,7 @@ static void ov65_022332C4(u32 param0, enum TouchScreenButtonState param1, void * } } -static void ov65_022332FC(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID) +static void ov65_022332FC(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, enum HeapID heapID) { int v0, v1; int v2, v3; @@ -5172,7 +5172,7 @@ static u32 ov65_0223368C(const UnkStruct_ov65_0222EBE0 *param0, u32 param1) return param0->unk_BE0.unk_50[param1 - 1]; } -static void ov65_022336A4(UnkStruct_ov65_0222EBE0 *param0, u32 heapID) +static void ov65_022336A4(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID) { if (param0->unk_BE0.unk_73 != 0) { ov65_02233874(param0, heapID); @@ -5266,9 +5266,9 @@ static void ov65_0223370C(UnkStruct_ov65_0222EBE0 *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0); } -static void ov65_02233874(UnkStruct_ov65_0222EBE0 *param0, u32 heapID) +static void ov65_02233874(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID) { - static void (*v0[7])(UnkStruct_ov65_0222EBE0 *, u32) = { + static void (*v0[7])(UnkStruct_ov65_0222EBE0 *, enum HeapID) = { ov65_02233940, ov65_0223449C, ov65_02233E20, @@ -5306,7 +5306,7 @@ static void ov65_02233874(UnkStruct_ov65_0222EBE0 *param0, u32 heapID) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 1); } -static void ov65_02233940(UnkStruct_ov65_0222EBE0 *param0, u32 param1) +static void ov65_02233940(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID) { int v0 = param0->unk_BE0.unk_71 - 1; TextColor color; @@ -5400,7 +5400,7 @@ static void ov65_02233940(UnkStruct_ov65_0222EBE0 *param0, u32 param1) ov65_0222E9C0(param0->unk_15C, ¶m0->unk_BD0, 6, 28, 2, v5, 0); } -static void ov65_02233E20(UnkStruct_ov65_0222EBE0 *param0, u32 param1) +static void ov65_02233E20(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID) { int v0 = param0->unk_BE0.unk_71 - 1; @@ -5422,7 +5422,7 @@ static void ov65_02233E20(UnkStruct_ov65_0222EBE0 *param0, u32 param1) } } -static void ov65_02233EF0(UnkStruct_ov65_0222EBE0 *param0, u32 param1) +static void ov65_02233EF0(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID) { int v0 = param0->unk_BE0.unk_71 - 1; @@ -5468,7 +5468,7 @@ static void ov65_02233EF0(UnkStruct_ov65_0222EBE0 *param0, u32 param1) ov65_02234694(param0, 66, 120, v0, 212, 128); } -static void ov65_0223416C(UnkStruct_ov65_0222EBE0 *param0, u32 param1) +static void ov65_0223416C(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID) { int v0 = param0->unk_BE0.unk_71 - 1; @@ -5499,7 +5499,7 @@ static void ov65_0223416C(UnkStruct_ov65_0222EBE0 *param0, u32 param1) } } -static void ov65_022342A8(UnkStruct_ov65_0222EBE0 *param0, u32 heapID) +static void ov65_022342A8(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID) { int v0; int v1; @@ -5537,7 +5537,7 @@ static void ov65_022342A8(UnkStruct_ov65_0222EBE0 *param0, u32 heapID) } } -static void ov65_022343CC(UnkStruct_ov65_0222EBE0 *param0, u32 param1) +static void ov65_022343CC(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID) { int v0 = param0->unk_BE0.unk_71 - 1; @@ -5559,7 +5559,7 @@ static void ov65_022343CC(UnkStruct_ov65_0222EBE0 *param0, u32 param1) } } -static void ov65_0223449C(UnkStruct_ov65_0222EBE0 *param0, u32 param1) +static void ov65_0223449C(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID) { int v0; WiFiList *v1 = SaveData_GetWiFiList(param0->saveData); @@ -5847,7 +5847,7 @@ static void ov65_02234A10(UnkStruct_ov65_0222EBE0 *param0) } } -static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID) +static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, enum HeapID heapID) { BOOL v0; int v1; diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c index 0100f7aefb..09c9a05b4a 100644 --- a/src/overlay065/ov65_02235060.c +++ b/src/overlay065/ov65_02235060.c @@ -55,11 +55,11 @@ static void ov65_022356E8(UnkStruct_ov65_02235130 *param0); static void ov65_0223573C(UnkStruct_ov65_02235130 *param0); static void ov65_02235778(UnkStruct_ov65_02235130 *param0); static const UnkStruct_ov65_022354D8 *ov65_022357A8(const UnkStruct_ov65_02235130 *param0, const UnkStruct_ov65_022354D8 *param1, int param2); -static void ov65_022357E8(UnkStruct_ov65_02235130 *param0, u32 param1, u32 heapID); +static void ov65_022357E8(UnkStruct_ov65_02235130 *param0, u32 param1, enum HeapID heapID); static void ov65_0223581C(UnkStruct_ov65_02235130 *param0); -static void ov65_0223582C(UnkStruct_ov65_02235130 *param0, u32 heapID, NARC *param2, u32 param3); +static void ov65_0223582C(UnkStruct_ov65_02235130 *param0, enum HeapID heapID, NARC *param2, u32 param3); static void ov65_0223586C(UnkStruct_ov65_02235130 *param0); -static void ov65_0223587C(UnkStruct_ov65_022358CC *param0, u32 heapID, NARC *param2); +static void ov65_0223587C(UnkStruct_ov65_022358CC *param0, enum HeapID heapID, NARC *param2); static void ov65_022358CC(UnkStruct_ov65_022358CC *param0); static void ov65_022358F8(UnkStruct_ov65_022358CC *param0, u32 param1, NARC *param2); static void ov65_02235900(UnkStruct_ov65_022358CC *param0); @@ -127,7 +127,7 @@ static const u16 Unk_ov65_02238BC8[2] = { 0x2 }; -void ov65_02235060(UnkStruct_ov65_02235130 *param0, u32 heapID, NARC *param2, BgConfig *param3, u32 param4, u32 param5) +void ov65_02235060(UnkStruct_ov65_02235130 *param0, enum HeapID heapID, NARC *param2, BgConfig *param3, u32 param4, u32 param5) { UnkStruct_ov63_0222CC3C v0; u32 v1; @@ -529,7 +529,7 @@ static const UnkStruct_ov65_022354D8 *ov65_022357A8(const UnkStruct_ov65_0223513 return NULL; } -static void ov65_022357E8(UnkStruct_ov65_02235130 *param0, u32 param1, u32 heapID) +static void ov65_022357E8(UnkStruct_ov65_02235130 *param0, u32 param1, enum HeapID heapID) { int v0; @@ -543,7 +543,7 @@ static void ov65_0223581C(UnkStruct_ov65_02235130 *param0) ov63_0222CD9C(param0->unk_750); } -static void ov65_0223582C(UnkStruct_ov65_02235130 *param0, u32 heapID, NARC *param2, u32 param3) +static void ov65_0223582C(UnkStruct_ov65_02235130 *param0, enum HeapID heapID, NARC *param2, u32 param3) { UnkStruct_ov65_0223582C v0 = { 0, @@ -568,7 +568,7 @@ static void ov65_0223586C(UnkStruct_ov65_02235130 *param0) ov63_0222D214(param0->unk_758); } -static void ov65_0223587C(UnkStruct_ov65_022358CC *param0, u32 heapID, NARC *param2) +static void ov65_0223587C(UnkStruct_ov65_022358CC *param0, enum HeapID heapID, NARC *param2) { int i; diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index c8925f9652..5117be6369 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -131,31 +131,29 @@ typedef struct UnkStruct_ov65_02236744_t { static void ov65_02236780(void *param0); static BOOL ov65_02236794(const UnkStruct_ov65_02236794 *param0); static void ov65_022367A8(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 heapID); -static void ov65_022367F8(UnkStruct_ov65_022367A8 *param0, u32 param1); +static void ov65_022367F8(UnkStruct_ov65_022367A8 *param0, u32 heapID); static void ov65_02236820(void); -static void ov65_02236840(UnkStruct_ov65_02236840 *param0, u32 param1); +static void ov65_02236840(UnkStruct_ov65_02236840 *param0, u32 heapID); static void ov65_022369F0(UnkStruct_ov65_02236840 *param0); -static void ov65_02236A28(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2); -static void ov65_02236B90(UnkStruct_ov65_02236840 *param0, u32 param1); +static void ov65_02236A28(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 heapID); +static void ov65_02236B90(UnkStruct_ov65_02236840 *param0, u32 heapID); static void ov65_02236C10(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 heapID); static void ov65_02236C5C(UnkStruct_ov65_02236840 *param0); -static void ov65_02236C7C(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2); +static void ov65_02236C7C(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 heapID); static void ov65_02236D50(UnkStruct_ov65_02236840 *param0, u32 heapID); static void ov65_02236E04(UnkStruct_ov65_02236840 *param0); -static void ov65_02236E44(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2, u32 param3); -static void ov65_02236E50(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2, u8 param3, u32 param4); +static void ov65_02236E50(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2, u8 param3, u32 heapID); static BOOL ov65_02236EF8(UnkStruct_ov65_02236840 *param0); static void ov65_02236F38(UnkStruct_ov65_02236840 *param0); -static void ov65_02236F70(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, u32 param3); +static void ov65_02236F70(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, u32 heapID); static void ov65_02237018(UnkStruct_ov65_02236840 *param0); -static void ov65_02237034(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 param2); -static void ov65_0223709C(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02236840 *param1, const UnkStruct_0207DE04 *param2, int param3, u32 param4); -static void ov65_022371FC(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, u32 param3); -static void ov65_0223726C(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, int param3, u32 param4); -static void ov65_02237284(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, int param3, u32 param4); +static void ov65_02237034(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 heapID); +static void ov65_0223709C(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02236840 *param1, const UnkStruct_0207DE04 *param2, int param3, u32 heapID); +static void ov65_022371FC(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, u32 heapID); +static void ov65_0223726C(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, int param3, u32 heapID); +static void ov65_02237284(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, int param3, u32 heapID); static void ov65_022372B0(UnkStruct_ov65_02236840 *param0); static void ov65_022372EC(UnkStruct_ov65_02236840 *param0, u32 param1); -static BOOL ov65_0223731C(UnkStruct_ov65_022367A8 *param0, u32 param1); static void ov65_02237370(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); static void ov65_0223742C(UnkStruct_ov65_022367A8 *param0); static BOOL ov65_02237450(const UnkStruct_ov65_022367A8 *param0); @@ -166,7 +164,6 @@ static BOOL ov65_02237504(UnkStruct_ov65_022367A8 *param0); static void ov65_02237520(UnkStruct_ov65_022367A8 *param0); static void ov65_02237534(UnkStruct_ov65_022367A8 *param0); static int ov65_02237548(UnkStruct_ov65_022367A8 *param0); -static BOOL ov65_02237550(UnkStruct_ov65_022367A8 *param0, u32 param1); static void ov65_0223758C(UnkStruct_ov65_022367A8 *param0); static void ov65_022375CC(UnkStruct_ov65_022367A8 *param0); static void ov65_0223760C(UnkStruct_ov65_022367A8 *param0); @@ -175,15 +172,14 @@ static BOOL ov65_02237628(UnkStruct_ov65_022367A8 *param0); static void ov65_02237654(u16 param0, void *param1); static BOOL ov65_02237660(UnkStruct_ov65_022367A8 *param0); static void ov65_02237698(UnkStruct_ov65_022367A8 *param0); -static void ov65_022376A0(UnkStruct_ov65_022367A8 *param0, u32 param1, u32 param2); -static void ov65_022376D0(UnkStruct_ov65_022367A8 *param0, u32 param1, u32 param2); +static void ov65_022376A0(UnkStruct_ov65_022367A8 *param0, u32 param1, u32 heapID); +static void ov65_022376D0(UnkStruct_ov65_022367A8 *param0, u32 param1, u32 heapID); static void ov65_022377A4(UnkStruct_ov65_022367A8 *param0); static void ov65_022377E8(UnkStruct_ov65_022367A8 *param0); static void ov65_02237808(UnkStruct_ov65_022367A8 *param0, u32 param1); static void ov65_0223782C(UnkStruct_ov65_022367A8 *param0); -static void ov65_02237860(UnkStruct_ov65_022367A8 *param0, u32 param1); +static void ov65_02237860(UnkStruct_ov65_022367A8 *param0, u32 heapID); static void ov65_0223789C(UnkStruct_ov65_022367A8 *param0); -static void ov65_022378C4(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 param2); static void ov65_02237908(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02237908 *param1); static void ov65_0223790C(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02237908 *param1); static void ov65_02237940(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02237908 *param1); @@ -193,69 +189,69 @@ static BOOL ov65_02237A10(UnkStruct_ov65_022367A8 *param0); static void ov65_02237A24(UnkStruct_0207DE04 *param0, u32 heapID); static void ov65_02237A44(UnkStruct_ov65_022367A8 *param0); static BOOL ov65_02237A54(UnkStruct_ov65_022367A8 *param0); -static BOOL ov65_02237A70(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237AA8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237AC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237B9C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237BC4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237BF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237C98(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237CB0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237CCC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237CE4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237D18(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237D60(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237D98(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237DD0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237DF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237E24(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237E54(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237EA4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237EC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237EF0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237F08(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237F48(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237FA0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237FB8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02237FF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02238050(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_0223806C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_022380AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_022380E8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02238104(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02238134(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_0223815C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02238190(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_022381CC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_022381E4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02238210(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02238250(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_022382B0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_022382F0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02238314(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02238350(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02238370(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_022383AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_022383D0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_0223846C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_022384BC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_0223850C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02238528(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02238558(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02238594(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_022385AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_022385D4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02238608(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02238660(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_022386D0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02238728(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_0223875C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_0223878C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_022387AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237A70(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237AA8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237AC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237B9C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237BC4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237BF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237C98(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237CB0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237CCC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237CE4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237D18(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237D60(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237D98(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237DD0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237DF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237E24(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237E54(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237EA4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237EC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237EF0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237F08(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237F48(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237FA0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237FB8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02237FF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02238050(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_0223806C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_022380AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_022380E8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02238104(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02238134(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_0223815C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02238190(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_022381CC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_022381E4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02238210(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02238250(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_022382B0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_022382F0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02238314(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02238350(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02238370(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_022383AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_022383D0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_0223846C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_022384BC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_0223850C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02238528(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02238558(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02238594(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_022385AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_022385D4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02238608(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02238660(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_022386D0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02238728(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_0223875C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_0223878C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_022387AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); static BOOL ov65_022387E8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); static BOOL ov65_02238838(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); -static BOOL ov65_022388FC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); -static BOOL ov65_02238910(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_022388FC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); +static BOOL ov65_02238910(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID); static const u8 Unk_ov65_02239A20[4] = { 0x8, @@ -453,17 +449,17 @@ int ov65_02236548(ApplicationManager *appMan, int *param1) ov65_0223782C(v0); } - v2 = Unk_ov65_02239B80[v0->unk_00.unk_05](v0, v1, 96); + v2 = Unk_ov65_02239B80[v0->unk_00.unk_05](v0, v1, HEAP_ID_96); } else { - v2 = Unk_ov65_02239B08[v0->unk_00.unk_05](v0, v1, 96); + v2 = Unk_ov65_02239B08[v0->unk_00.unk_05](v0, v1, HEAP_ID_96); if (CommInfo_IsInitialized() == 1) { - ov65_02237860(v0, 96); + ov65_02237860(v0, HEAP_ID_96); } } if (ov65_02237660(v0)) { - ov65_02237034(v0, v1, 96); + ov65_02237034(v0, v1, HEAP_ID_96); } ov65_022377A4(v0); @@ -502,7 +498,7 @@ int ov65_0223668C(ApplicationManager *appMan, int *param1) ov65_0223761C(v0); ov65_022377E8(v0); ov65_02237504(v0); - ov65_022367F8(v0, 96); + ov65_022367F8(v0, HEAP_ID_96); VramTransfer_Free(); ApplicationManager_FreeData(appMan); @@ -590,11 +586,11 @@ static void ov65_022367A8(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207D ov65_02236D50(¶m0->unk_30, heapID); } -static void ov65_022367F8(UnkStruct_ov65_022367A8 *param0, u32 param1) +static void ov65_022367F8(UnkStruct_ov65_022367A8 *param0, u32 heapID) { ov65_02236E04(¶m0->unk_30); ov65_02236C5C(¶m0->unk_30); - ov65_02236B90(¶m0->unk_30, param1); + ov65_02236B90(¶m0->unk_30, heapID); ov65_022369F0(¶m0->unk_30); } @@ -735,17 +731,17 @@ static void ov65_022369F0(UnkStruct_ov65_02236840 *param0) Heap_Free(param0->unk_00); } -static void ov65_02236A28(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2) +static void ov65_02236A28(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 heapID) { int v0; - Font_LoadScreenIndicatorsPalette(0, 1 * 0x20, param2); + Font_LoadScreenIndicatorsPalette(0, 1 * 0x20, heapID); v0 = Options_Frame(SaveData_GetOptions(param1->saveData)); - LoadMessageBoxGraphics(param0->unk_00, BG_LAYER_MAIN_1, 1, 2, v0, param2); - LoadStandardWindowGraphics(param0->unk_00, BG_LAYER_MAIN_1, 1 + (18 + 12), 3, 0, param2); - LoadStandardWindowGraphics(param0->unk_00, BG_LAYER_MAIN_2, 0 + (24 * 2), 4, 0, param2); + LoadMessageBoxGraphics(param0->unk_00, BG_LAYER_MAIN_1, 1, 2, v0, heapID); + LoadStandardWindowGraphics(param0->unk_00, BG_LAYER_MAIN_1, 1 + (18 + 12), 3, 0, heapID); + LoadStandardWindowGraphics(param0->unk_00, BG_LAYER_MAIN_2, 0 + (24 * 2), 4, 0, heapID); Window_Add(param0->unk_00, ¶m0->unk_1F0, 1, 2, 19, 27, 4, 1, (1 + (18 + 12)) + 9); Window_FillTilemap(¶m0->unk_1F0, 15); Window_DrawMessageBoxWithScrollCursor(¶m0->unk_1F0, 1, 1, 2); @@ -761,7 +757,7 @@ static void ov65_02236A28(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207D Window_FillTilemap(¶m0->unk_230, 15); } -static void ov65_02236B90(UnkStruct_ov65_02236840 *param0, u32 param1) +static void ov65_02236B90(UnkStruct_ov65_02236840 *param0, u32 heapID) { ov65_02236F38(param0); @@ -776,7 +772,7 @@ static void ov65_02236B90(UnkStruct_ov65_02236840 *param0, u32 param1) Window_Remove(¶m0->unk_230); if (param0->unk_240 != NULL) { - Menu_DestroyForExit(param0->unk_240, param1); + Menu_DestroyForExit(param0->unk_240, heapID); } } @@ -798,7 +794,7 @@ static void ov65_02236C5C(UnkStruct_ov65_02236840 *param0) StringTemplate_Free(param0->unk_04); } -static void ov65_02236C7C(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2) +static void ov65_02236C7C(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 heapID) { switch (param1->unk_00) { case 0: @@ -875,9 +871,9 @@ static void ov65_02236E04(UnkStruct_ov65_02236840 *param0) RenderOam_Free(); } -static void ov65_02236E44(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2, u32 param3) +static void ov65_02236E44(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2, u32 heapID) { - ov65_02236E50(param0, param1, param2, 0, param3); + ov65_02236E50(param0, param1, param2, 0, heapID); } static void ov65_02236E50(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2, u8 param3, u32 heapID) @@ -974,7 +970,7 @@ static void ov65_02237018(UnkStruct_ov65_02236840 *param0) Window_ClearAndScheduleCopyToVRAM(¶m0->unk_230); } -static void ov65_02237034(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 param2) +static void ov65_02237034(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 heapID) { int v0; int v1 = 4; @@ -985,12 +981,12 @@ static void ov65_02237034(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207D for (v0 = 0; v0 < v1; v0++) { if ((v0 == 0) && (sub_02032DE0(v0) == 1)) { - ov65_0223709C(param0, ¶m0->unk_30, param1, v0, param2); + ov65_0223709C(param0, ¶m0->unk_30, param1, v0, heapID); } else { if (sub_02032E00(v0) == 1) { - ov65_0223709C(param0, ¶m0->unk_30, param1, v0, param2); + ov65_0223709C(param0, ¶m0->unk_30, param1, v0, heapID); } else { - ov65_022371FC(¶m0->unk_30, param1, v0, param2); + ov65_022371FC(¶m0->unk_30, param1, v0, heapID); } } } @@ -1043,7 +1039,7 @@ static void ov65_0223709C(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_022368 String_Free(v1); } -static void ov65_022371FC(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, u32 param3) +static void ov65_022371FC(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, u32 heapID) { Window_FillRectWithColor(¶m0->unk_220, 15, 0, param2 * (2 * 8), 20 * 8, 2 * 8); Bg_CopyToTilemapRect(param0->unk_00, 2, 18, 5 + param2 * 2, 2, 2, param0->unk_248->rawData, 0 * 2, 0, param0->unk_248->screenWidth / 8, param0->unk_248->screenHeight / 8); @@ -1051,13 +1047,13 @@ static void ov65_022371FC(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207D Window_ScheduleCopyToVRAM(¶m0->unk_220); } -static void ov65_0223726C(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, int param3, u32 param4) +static void ov65_0223726C(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, int param3, u32 heapID) { TrainerInfo *v0 = CommInfo_TrainerInfo(param2); StringTemplate_SetPlayerName(param0->unk_04, param3, v0); } -static void ov65_02237284(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, int param3, u32 param4) +static void ov65_02237284(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, int param3, u32 heapID) { TrainerInfo *v0; u16 v1; @@ -1090,7 +1086,7 @@ static void ov65_022372EC(UnkStruct_ov65_02236840 *param0, u32 param1) GF_ASSERT(v0); } -static BOOL ov65_0223731C(UnkStruct_ov65_022367A8 *param0, u32 param1) +static BOOL ov65_0223731C(UnkStruct_ov65_022367A8 *param0, u32 heapID) { param0->unk_00.unk_00->unk_00.unk_22 = 1 - param0->unk_00.unk_00->unk_00.unk_22; param0->unk_00.unk_00->unk_00.unk_21 = param0->unk_00.unk_00->unk_00.unk_22; @@ -1253,7 +1249,7 @@ static int ov65_02237548(UnkStruct_ov65_022367A8 *param0) } } -static BOOL ov65_02237550(UnkStruct_ov65_022367A8 *param0, u32 param1) +static BOOL ov65_02237550(UnkStruct_ov65_022367A8 *param0, u32 heapID) { int v0; int v1; @@ -1264,7 +1260,7 @@ static BOOL ov65_02237550(UnkStruct_ov65_022367A8 *param0, u32 param1) for (v0 = v1; v0 >= 0; v0--) { if (sub_02032DC4(v0) == 1) { - ov65_022376A0(param0, v0, param1); + ov65_022376A0(param0, v0, heapID); } else if (sub_02032E00(v0) == 0) { v2 = 0; } @@ -1372,19 +1368,19 @@ static void ov65_02237698(UnkStruct_ov65_022367A8 *param0) param0->unk_00.unk_24 = 1; } -static void ov65_022376A0(UnkStruct_ov65_022367A8 *param0, u32 param1, u32 param2) +static void ov65_022376A0(UnkStruct_ov65_022367A8 *param0, u32 param1, u32 heapID) { if (sub_02032E00(param1) == 0) { sub_02032E1C(param1); param0->unk_00.unk_25 = param1; - ov65_022376D0(param0, param1, param2); + ov65_022376D0(param0, param1, heapID); ov65_02237698(param0); } } -static void ov65_022376D0(UnkStruct_ov65_022367A8 *param0, u32 param1, u32 param2) +static void ov65_022376D0(UnkStruct_ov65_022367A8 *param0, u32 param1, u32 heapID) { UnkStruct_ov65_022376D0 v0; TrainerInfo *v1; @@ -1410,10 +1406,10 @@ static void ov65_022376D0(UnkStruct_ov65_022367A8 *param0, u32 param1, u32 param param0->unk_30.unk_1C0[param1].unk_00 = ov63_0222BEC0(param0->unk_30.unk_1B8, &v0); if (ov63_0222CE18(param0->unk_30.unk_1BC, v0.unk_0A) == 0) { - ov63_0222CDE8(param0->unk_30.unk_1BC, v0.unk_0A, 2, param2); + ov63_0222CDE8(param0->unk_30.unk_1BC, v0.unk_0A, 2, heapID); } - param0->unk_30.unk_1C0[param1].unk_04 = ov63_0222CE44(param0->unk_30.unk_1BC, param0->unk_30.unk_1C0[param1].unk_00, 0, param2); + param0->unk_30.unk_1C0[param1].unk_04 = ov63_0222CE44(param0->unk_30.unk_1BC, param0->unk_30.unk_1C0[param1].unk_00, 0, heapID); ov63_0222D008(param0->unk_30.unk_1C0[param1].unk_04, 0); param0->unk_30.unk_1C0[param1].unk_08++; } @@ -1462,14 +1458,14 @@ static void ov65_0223782C(UnkStruct_ov65_022367A8 *param0) } } -static void ov65_02237860(UnkStruct_ov65_022367A8 *param0, u32 param1) +static void ov65_02237860(UnkStruct_ov65_022367A8 *param0, u32 heapID) { int v0; for (v0 = 0; v0 < 4; v0++) { if (param0->unk_00.unk_28[v0] == 1) { if (sub_02032DE0(v0) == 1) { - ov65_022376A0(param0, v0, param1); + ov65_022376A0(param0, v0, heapID); param0->unk_00.unk_28[v0] = 0; param0->unk_00.unk_12 = 1; } @@ -1483,7 +1479,7 @@ static void ov65_0223789C(UnkStruct_ov65_022367A8 *param0) param0->unk_30.unk_24C = Window_AddWaitDial(¶m0->unk_30.unk_1F0, 1); } -static void ov65_022378C4(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 param2) +static void ov65_022378C4(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 heapID) { int v0; @@ -1496,7 +1492,7 @@ static void ov65_022378C4(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207D param0->unk_30.unk_24C = NULL; v0 = Options_Frame(SaveData_GetOptions(param1->saveData)); - LoadMessageBoxGraphics(param0->unk_30.unk_00, 1, 1, 2, v0, param2); + LoadMessageBoxGraphics(param0->unk_30.unk_00, 1, 1, 2, v0, heapID); } static void ov65_02237908(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02237908 *param1) @@ -1621,7 +1617,7 @@ static BOOL ov65_02237A54(UnkStruct_ov65_022367A8 *param0) return 1; } -static BOOL ov65_02237A70(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237A70(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { if (param0->unk_00.unk_00->unk_00.unk_21 == 1) { ov65_02237520(param0); @@ -1629,22 +1625,22 @@ static BOOL ov65_02237A70(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p ov4_021D26EC(0); CommMan_SetErrorHandling(0, 1); - ov65_022376D0(param0, CommSys_CurNetId(), param2); + ov65_022376D0(param0, CommSys_CurNetId(), heapID); param0->unk_00.unk_05 = 1; return 0; } -static BOOL ov65_02237AA8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237AA8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - ov65_02236E44(¶m0->unk_30, param1, 107, param2); + ov65_02236E44(¶m0->unk_30, param1, 107, heapID); param0->unk_00.unk_05 = 2; return 0; } -static BOOL ov65_02237AC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237AC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0 = ov65_02236EF8(¶m0->unk_30); @@ -1716,17 +1712,17 @@ static BOOL ov65_02237AC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02237B9C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237B9C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - ov65_02236F70(¶m0->unk_30, param1, param0->unk_00.unk_06, param2); - ov65_02236E44(¶m0->unk_30, param1, 108, param2); + ov65_02236F70(¶m0->unk_30, param1, param0->unk_00.unk_06, heapID); + ov65_02236E44(¶m0->unk_30, param1, 108, heapID); param0->unk_00.unk_05 = 4; return 0; } -static BOOL ov65_02237BC4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237BC4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0 = ov65_02236EF8(¶m0->unk_30); @@ -1734,19 +1730,19 @@ static BOOL ov65_02237BC4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } - param0->unk_30.unk_240 = Menu_MakeYesNoChoice(param0->unk_30.unk_00, &Unk_ov65_02239A24, 0 + (24 * 2), 4, param2); + param0->unk_30.unk_240 = Menu_MakeYesNoChoice(param0->unk_30.unk_00, &Unk_ov65_02239A24, 0 + (24 * 2), 4, heapID); param0->unk_00.unk_05 = 5; return 0; } -static BOOL ov65_02237BF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237BF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { int v0; UnkStruct_ov65_022366E4 v1; BOOL v2; - v0 = Menu_ProcessInputAndHandleExit(param0->unk_30.unk_240, param2); + v0 = Menu_ProcessInputAndHandleExit(param0->unk_30.unk_240, heapID); if (v0 != 0xffffffff) { v1.unk_00 = param0->unk_00.unk_06; @@ -1754,7 +1750,7 @@ static BOOL ov65_02237BF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p if (v0 == 0) { v1.unk_04 = 1; - ov65_022376A0(param0, param0->unk_00.unk_06, param2); + ov65_022376A0(param0, param0->unk_00.unk_06, heapID); if (param0->unk_00.unk_00->unk_00.unk_21 == 1) { ov65_02237504(param0); @@ -1785,15 +1781,15 @@ static BOOL ov65_02237BF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02237C98(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237C98(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - ov65_02236E44(¶m0->unk_30, param1, 119, param2); + ov65_02236E44(¶m0->unk_30, param1, 119, heapID); param0->unk_00.unk_05 = 7; return 0; } -static BOOL ov65_02237CB0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237CB0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0 = ov65_02236EF8(¶m0->unk_30); @@ -1805,15 +1801,15 @@ static BOOL ov65_02237CB0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02237CCC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237CCC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - ov65_02236E44(¶m0->unk_30, param1, 111, param2); + ov65_02236E44(¶m0->unk_30, param1, 111, heapID); param0->unk_00.unk_05 = 9; return 0; } -static BOOL ov65_02237CE4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237CE4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0 = ov65_02236EF8(¶m0->unk_30); @@ -1821,15 +1817,15 @@ static BOOL ov65_02237CE4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } - param0->unk_30.unk_240 = Menu_MakeYesNoChoice(param0->unk_30.unk_00, &Unk_ov65_02239A24, 0 + (24 * 2), 4, param2); + param0->unk_30.unk_240 = Menu_MakeYesNoChoice(param0->unk_30.unk_00, &Unk_ov65_02239A24, 0 + (24 * 2), 4, heapID); param0->unk_00.unk_05 = 10; return 0; } -static BOOL ov65_02237D18(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237D18(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - int v0 = Menu_ProcessInputAndHandleExit(param0->unk_30.unk_240, param2); + int v0 = Menu_ProcessInputAndHandleExit(param0->unk_30.unk_240, heapID); if (v0 != 0xffffffff) { if (v0 == 0) { @@ -1848,12 +1844,12 @@ static BOOL ov65_02237D18(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02237D60(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237D60(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { param0->unk_00.unk_08 = 30; ov65_0223758C(param0); - ov65_02236E44(¶m0->unk_30, param1, 102, param2); + ov65_02236E44(¶m0->unk_30, param1, 102, heapID); ov65_0223789C(param0); ov65_02237A44(param0); @@ -1863,7 +1859,7 @@ static BOOL ov65_02237D60(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02237D98(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237D98(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { int v0; @@ -1884,7 +1880,7 @@ static BOOL ov65_02237D98(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02237DD0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237DD0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0; @@ -1901,7 +1897,7 @@ static BOOL ov65_02237DD0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02237DF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237DF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { if (CommTiming_IsSyncState(13)) { ov65_02237498(param0, param1); @@ -1914,7 +1910,7 @@ static BOOL ov65_02237DF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02237E24(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237E24(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { if (CommTiming_IsSyncState(14)) { u16 v0 = param0->unk_00.unk_00->unk_00.unk_1B; @@ -1930,7 +1926,7 @@ static BOOL ov65_02237E24(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02237E54(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237E54(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { int v0; int v1; @@ -1965,7 +1961,7 @@ static BOOL ov65_02237E54(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02237EA4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237EA4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { CommMan_SetErrorHandling(1, 1); CommTiming_StartSync(18); @@ -1975,13 +1971,13 @@ static BOOL ov65_02237EA4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02237EC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237EC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { if (CommTiming_IsSyncState(18)) { param0->unk_00.unk_07 = 1; - ov65_02237A24(param1, param2); - ov65_022378C4(param0, param1, param2); + ov65_02237A24(param1, heapID); + ov65_022378C4(param0, param1, heapID); return 1; } @@ -1989,15 +1985,15 @@ static BOOL ov65_02237EC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02237EF0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237EF0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - ov65_02236E44(¶m0->unk_30, param1, 120, param2); + ov65_02236E44(¶m0->unk_30, param1, 120, heapID); param0->unk_00.unk_05 = 20; return 0; } -static BOOL ov65_02237F08(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237F08(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0 = ov65_02236EF8(¶m0->unk_30); @@ -2005,15 +2001,15 @@ static BOOL ov65_02237F08(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } - param0->unk_30.unk_240 = Menu_MakeYesNoChoiceWithCursorAt(param0->unk_30.unk_00, &Unk_ov65_02239A24, 0 + (24 * 2), 4, 1, param2); + param0->unk_30.unk_240 = Menu_MakeYesNoChoiceWithCursorAt(param0->unk_30.unk_00, &Unk_ov65_02239A24, 0 + (24 * 2), 4, 1, heapID); param0->unk_00.unk_05 = 21; return 0; } -static BOOL ov65_02237F48(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237F48(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - int v0 = Menu_ProcessInputAndHandleExit(param0->unk_30.unk_240, param2); + int v0 = Menu_ProcessInputAndHandleExit(param0->unk_30.unk_240, heapID); if (v0 != 0xffffffff) { if (v0 == 0) { @@ -2036,15 +2032,15 @@ static BOOL ov65_02237F48(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02237FA0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237FA0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - ov65_02236E44(¶m0->unk_30, param1, 121, param2); + ov65_02236E44(¶m0->unk_30, param1, 121, heapID); param0->unk_00.unk_05 = 23; return 0; } -static BOOL ov65_02237FB8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237FB8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0 = ov65_02236EF8(¶m0->unk_30); @@ -2052,15 +2048,15 @@ static BOOL ov65_02237FB8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } - param0->unk_30.unk_240 = Menu_MakeYesNoChoiceWithCursorAt(param0->unk_30.unk_00, &Unk_ov65_02239A24, 0 + (24 * 2), 4, 1, param2); + param0->unk_30.unk_240 = Menu_MakeYesNoChoiceWithCursorAt(param0->unk_30.unk_00, &Unk_ov65_02239A24, 0 + (24 * 2), 4, 1, heapID); param0->unk_00.unk_05 = 24; return 0; } -static BOOL ov65_02237FF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02237FF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - int v0 = Menu_ProcessInputAndHandleExit(param0->unk_30.unk_240, param2); + int v0 = Menu_ProcessInputAndHandleExit(param0->unk_30.unk_240, heapID); if (v0 != 0xffffffff) { if (v0 == 0) { @@ -2083,9 +2079,9 @@ static BOOL ov65_02237FF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02238050(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02238050(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - ov65_02236E44(¶m0->unk_30, param1, 122, param2); + ov65_02236E44(¶m0->unk_30, param1, 122, heapID); param0->unk_00.unk_08 = 30; param0->unk_00.unk_05 = 26; @@ -2093,7 +2089,7 @@ static BOOL ov65_02238050(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_0223806C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_0223806C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0 = ov65_02236EF8(¶m0->unk_30); @@ -2117,30 +2113,30 @@ static BOOL ov65_0223806C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 1; } -static BOOL ov65_022380AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_022380AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { if (param0->unk_30.unk_240 != NULL) { - Menu_DestroyForExit(param0->unk_30.unk_240, param2); + Menu_DestroyForExit(param0->unk_30.unk_240, heapID); param0->unk_30.unk_240 = NULL; } ov65_02237018(¶m0->unk_30); - ov65_022378C4(param0, param1, param2); + ov65_022378C4(param0, param1, heapID); param0->unk_00.unk_05 = 28; return 0; } -static BOOL ov65_022380E8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_022380E8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - ov65_02236E44(¶m0->unk_30, param1, 118, param2); + ov65_02236E44(¶m0->unk_30, param1, 118, heapID); param0->unk_00.unk_05 = 29; ov65_022375CC(param0); return 0; } -static BOOL ov65_02238104(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02238104(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0 = ov65_02236EF8(¶m0->unk_30); @@ -2157,7 +2153,7 @@ static BOOL ov65_02238104(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 1; } -static BOOL ov65_02238134(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02238134(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { u32 v0; @@ -2167,13 +2163,13 @@ static BOOL ov65_02238134(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p v0 = 124; } - ov65_02236E44(¶m0->unk_30, param1, v0, param2); + ov65_02236E44(¶m0->unk_30, param1, v0, heapID); param0->unk_00.unk_05 = 31; return 0; } -static BOOL ov65_0223815C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_0223815C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0 = ov65_02236EF8(¶m0->unk_30); @@ -2181,19 +2177,19 @@ static BOOL ov65_0223815C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } - param0->unk_30.unk_240 = Menu_MakeYesNoChoice(param0->unk_30.unk_00, &Unk_ov65_02239A24, 0 + (24 * 2), 4, param2); + param0->unk_30.unk_240 = Menu_MakeYesNoChoice(param0->unk_30.unk_00, &Unk_ov65_02239A24, 0 + (24 * 2), 4, heapID); param0->unk_00.unk_05 = 32; return 0; } -static BOOL ov65_02238190(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02238190(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - int v0 = Menu_ProcessInputAndHandleExit(param0->unk_30.unk_240, param2); + int v0 = Menu_ProcessInputAndHandleExit(param0->unk_30.unk_240, heapID); if (v0 != 0xffffffff) { if (v0 == 0) { - ov65_0223731C(param0, param2); + ov65_0223731C(param0, heapID); ov65_02237698(param0); } @@ -2205,7 +2201,7 @@ static BOOL ov65_02238190(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_022381CC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_022381CC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { CommInfo_SendBattleRegulation(); CommMan_SetErrorHandling(0, 1); @@ -2213,9 +2209,9 @@ static BOOL ov65_022381CC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_022381E4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_022381E4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - ov65_02237550(param0, param2); + ov65_02237550(param0, heapID); if (CommSys_IsPlayerConnected(0) == 0) { param0->unk_00.unk_05 = 15; @@ -2228,11 +2224,11 @@ static BOOL ov65_022381E4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02238210(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02238210(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - ov65_02237550(param0, param2); - ov65_0223726C(¶m0->unk_30, param1, 0, 0, param2); - ov65_02236E44(¶m0->unk_30, param1, 114, param2); + ov65_02237550(param0, heapID); + ov65_0223726C(¶m0->unk_30, param1, 0, 0, heapID); + ov65_02236E44(¶m0->unk_30, param1, 114, heapID); ov65_0223789C(param0); param0->unk_00.unk_05 = 3; @@ -2240,11 +2236,11 @@ static BOOL ov65_02238210(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02238250(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02238250(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0; - ov65_02237550(param0, param2); + ov65_02237550(param0, heapID); v0 = ov65_02236EF8(¶m0->unk_30); @@ -2253,7 +2249,7 @@ static BOOL ov65_02238250(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p } if (param0->unk_00.unk_13 != 0) { - ov65_022378C4(param0, param1, param2); + ov65_022378C4(param0, param1, heapID); switch (param0->unk_00.unk_13) { case 1: @@ -2274,21 +2270,21 @@ static BOOL ov65_02238250(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_022382B0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_022382B0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - ov65_0223726C(¶m0->unk_30, param1, 0, 0, param2); - ov65_02236E50(¶m0->unk_30, param1, 115, 30, param2); + ov65_0223726C(¶m0->unk_30, param1, 0, 0, heapID); + ov65_02236E50(¶m0->unk_30, param1, 115, 30, heapID); param0->unk_00.unk_05 = 5; - ov65_022376A0(param0, CommSys_CurNetId(), 96); + ov65_022376A0(param0, CommSys_CurNetId(), HEAP_ID_96); return 0; } -static BOOL ov65_022382F0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_022382F0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0; - ov65_02237550(param0, param2); + ov65_02237550(param0, heapID); v0 = ov65_02236EF8(¶m0->unk_30); @@ -2301,10 +2297,10 @@ static BOOL ov65_022382F0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02238314(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02238314(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - ov65_0223726C(¶m0->unk_30, param1, 0, 0, param2); - ov65_02236E44(¶m0->unk_30, param1, param0->unk_00.unk_2D, param2); + ov65_0223726C(¶m0->unk_30, param1, 0, 0, heapID); + ov65_02236E44(¶m0->unk_30, param1, param0->unk_00.unk_2D, heapID); param0->unk_00.unk_05 = 7; @@ -2314,7 +2310,7 @@ static BOOL ov65_02238314(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02238350(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02238350(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0 = ov65_02236EF8(¶m0->unk_30); @@ -2328,10 +2324,10 @@ static BOOL ov65_02238350(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 1; } -static BOOL ov65_02238370(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02238370(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - ov65_02237550(param0, param2); - ov65_02236E44(¶m0->unk_30, param1, 123, param2); + ov65_02237550(param0, heapID); + ov65_02236E44(¶m0->unk_30, param1, 123, heapID); ov65_0223789C(param0); param0->unk_00.unk_05 = 9; @@ -2343,11 +2339,11 @@ static BOOL ov65_02238370(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_022383AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_022383AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0; - ov65_02237550(param0, param2); + ov65_02237550(param0, heapID); v0 = ov65_02236EF8(¶m0->unk_30); if (v0 == 0) { @@ -2359,9 +2355,9 @@ static BOOL ov65_022383AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_022383D0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_022383D0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - ov65_02237550(param0, param2); + ov65_02237550(param0, heapID); if (param0->unk_00.unk_12) { param0->unk_00.unk_12 = 0; @@ -2378,8 +2374,8 @@ static BOOL ov65_022383D0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p CommTool_ClearReceivedTempDataAllPlayers(); CommTiming_StartSync(14); - ov65_022378C4(param0, param1, param2); - ov65_02236E44(¶m0->unk_30, param1, 102, param2); + ov65_022378C4(param0, param1, heapID); + ov65_02236E44(¶m0->unk_30, param1, 102, heapID); ov65_02237A44(param0); param0->unk_00.unk_08 = (10 * 30); @@ -2387,7 +2383,7 @@ static BOOL ov65_022383D0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p param0->unk_00.unk_05 = 11; } else { if (gSystem.pressedKeys & PAD_BUTTON_X) { - ov65_022378C4(param0, param1, param2); + ov65_022378C4(param0, param1, heapID); param0->unk_00.unk_05 = 18; } } @@ -2395,7 +2391,7 @@ static BOOL ov65_022383D0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_0223846C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_0223846C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { int v0; @@ -2425,7 +2421,7 @@ static BOOL ov65_0223846C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_022384BC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_022384BC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { int v0; int v1; @@ -2460,7 +2456,7 @@ static BOOL ov65_022384BC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_0223850C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_0223850C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { CommMan_SetErrorHandling(1, 1); CommTiming_StartSync(18); @@ -2470,12 +2466,12 @@ static BOOL ov65_0223850C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02238528(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02238528(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { if (CommTiming_IsSyncState(18)) { - ov65_022378C4(param0, param1, param2); + ov65_022378C4(param0, param1, heapID); param0->unk_00.unk_07 = 1; - ov65_02237A24(param1, param2); + ov65_02237A24(param1, heapID); return 1; } @@ -2483,31 +2479,31 @@ static BOOL ov65_02238528(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02238558(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02238558(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { if (param0->unk_30.unk_240 != NULL) { - Menu_DestroyForExit(param0->unk_30.unk_240, param2); + Menu_DestroyForExit(param0->unk_30.unk_240, heapID); param0->unk_30.unk_240 = NULL; } ov65_02237018(¶m0->unk_30); - ov65_022378C4(param0, param1, param2); + ov65_022378C4(param0, param1, heapID); param0->unk_00.unk_05 = 16; return 0; } -static BOOL ov65_02238594(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02238594(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - ov65_02236E44(¶m0->unk_30, param1, 118, param2); + ov65_02236E44(¶m0->unk_30, param1, 118, heapID); param0->unk_00.unk_05 = 17; return 0; } -static BOOL ov65_022385AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_022385AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0 = ov65_02236EF8(¶m0->unk_30); @@ -2525,11 +2521,11 @@ static BOOL ov65_022385AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 1; } -static BOOL ov65_022385D4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_022385D4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { u32 v0; - ov65_02237550(param0, param2); + ov65_02237550(param0, heapID); if (param0->unk_00.unk_00->unk_00.unk_21 == 1) { v0 = 125; @@ -2537,17 +2533,17 @@ static BOOL ov65_022385D4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p v0 = 124; } - ov65_02236E44(¶m0->unk_30, param1, v0, param2); + ov65_02236E44(¶m0->unk_30, param1, v0, heapID); param0->unk_00.unk_05 = 19; return 0; } -static BOOL ov65_02238608(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02238608(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0; - ov65_02237550(param0, param2); + ov65_02237550(param0, heapID); if (ov65_02237A10(param0) == 1) { param0->unk_00.unk_05 = 10; @@ -2561,31 +2557,31 @@ static BOOL ov65_02238608(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } - param0->unk_30.unk_240 = Menu_MakeYesNoChoice(param0->unk_30.unk_00, &Unk_ov65_02239A24, 0 + (24 * 2), 4, param2); + param0->unk_30.unk_240 = Menu_MakeYesNoChoice(param0->unk_30.unk_00, &Unk_ov65_02239A24, 0 + (24 * 2), 4, heapID); param0->unk_00.unk_05 = 20; return 0; } -static BOOL ov65_02238660(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02238660(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { int v0; - ov65_02237550(param0, param2); + ov65_02237550(param0, heapID); if (ov65_02237A10(param0) == 1) { param0->unk_00.unk_05 = 10; ov65_02236F38(¶m0->unk_30); - Menu_DestroyForExit(param0->unk_30.unk_240, param2); + Menu_DestroyForExit(param0->unk_30.unk_240, heapID); param0->unk_30.unk_240 = NULL; return 0; } - v0 = Menu_ProcessInputAndHandleExit(param0->unk_30.unk_240, param2); + v0 = Menu_ProcessInputAndHandleExit(param0->unk_30.unk_240, heapID); if (v0 != 0xffffffff) { if (v0 == 0) { - ov65_0223731C(param0, param2); + ov65_0223731C(param0, heapID); ov65_02237698(param0); } @@ -2597,23 +2593,23 @@ static BOOL ov65_02238660(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_022386D0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_022386D0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { param0->unk_00.unk_26 = sub_02032F40(0); GF_ASSERT(param0->unk_00.unk_26 != 32); - ov65_0223726C(¶m0->unk_30, param1, 0, 0, param2); + ov65_0223726C(¶m0->unk_30, param1, 0, 0, heapID); sub_02038378(); param0->unk_00.unk_27 = 0; - ov65_02236E44(¶m0->unk_30, param1, 132, param2); + ov65_02236E44(¶m0->unk_30, param1, 132, heapID); param0->unk_00.unk_05 = 22; return 0; } -static BOOL ov65_02238728(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02238728(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0 = ov65_02236EF8(¶m0->unk_30); @@ -2621,15 +2617,15 @@ static BOOL ov65_02238728(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } - param0->unk_30.unk_240 = Menu_MakeYesNoChoice(param0->unk_30.unk_00, &Unk_ov65_02239A24, 0 + (24 * 2), 4, param2); + param0->unk_30.unk_240 = Menu_MakeYesNoChoice(param0->unk_30.unk_00, &Unk_ov65_02239A24, 0 + (24 * 2), 4, heapID); param0->unk_00.unk_05 = 23; return 0; } -static BOOL ov65_0223875C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_0223875C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - int v0 = Menu_ProcessInputAndHandleExit(param0->unk_30.unk_240, param2); + int v0 = Menu_ProcessInputAndHandleExit(param0->unk_30.unk_240, heapID); if (v0 != 0xffffffff) { if (v0 == 0) { @@ -2644,9 +2640,9 @@ static BOOL ov65_0223875C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_0223878C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_0223878C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { - ov65_02236E44(¶m0->unk_30, param1, 17, param2); + ov65_02236E44(¶m0->unk_30, param1, 17, heapID); ov65_0223789C(param0); param0->unk_00.unk_08 = 90; @@ -2655,7 +2651,7 @@ static BOOL ov65_0223878C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_022387AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_022387AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { BOOL v0; @@ -2733,7 +2729,7 @@ static BOOL ov65_02238838(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_022388FC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_022388FC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { if (IsScreenFadeDone()) { param0->unk_00.unk_05 = 0; @@ -2742,7 +2738,7 @@ static BOOL ov65_022388FC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p return 0; } -static BOOL ov65_02238910(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) +static BOOL ov65_02238910(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID) { sub_02038378(); sub_02038B60(); diff --git a/src/overlay066/ov66_0222DDF0.c b/src/overlay066/ov66_0222DDF0.c index 928d6a9789..871696b322 100644 --- a/src/overlay066/ov66_0222DDF0.c +++ b/src/overlay066/ov66_0222DDF0.c @@ -244,7 +244,7 @@ typedef struct UnkStruct_ov66_0222DFF8_t { UnkStruct_ov66_02230A6C unk_4BC; UnkStruct_ov66_0222FBF0 unk_508; UnkStruct_ov66_0222DFF8_sub3 unk_510; - u32 heapID; + enum HeapID heapID; u32 unk_52C; } UnkStruct_ov66_0222DFF8; @@ -266,7 +266,7 @@ static void ov66_0222F4C8(PPW_LOBBY_TIME_EVENT param0, void *param1); static void ov66_0222F684(const void *param0, u32 param1, void *param2); static void ov66_0222F6C4(UnkStruct_ov66_0222F6C4 *param0, UnkStruct_ov66_02231560 *param1); static void ov66_0222F768(UnkStruct_ov66_0222DFF8 *param0); -static void ov66_0222F7C8(UnkStruct_ov66_0222F6C4 *param0, SaveData *saveData, u32 heapID); +static void ov66_0222F7C8(UnkStruct_ov66_0222F6C4 *param0, SaveData *saveData, enum HeapID heapID); static void ov66_0222F964(UnkStruct_ov66_0222DFF8 *param0); static void ov66_0222F9EC(UnkStruct_ov66_0222F6C4 *param0, const SaveData *saveData); static BOOL ov66_0222FA04(const UnkStruct_ov66_0222F6C4 *param0, const SaveData *saveData); @@ -278,9 +278,9 @@ static void ov66_0222FBAC(const UnkStruct_ov66_0222FB64 *param0); static void ov66_0222FBC8(UnkStruct_ov66_0222FBC8 *param0); static BOOL ov66_0222FBD0(const UnkStruct_ov66_0222FBC8 *param0); static void ov66_0222FBE0(UnkStruct_ov66_0222FBC8 *param0); -static void ov66_0222FBF0(UnkStruct_ov66_0222FBF0 *param0, u32 heapID); +static void ov66_0222FBF0(UnkStruct_ov66_0222FBF0 *param0, enum HeapID heapID); static void ov66_0222FC00(UnkStruct_ov66_0222FBF0 *param0); -static void ov66_0222FC0C(UnkStruct_ov66_0222FBF0 *param0, const UnkStruct_ov66_0222F6C4 *param1, u32 heapID); +static void ov66_0222FC0C(UnkStruct_ov66_0222FBF0 *param0, const UnkStruct_ov66_0222F6C4 *param1, enum HeapID heapID); static void ov66_0222FC4C(UnkStruct_ov66_0222FBC8 *param0); static BOOL ov66_0222FC54(const UnkStruct_ov66_0222FBC8 *param0); static void ov66_0222FC58(UnkStruct_ov66_0222FC58 *param0); @@ -411,7 +411,7 @@ static const UnkStruct_ov66_022589B4 Unk_ov66_022589B4[8] = { { ov66_022307B4, sizeof(u32) } }; -UnkStruct_ov66_0222DFF8 *ov66_0222DDF0(SaveData *saveData, u32 heapID) +UnkStruct_ov66_0222DFF8 *ov66_0222DDF0(SaveData *saveData, enum HeapID heapID) { UnkStruct_ov66_0222DFF8 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_0222DFF8)); memset(v0, 0, sizeof(UnkStruct_ov66_0222DFF8)); @@ -979,7 +979,7 @@ void ov66_0222E5D8(UnkStruct_ov66_0222DFF8 *param0, u32 param1, u32 param2) ov66_0222F964(param0); } -void ov66_0222E640(const UnkStruct_ov66_0222E71C *param0, TrainerInfo *param1, u32 heapID) +void ov66_0222E640(const UnkStruct_ov66_0222E71C *param0, TrainerInfo *param1, enum HeapID heapID) { BOOL v0; BOOL v1; @@ -2273,7 +2273,7 @@ static void ov66_0222F768(UnkStruct_ov66_0222DFF8 *param0) } } -static void ov66_0222F7C8(UnkStruct_ov66_0222F6C4 *param0, SaveData *saveData, u32 heapID) +static void ov66_0222F7C8(UnkStruct_ov66_0222F6C4 *param0, SaveData *saveData, enum HeapID heapID) { TrainerInfo *v0; Party *v1; @@ -2509,7 +2509,7 @@ static void ov66_0222FBE0(UnkStruct_ov66_0222FBC8 *param0) } } -static void ov66_0222FBF0(UnkStruct_ov66_0222FBF0 *param0, u32 heapID) +static void ov66_0222FBF0(UnkStruct_ov66_0222FBF0 *param0, enum HeapID heapID) { param0->unk_00 = TrainerInfo_New(heapID); } @@ -2519,7 +2519,7 @@ static void ov66_0222FC00(UnkStruct_ov66_0222FBF0 *param0) Heap_Free(param0->unk_00); } -static void ov66_0222FC0C(UnkStruct_ov66_0222FBF0 *param0, const UnkStruct_ov66_0222F6C4 *param1, u32 heapID) +static void ov66_0222FC0C(UnkStruct_ov66_0222FBF0 *param0, const UnkStruct_ov66_0222F6C4 *param1, enum HeapID heapID) { UnkStruct_ov66_0222E71C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_0222E71C)); diff --git a/src/overlay066/ov66_0223177C.c b/src/overlay066/ov66_0223177C.c index 9e86cb7d63..e4120953a5 100644 --- a/src/overlay066/ov66_0223177C.c +++ b/src/overlay066/ov66_0223177C.c @@ -70,7 +70,7 @@ static BOOL ov66_02231E30(const UnkStruct_ov66_02231D38 *param0, u32 param1); static UnkEnum_ov66_02231E54 ov66_02231E54(const UnkStruct_ov66_02231D38 *param0, u32 param1); static UnkEnum_ov66_02231E6C ov66_02231E6C(const UnkStruct_ov66_02231D38 *param0); static BOOL ov66_02231E74(const UnkStruct_ov66_02231D38 *param0, u32 param1); -static void ov66_02231E94(UnkStruct_ov66_02231E94 *param0, u32 param1); +static void ov66_02231E94(UnkStruct_ov66_02231E94 *param0, u32 heapID); static void ov66_02231EEC(UnkStruct_ov66_02231E94 *param0); static void ov66_02231F1C(UnkStruct_ov66_02231E94 *param0); static void ov66_02231F58(UnkStruct_ov66_02231E94 *param0); diff --git a/src/overlay066/ov66_022343A8.c b/src/overlay066/ov66_022343A8.c index d6533b4545..eeaa37eb18 100644 --- a/src/overlay066/ov66_022343A8.c +++ b/src/overlay066/ov66_022343A8.c @@ -70,7 +70,7 @@ typedef struct UnkStruct_ov66_02234548_t { static const UnkStruct_ov66_02258B38 *ov66_022348B0(u32 param0); static u32 ov66_022348D8(BOOL param0, u32 param1); static fx32 ov66_022348E4(u16 param0, u16 param1, u32 param2); -static void ov66_022348FC(UnkStruct_ov66_02234958 *param0, NARC *param1, u32 param2, u32 heapID); +static void ov66_022348FC(UnkStruct_ov66_02234958 *param0, NARC *param1, u32 param2, enum HeapID heapID); static void ov66_02234958(UnkStruct_ov66_02234958 *param0); static void ov66_02234960(UnkStruct_ov66_02234958 *param0, u32 param1); static u32 ov66_0223496C(const UnkStruct_ov66_02234958 *param0); @@ -141,7 +141,7 @@ static const UnkStruct_ov66_02258B38 Unk_ov66_02258B38[20] = { { 0xEA, 0x18D, 0x0 } }; -UnkStruct_ov66_02234548 *ov66_022343A8(u32 param0, u32 param1, u32 heapID, u32 heapID2) +UnkStruct_ov66_02234548 *ov66_022343A8(u32 param0, u32 param1, enum HeapID heapID, u32 heapID2) { UnkStruct_ov66_02234548 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_02234548)); memset(v0, 0, sizeof(UnkStruct_ov66_02234548)); @@ -501,7 +501,7 @@ static fx32 ov66_022348E4(u16 param0, u16 param1, u32 param2) return v0; } -static void ov66_022348FC(UnkStruct_ov66_02234958 *param0, NARC *param1, u32 param2, u32 heapID) +static void ov66_022348FC(UnkStruct_ov66_02234958 *param0, NARC *param1, u32 param2, enum HeapID heapID) { void *v0; diff --git a/src/overlay066/ov66_02234EA8.c b/src/overlay066/ov66_02234EA8.c index 697d4c5991..e45d815f00 100644 --- a/src/overlay066/ov66_02234EA8.c +++ b/src/overlay066/ov66_02234EA8.c @@ -15,7 +15,7 @@ static void ov66_02234F2C(NARC *param0, u32 param1, u16 param2, u8 param3, fx32 *param4); -UnkStruct_ov66_02231428 ov66_02234EA8(u16 param0, u8 param1, UnkStruct_ov66_02231428 param2, u32 heapID) +UnkStruct_ov66_02231428 ov66_02234EA8(u16 param0, u8 param1, UnkStruct_ov66_02231428 param2, enum HeapID heapID) { fx32 v0; fx32 v1; diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index 85de02b238..96b3d02495 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -67,10 +67,10 @@ typedef struct { } UnkStruct_ov67_0225D154; static void ov67_0225CE28(void *param0); -static void ov67_0225CE30(UnkStruct_ov67_0225D154 *param0, u32 param1); +static void ov67_0225CE30(UnkStruct_ov67_0225D154 *param0, enum HeapID heapID); static void ov67_0225D154(UnkStruct_ov67_0225D154 *param0); static void ov67_0225D17C(UnkStruct_ov67_0225D154 *param0); -static void ov67_0225D188(UnkStruct_ov67_0225D210 *param0, BgConfig *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, SaveData *saveData, u32 param10); +static void ov67_0225D188(UnkStruct_ov67_0225D210 *param0, BgConfig *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, SaveData *saveData, enum HeapID heapID); static void ov67_0225D210(UnkStruct_ov67_0225D210 *param0, u32 param1); static void ov67_0225D294(UnkStruct_ov67_0225D210 *param0); static void ov67_0225D2EC(UnkStruct_ov67_0225D210 *param0); @@ -534,7 +534,7 @@ static void ov67_0225CE28(void *param0) inline_ov61_0222C1FC(&v0->unk_D4); } -static void ov67_0225CE30(UnkStruct_ov67_0225D154 *param0, u32 heapID) +static void ov67_0225CE30(UnkStruct_ov67_0225D154 *param0, enum HeapID heapID) { G2_BlendNone(); G2S_BlendNone(); @@ -608,7 +608,7 @@ static void ov67_0225D17C(UnkStruct_ov67_0225D154 *param0) Bg_RunScheduledUpdates(param0->unk_0C); } -static void ov67_0225D188(UnkStruct_ov67_0225D210 *param0, BgConfig *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, SaveData *saveData, u32 heapID) +static void ov67_0225D188(UnkStruct_ov67_0225D210 *param0, BgConfig *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, SaveData *saveData, enum HeapID heapID) { param0->unk_00 = StringTemplate_Default(heapID); param0->unk_04 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, param3, heapID); diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index b20418c1a0..6df9a2624e 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -122,21 +122,21 @@ typedef struct { } UnkStruct_ov68_0225C700; static void ov68_0225C914(void *param0); -static void ov68_0225C91C(UnkStruct_ov68_0225C91C *param0, SaveData *saveData, u32 param2); +static void ov68_0225C91C(UnkStruct_ov68_0225C91C *param0, SaveData *saveData, enum HeapID heapID); static void ov68_0225C960(UnkStruct_ov68_0225C91C *param0); static void ov68_0225C980(UnkStruct_ov68_0225C91C *param0); static void ov68_0225C98C(UnkStruct_ov68_0225C91C *param0); -static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *options, u32 heapID); +static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *options, enum HeapID heapID); static void ov68_0225CA8C(UnkStruct_ov68_0225C91C *param0); -static void ov68_0225CAB4(UnkStruct_ov68_0225C91C *param0, u32 heapID); +static void ov68_0225CAB4(UnkStruct_ov68_0225C91C *param0, enum HeapID heapID); static void ov68_0225CB44(UnkStruct_ov68_0225C91C *param0); -static void ov68_0225CB70(UnkStruct_ov68_0225CB70 *param0, UnkStruct_ov66_0222DFF8 *param1, u32 param2); +static void ov68_0225CB70(UnkStruct_ov68_0225CB70 *param0, UnkStruct_ov66_0222DFF8 *param1, enum HeapID heapID); static void ov68_0225CBC0(UnkStruct_ov68_0225CB70 *param0); static String *ov68_0225CBEC(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 param2); static String *ov68_0225CC18(UnkStruct_ov68_0225CB70 *param0, u32 param1); static String *ov68_0225CC44(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 param2); -static void ov68_0225CC78(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 heapID); -static void ov68_0225DB8C(UnkStruct_ov68_0225DB8C *param0, BOOL param1, u32 param2); +static void ov68_0225CC78(UnkStruct_ov68_0225CB70 *param0, u32 param1, enum HeapID heapID); +static void ov68_0225DB8C(UnkStruct_ov68_0225DB8C *param0, BOOL param1, enum HeapID heapID); static void ov68_0225DC24(UnkStruct_ov68_0225DB8C *param0); static String *ov68_0225DC40(const UnkStruct_ov68_0225DB8C *param0, UnkStruct_ov68_0225CB70 *param1); static String *ov68_0225DC58(const UnkStruct_ov68_0225DB8C *param0, UnkStruct_ov68_0225CB70 *param1, u32 param2); @@ -144,7 +144,7 @@ static void ov68_0225DC74(UnkStruct_ov68_0225DC74 *param0); static u32 ov68_0225DCA4(const UnkStruct_ov68_0225DC74 *param0, u32 param1, u32 param2); static void ov68_0225DCCC(UnkStruct_ov68_0225DC74 *param0, const UnkStruct_ov66_0222DFF8 *param1); static void ov68_0225CCA8(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov66_02231374 *param3, u32 param4); -static BOOL ov68_0225CCB4(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, u32 param5); +static BOOL ov68_0225CCB4(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, enum HeapID heapID); static void ov68_0225CCC8(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2); static void ov68_0225CCD0(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, u32 param3); static BOOL ov68_0225CE48(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, u32 param5); @@ -153,17 +153,17 @@ static void ov68_0225D06C(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB static void ov68_0225D0F8(UnkStruct_ov68_0225D0F8 *param0); static void ov68_0225D11C(UnkStruct_ov68_0225D0F8 *param0); static void ov68_0225D35C(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov66_02231374 *param3, u32 param4); -static BOOL ov68_0225D36C(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, u32 heapID); +static BOOL ov68_0225D36C(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, enum HeapID heapID); static void ov68_0225D380(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2); -static void ov68_0225D388(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov66_02231374 *param3, u32 param4); -static BOOL ov68_0225D478(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, u32 heapID); +static void ov68_0225D388(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov66_02231374 *param3, enum HeapID heapID); +static BOOL ov68_0225D478(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, enum HeapID heapID); static void ov68_0225D868(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2); static void ov68_0225D89C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, u32 param2, TextColor param3); -static void ov68_0225D8F0(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DB8C *param1, UnkStruct_ov68_0225CB70 *param2, UnkStruct_ov68_0225C91C *param3, const UnkStruct_ov66_0222E908 *param4, u32 heapID, u32 param6, u32 param7, BOOL param8); +static void ov68_0225D8F0(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DB8C *param1, UnkStruct_ov68_0225CB70 *param2, UnkStruct_ov68_0225C91C *param3, const UnkStruct_ov66_0222E908 *param4, enum HeapID heapID, u32 param6, u32 param7, BOOL param8); static void ov68_0225DA30(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DC74 *param1, UnkStruct_ov68_0225C91C *param2, u32 param3); static BOOL ov68_0225DA74(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225C91C *param1); static void ov68_0225DB3C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, u32 param3); -static void ov68_0225D128(UnkStruct_ov68_0225D128 *param0, UnkStruct_ov68_0225C91C *param1, SaveData *saveData, u32 param3); +static void ov68_0225D128(UnkStruct_ov68_0225D128 *param0, UnkStruct_ov68_0225C91C *param1, SaveData *saveData, enum HeapID heapID); static void ov68_0225D178(UnkStruct_ov68_0225D128 *param0, u32 param1); static void ov68_0225D1B4(UnkStruct_ov68_0225D128 *param0, const String *param1); static void ov68_0225D218(UnkStruct_ov68_0225D128 *param0, const String *param1); @@ -302,7 +302,7 @@ static void (*Unk_ov68_0225DEB0[2])(UnkUnion_ov68_0225CCA8 *, UnkStruct_ov68_022 ov68_0225D35C }; -static BOOL (*Unk_ov68_0225DEA8[2])(UnkUnion_ov68_0225CCA8 *, UnkStruct_ov68_0225CB70 *, UnkStruct_ov68_0225C91C *, UnkStruct_ov68_0225D128 *, UnkStruct_ov66_02231374 *, u32) = { +static BOOL (*Unk_ov68_0225DEA8[2])(UnkUnion_ov68_0225CCA8 *, UnkStruct_ov68_0225CB70 *, UnkStruct_ov68_0225C91C *, UnkStruct_ov68_0225D128 *, UnkStruct_ov66_02231374 *, enum HeapID) = { ov68_0225CCB4, ov68_0225D36C }; @@ -422,7 +422,7 @@ static void ov68_0225C914(void *param0) ov68_0225C98C(&v0->unk_00); } -static void ov68_0225C91C(UnkStruct_ov68_0225C91C *param0, SaveData *saveData, u32 heapID) +static void ov68_0225C91C(UnkStruct_ov68_0225C91C *param0, SaveData *saveData, enum HeapID heapID) { Options *options = SaveData_GetOptions(saveData); param0->unk_1A4 = NARC_ctor(NARC_INDEX_GRAPHIC__WIFI_LOBBY_OTHER, heapID); @@ -454,7 +454,7 @@ static void ov68_0225C98C(UnkStruct_ov68_0225C91C *param0) VramTransfer_Process(); } -static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *options, u32 heapID) +static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *options, enum HeapID heapID) { SetAllGraphicsModes(&Unk_ov68_0225DD48); @@ -494,7 +494,7 @@ static void ov68_0225CA8C(UnkStruct_ov68_0225C91C *param0) Heap_Free(param0->unk_00); } -static void ov68_0225CAB4(UnkStruct_ov68_0225C91C *param0, u32 heapID) +static void ov68_0225CAB4(UnkStruct_ov68_0225C91C *param0, enum HeapID heapID) { int v0; @@ -534,7 +534,7 @@ static void ov68_0225CB44(UnkStruct_ov68_0225C91C *param0) RenderOam_Free(); } -static void ov68_0225CB70(UnkStruct_ov68_0225CB70 *param0, UnkStruct_ov66_0222DFF8 *param1, u32 heapID) +static void ov68_0225CB70(UnkStruct_ov68_0225CB70 *param0, UnkStruct_ov66_0222DFF8 *param1, enum HeapID heapID) { int v0; static const v1[9] = { @@ -611,7 +611,7 @@ static String *ov68_0225CC44(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 pa return ov68_0225CBEC(param0, 6 + param2, param1 - 50); } -static void ov68_0225CC78(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 heapID) +static void ov68_0225CC78(UnkStruct_ov68_0225CB70 *param0, u32 param1, enum HeapID heapID) { TrainerInfo *v0 = TrainerInfo_New(heapID); const UnkStruct_ov66_0222E71C *v1 = ov66_0222E3BC(param0->unk_30); @@ -626,9 +626,9 @@ static void ov68_0225CCA8(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB7 ov68_0225CCD0(¶m0->val1, param1, param2, param4); } -static BOOL ov68_0225CCB4(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, u32 param5) +static BOOL ov68_0225CCB4(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, enum HeapID heapID) { - return ov68_0225CE48(¶m0->val1, param1, param2, param3, param4, param5); + return ov68_0225CE48(¶m0->val1, param1, param2, param3, param4, heapID); } static void ov68_0225CCC8(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2) @@ -875,7 +875,7 @@ static void ov68_0225D11C(UnkStruct_ov68_0225D0F8 *param0) Sprite_SetAnimateFlag(param0->unk_14, 1); } -static void ov68_0225D128(UnkStruct_ov68_0225D128 *param0, UnkStruct_ov68_0225C91C *param1, SaveData *saveData, u32 heapID) +static void ov68_0225D128(UnkStruct_ov68_0225D128 *param0, UnkStruct_ov68_0225C91C *param1, SaveData *saveData, enum HeapID heapID) { Window_Add(param1->unk_00, ¶m0->unk_08, 1, 2, 19, 27, 4, 4, (1 + (18 + 12)) + 9); Window_FillTilemap(¶m0->unk_08, 15); @@ -988,7 +988,7 @@ static void ov68_0225D35C(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB7 ov68_0225D388(¶m0->val2, param1, param2, param3, param4); } -static BOOL ov68_0225D36C(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, u32 heapID) +static BOOL ov68_0225D36C(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, enum HeapID heapID) { return ov68_0225D478(¶m0->val2, param1, param2, param3, param4, heapID); } @@ -998,12 +998,12 @@ static void ov68_0225D380(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB7 ov68_0225D868(¶m0->val2, param1, param2); } -static void ov68_0225D388(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov66_02231374 *param3, u32 param4) +static void ov68_0225D388(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov66_02231374 *param3, enum HeapID heapID) { { - Graphics_LoadPaletteFromOpenNARC(param2->unk_1A4, 199, 0, 0, 4 * 32, param4); - Graphics_LoadTilesToBgLayerFromOpenNARC(param2->unk_1A4, 200, param2->unk_00, 0, 0, 0, 0, param4); - Graphics_LoadTilemapToBgLayerFromOpenNARC(param2->unk_1A4, 202, param2->unk_00, 0, 0, 0, 0, param4); + Graphics_LoadPaletteFromOpenNARC(param2->unk_1A4, 199, 0, 0, 4 * 32, heapID); + Graphics_LoadTilesToBgLayerFromOpenNARC(param2->unk_1A4, 200, param2->unk_00, 0, 0, 0, 0, heapID); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param2->unk_1A4, 202, param2->unk_00, 0, 0, 0, 0, heapID); } { @@ -1017,12 +1017,12 @@ static void ov68_0225D388(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB ov68_0225D89C(param0, param1, 109, TEXT_COLOR(3, 4, 0)); { - param0->unk_80 = Graphics_GetCharDataFromOpenNARC(param2->unk_1A4, 200, 0, ¶m0->unk_84, param4); + param0->unk_80 = Graphics_GetCharDataFromOpenNARC(param2->unk_1A4, 200, 0, ¶m0->unk_84, heapID); } { - ov68_0225DB8C(¶m0->unk_88, 1, param4); - ov68_0225DB8C(¶m0->unk_A8, 0, param4); + ov68_0225DB8C(¶m0->unk_88, 1, heapID); + ov68_0225DB8C(¶m0->unk_A8, 0, heapID); if (ov66_0222F144(param3->unk_04, ¶m0->unk_C8) == 0) { ov68_0225DCCC(¶m0->unk_C8, param3->unk_04); @@ -1033,7 +1033,7 @@ static void ov68_0225D388(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB } } -static BOOL ov68_0225D478(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, u32 heapID) +static BOOL ov68_0225D478(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, enum HeapID heapID) { String *v0; u32 v1; @@ -1279,7 +1279,7 @@ static void ov68_0225D89C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB Window_ScheduleCopyToVRAM(¶m0->unk_00[0]); } -static void ov68_0225D8F0(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DB8C *param1, UnkStruct_ov68_0225CB70 *param2, UnkStruct_ov68_0225C91C *param3, const UnkStruct_ov66_0222E908 *param4, u32 heapID, u32 param6, u32 param7, BOOL param8) +static void ov68_0225D8F0(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DB8C *param1, UnkStruct_ov68_0225CB70 *param2, UnkStruct_ov68_0225C91C *param3, const UnkStruct_ov66_0222E908 *param4, enum HeapID heapID, u32 param6, u32 param7, BOOL param8) { String *v0; @@ -1405,7 +1405,7 @@ static void ov68_0225DB3C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB ov68_0225D89C(param0, param1, 119, TEXT_COLOR(5, 6, 0)); } -static void ov68_0225DB8C(UnkStruct_ov68_0225DB8C *param0, BOOL param1, u32 heapID) +static void ov68_0225DB8C(UnkStruct_ov68_0225DB8C *param0, BOOL param1, enum HeapID heapID) { u32 v0; u32 v1; diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index 5e7990bccc..0f6bec01ab 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -324,7 +324,7 @@ static void ov69_0225DDC8(UnkStruct_ov69_0225DDC8 *param0); static void ov69_0225DDFC(UnkStruct_ov69_0225DDC8 *param0); static u32 ov69_0225DE40(UnkStruct_ov69_0225DDC8 *param0); static void ov69_0225DEA0(UnkStruct_ov69_0225DDC8 *param0); -static void ov69_0225DEC0(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, u32 heapID); +static void ov69_0225DEC0(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, enum HeapID heapID); static void ov69_0225DFBC(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1); static void ov69_0225E00C(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225EF54 *param1, UnkStruct_ov69_0225D35C *param2); static void ov69_0225E084(UnkStruct_ov69_0225E084 *param0); @@ -356,7 +356,7 @@ static void ov69_0225E644(UnkStruct_ov69_0225E084 *param0, u32 param1, const Unk static u8 *ov69_0225E6E8(UnkStruct_ov69_0225E084 *param0, u32 param1, u32 param2); static u8 *ov69_0225E70C(UnkStruct_ov69_0225E084 *param0, u32 param1); static void ov69_0225E71C(UnkStruct_ov69_0225E084 *param0, u32 param1, u32 param2, const u8 *param3); -static void ov69_0225E748(UnkStruct_ov69_0225E7DC *param0, UnkStruct_ov69_0225D35C *param1, const UnkStruct_ov69_0225F118 *param2, u16 param3, u32 heapID); +static void ov69_0225E748(UnkStruct_ov69_0225E7DC *param0, UnkStruct_ov69_0225D35C *param1, const UnkStruct_ov69_0225F118 *param2, u16 param3, enum HeapID heapID); static void ov69_0225E7DC(UnkStruct_ov69_0225E7DC *param0); static void ov69_0225E810(UnkStruct_ov69_0225E7DC *param0, UnkStruct_ov69_0225D35C *param1); static void ov69_0225E8EC(UnkStruct_ov69_0225E7DC *param0, u32 param1, BOOL param2); @@ -1966,7 +1966,7 @@ static void ov69_0225DEA0(UnkStruct_ov69_0225DDC8 *param0) Window_ClearAndScheduleCopyToVRAM(¶m0->unk_10); } -static void ov69_0225DEC0(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, u32 heapID) +static void ov69_0225DEC0(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, enum HeapID heapID) { param0->unk_00 = 0; @@ -2476,7 +2476,7 @@ static void ov69_0225E71C(UnkStruct_ov69_0225E084 *param0, u32 param1, u32 param VramTransfer_Request(NNS_GFD_DST_2D_BG1_CHAR_SUB, v0 * 32, (void *)param3, 27 * 32); } -static void ov69_0225E748(UnkStruct_ov69_0225E7DC *param0, UnkStruct_ov69_0225D35C *param1, const UnkStruct_ov69_0225F118 *param2, u16 param3, u32 heapID) +static void ov69_0225E748(UnkStruct_ov69_0225E7DC *param0, UnkStruct_ov69_0225D35C *param1, const UnkStruct_ov69_0225F118 *param2, u16 param3, enum HeapID heapID) { int v0; diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index 33c612f565..cdc53cb239 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -293,7 +293,7 @@ static void ov70_0225F3E4(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9 static void ov70_0225F418(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225DEE8 *param1, BOOL param2, u32 heapID); static u32 ov70_0225F798(const UnkStruct_ov70_0225F350 *param0); static void ov70_0225F79C(UnkStruct_ov70_0225F350 *param0, u32 param1, BOOL param2); -static void ov70_0225F7A8(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u32 param3); +static void ov70_0225F7A8(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u32 heapID); static void ov70_0225F7E0(UnkStruct_ov70_0225F350 *param0); static void ov70_0225F7EC(UnkStruct_ov70_0225F350 *param0); static u32 ov70_0225F7F8(const UnkStruct_ov70_0225F350 *param0); @@ -303,25 +303,24 @@ static BOOL ov70_0225F828(const UnkStruct_ov70_0225F350 *param0); static BOOL ov70_0225F834(const UnkStruct_ov70_0225F350 *param0); static void ov70_0225F844(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2, UnkStruct_ov70_0225F208 *param3, BOOL param4, u32 heapID, const UnkStruct_ov66_0222E71C *param6, const UnkStruct_ov66_0222E71C *param7, BOOL param8, BOOL param9, const UnkStruct_ov66_02230914 *param10, BOOL param11); static void ov70_0225F89C(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2); -static void ov70_0225F8AC(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, UnkStruct_ov70_0225F208 *param2, u32 param3, const UnkStruct_ov66_0222E71C *param4); -static void ov70_0225F8F0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u32 param3); +static void ov70_0225F8AC(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, UnkStruct_ov70_0225F208 *param2, u32 heapID, const UnkStruct_ov66_0222E71C *param4); +static void ov70_0225F8F0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 heapID, u32 param3); static void ov70_0225F920(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1); static void ov70_0225F934(UnkStruct_ov70_0225F350 *param0, BOOL param1); -static void ov70_0225F940(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u32 param3); static void ov70_0225F95C(SysTask *param0, void *param1); -static void ov70_0225F9BC(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4); +static void ov70_0225F9BC(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 heapID); static void ov70_0225FA10(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1); -static void ov70_0225FA84(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3); +static void ov70_0225FA84(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 heapID); static void ov70_0225FAA8(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2); static void ov70_0225FACC(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E9C8 *param1); static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225FA84 *param2, UnkStruct_ov70_0225E4EC *param3, UnkStruct_ov70_0225F208 *param4, BOOL param5, NARC *param6, u32 heapID, const UnkStruct_ov66_0222E71C *param8, const UnkStruct_ov66_0222E71C *param9, BOOL param10, BOOL param11, const UnkStruct_ov66_02230914 *param12, BOOL param13); -static void ov70_0225FDA0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225FA84 *param1, UnkStruct_ov70_0225E4EC *param2, u32 param3, const UnkStruct_ov66_0222E71C *param4); +static void ov70_0225FDA0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225FA84 *param1, UnkStruct_ov70_0225E4EC *param2, u32 heapID, const UnkStruct_ov66_0222E71C *param4); static void ov70_0225FE80(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2); -static void ov70_0225FEC4(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4); +static void ov70_0225FEC4(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 heapID, u32 param4); static BOOL ov70_0225FEEC(const UnkStruct_ov70_0225FA84 *param0); -static void ov70_0225FEF0(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4, BOOL param5); +static void ov70_0225FEF0(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 heapID, u32 param4, BOOL param5); static void ov70_02260048(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1); -static void ov70_02260080(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4); +static void ov70_02260080(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 heapID, u32 param4); static void ov70_02260228(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1); static void ov70_02260268(NNSG2dPaletteData *param0); static void ov70_022602C0(UnkStruct_ov70_0225FA84 *param0); @@ -331,16 +330,16 @@ static void ov70_02260360(UnkStruct_ov70_0225FA84 *param0, u32 param1); static void ov70_02260370(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F208 *param1, const TrainerInfo *param2); static void ov70_02260380(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F208 *param1, const UnkStruct_ov66_0222E71C *param2); static void ov70_022603B0(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F208 *param1, const UnkStruct_ov66_02230914 *param2); -static void ov70_022603CC(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, const UnkStruct_ov66_0222E71C *param4, const UnkStruct_ov66_0222E71C *param5); +static void ov70_022603CC(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 heapID, const UnkStruct_ov66_0222E71C *param4, const UnkStruct_ov66_0222E71C *param5); static void ov70_0226068C(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1); static const UnkStruct_ov70_0226D844 *ov70_02260728(int param0, s32 param1, s32 param2, u32 param3); -static void ov70_02260744(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3); +static void ov70_02260744(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 heapID); static void ov70_022607A8(UnkStruct_ov70_02260744 *param0); -static BOOL ov70_022607D4(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3); +static BOOL ov70_022607D4(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 heapID); static void ov70_02260870(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, UnkStruct_ov70_0225F208 *param2, const UnkStruct_ov66_0222E71C *param3, NARC *param4, u32 heapID); -static void ov70_02260930(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, NARC *param3, u32 param4); +static void ov70_02260930(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, NARC *param3, u32 heapID); static void ov70_022609A8(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1); -static void ov70_022609D4(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, NARC *param3, u32 param4); +static void ov70_022609D4(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, NARC *param3, u32 heapID); static void ov70_02260A50(u32 param0, enum TouchScreenButtonState param1, void *param2); static void ov70_02260A68(UnkStruct_ov70_02260744 *param0); @@ -1138,7 +1137,7 @@ void ov70_0225E328(UnkStruct_ov70_0225DEE8 *param0, u32 param1, BOOL param2) void ov70_0225E378(UnkStruct_ov70_0225DEE8 *param0, u32 param1) { - ov70_0225F7A8(¶m0->unk_1E8, ¶m0->unk_3C, param1, 112); + ov70_0225F7A8(¶m0->unk_1E8, ¶m0->unk_3C, param1, HEAP_ID_112); } void ov70_0225E390(UnkStruct_ov70_0225DEE8 *param0) @@ -1153,7 +1152,7 @@ void ov70_0225E390(UnkStruct_ov70_0225DEE8 *param0) v1 = ov70_0225F7F8(¶m0->unk_1E8); v0 = ov66_0222E374(param0->unk_34, v1); - ov70_0225FDA0(¶m0->unk_1E8, ¶m0->unk_1E8.unk_08, ¶m0->unk_3C, 112, v0); + ov70_0225FDA0(¶m0->unk_1E8, ¶m0->unk_1E8.unk_08, ¶m0->unk_3C, HEAP_ID_112, v0); } void ov70_0225E3D0(UnkStruct_ov70_0225DEE8 *param0) @@ -2269,13 +2268,13 @@ static void ov70_0225F79C(UnkStruct_ov70_0225F350 *param0, u32 param1, BOOL para param0->unk_04 = param2; } -static void ov70_0225F7A8(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u32 param3) +static void ov70_0225F7A8(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u32 heapID) { GF_ASSERT(param2 < 27); GF_ASSERT(param0->unk_01 == 2); if (param0->unk_01 == 2) { - ov70_0225FEC4(¶m0->unk_08, param1, param0->unk_14C, param3, param2); + ov70_0225FEC4(¶m0->unk_08, param1, param0->unk_14C, heapID, param2); } } @@ -2360,13 +2359,13 @@ static void ov70_0225F8AC(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4 param0->unk_01 = 1; } -static void ov70_0225F8F0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u32 param3) +static void ov70_0225F8F0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 heapID, u32 param3) { if (param0->unk_01 == 3) { ov70_0225F920(param0, param1); } - ov70_02260930(¶m0->unk_114, param1, param3, param0->unk_14C, param2); + ov70_02260930(¶m0->unk_114, param1, param3, param0->unk_14C, heapID); param0->unk_01 = 3; } @@ -2381,10 +2380,10 @@ static void ov70_0225F934(UnkStruct_ov70_0225F350 *param0, BOOL param1) param0->unk_114.unk_06 = param1; } -static void ov70_0225F940(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u32 param3) +static void ov70_0225F940(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u32 heapID) { param0->unk_154 = param2; - param0->unk_156 = param3; + param0->unk_156 = heapID; SysTask_ExecuteAfterVBlank(ov70_0225F95C, param0, 0); } @@ -2408,20 +2407,20 @@ static void ov70_0225F95C(SysTask *param0, void *param1) SysTask_Done(param0); } -static void ov70_0225F9BC(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4) +static void ov70_0225F9BC(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 heapID) { { if (param3 == 0) { - Graphics_LoadPaletteFromOpenNARC(param2, 86, 4, 0, 0, param4); + Graphics_LoadPaletteFromOpenNARC(param2, 86, 4, 0, 0, heapID); } else { - Graphics_LoadPaletteFromOpenNARC(param2, 87, 4, 0, 0, param4); + Graphics_LoadPaletteFromOpenNARC(param2, 87, 4, 0, 0, heapID); } - Graphics_LoadTilesToBgLayerFromOpenNARC(param2, 54, param1->unk_00, Unk_ov70_0226D5CC[1], 0, 0, 0, param4); + Graphics_LoadTilesToBgLayerFromOpenNARC(param2, 54, param1->unk_00, Unk_ov70_0226D5CC[1], 0, 0, 0, heapID); } { - Font_LoadTextPalette(4, 5 * 32, param4); + Font_LoadTextPalette(4, 5 * 32, heapID); } } @@ -2455,7 +2454,7 @@ static void ov70_0225FA14(UnkStruct_ov70_0225E4EC *param0, NARC *param1, u32 par Heap_Free(v0); } -static void ov70_0225FA84(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3) +static void ov70_0225FA84(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 heapID) { { int v0; @@ -2588,7 +2587,7 @@ static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9 Heap_Free(v1); } -static void ov70_0225FDA0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225FA84 *param1, UnkStruct_ov70_0225E4EC *param2, u32 param3, const UnkStruct_ov66_0222E71C *param4) +static void ov70_0225FDA0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225FA84 *param1, UnkStruct_ov70_0225E4EC *param2, u32 heapID, const UnkStruct_ov66_0222E71C *param4) { u16 v0; int v1; @@ -2601,7 +2600,7 @@ static void ov70_0225FDA0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225FA if (v0 != 0) { v2 = ov66_022316E8(v0); - v3 = LoadMemberFromNARC(TypeIcon_GetNARC(), TypeIcon_GetChar(v2), 1, param3, 1); + v3 = LoadMemberFromNARC(TypeIcon_GetNARC(), TypeIcon_GetChar(v2), 1, heapID, 1); NNS_G2dGetUnpackedCharacterData(v3, &v4); @@ -2630,10 +2629,10 @@ static void ov70_0225FE80(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E9 Bg_ClearTilemap(param2->unk_00, Unk_ov70_0226D5CC[3]); } -static void ov70_0225FEC4(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4) +static void ov70_0225FEC4(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 heapID, u32 param4) { ov70_02260048(param0, param1); - ov70_0225FEF0(param0, param1, param2, param3, param4, 1); + ov70_0225FEF0(param0, param1, param2, heapID, param4, 1); } static BOOL ov70_0225FEEC(const UnkStruct_ov70_0225FA84 *param0) @@ -2641,7 +2640,7 @@ static BOOL ov70_0225FEEC(const UnkStruct_ov70_0225FA84 *param0) return param0->unk_00; } -static void ov70_0225FEF0(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4, BOOL param5) +static void ov70_0225FEF0(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 heapID, u32 param4, BOOL param5) { u32 v0; u32 v1; @@ -2655,20 +2654,20 @@ static void ov70_0225FEF0(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4 { BOOL v2; - param0->unk_58[0] = SpriteResourceCollection_AddTilesFrom(param1->unk_194[0], param2, 61 + (v0 * 3), 0, 100, NNS_G2D_VRAM_TYPE_2DSUB, param3); + param0->unk_58[0] = SpriteResourceCollection_AddTilesFrom(param1->unk_194[0], param2, 61 + (v0 * 3), 0, 100, NNS_G2D_VRAM_TYPE_2DSUB, heapID); v2 = SpriteTransfer_RequestCharAtEnd(param0->unk_58[0]); GF_ASSERT(v2); SpriteResource_ReleaseData(param0->unk_58[0]); - param0->unk_58[1] = SpriteResourceCollection_AddPaletteFrom(param1->unk_194[1], param2, 89, 0, 100, NNS_G2D_VRAM_TYPE_2DSUB, 3, param3); + param0->unk_58[1] = SpriteResourceCollection_AddPaletteFrom(param1->unk_194[1], param2, 89, 0, 100, NNS_G2D_VRAM_TYPE_2DSUB, 3, heapID); v2 = SpriteTransfer_RequestPlttFreeSpace(param0->unk_58[1]); GF_ASSERT(v2); SpriteResource_ReleaseData(param0->unk_58[1]); - param0->unk_58[2] = SpriteResourceCollection_AddFrom(param1->unk_194[2], param2, 60 + (v0 * 3), 0, 100, 2, param3); - param0->unk_58[3] = SpriteResourceCollection_AddFrom(param1->unk_194[3], param2, 59 + (v0 * 3), 0, 100, 3, param3); + param0->unk_58[2] = SpriteResourceCollection_AddFrom(param1->unk_194[2], param2, 60 + (v0 * 3), 0, 100, 2, heapID); + param0->unk_58[3] = SpriteResourceCollection_AddFrom(param1->unk_194[3], param2, 59 + (v0 * 3), 0, 100, 3, heapID); } { @@ -2681,7 +2680,7 @@ static void ov70_0225FEF0(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4 v4.resourceData = &v3; v4.priority = 16; v4.vramType = NNS_G2D_VRAM_TYPE_2DSUB; - v4.heapID = param3; + v4.heapID = heapID; v4.position.x = (FX32_CONST(208)); v4.position.y = (FX32_CONST(152) + (256 * FX32_ONE)); param0->unk_54 = SpriteList_Add(&v4); @@ -2708,7 +2707,7 @@ static void ov70_02260048(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4 } } -static void ov70_02260080(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4) +static void ov70_02260080(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 heapID, u32 param4) { u32 v0; u16 v1, v2; @@ -2730,19 +2729,19 @@ static void ov70_02260080(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4 { BOOL v5; - param0->unk_6C[0] = SpriteResourceCollection_AddTiles(param1->unk_194[0], v4.narcID, v4.unk_04, 0, 101, NNS_G2D_VRAM_TYPE_2DSUB, param3); + param0->unk_6C[0] = SpriteResourceCollection_AddTiles(param1->unk_194[0], v4.narcID, v4.unk_04, 0, 101, NNS_G2D_VRAM_TYPE_2DSUB, heapID); v5 = SpriteTransfer_RequestCharAtEnd(param0->unk_6C[0]); GF_ASSERT(v5); - param0->unk_6C[1] = SpriteResourceCollection_AddPalette(param1->unk_194[1], v4.narcID, v4.unk_08, 0, 101, NNS_G2D_VRAM_TYPE_2DSUB, 1, param3); + param0->unk_6C[1] = SpriteResourceCollection_AddPalette(param1->unk_194[1], v4.narcID, v4.unk_08, 0, 101, NNS_G2D_VRAM_TYPE_2DSUB, 1, heapID); ov70_02260268(SpriteResource_GetPaletteFade(param0->unk_6C[1])); v5 = SpriteTransfer_RequestPlttFreeSpace(param0->unk_6C[1]); GF_ASSERT(v5); SpriteResource_ReleaseData(param0->unk_6C[1]); - param0->unk_6C[2] = SpriteResourceCollection_Add(param1->unk_194[2], v4.narcID, v4.unk_0C, 0, 101, 2, param3); - param0->unk_6C[3] = SpriteResourceCollection_Add(param1->unk_194[3], v4.narcID, v4.unk_10, 0, 101, 3, param3); + param0->unk_6C[2] = SpriteResourceCollection_Add(param1->unk_194[2], v4.narcID, v4.unk_0C, 0, 101, 2, heapID); + param0->unk_6C[3] = SpriteResourceCollection_Add(param1->unk_194[3], v4.narcID, v4.unk_10, 0, 101, 3, heapID); } { @@ -2755,7 +2754,7 @@ static void ov70_02260080(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4 v7.resourceData = &v6; v7.priority = 32; v7.vramType = NNS_G2D_VRAM_TYPE_2DSUB; - v7.heapID = param3; + v7.heapID = heapID; v7.position.x = FX32_CONST(v1); v7.position.y = FX32_CONST(v2) + (256 * FX32_ONE); @@ -3020,19 +3019,19 @@ static const UnkStruct_ov70_0226D844 *ov70_02260728(int param0, s32 param1, s32 return &Unk_ov70_0226D844[param0]; } -static void ov70_02260744(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3) +static void ov70_02260744(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 heapID) { int v0; Window_AddFromTemplate(param1->unk_00, ¶m0->unk_0C, &Unk_ov70_0226D5A4); for (v0 = 0; v0 < 3; v0++) { - param0->unk_20[v0] = Graphics_GetScrnDataFromOpenNARC(param2, 56 + v0, 0, ¶m0->unk_2C[v0], param3); + param0->unk_20[v0] = Graphics_GetScrnDataFromOpenNARC(param2, 56 + v0, 0, ¶m0->unk_2C[v0], heapID); } { static const TouchScreenHitTable v1 = { 32, 160, 40, 216 }; - param0->unk_1C = TouchScreenActions_RegisterHandler(&v1, 1, ov70_02260A50, param0, param3); + param0->unk_1C = TouchScreenActions_RegisterHandler(&v1, 1, ov70_02260A50, param0, heapID); } param0->unk_06 = 1; @@ -3052,7 +3051,7 @@ static void ov70_022607A8(UnkStruct_ov70_02260744 *param0) param0->unk_02 = 0; } -static BOOL ov70_022607D4(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3) +static BOOL ov70_022607D4(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 heapID) { BOOL v0 = 0; @@ -3065,7 +3064,7 @@ static BOOL ov70_022607D4(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4 if (param0->unk_02 == 1) { if (param0->unk_00 == 0) { param0->unk_02 = 0; - ov70_022609D4(param0, param1, 0, param2, param3); + ov70_022609D4(param0, param1, 0, param2, heapID); } } @@ -3073,12 +3072,12 @@ static BOOL ov70_022607D4(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4 param0->unk_04 = param0->unk_03; if (param0->unk_03 == 2) { - ov70_022609D4(param0, param1, 1, param2, param3); + ov70_022609D4(param0, param1, 1, param2, heapID); } else { if (param0->unk_02 == 0) { - ov70_022609D4(param0, param1, 0, param2, param3); + ov70_022609D4(param0, param1, 0, param2, heapID); } else { - ov70_022609D4(param0, param1, 2, param2, param3); + ov70_022609D4(param0, param1, 2, param2, heapID); } } @@ -3118,23 +3117,23 @@ static void ov70_02260870(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4 } } -static void ov70_02260930(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, NARC *param3, u32 param4) +static void ov70_02260930(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, NARC *param3, u32 heapID) { GF_ASSERT(param2 < 3); { - Graphics_LoadTilemapToBgLayerFromOpenNARC(param3, 55, param1->unk_00, Unk_ov70_0226D5CC[1], 0, 0, 0, param4); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param3, 55, param1->unk_00, Unk_ov70_0226D5CC[1], 0, 0, 0, heapID); } param0->unk_08 = 1; param0->unk_0A = param2; - Graphics_LoadTilesToBgLayerFromOpenNARC(param3, 93 + param0->unk_0A, param1->unk_00, Unk_ov70_0226D5CC[3], 320, 0, 0, param4); + Graphics_LoadTilesToBgLayerFromOpenNARC(param3, 93 + param0->unk_0A, param1->unk_00, Unk_ov70_0226D5CC[3], 320, 0, 0, heapID); if (param0->unk_02 == 0) { - ov70_022609D4(param0, param1, 0, param3, param4); + ov70_022609D4(param0, param1, 0, param3, heapID); } else { - ov70_022609D4(param0, param1, 2, param3, param4); + ov70_022609D4(param0, param1, 2, param3, heapID); } } diff --git a/src/overlay070/ov70_02261E10.c b/src/overlay070/ov70_02261E10.c index 23ecafe9bc..30ecba621b 100644 --- a/src/overlay070/ov70_02261E10.c +++ b/src/overlay070/ov70_02261E10.c @@ -141,7 +141,7 @@ static const UnkStruct_ov70_0226D920 Unk_ov70_0226D920[9] = { { 0x1, 0x2 } }; -UnkStruct_ov70_02261E10 *ov70_02261E10(int param0, int param1, const UnkStruct_ov70_0225C894 *param2, u32 heapID, u32 heapID2) +UnkStruct_ov70_02261E10 *ov70_02261E10(int param0, int param1, const UnkStruct_ov70_0225C894 *param2, enum HeapID heapID, u32 heapID2) { UnkStruct_ov70_02261E10 *v0; int v1; diff --git a/src/overlay070/ov70_02262DA8.c b/src/overlay070/ov70_02262DA8.c index 786123e77f..ffd5b5585e 100644 --- a/src/overlay070/ov70_02262DA8.c +++ b/src/overlay070/ov70_02262DA8.c @@ -32,7 +32,7 @@ typedef struct UnkStruct_ov70_022630A4_t { } UnkStruct_ov70_022630A4; static void ov70_02262F14(UnkStruct_ov70_022630A4 *param0, u32 param1); -static void ov70_02262F64(UnkStruct_ov70_02263344 *param0, u32 param1, u32 heapID); +static void ov70_02262F64(UnkStruct_ov70_02263344 *param0, u32 param1, enum HeapID heapID); static void ov70_02262F70(UnkStruct_ov70_02263344 *param0); static void ov70_02262F94(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_022630A4 *param1, u32 param2, u32 param3); static void ov70_02262FD4(UnkStruct_ov70_02263344 *param0, const UnkStruct_ov70_0226DA18 *param1, void *param2); @@ -44,7 +44,7 @@ static BOOL ov70_0226307C(const UnkStruct_ov70_02263344 *param0); static void ov70_0226308C(UnkStruct_ov70_0226308C *param0, const UnkStruct_ov70_0226DA18 *param1, void *param2, u32 param3, void *param4); static void ov70_02263098(UnkStruct_ov70_0226308C *param0); -UnkStruct_ov70_022630A4 *ov70_02262DA8(UnkStruct_ov70_0225DEE8 *param0, u32 heapID) +UnkStruct_ov70_022630A4 *ov70_02262DA8(UnkStruct_ov70_0225DEE8 *param0, enum HeapID heapID) { UnkStruct_ov70_022630A4 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov70_022630A4)); memset(v0, 0, sizeof(UnkStruct_ov70_022630A4)); @@ -173,7 +173,7 @@ static void ov70_02262F14(UnkStruct_ov70_022630A4 *param0, u32 param1) } } -static void ov70_02262F64(UnkStruct_ov70_02263344 *param0, u32 param1, u32 heapID) +static void ov70_02262F64(UnkStruct_ov70_02263344 *param0, u32 param1, enum HeapID heapID) { param0->heapID = heapID; param0->unk_02 = 1; diff --git a/src/overlay070/ov70_02269190.c b/src/overlay070/ov70_02269190.c index 9c50477e55..710507c6ec 100644 --- a/src/overlay070/ov70_02269190.c +++ b/src/overlay070/ov70_02269190.c @@ -625,7 +625,7 @@ static const UnkStruct_ov70_0226E5A4 Unk_ov70_0226E5A4[39] = { }, }; -UnkStruct_ov70_02269204 *ov70_02269190(UnkStruct_ov66_0222DFF8 *param0, UnkStruct_ov70_0225C894 *param1, UnkStruct_ov70_02260AD4 *param2, UnkStruct_ov70_0225CA20 *param3, u32 heapID, u32 heapID2) +UnkStruct_ov70_02269204 *ov70_02269190(UnkStruct_ov66_0222DFF8 *param0, UnkStruct_ov70_0225C894 *param1, UnkStruct_ov70_02260AD4 *param2, UnkStruct_ov70_0225CA20 *param3, enum HeapID heapID, u32 heapID2) { UnkStruct_ov70_02269204 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov70_02269204)); memset(v0, 0, sizeof(UnkStruct_ov70_02269204)); diff --git a/src/overlay070/ov70_0226CE54.c b/src/overlay070/ov70_0226CE54.c index 49b86a9cea..088e857e95 100644 --- a/src/overlay070/ov70_0226CE54.c +++ b/src/overlay070/ov70_0226CE54.c @@ -111,7 +111,7 @@ static const UnkStruct_ov70_0226E774 Unk_ov70_0226E774[5] = { }, }; -UnkStruct_ov70_0226CF38 *ov70_0226CE54(UnkStruct_ov70_0225DEE8 *param0, u32 heapID) +UnkStruct_ov70_0226CF38 *ov70_0226CE54(UnkStruct_ov70_0225DEE8 *param0, enum HeapID heapID) { UnkStruct_ov70_0226CF38 *v0; int v1; diff --git a/src/overlay101/ov101_021D7E48.c b/src/overlay101/ov101_021D7E48.c index 3a1abda9c5..c9efc61fea 100644 --- a/src/overlay101/ov101_021D7E48.c +++ b/src/overlay101/ov101_021D7E48.c @@ -21,7 +21,7 @@ typedef struct { } UnkStruct_ov101_021D7E48_sub1; typedef struct UnkStruct_ov101_021D7E48_t { - u32 heapID; + enum HeapID heapID; u8 unk_04; u8 unk_05; u8 unk_06; diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c index c25f03b309..669cf6f753 100644 --- a/src/overlay104/ov104_0223C2D4.c +++ b/src/overlay104/ov104_0223C2D4.c @@ -290,7 +290,7 @@ void ov104_0223C688(UnkStruct_ov104_0223C4CC *param0) for (v0 = 0; v0 < 24; v0++) { if (v1[v0].unk_00 != 0xffff) { - ov63_0222CDE8(param0->unk_20, v1[v0].unk_00, v1[v0].unk_02, 94); + ov63_0222CDE8(param0->unk_20, v1[v0].unk_00, v1[v0].unk_02, HEAP_ID_94); } } } @@ -859,7 +859,7 @@ void ov104_0223D0EC(UnkStruct_ov104_0223C4CC *param0, const UnkStruct_ov104_0223 v2 = v1; v0[v2] = *param1; - ov63_0222CDE8(param0->unk_20, param1->unk_00, param1->unk_02, 94); + ov63_0222CDE8(param0->unk_20, param1->unk_00, param1->unk_02, HEAP_ID_94); } void ov104_0223D148(UnkStruct_ov104_0223C4CC *param0, int param1) @@ -907,7 +907,7 @@ UnkStruct_ov63_0222BEC0 *ov104_0223D180(UnkStruct_ov104_0223C4CC *param0, const v3.unk_0A = param1->unk_00; v4 = ov63_0222BEC0(param0->unk_14, &v3); - v5 = ov63_0222CE44(param0->unk_20, v4, 0, 94); + v5 = ov63_0222CE44(param0->unk_20, v4, 0, HEAP_ID_94); ov63_0222D008(v5, param1->unk_0B); ov104_0223D584(param0->unk_08, v2, v4, v5, param1); diff --git a/src/overlay104/ov104_0223E894.c b/src/overlay104/ov104_0223E894.c index 929e472967..9c01c30e0c 100644 --- a/src/overlay104/ov104_0223E894.c +++ b/src/overlay104/ov104_0223E894.c @@ -212,7 +212,7 @@ BOOL ov104_0223EA38(UnkStruct_ov104_0223EA38 *param0) return 1; } -UnkStruct_ov104_0223EA84 *ov104_0223EA64(u32 heapID) +UnkStruct_ov104_0223EA84 *ov104_0223EA64(enum HeapID heapID) { UnkStruct_ov104_0223EA84 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov104_0223EA84)); memset(v0, 0, sizeof(UnkStruct_ov104_0223EA84)); @@ -295,7 +295,7 @@ static void ov104_0223EB44(Window *param0, s32 param1, s32 param2, s32 param3, s Window_FillRectWithColor(param0, param5, param3, param1, param4 - param3, param2 - param1); } -UnkStruct_ov104_0223EBD0 *ov104_0223EBA0(u32 heapID) +UnkStruct_ov104_0223EBD0 *ov104_0223EBA0(enum HeapID heapID) { UnkStruct_ov104_0223EBD0 *v0; int v1; @@ -506,7 +506,7 @@ static void ov104_0223F070(SysTask *param0, void *param1) v0->unk_08++; } -void ov104_0223F094(UnkStruct_ov104_0223F094 *param0, u32 heapID) +void ov104_0223F094(UnkStruct_ov104_0223F094 *param0, enum HeapID heapID) { param0->screenScrollMgr = ScreenScrollManager_New(heapID); param0->unk_08 = 0; diff --git a/src/overlay105/ov105_02245DC4.c b/src/overlay105/ov105_02245DC4.c index b7594b57fd..22560fabcf 100644 --- a/src/overlay105/ov105_02245DC4.c +++ b/src/overlay105/ov105_02245DC4.c @@ -20,7 +20,7 @@ void *ov105_02245E1C(UnkStruct_ov105_02245E1C *param0); void ov105_02245E30(UnkStruct_ov105_02245E1C *param0, int param1, int param2); BOOL ov105_02245E48(UnkStruct_ov105_02245E1C *param0); -UnkStruct_ov105_02245E1C *ov105_02245DC4(UnkStruct_ov105_02245AAC *param0, u32 param1, int param2, int param3, u32 heapID) +UnkStruct_ov105_02245E1C *ov105_02245DC4(UnkStruct_ov105_02245AAC *param0, u32 param1, int param2, int param3, enum HeapID heapID) { UnkStruct_ov105_02245E1C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov105_02245E1C)); memset(v0, 0, sizeof(UnkStruct_ov105_02245E1C)); diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c index b82e677ea3..6b33555e1b 100644 --- a/src/overlay112/ov112_0225C700.c +++ b/src/overlay112/ov112_0225C700.c @@ -132,25 +132,25 @@ typedef struct { static void ov112_0225C964(void *param0); static void ov112_0225C970(UnkStruct_ov112_0225C970 *param0, const UnkStruct_ov66_0222DFF8 *param1); -static void ov112_0225C9BC(UnkStruct_ov112_0225C9BC *param0, u32 param1); +static void ov112_0225C9BC(UnkStruct_ov112_0225C9BC *param0, enum HeapID heapID); static void ov112_0225C9F4(UnkStruct_ov112_0225C9BC *param0); static void ov112_0225CA14(UnkStruct_ov112_0225C9BC *param0); static void ov112_0225CA20(UnkStruct_ov112_0225C9BC *param0); -static void ov112_0225CA34(UnkStruct_ov112_0225C9BC *param0, u32 heapID); +static void ov112_0225CA34(UnkStruct_ov112_0225C9BC *param0, enum HeapID heapID); static void ov112_0225CB60(UnkStruct_ov112_0225C9BC *param0); -static void ov112_0225CB98(UnkStruct_ov112_0225C9BC *param0, u32 heapID); +static void ov112_0225CB98(UnkStruct_ov112_0225C9BC *param0, enum HeapID heapID); static void ov112_0225CC38(UnkStruct_ov112_0225C9BC *param0); -static void ov112_0225CC64(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u32 heapID); +static void ov112_0225CC64(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, enum HeapID heapID); static void ov112_0225CC84(UnkStruct_ov112_0225CC84 *param0); static void ov112_0225CC90(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2, u8 param3, u8 param4); static void ov112_0225CCE8(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u8 param2, u8 param3, u32 param4, u32 param5, BOOL param6, BOOL param7, BOOL param8); -static void ov112_0225CDA8(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_02231428 *param4, const UnkStruct_ov66_0222DFF8 *param5, u32 param6); +static void ov112_0225CDA8(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_02231428 *param4, const UnkStruct_ov66_0222DFF8 *param5, enum HeapID heapID); static void ov112_0225CDF8(UnkStruct_ov112_0225CDF8 *param0); static BOOL ov112_0225CDFC(UnkStruct_ov112_0225CDF8 *param0, const UnkStruct_ov66_0223177C *param1, const UnkStruct_ov66_02231428 *param2); static void ov112_0225CE60(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225CC84 *param1, UnkStruct_ov112_0225C9BC *param2); static void ov112_0225CE74(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225CC84 *param1, UnkStruct_ov112_0225C9BC *param2); static void ov112_0225CE88(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225CC84 *param1, UnkStruct_ov112_0225C9BC *param2); -static void ov112_0225CFC0(UnkStruct_ov112_0225CFD4 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_0222DFF8 *param4, u32 heapID); +static void ov112_0225CFC0(UnkStruct_ov112_0225CFD4 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_0222DFF8 *param4, enum HeapID heapID); static void ov112_0225CFD4(UnkStruct_ov112_0225CFD4 *param0); static BOOL ov112_0225CFD8(UnkStruct_ov112_0225CFD4 *param0, const UnkStruct_ov66_0223177C *param1); static void ov112_0225D004(UnkStruct_ov112_0225CFD4 *param0, UnkStruct_ov112_0225CC84 *param1, UnkStruct_ov112_0225C9BC *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_0222DFF8 *param4); @@ -159,17 +159,17 @@ static void ov112_0225D144(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_022 static void ov112_0225D164(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, const UnkStruct_ov66_0223177C *param2, const UnkStruct_ov66_0222DFF8 *param3, u32 param4); static void ov112_0225D180(UnkStruct_ov112_0225D180 *param0, const UnkStruct_ov66_0223177C *param1, int param2, const UnkStruct_ov66_0222DFF8 *param3); static void ov112_0225D1B8(const UnkStruct_ov112_0225D180 *param0, const NNSG2dPaletteData *param1, u32 param2); -static void ov112_0225D1EC(UnkStruct_ov112_0225D2D0 *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2); +static void ov112_0225D1EC(UnkStruct_ov112_0225D2D0 *param0, UnkStruct_ov112_0225C9BC *param1, enum HeapID heapID); static void ov112_0225D2D0(UnkStruct_ov112_0225D2D0 *param0); -static BOOL ov112_0225D304(UnkStruct_ov112_0225D2D0 *param0, UnkStruct_ov66_0223177C *param1, const UnkStruct_ov66_0222DFF8 *param2, u32 heapID); +static BOOL ov112_0225D304(UnkStruct_ov112_0225D2D0 *param0, UnkStruct_ov66_0223177C *param1, const UnkStruct_ov66_0222DFF8 *param2, enum HeapID heapID); static void ov112_0225D3E0(UnkStruct_ov112_0225D2D0 *param0); -static void ov112_0225D408(UnkStruct_ov112_0225D44C *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2, u32 param3); +static void ov112_0225D408(UnkStruct_ov112_0225D44C *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2, enum HeapID heapID); static void ov112_0225D44C(UnkStruct_ov112_0225D44C *param0); static void ov112_0225D460(UnkStruct_ov112_0225D44C *param0, const String *param1, u32 param2, const UnkStruct_ov112_0225D180 *param3, const NNSG2dPaletteData *param4); static void ov112_0225D4DC(UnkStruct_ov112_0225D44C *param0); static BOOL ov112_0225D4E4(UnkStruct_ov112_0225D44C *param0); static void ov112_0225D4F8(const UnkStruct_ov112_0225D44C *param0, Window *param1); -static void ov112_0225D57C(UnkStruct_ov112_0225D6DC *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2); +static void ov112_0225D57C(UnkStruct_ov112_0225D6DC *param0, UnkStruct_ov112_0225C9BC *param1, enum HeapID heapID); static void ov112_0225D6DC(UnkStruct_ov112_0225D6DC *param0); static void ov112_0225D700(UnkStruct_ov112_0225D6DC *param0); static void ov112_0225D718(UnkStruct_ov112_0225D6DC *param0, u32 param1); @@ -454,7 +454,7 @@ static void ov112_0225C970(UnkStruct_ov112_0225C970 *param0, const UnkStruct_ov6 ov112_0225CA14(¶m0->unk_08); } -static void ov112_0225C9BC(UnkStruct_ov112_0225C9BC *param0, u32 heapID) +static void ov112_0225C9BC(UnkStruct_ov112_0225C9BC *param0, enum HeapID heapID) { param0->unk_1A4 = NARC_ctor(NARC_INDEX_GRAPHIC__LOBBY_NEWS, heapID); @@ -486,7 +486,7 @@ static void ov112_0225CA20(UnkStruct_ov112_0225C9BC *param0) VramTransfer_Process(); } -static void ov112_0225CA34(UnkStruct_ov112_0225C9BC *param0, u32 heapID) +static void ov112_0225CA34(UnkStruct_ov112_0225C9BC *param0, enum HeapID heapID) { SetAllGraphicsModes(&Unk_ov112_0225D834); @@ -535,7 +535,7 @@ static void ov112_0225CB60(UnkStruct_ov112_0225C9BC *param0) GXLayers_SwapDisplay(); } -static void ov112_0225CB98(UnkStruct_ov112_0225C9BC *param0, u32 heapID) +static void ov112_0225CB98(UnkStruct_ov112_0225C9BC *param0, enum HeapID heapID) { int i; @@ -577,7 +577,7 @@ static void ov112_0225CC38(UnkStruct_ov112_0225C9BC *param0) RenderOam_Free(); } -static void ov112_0225CC64(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u32 heapID) +static void ov112_0225CC64(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, enum HeapID heapID) { param0->unk_00 = Graphics_GetScrnDataFromOpenNARC(param1->unk_1A4, 5, 0, ¶m0->unk_04, heapID); } @@ -619,7 +619,7 @@ static void ov112_0225CCE8(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_022 Bg_ScheduleTilemapTransfer(param1->unk_00, 3); } -static void ov112_0225CDA8(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_02231428 *param4, const UnkStruct_ov66_0222DFF8 *param5, u32 heapID) +static void ov112_0225CDA8(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_02231428 *param4, const UnkStruct_ov66_0222DFF8 *param5, enum HeapID heapID) { u32 v0; u32 v1; @@ -766,7 +766,7 @@ static void ov112_0225CE88(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_022 } } -static void ov112_0225CFC0(UnkStruct_ov112_0225CFD4 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_0222DFF8 *param4, u32 heapID) +static void ov112_0225CFC0(UnkStruct_ov112_0225CFD4 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_0222DFF8 *param4, enum HeapID heapID) { ov112_0225D08C(param2, param1, param3, param4, 0); } @@ -937,7 +937,7 @@ static void ov112_0225D1B8(const UnkStruct_ov112_0225D180 *param0, const NNSG2dP } } -static void ov112_0225D1EC(UnkStruct_ov112_0225D2D0 *param0, UnkStruct_ov112_0225C9BC *param1, u32 heapID) +static void ov112_0225D1EC(UnkStruct_ov112_0225D2D0 *param0, UnkStruct_ov112_0225C9BC *param1, enum HeapID heapID) { int v0; @@ -970,7 +970,7 @@ static void ov112_0225D2D0(UnkStruct_ov112_0225D2D0 *param0) } } -static BOOL ov112_0225D304(UnkStruct_ov112_0225D2D0 *param0, UnkStruct_ov66_0223177C *param1, const UnkStruct_ov66_0222DFF8 *param2, u32 heapID) +static BOOL ov112_0225D304(UnkStruct_ov112_0225D2D0 *param0, UnkStruct_ov66_0223177C *param1, const UnkStruct_ov66_0222DFF8 *param2, enum HeapID heapID) { int v0; BOOL v1; @@ -1024,7 +1024,7 @@ static void ov112_0225D3E0(UnkStruct_ov112_0225D2D0 *param0) } } -static void ov112_0225D408(UnkStruct_ov112_0225D44C *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2, u32 heapID) +static void ov112_0225D408(UnkStruct_ov112_0225D44C *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2, enum HeapID heapID) { param0->unk_00 = 0; param0->unk_02 = 0; @@ -1105,7 +1105,7 @@ static void ov112_0225D4F8(const UnkStruct_ov112_0225D44C *param0, Window *param Window_ScheduleCopyToVRAM(param1); } -static void ov112_0225D57C(UnkStruct_ov112_0225D6DC *param0, UnkStruct_ov112_0225C9BC *param1, u32 heapID) +static void ov112_0225D57C(UnkStruct_ov112_0225D6DC *param0, UnkStruct_ov112_0225C9BC *param1, enum HeapID heapID) { int v0; MessageLoader *v1; diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index 7d5742dfb1..9db1d9690f 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -272,7 +272,6 @@ static UnkStruct_ov114_0225CDB4 *ov114_0225CD54(UnkStruct_ov114_0225CCD0 *param0 static Sprite *ov114_0225CDB4(UnkStruct_ov114_0225CDB4 *param0, SpriteList *param1, s16 param2, s16 param3, u16 param4, u32 param5); static void ov114_0225CDE0(UnkStruct_ov114_0225CCD0 *param0, UnkStruct_ov114_0225CDB4 *param1, NARC *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9); static void ov114_0225CEB8(UnkStruct_ov114_0225CCD0 *param0, UnkStruct_ov114_0225CDB4 *param1); -static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const GraphicsModes *param1, const UnkStruct_ov114_02260284 *param2, u32 param3, u32 heapID); static void ov114_0225CF84(UnkStruct_ov114_0225CEF0 *param0); static void ov114_0225CFC0(UnkStruct_ov114_0225CEF0 *param0); static void ov114_0225CFCC(UnkStruct_ov114_0225CFCC *param0, u32 param1, u32 param2, u32 param3, u32 param4); @@ -294,7 +293,7 @@ static void ov114_0225D1AC(UnkStruct_ov114_0225D084 *param0, u32 param1, Window static void ov114_0225D1C8(UnkStruct_ov114_0225D084 *param0, u32 param1, Window *param2, u8 param3, u8 param4); static u32 ov114_0225D218(UnkStruct_ov114_0225D084 *param0, u32 param1, Window *param2, String *param3, u32 param4); static void ov114_0225D254(UnkStruct_ov114_0225D084 *param0, u32 param1, Window *param2, u8 param3, u8 param4, TextColor param5); -static void ov114_0225D290(UnkStruct_ov114_0225D338 *param0, UnkStruct_ov114_0225CEF0 *param1, SaveData *saveData, BOOL param3, u32 param4); +static void ov114_0225D290(UnkStruct_ov114_0225D338 *param0, UnkStruct_ov114_0225CEF0 *param1, SaveData *saveData, BOOL param3, u32 heapID); static void ov114_0225D338(UnkStruct_ov114_0225D338 *param0); static void ov114_0225D368(UnkStruct_ov114_0225D338 *param0, UnkStruct_ov114_0225D084 *param1, u32 param2, u32 param3); static void ov114_0225D400(UnkStruct_ov114_0225D338 *param0, u32 param1); @@ -322,7 +321,7 @@ static void ov114_0225E0AC(void *param0); static void ov114_0225E0F8(UnkStruct_ov114_0225E0F8 *param0, const UnkStruct_ov114_0225C76C *param1); static BOOL ov114_0225E14C(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225E0F8 *param1); u32 ov114_0225E180(u32 param0); -static void ov114_0225E1A4(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, UnkStruct_ov114_0225D084 *param2, u32 param3, NARC *param4, u32 param5); +static void ov114_0225E1A4(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, UnkStruct_ov114_0225D084 *param2, u32 param3, NARC *param4, u32 heapID); static void ov114_0225E234(UnkStruct_ov114_0225E1A4 *param0); static void ov114_0225E244(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, u32 heapID); static void ov114_0225E2D4(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1); @@ -332,14 +331,14 @@ static void ov114_0225E4B0(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_022 static void ov114_0225E500(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, s32 param2); static void ov114_0225E550(NARC *param0, u32 param1, u32 param2); static UnkStruct_ov114_0225D678 *ov114_0225D48C(const UnkStruct_ov114_0225C76C *param0, u32 param1, u32 heapID); -static void ov114_0225D5BC(UnkStruct_ov114_0225D678 *param0, u32 param1); +static void ov114_0225D5BC(UnkStruct_ov114_0225D678 *param0, u32 heapID); static void ov114_0225D678(UnkStruct_ov114_0225D678 *param0); static void ov114_0225D688(SysTask *param0, void *param1); static void ov114_0225DA0C(SysTask *param0, void *param1); static int ov114_0225DA2C(const u8 *param0, u32 param1); static BOOL ov114_0225DA5C(UnkStruct_ov114_0225D678 *param0); static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2, u32 heapID); -static void ov114_0225E744(UnkStruct_ov114_0225E854 *param0, u32 param1); +static void ov114_0225E744(UnkStruct_ov114_0225E854 *param0, u32 heapID); static void ov114_0225E854(UnkStruct_ov114_0225E854 *param0); static void ov114_0225E874(SysTask *param0, void *param1); static void ov114_0225ED40(SysTask *param0, void *param1); @@ -1308,7 +1307,7 @@ static void ov114_0225CEB8(UnkStruct_ov114_0225CCD0 *param0, UnkStruct_ov114_022 } } -static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const GraphicsModes *param1, const UnkStruct_ov114_02260284 *param2, u32 param3, u32 heapID) +static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const GraphicsModes *param1, const UnkStruct_ov114_02260284 *param2, u32 param3, enum HeapID heapID) { SetAllGraphicsModes(param1); diff --git a/src/overlay115/ov115_02260BBC.c b/src/overlay115/ov115_02260BBC.c index 7724195fc0..0ab007868c 100644 --- a/src/overlay115/ov115_02260BBC.c +++ b/src/overlay115/ov115_02260BBC.c @@ -24,7 +24,7 @@ typedef struct UnkStruct_ov115_02260BE4_t { static u32 ov115_02260CCC(const UnkStruct_ov115_02260BE4 *param0); -UnkStruct_ov115_02260BE4 *ov115_02260BBC(u32 heapID, u32 param1, u32 param2, const UnkStruct_ov115_02262F50 *param3) +UnkStruct_ov115_02260BE4 *ov115_02260BBC(enum HeapID heapID, u32 param1, u32 param2, const UnkStruct_ov115_02262F50 *param3) { UnkStruct_ov115_02260BE4 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov115_02260BE4)); memset(v0, 0, sizeof(UnkStruct_ov115_02260BE4)); diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c index b967a4c1c8..6ab9d1c8d8 100644 --- a/src/overlay115/ov115_02260CEC.c +++ b/src/overlay115/ov115_02260CEC.c @@ -256,7 +256,7 @@ typedef struct { s16 unk_96; u16 unk_98; s16 unk_9A; - u32 heapID; + enum HeapID heapID; } UnkStruct_ov115_02265788; typedef struct { @@ -338,7 +338,6 @@ static void ov115_02261660(UnkStruct_ov115_022615B0 *param0, u32 param1, u32 par static void ov115_02261744(UnkStruct_ov115_022615B0 *param0); static void ov115_0226177C(UnkStruct_ov115_022615B0 *param0, u32 param1); static void ov115_022617D8(UnkStruct_ov115_022615B0 *param0, u32 param1); -static void ov115_022617E8(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1, const UnkStruct_ov115_02262F50 *param2, u32 param3, u32 param4, NARC *param5, u32 param6); static void ov115_02261A04(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1); static void ov115_02261A10(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1); static BOOL ov115_02261A3C(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1); @@ -427,7 +426,7 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 heapID); static void ov115_02263954(UnkStruct_ov115_02261ADC *param0); static void ov115_02263990(UnkStruct_ov115_02261ADC *param0, u32 heapID); static void ov115_02263A3C(UnkStruct_ov115_02261ADC *param0); -static void ov115_02263BCC(UnkStruct_ov115_02261ADC *param0, u32 param1); +static void ov115_02263BCC(UnkStruct_ov115_02261ADC *param0, u32 heapID); static void ov115_02263C04(UnkStruct_ov115_02261ADC *param0); static void ov115_02263C24(UnkStruct_ov115_02261ADC *param0, u32 param1, u32 param2, u32 param3); static void ov115_02263CC0(UnkStruct_ov115_02261ADC *param0); diff --git a/src/palette.c b/src/palette.c index ae847971b9..5e6cc76540 100644 --- a/src/palette.c +++ b/src/palette.c @@ -44,7 +44,7 @@ void PaletteData_InitBuffer(PaletteData *paletteData, enum PaletteBufferID buffe paletteData->buffers[bufferID].size = size; } -void PaletteData_AllocBuffer(PaletteData *paletteData, enum PaletteBufferID bufferID, u32 size, u32 heapID) +void PaletteData_AllocBuffer(PaletteData *paletteData, enum PaletteBufferID bufferID, u32 size, enum HeapID heapID) { void *unfaded = Heap_Alloc(heapID, size); void *faded = Heap_Alloc(heapID, size); @@ -63,7 +63,7 @@ void PaletteData_LoadBuffer(PaletteData *paletteData, const void *src, enum Pale MI_CpuCopy16(src, paletteData->buffers[bufferID].faded + destStart, srcSize); } -void PaletteData_LoadBufferFromFile(PaletteData *paletteData, enum NarcID narcID, u32 narcMemberIdx, u32 heapID, enum PaletteBufferID bufferID, u32 srcSize, u16 destStart, u16 srcStart) +void PaletteData_LoadBufferFromFile(PaletteData *paletteData, enum NarcID narcID, u32 narcMemberIdx, enum HeapID heapID, enum PaletteBufferID bufferID, u32 srcSize, u16 destStart, u16 srcStart) { NNSG2dPaletteData *palette; void *ptr = Graphics_GetPlttData(narcID, narcMemberIdx, &palette, heapID); @@ -80,7 +80,7 @@ void PaletteData_LoadBufferFromFile(PaletteData *paletteData, enum NarcID narcID Heap_Free(ptr); } -void PaletteData_LoadBufferFromFileStart(PaletteData *paletteData, enum NarcID narcID, u32 narcMemberIdx, u32 heapID, enum PaletteBufferID bufferID, u32 srcSize, u16 destStart) +void PaletteData_LoadBufferFromFileStart(PaletteData *paletteData, enum NarcID narcID, u32 narcMemberIdx, enum HeapID heapID, enum PaletteBufferID bufferID, u32 srcSize, u16 destStart) { PaletteData_LoadBufferFromFile(paletteData, narcID, narcMemberIdx, heapID, bufferID, srcSize, destStart, 0); } @@ -115,7 +115,7 @@ void PaletteData_LoadBufferFromHardware(PaletteData *paletteData, enum PaletteBu PaletteData_LoadBuffer(paletteData, ptr + start, bufferID, start, size); } -void LoadPaletteFromFile(enum NarcID narcID, u32 narcMemberIdx, u32 heapID, u32 size, u16 start, void *dest) +void LoadPaletteFromFile(enum NarcID narcID, u32 narcMemberIdx, enum HeapID heapID, u32 size, u16 start, void *dest) { NNSG2dPaletteData *palette; void *ptr = Graphics_GetPlttData(narcID, narcMemberIdx, &palette, heapID); @@ -578,7 +578,7 @@ void TintPalette(u16 *palette, int numColorsToTint, int tintR, int tintG, int ti } } -void PaletteData_LoadBufferFromFileStartWithTint(PaletteData *paletteData, enum NarcID narcID, u32 narcMemberIdx, u32 heapID, enum PaletteBufferID bufferID, u32 size, u16 start, int r, int g, int b) +void PaletteData_LoadBufferFromFileStartWithTint(PaletteData *paletteData, enum NarcID narcID, u32 narcMemberIdx, enum HeapID heapID, enum PaletteBufferID bufferID, u32 size, u16 start, int r, int g, int b) { NNSG2dPaletteData *palette; void *ptr = Graphics_GetPlttData(narcID, narcMemberIdx, &palette, heapID); diff --git a/src/pokedex_memory.c b/src/pokedex_memory.c index d8b1a8d1b6..8738ba89bd 100644 --- a/src/pokedex_memory.c +++ b/src/pokedex_memory.c @@ -5,7 +5,7 @@ #include "heap.h" -PokedexMemory *PokedexMemory_New(u32 heapID) +PokedexMemory *PokedexMemory_New(enum HeapID heapID) { PokedexMemory *pokedexMemory = Heap_Alloc(heapID, sizeof(PokedexMemory)); memset(pokedexMemory, 0, sizeof(PokedexMemory)); diff --git a/src/pokemon.c b/src/pokemon.c index 93dd2e66cd..5730bef92b 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -299,7 +299,7 @@ int Pokemon_StructSize(void) return sizeof(Pokemon); } -Pokemon *Pokemon_New(u32 heapID) +Pokemon *Pokemon_New(enum HeapID heapID) { Pokemon *mon = Heap_Alloc(heapID, sizeof(Pokemon)); Pokemon_Init(mon); diff --git a/src/scrcmd_strings.c b/src/scrcmd_strings.c index 1eb5e20a86..9b9cef4a99 100644 --- a/src/scrcmd_strings.c +++ b/src/scrcmd_strings.c @@ -33,7 +33,7 @@ #include "unk_0205DFC4.h" #include "vars_flags.h" -static String *GetSpeciesNameString(u16 speciesId, u32 heapID); +static String *GetSpeciesNameString(u16 speciesId, enum HeapID heapID); BOOL ScrCmd_BufferStatName(ScriptContext *ctx) { @@ -269,7 +269,7 @@ BOOL ScrCmd_BufferSpeciesNameFromVar(ScriptContext *ctx) return FALSE; } -static String *GetSpeciesNameString(u16 speciesId, u32 heapID) +static String *GetSpeciesNameString(u16 speciesId, enum HeapID heapID) { MessageLoader *speciesNames = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_SPECIES_NAME, heapID); String *buffer = MessageLoader_GetNewString(speciesNames, speciesId); diff --git a/src/sprite_resource.c b/src/sprite_resource.c index 543639ec3c..f0a020e873 100644 --- a/src/sprite_resource.c +++ b/src/sprite_resource.c @@ -54,7 +54,7 @@ static SpriteResource *SpriteResourceCollection_AllocResource(SpriteResourceColl static void SpriteResourceCollection_InitResFromFile(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, const char *filename, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum SpriteResourceType type, enum HeapID heapID); static void SpriteResourceCollection_InitRes(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, enum NarcID narcID, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum SpriteResourceType type, enum HeapID heapID, BOOL allocAtEnd); static void SpriteResourceCollection_InitResFromNARC(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum SpriteResourceType type, enum HeapID heapID, BOOL allocAtEnd); -static void *SpriteUtil_ReadNARCMember(NARC *narc, u32 memberIdx, BOOL compressed, u32 heapID, BOOL allocAtEnd); +static void *SpriteUtil_ReadNARCMember(NARC *narc, u32 memberIdx, BOOL compressed, enum HeapID heapID, BOOL allocAtEnd); static void SpriteResource_UnpackData(SpriteResource *spriteRes, enum SpriteResourceType type, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapID heapID); static TileResourceData *SpriteUtil_UnpackTileResource(void *rawData, NNS_G2D_VRAM_TYPE vramType, enum HeapID heapID); static PaletteResourceData *SpriteUtil_UnpackPaletteResource(void *rawData, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapID heapID); @@ -852,7 +852,7 @@ static int SpriteResourceTableEntryNARC_GetEntryCount(const SpriteResourceTableE return i; } -static void *SpriteUtil_ReadNARCMember(NARC *narc, u32 memberIdx, BOOL compressed, u32 heapID, BOOL allocAtEnd) +static void *SpriteUtil_ReadNARCMember(NARC *narc, u32 memberIdx, BOOL compressed, enum HeapID heapID, BOOL allocAtEnd) { void *data = NARC_AllocAndReadWholeMember(narc, memberIdx, heapID); diff --git a/src/tv_episode_segment.c b/src/tv_episode_segment.c index d472fd5057..290386ecda 100644 --- a/src/tv_episode_segment.c +++ b/src/tv_episode_segment.c @@ -75,7 +75,7 @@ static void FieldSystem_SaveTVEpisodeSegment(FieldSystem *fieldSystem, int programTypeID, int segmentID, const void *segment); static void SaveData_SaveTVEpisodeSegment(SaveData *saveData, int programTypeID, int segmentID, const void *segment); static u8 sub_0206DE4C(Pokemon *param0); -static String *sub_0206F0D8(u16 param0, u32 heapID); +static String *sub_0206F0D8(u16 param0, enum HeapID heapID); #define TV_EPISODE_SEGMENT_SIZE 40 #define TEMPLATE_NAME_SIZE MON_NAME_LEN + 1 @@ -713,7 +713,7 @@ void CaptureAttempt_Free(CaptureAttempt *captureAttempt) Heap_Free(captureAttempt); } -void CaptureAttempt_Init(CaptureAttempt *captureAttempt, Pokemon *mon, int resultMask, int ballsThrown, u32 heapID) +void CaptureAttempt_Init(CaptureAttempt *captureAttempt, Pokemon *mon, int resultMask, int ballsThrown, enum HeapID heapID) { MI_CpuClear32(captureAttempt, sizeof(CaptureAttempt)); @@ -2707,7 +2707,7 @@ static int sub_0206F01C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr } } -static String *sub_0206F0D8(u16 param0, u32 heapID) +static String *sub_0206F0D8(u16 param0, enum HeapID heapID) { MessageLoader *v0 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_SPECIES_NAME, heapID); String *v1 = MessageLoader_GetNewString(v0, param0); diff --git a/src/unk_0200679C.c b/src/unk_0200679C.c index 3347def2c6..febfff66cc 100644 --- a/src/unk_0200679C.c +++ b/src/unk_0200679C.c @@ -7,7 +7,7 @@ #include "sys_task.h" #include "sys_task_manager.h" -SysTask *SysTask_StartAndAllocateParam(SysTaskFunc callback, int paramSize, u32 priority, const u32 heapID) +SysTask *SysTask_StartAndAllocateParam(SysTaskFunc callback, int paramSize, u32 priority, const enum HeapID heapID) { void *param; diff --git a/src/unk_02014A84.c b/src/unk_02014A84.c index 9f4b6f90f1..256de2c50e 100644 --- a/src/unk_02014A84.c +++ b/src/unk_02014A84.c @@ -85,7 +85,7 @@ void sub_02014AC4(Sentence *sentence, int param1) } } -String *sub_02014B34(const Sentence *sentence, u32 heapID) +String *sub_02014B34(const Sentence *sentence, enum HeapID heapID) { String *v0; StringTemplate *v1; diff --git a/src/unk_02014D38.c b/src/unk_02014D38.c index ee7182e7a1..9ef1c87d3c 100644 --- a/src/unk_02014D38.c +++ b/src/unk_02014D38.c @@ -120,7 +120,7 @@ static const struct { }; typedef struct UnkStruct_02014D38_t { - u32 heapID; + enum HeapID heapID; MessageLoader *unk_04[11]; } UnkStruct_02014D38; @@ -142,7 +142,7 @@ void include_unk_020E5538(void) Unk_020E5538[0]; } -UnkStruct_02014D38 *sub_02014D38(u32 heapID) +UnkStruct_02014D38 *sub_02014D38(enum HeapID heapID) { int v0; UnkStruct_02014D38 *v1 = Heap_Alloc(heapID, sizeof(UnkStruct_02014D38)); @@ -341,7 +341,7 @@ void sub_02014F98(UnkStruct_02014EC4 *param0, int param1) SaveData_SetChecksum(SAVE_TABLE_ENTRY_SENTENCE); } -UnkStruct_02014FB0 *sub_02014FB0(u32 heapID) +UnkStruct_02014FB0 *sub_02014FB0(enum HeapID heapID) { UnkStruct_02014FB0 *v0; u32 fileSize; diff --git a/src/unk_0201567C.c b/src/unk_0201567C.c index cfc4f69822..8be994cbbd 100644 --- a/src/unk_0201567C.c +++ b/src/unk_0201567C.c @@ -16,7 +16,7 @@ static void sub_02015858(UnkStruct_020157E4 *param0, u16 *param1); static void sub_02015870(UnkStruct_020157E4 *param0, u16 *param1); static void sub_0201588C(UnkStruct_020157E4 *param0, u16 *param1); -UnkStruct_020157E4 *sub_0201567C(PaletteData *param0, u16 param1, u16 param2, u32 heapID) +UnkStruct_020157E4 *sub_0201567C(PaletteData *param0, u16 param1, u16 param2, enum HeapID heapID) { UnkStruct_020157E4 *v0; SysTask *v1; diff --git a/src/unk_02015920.c b/src/unk_02015920.c index 2b20a1d166..0709c9221b 100644 --- a/src/unk_02015920.c +++ b/src/unk_02015920.c @@ -70,7 +70,7 @@ typedef struct UnkStruct_02015920_t { UnkStruct_02015C38 unk_0C[2]; BgConfig *unk_7C; u32 unk_80; - u32 heapID; + enum HeapID heapID; fx32 unk_88[4]; u8 unk_98; u8 unk_99; @@ -79,7 +79,7 @@ typedef struct UnkStruct_02015920_t { u8 unk_9B_4 : 4; } UnkStruct_02015920; -static void sub_02015A80(UnkStruct_02015920 *param0, u32 heapID); +static void sub_02015A80(UnkStruct_02015920 *param0, enum HeapID heapID); static void sub_02015AC0(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1); static void sub_02015AE4(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1); static void sub_02015B14(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1); @@ -92,15 +92,15 @@ static void sub_02015D60(UnkStruct_02015C38 *param0); static void sub_02015D8C(UnkStruct_02015D8C *param0, const fx32 *param1, u32 param2); static void sub_02015D98(UnkStruct_02015D8C *param0, fx32 param1); static u32 sub_02015DA0(const UnkStruct_02015D8C *param0); -static void sub_02015DCC(enum NarcID narcID, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 heapID); -static void sub_02015E1C(enum NarcID narcID, u32 param1, int param2, u32 param3, u32 param4, u32 heapID); +static void sub_02015DCC(enum NarcID narcID, u32 param1, BgConfig *param2, u32 param3, u32 param4, enum HeapID heapID); +static void sub_02015E1C(enum NarcID narcID, u32 param1, int param2, u32 param3, u32 param4, enum HeapID heapID); static void sub_02015E64(SysTask *param0, void *param1); static void sub_02015EA0(SysTask *param0, void *param1); static void sub_02015EE8(BgConfig *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4); static void sub_02015F34(const NNSG2dScreenData *param0, int param1); static void sub_02015F54(const NNSG2dScreenData *param0, int param1); -UnkStruct_02015920 *sub_02015920(u32 heapID) +UnkStruct_02015920 *sub_02015920(enum HeapID heapID) { UnkStruct_02015920 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02015920)); sub_02015A80(v0, heapID); @@ -194,7 +194,7 @@ void sub_02015A54(UnkStruct_02015920 *param0) sub_02015A80(param0, param0->heapID); } -static void sub_02015A80(UnkStruct_02015920 *param0, u32 heapID) +static void sub_02015A80(UnkStruct_02015920 *param0, enum HeapID heapID) { memset(param0, 0, sizeof(UnkStruct_02015920)); @@ -364,7 +364,7 @@ static u32 sub_02015DA0(const UnkStruct_02015D8C *param0) return param0->unk_04 - 1; } -static void sub_02015DCC(enum NarcID narcID, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 heapID) +static void sub_02015DCC(enum NarcID narcID, u32 param1, BgConfig *param2, u32 param3, u32 param4, enum HeapID heapID) { UnkStruct_02015DCC *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02015DCC)); memset(v0, 0, sizeof(UnkStruct_02015DCC)); @@ -377,7 +377,7 @@ static void sub_02015DCC(enum NarcID narcID, u32 param1, BgConfig *param2, u32 p SysTask_ExecuteAfterVBlank(sub_02015E64, v0, 128); } -static void sub_02015E1C(enum NarcID narcID, u32 param1, int param2, u32 param3, u32 param4, u32 heapID) +static void sub_02015E1C(enum NarcID narcID, u32 param1, int param2, u32 param3, u32 param4, enum HeapID heapID) { UnkStruct_02015E1C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02015E1C)); memset(v0, 0, sizeof(UnkStruct_02015E1C)); diff --git a/src/unk_0202854C.c b/src/unk_0202854C.c index 864e8d1efa..3a2581ce23 100644 --- a/src/unk_0202854C.c +++ b/src/unk_0202854C.c @@ -96,7 +96,7 @@ int UndergroundRecord_Size(void) return sizeof(UndergroundRecord); } -UndergroundRecord *UndergroundRecord_Init(u32 heapID) +UndergroundRecord *UndergroundRecord_Init(enum HeapID heapID) { UndergroundRecord *undergroundRecord = Heap_Alloc(heapID, sizeof(UndergroundRecord)); MI_CpuFill8(undergroundRecord, 0, sizeof(UndergroundRecord)); diff --git a/src/unk_0206C660.c b/src/unk_0206C660.c index 0f4a498028..139f194353 100644 --- a/src/unk_0206C660.c +++ b/src/unk_0206C660.c @@ -87,7 +87,7 @@ static BOOL sub_0206C680(FieldTask *param0) return 0; } -void sub_0206C740(FieldTask *param0, NpcTradeData *param1, int param2, u32 heapID) +void sub_0206C740(FieldTask *param0, NpcTradeData *param1, int param2, enum HeapID heapID) { UnkStruct_0206C660 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0206C660)); diff --git a/src/unk_0207064C.c b/src/unk_0207064C.c index 775204bcec..7917141f03 100644 --- a/src/unk_0207064C.c +++ b/src/unk_0207064C.c @@ -25,7 +25,7 @@ typedef struct { SysTask *cutInTask; } FlyTaskEnv; -void *sub_0207064C(u32 heapID, FieldSystem *fieldSystem, Pokemon *mon, u16 mapID, s16 param4, s16 param5) +void *sub_0207064C(enum HeapID heapID, FieldSystem *fieldSystem, Pokemon *mon, u16 mapID, s16 param4, s16 param5) { FlyTaskEnv *v0 = Heap_AllocAtEnd(heapID, sizeof(FlyTaskEnv)); diff --git a/src/unk_0207DA28.c b/src/unk_0207DA28.c index d9837cf3fb..0998893ca1 100644 --- a/src/unk_0207DA28.c +++ b/src/unk_0207DA28.c @@ -53,13 +53,13 @@ typedef struct { void sub_02099570(void); static BOOL sub_0207DA28(FieldTask *param0); -static void sub_0207DE04(UnkStruct_0207DE40 *param0, FieldSystem *fieldSystem, u32 heapID, u32 param3); +static void sub_0207DE04(UnkStruct_0207DE40 *param0, FieldSystem *fieldSystem, enum HeapID heapID, u32 param3); static u32 sub_0207DE40(UnkStruct_0207DE40 *param0); -static UnkStruct_ov115_02260440 *sub_0207DE90(FieldSystem *fieldSystem, u32 param1, u32 param2); +static UnkStruct_ov115_02260440 *sub_0207DE90(FieldSystem *fieldSystem, enum HeapID heapID, u32 param2); static void sub_0207DED8(UnkStruct_ov115_02260440 *param0); -static UnkStruct_ov66_02231134 *sub_0207DEEC(FieldSystem *fieldSystem, u32 param1, u32 param2); +static UnkStruct_ov66_02231134 *sub_0207DEEC(FieldSystem *fieldSystem, enum HeapID heapID, u32 param2); static void sub_0207DF2C(UnkStruct_ov66_02231134 *param0); -static UnkStruct_ov117_02260440 *sub_0207DF40(FieldSystem *fieldSystem, u32 param1, u32 param2); +static UnkStruct_ov117_02260440 *sub_0207DF40(FieldSystem *fieldSystem, enum HeapID heapID, u32 param2); static void sub_0207DF88(UnkStruct_ov115_02260440 *param0); static void sub_0207DF9C(FieldSystem *fieldSystem); @@ -325,7 +325,7 @@ void sub_0207DDE0(FieldTask *param0, u16 *param1) FieldTask_InitCall(param0, sub_0207DA28, v0); } -static void sub_0207DE04(UnkStruct_0207DE40 *param0, FieldSystem *fieldSystem, u32 heapID, u32 param3) +static void sub_0207DE04(UnkStruct_0207DE40 *param0, FieldSystem *fieldSystem, enum HeapID heapID, u32 param3) { UnkStruct_0207DE04 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0207DE04)); @@ -370,7 +370,7 @@ static u32 sub_0207DE40(UnkStruct_0207DE40 *param0) return param0->unk_04; } -static UnkStruct_ov115_02260440 *sub_0207DE90(FieldSystem *fieldSystem, u32 heapID, u32 param2) +static UnkStruct_ov115_02260440 *sub_0207DE90(FieldSystem *fieldSystem, enum HeapID heapID, u32 param2) { UnkStruct_ov115_02260440 *v0; @@ -406,7 +406,7 @@ static void sub_0207DED8(UnkStruct_ov115_02260440 *param0) Overlay_UnloadByID(FS_OVERLAY_ID(overlay114)); } -static UnkStruct_ov66_02231134 *sub_0207DEEC(FieldSystem *fieldSystem, u32 heapID, u32 param2) +static UnkStruct_ov66_02231134 *sub_0207DEEC(FieldSystem *fieldSystem, enum HeapID heapID, u32 param2) { UnkStruct_ov66_02231134 *v0; @@ -440,7 +440,7 @@ static void sub_0207DF2C(UnkStruct_ov66_02231134 *param0) Overlay_UnloadByID(FS_OVERLAY_ID(overlay114)); } -static UnkStruct_ov117_02260440 *sub_0207DF40(FieldSystem *fieldSystem, u32 heapID, u32 param2) +static UnkStruct_ov117_02260440 *sub_0207DF40(FieldSystem *fieldSystem, enum HeapID heapID, u32 param2) { UnkStruct_ov117_02260440 *v0; diff --git a/src/unk_0207E060.c b/src/unk_0207E060.c index 3408e96a67..9785155221 100644 --- a/src/unk_0207E060.c +++ b/src/unk_0207E060.c @@ -10,7 +10,7 @@ #include "heap.h" #include "trainer_info.h" -UnkStruct_0207E060 *sub_0207E060(const TrainerInfo *info, u32 heapID) +UnkStruct_0207E060 *sub_0207E060(const TrainerInfo *info, enum HeapID heapID) { UnkStruct_0207E060 *v0; BOOL v1; diff --git a/src/unk_0208C098.c b/src/unk_0208C098.c index 2177ec3293..5813ecf4b0 100644 --- a/src/unk_0208C098.c +++ b/src/unk_0208C098.c @@ -77,7 +77,7 @@ u8 HealthBar_Color(u16 curHP, u16 maxHP, u32 barSize) return App_BarColor(App_PixelCount(curHP, maxHP, barSize), barSize); } -void App_StartScreenFade(u8 fadeOut, u32 heapID) +void App_StartScreenFade(u8 fadeOut, enum HeapID heapID) { if (fadeOut == FALSE) { StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, heapID); diff --git a/src/unk_0209747C.c b/src/unk_0209747C.c index 7bbede06db..0968dd59d1 100644 --- a/src/unk_0209747C.c +++ b/src/unk_0209747C.c @@ -33,7 +33,7 @@ struct UnkStruct_0209747C_t { u16 unk_20[2]; }; -UnkStruct_0209747C *sub_0209747C(u32 param0, u32 param1, SaveData *saveData, u32 heapID) +UnkStruct_0209747C *sub_0209747C(u32 param0, u32 param1, SaveData *saveData, enum HeapID heapID) { UnkStruct_0209747C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0209747C)); diff --git a/src/unk_0209BDF8.c b/src/unk_0209BDF8.c index f42ae2447a..c63163ad90 100644 --- a/src/unk_0209BDF8.c +++ b/src/unk_0209BDF8.c @@ -35,7 +35,7 @@ static BOOL sub_0209BE84(UnkStruct_0209BDF8 *param0, u32 param1, const void *par static const CommCmdTable Unk_020F8EA8[135]; static const UnkFuncPtr_020F8E60 Unk_020F8E60[18]; -UnkStruct_0209BDF8 *sub_0209BDF8(UnkStruct_0209C194 *param0, u32 heapID) +UnkStruct_0209BDF8 *sub_0209BDF8(UnkStruct_0209C194 *param0, enum HeapID heapID) { UnkStruct_0209BDF8 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0209BDF8)); GF_ASSERT(v0 != NULL); diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c index 96d9e2eb8f..c000e386f8 100644 --- a/src/unk_0209C194.c +++ b/src/unk_0209C194.c @@ -39,7 +39,7 @@ static BOOL (*const Unk_020F951C[6])(UnkStruct_0209C1EC *); static const ApplicationManagerTemplate Unk_020F94FC; static const ApplicationManagerTemplate Unk_020F950C; -UnkStruct_0209C194 *sub_0209C194(UnkStruct_0209C194_1 *param0, u32 heapID) +UnkStruct_0209C194 *sub_0209C194(UnkStruct_0209C194_1 *param0, enum HeapID heapID) { UnkStruct_0209C194 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0209C194)); memset(v0, 0, sizeof(UnkStruct_0209C194));