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

Convert multiple u32 heapID to enum HeapID heapID (#895)

Browse Source
This commit is contained in:
Eduardo Quezada 2026-01-16 19:37:55 -03:00 committed by GitHub
parent 7927019ed6
commit a177c127cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
155 changed files with 996 additions and 967 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/applications/poketch/poketch_animation.h
View File

@ -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);

4
include/applications/poketch/poketch_button.h
View File

@ -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;

2
include/applications/poketch/poketch_task.h
View File

@ -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);

2
include/bag.h
View File

@ -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);

4
include/bag_context.h
View File

@ -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

10
include/bg_window.h
View File

@ -4,6 +4,8 @@
#include <nitro/fx/fx.h>
#include <nitro/gx.h>
#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);

4
include/easy3d_object.h
View File

@ -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);

8
include/font.h
View File

@ -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);

2
include/font_manager.h
View File

@ -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);

2
include/font_special_chars.h
View File

@ -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);

2
include/game_options.h
View File

@ -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);

50
include/graphics.h
View File

@ -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

6
include/item.h
View File

@ -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.

90
include/journal.h
View File

@ -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

2
include/map_header_util.h
View File

@ -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

2
include/message.h
View File

@ -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.

4
include/move_reminder_data.h
View File

@ -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

4
include/narc.h
View File

@ -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.

2
include/overlay005/fishing.h
View File

@ -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);

4
include/overlay005/ov5_021DF440.h
View File

@ -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);

2
include/overlay005/ov5_021EF4BC.h
View File

@ -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);

4
include/overlay005/ov5_021F0EB0.h
View File

@ -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);

2
include/overlay005/signpost.h
View File

@ -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);

4
include/overlay005/sprite_resource_manager.h
View File

@ -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);

4
include/overlay006/npc_trade.h
View File

@ -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);

10
include/overlay006/ov6_0223E140.h
View File

@ -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);

8
include/overlay006/ov6_02247100.h
View File

@ -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

4
include/overlay006/ov6_02248948.h
View File

@ -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

2
include/overlay010/struct_ov10_0221F800.h
View File

@ -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;

2
include/overlay013/battle_bag.h
View File

@ -65,7 +65,7 @@ typedef struct BattleBagContext {
BattleSystem *battleSystem;
TrainerInfo *trainerInfo;
Bag *bag;
u32 heapID;
enum HeapID heapID;
s32 battler;
BOOL isInCatchTutorial;
u32 embargoRemainingTurns;

2
include/overlay013/battle_party.h
View File

@ -174,7 +174,7 @@ typedef struct BattlePartyContext {
Party *party;
void *unused1;
BattleSystem *battleSystem;
u32 heapID;
enum HeapID heapID;
u8 unused2;
u8 selectedPartyIndex;
u8 doubleBattleFirstSelectedPartySlot;

4
include/overlay013/battle_sub_menu_cursor.h
View File

@ -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);

2
include/overlay017/ov17_0223F118.h
View File

@ -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);

2
include/overlay062/ov62_02231690.h
View File

@ -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);

8
include/overlay063/ov63_0222AE60.h
View File

@ -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);

4
include/overlay063/ov63_0222BCE8.h
View File

@ -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);

4
include/overlay063/ov63_0222BE18.h
View File

@ -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);

6
include/overlay063/ov63_0222CCE4.h
View File

@ -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);

2
include/overlay063/ov63_0222D1C0.h
View File

@ -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);

6
include/overlay063/ov63_0222D77C.h
View File

@ -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);

2
include/overlay065/ov65_02235060.h
View File

@ -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);

4
include/overlay066/ov66_0222DDF0.h
View File

@ -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);

4
include/overlay066/ov66_022343A8.h
View File

@ -3,12 +3,14 @@
#include <nitro/fx/fx.h>
#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);

4
include/overlay066/ov66_02234EA8.h
View File

@ -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

4
include/overlay070/ov70_02261E10.h
View File

@ -3,12 +3,14 @@
#include <nitro/fx/fx.h>
#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);

4
include/overlay070/ov70_02262DA8.h
View File

@ -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);

4
include/overlay070/ov70_02269190.h
View File

@ -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);

4
include/overlay070/ov70_0226CE54.h
View File

@ -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);

6
include/overlay104/ov104_0223E894.h
View File

@ -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);

2
include/overlay105/ov105_02245DC4.h
View File

@ -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);

2
include/overlay115/ov115_02260BBC.h
View File

@ -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);

10
include/palette.h
View File

@ -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);

3
include/pokedex_memory.h
View File

@ -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);

2
include/pokemon.h
View File

@ -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

2
include/string_template.h
View File

@ -30,7 +30,7 @@ typedef struct StringTemplateArg {
typedef struct StringTemplate {
u32 maxArgs;
u32 heapID;
enum HeapID heapID;
StringTemplateArg *args;
String *templateBuf;
} StringTemplate;

2
include/tv_episode_segment.h
View File

@ -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);

4
include/unk_0200679C.h
View File

@ -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

4
include/unk_02014A84.h
View File

@ -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);

4
include/unk_02014D38.h
View File

@ -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);

2
include/unk_0201567C.h
View File

@ -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);

2
include/unk_02015920.h
View File

@ -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);

2
include/unk_0202854C.h
View File

@ -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);

2
include/unk_0206C660.h
View File

@ -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

2
include/unk_0207064C.h
View File

@ -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

2
include/unk_0207E060.h
View File

@ -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

2
include/unk_0208C098.h
View File

@ -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);

2
include/unk_0209747C.h
View File

@ -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);

4
include/unk_0209BDF8.h
View File

@ -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);

2
include/unk_0209C194.h
View File

@ -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);

2
src/applications/poketch/poketch_animation.c
View File

@ -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);

2
src/applications/poketch/poketch_task.c
View File

@ -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) {

2
src/bag.c
View File

@ -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));

4
src/bag_context.c
View File

@ -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;

6
src/bg_window.c
View File

@ -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);

4
src/easy3d_object.c
View File

@ -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);

11
src/font.c
View File

@ -3,6 +3,7 @@
#include <nitro.h>
#include <string.h>
#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,

10
src/font_manager.c
View File

@ -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);

2
src/font_special_chars.c
View File

@ -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));

2
src/game_options.c
View File

@ -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);

50
src/graphics.c
View File

@ -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);

6
src/item.c
View File

@ -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);

96
src/journal.c
View File

@ -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);

2
src/main_menu/gba_migrator.c
View File

@ -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);

2
src/map_header_util.c
View File

@ -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);

4
src/move_reminder_data.c
View File

@ -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;

4
src/narc.c
View File

@ -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;

2
src/overlay005/encounter_effect_core.c
View File

@ -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;

2
src/overlay005/fishing.c
View File

@ -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));

12
src/overlay005/ov5_021DF440.c
View File

@ -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;

2
src/overlay005/ov5_021EF4BC.c
View File

@ -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));

4
src/overlay005/ov5_021F0EB0.c
View File

@ -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)));

2
src/overlay005/signpost.c
View File

@ -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));

4
src/overlay005/sprite_resource_manager.c
View File

@ -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;

12
src/overlay006/hm_cut_in.c
View File

@ -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);

14
src/overlay006/npc_trade.c
View File

@ -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);

28
src/overlay006/ov6_0223E140.c
View File

@ -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(&param0->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(&param0->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;

12
src/overlay006/ov6_02247100.c
View File

@ -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);

2
src/overlay006/ov6_02248948.c
View File

@ -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));

4
src/overlay013/battle_bag.c
View File

@ -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);

4
src/overlay013/battle_party.c
View File

@ -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);

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