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

Fully sync Heap functions with pokeheartgold (#621)

Browse Source
This commit is contained in:
Eduardo Quezada 2025-08-23 17:31:51 -04:00 committed by GitHub
parent 5bf61af0c5
commit 75df4dcd07
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
679 changed files with 3647 additions and 3340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/3d_rendering.md
View File

@ -48,23 +48,23 @@ NNSFndAllocator allocator; // Needed for Animations
Next we load all of the data:
```c
// Open the title NARC
NARC *narc = NARC_ctor(NARC_INDEX_DEMO__TITLE__TITLEDEMO, HEAP_ID_FIELD);
NARC *narc = NARC_ctor(NARC_INDEX_DEMO__TITLE__TITLEDEMO, HEAP_ID_FIELD1);
// Load the model from the title screen NARC. Member index 1 is the model data.
// There is also Easy3DModel_Load which takes a NARC index and a member index.
Easy3DModel_LoadFrom(&giratinaModel, narc, 1, HEAP_ID_FIELD);
Easy3DModel_LoadFrom(&giratinaModel, narc, 1, HEAP_ID_FIELD1);
Easy3DObject_Init(&giratinaObj, &giratinaModel);
// Initialize the Allocator used by the animations
Heap_FndInitAllocatorForExpHeap(&allocator, HEAP_ID_FIELD, 4);
HeapExp_FndInitAllocator(&allocator, HEAP_ID_FIELD1, 4);
// Load the model animation with member index 2.
Easy3DAnim_LoadFrom(&giratinaModelAnim, &giratinaModel, narc, 2, HEAP_ID_FIELD, &allocator);
Easy3DAnim_LoadFrom(&giratinaModelAnim, &giratinaModel, narc, 2, HEAP_ID_FIELD1, &allocator);
// Bind the animation to the object
Easy3DObject_AddAnim(&giratinaObj, &giratinaModelAnim);
// Do the same for the texture animation
Easy3DAnim_LoadFrom(&giratinaTexAnim, &giratinaModel, narc, 0, HEAP_ID_FIELD, &allocator);
Easy3DAnim_LoadFrom(&giratinaTexAnim, &giratinaModel, narc, 0, HEAP_ID_FIELD1, &allocator);
Easy3DObject_AddAnim(&giratinaObj, &giratinaTexAnim);
NARC_dtor(narc);

2
include/applications/naming_screen.h
View File

@ -40,7 +40,7 @@ typedef struct NamingScreenArgs {
extern const ApplicationManagerTemplate gNamingScreenAppTemplate;
NamingScreenArgs *NamingScreenArgs_Init(
enum HeapId heapID,
enum HeapID heapID,
enum NamingScreenType type,
int playerGenderOrMonSpecies,
int maxChars,

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

@ -6,7 +6,7 @@
#include "heap.h"
void CrySub_Init(PokedexScreenManager *screenMan, PokedexApp *pokedexApp, enum HeapId heapID);
void CrySub_Init(PokedexScreenManager *screenMan, PokedexApp *pokedexApp, enum HeapID heapID);
void CrySub_Free(PokedexScreenManager *screenMan);
int CrySub_GetPitch(const PokedexScreenManager *screenMan);

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

@ -6,6 +6,6 @@
#include "heap.h"
typedef void (*UnkFuncPtr_ov21_021E9B74)(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
typedef void (*UnkFuncPtr_ov21_021E9B74)(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
#endif // POKEPLATINUM_FUNCPTR_OV21_021E9B74_H

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

@ -6,7 +6,7 @@
#include "applications/pokedex/struct_ov21_021D423C_decl.h"
#include "applications/pokedex/struct_ov21_021D4660.h"
UnkStruct_ov21_021D423C *ov21_021D423C(enum HeapId heapID);
UnkStruct_ov21_021D423C *ov21_021D423C(enum HeapID heapID);
void ov21_021D426C(UnkStruct_ov21_021D423C *param0, UnkStruct_ov21_021D4660 *param1, int param2);
const UnkStruct_ov21_021D4660 *ov21_021D4284(UnkStruct_ov21_021D423C *param0, int param1);
BOOL ov21_021D42D4(UnkStruct_ov21_021D423C *param0);

28
include/applications/pokedex/ov21_021D4340.h
View File

@ -12,19 +12,19 @@ BOOL ov21_021D43A8(UnkStruct_ov21_021D4340_1 *param0);
BOOL ov21_021D4434(UnkStruct_ov21_021D4340_1 *param0);
BOOL ov21_021D4558(UnkStruct_ov21_021D4340_1 *param0);
void ov21_021D4660(UnkStruct_ov21_021D4660 *param0);
void ov21_021D467C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D4704(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D475C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D47F0(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D4878(UnkStruct_ov21_021D4660 *param0, PokedexApp *param1, enum HeapId heapID, int param3);
void ov21_021D48B8(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D491C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D4980(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D49E4(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D4A3C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D4A94(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D4AF8(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D4B50(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D4BB4(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D467C(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D4704(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D475C(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D47F0(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D4878(UnkStruct_ov21_021D4660 *param0, PokedexApp *param1, enum HeapID heapID, int param3);
void ov21_021D48B8(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D491C(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D4980(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D49E4(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D4A3C(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D4A94(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D4AF8(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D4B50(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
void ov21_021D4BB4(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
#endif // POKEPLATINUM_OV21_021D4340_H

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

@ -7,7 +7,7 @@
#include "heap.h"
void ov21_021D5AEC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
void ov21_021D5AEC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void ov21_021D5B50(PokedexScreenManager *param0);
BOOL ov21_021D5B68(const UnkStruct_ov21_021D5B68 *param0);

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

@ -6,7 +6,7 @@
#include "heap.h"
void ov21_021D76B0(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
void ov21_021D76B0(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void ov21_021D7710(PokedexScreenManager *param0);
#endif // POKEPLATINUM_OV21_021D76B0_H

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

@ -6,7 +6,7 @@
#include "heap.h"
void ov21_021D94BC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
void ov21_021D94BC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void ov21_021D951C(PokedexScreenManager *param0);
#endif // POKEPLATINUM_OV21_021D94BC_H

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

@ -6,7 +6,7 @@
#include "heap.h"
void ov21_021DC9BC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
void ov21_021DC9BC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void ov21_021DCA14(PokedexScreenManager *param0);
int ov21_021DCA28(const PokedexScreenManager *param0);
void ov21_021DCA30(PokedexScreenManager *param0, int param1);

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

@ -6,7 +6,7 @@
#include "heap.h"
void ov21_021DDD2C(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
void ov21_021DDD2C(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void ov21_021DDD8C(PokedexScreenManager *param0);
#endif // POKEPLATINUM_OV21_021DDD2C_H

4
include/applications/pokedex/ov21_021DE668.h
View File

@ -9,11 +9,11 @@
#include "bg_window.h"
#include "heap.h"
void ov21_021DE668(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
void ov21_021DE668(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void ov21_021DE6C0(PokedexScreenManager *param0);
BOOL ov21_021DE6D4(UnkStruct_ov21_021DE6D4 *param0, int param1);
BOOL ov21_021DE6D8(UnkStruct_ov21_021DE6D4 *param0, int param1);
void ov21_021DEB8C(Window *param0, int param1, enum HeapId heapID, int param3, u32 param4);
void ov21_021DEB8C(Window *param0, int param1, enum HeapID heapID, int param3, u32 param4);
int PokedexGraphics_GetAnimIDfromType(int monType);
Window *ov21_021DF30C(PokedexTextManager *textMan, int param1, int param2);

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

@ -6,7 +6,7 @@
#include "heap.h"
void ov21_021DF734(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
void ov21_021DF734(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void ov21_021DF78C(PokedexScreenManager *param0);
BOOL ov21_021DF7A0(PokedexScreenManager *param0, int param1);

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

@ -6,7 +6,7 @@
#include "heap.h"
void ov21_021E0C68(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
void ov21_021E0C68(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void ov21_021E0CC0(PokedexScreenManager *param0);
void ov21_021E0CD4(PokedexScreenManager *param0, int param1, int param2);
void ov21_021E0CDC(PokedexScreenManager *param0, int param1);

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

@ -6,7 +6,7 @@
#include "heap.h"
void ov21_021E1924(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
void ov21_021E1924(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void ov21_021E1984(PokedexScreenManager *param0);
#endif // POKEPLATINUM_OV21_021E1924_H

4
include/applications/pokedex/ov21_021E29DC.h
View File

@ -6,10 +6,10 @@
#include "heap.h"
void ov21_021E29DC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
void ov21_021E29DC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void ov21_021E2A3C(PokedexScreenManager *param0);
BOOL ov21_021E2A54(const PokedexScreenManager *param0);
void ov21_021E332C(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
void ov21_021E332C(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void ov21_021E338C(PokedexScreenManager *param0);
BOOL ov21_021E33A4(const PokedexScreenManager *param0);
BOOL ov21_021E33AC(const PokedexScreenManager *param0);

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

@ -6,7 +6,7 @@
#include "heap.h"
void ov21_021E3FFC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
void ov21_021E3FFC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void ov21_021E4054(PokedexScreenManager *param0);
void ov21_021E4068(PokedexScreenManager *param0, int param1, int param2);
void ov21_021E4070(PokedexScreenManager *param0, int param1);

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

@ -6,7 +6,7 @@
#include "heap.h"
void ov21_021E68F4(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
void ov21_021E68F4(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void ov21_021E6954(PokedexScreenManager *param0);
#endif // POKEPLATINUM_OV21_021E68F4_H

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

@ -6,7 +6,7 @@
#include "heap.h"
void ov21_021E737C(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
void ov21_021E737C(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void ov21_021E73D4(PokedexScreenManager *param0);
#endif // POKEPLATINUM_OV21_021E737C_H

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

@ -6,7 +6,7 @@
#include "heap.h"
void ov21_021E8484(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
void ov21_021E8484(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void ov21_021E84E4(PokedexScreenManager *param0);
#endif // POKEPLATINUM_OV21_021E8484_H

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

@ -5,7 +5,7 @@
typedef struct PokedexDataManager {
int state;
enum HeapId heapID;
enum HeapID heapID;
void *pageData;
BOOL exit;
BOOL unchanged;

6
include/applications/pokedex/pokedex_enc_data.h
View File

@ -50,7 +50,7 @@ enum PokedexEncFileCatgegory {
* @param encounterCategory
* @param heapID
*/
void PokedexEncData_PopulateEncounterLocations(EncounterLocations *encounterLocations, int species, int encounterCategory, enum HeapId heapID);
void PokedexEncData_PopulateEncounterLocations(EncounterLocations *encounterLocations, int species, int encounterCategory, enum HeapID heapID);
/**
* @brief Frees encounter data from the heap
@ -69,7 +69,7 @@ void PokedexEncData_FreeEncounterLocations(EncounterLocations *encounterLocation
* @param numDungeons
* @return Array of coordinates for each dungeon
*/
DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(enum HeapId heapID, int *numDungeons);
DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(enum HeapID heapID, int *numDungeons);
/**
* @brief Reads field coordinates data from zukan_enc_platinum.narc
@ -81,7 +81,7 @@ DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(enum HeapId heapID, int
* @param numFields
* @return Array of coordinates for each field
*/
FieldCoordinates *PokedexEncData_GetFieldCoordinates(enum HeapId heapID, int *numFields);
FieldCoordinates *PokedexEncData_GetFieldCoordinates(enum HeapID heapID, int *numFields);
/**
* @brief Updates fieldMap with the coordinates occupied by the field

16
include/applications/pokedex/pokedex_graphics.h
View File

@ -93,7 +93,7 @@ typedef struct PokedexGraphicData {
NARC *pokedexGraphics;
} PokedexGraphicData;
void PokedexGraphics_Init(PokedexGraphicData *pokedexGraphicData, enum HeapId heapID);
void PokedexGraphics_Init(PokedexGraphicData *pokedexGraphicData, enum HeapID heapID);
void PokedexGraphics_Free(PokedexGraphicData *pokedexGraphicData);
void PokemonGraphics_UpdateSprites(PokedexGraphicData *pokedexGraphicData);
void PokemonGraphics_UpdateCharAndPltt(PokedexGraphicData *pokedexGraphicData);
@ -130,14 +130,14 @@ void PokedexGraphics_SetCursorPosAndSize(PokedexGraphicData *pokedexGraphicData,
void PokedexGraphics_InitTransformation(CursorTransformation *cursorTransformation, int startX, int endX, int startY, int endY, int numSteps);
BOOL PokedexGraphics_TakeCursorTransformStep(CursorTransformation *cursorTransformation);
NARC *PokedexGraphics_GetNARC(PokedexGraphicData *pokedexGraphicData);
u32 PokedexGraphics_LoadGraphicNarcCharacterData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BgConfig *bgConfig, u32 bgLayer, u32 tileStart, u32 size, BOOL isCompressed, enum HeapId heapID);
void PokedexGraphics_LoadGraphicNarcPaletteData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, enum PaletteLoadLocation loadLocation, u32 offset, u32 szByte, enum HeapId heapID);
void *PokedexGraphics_GetGraphicNarcScreenData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, NNSG2dScreenData **screenData, enum HeapId heapID);
void *PokedexGraphics_GetGraphicNarcPaletteData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, NNSG2dPaletteData **paletteData, enum HeapId heapID);
void *PokedexGraphics_GetGraphicNarcCharacterData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, NNSG2dCharacterData **characterData, enum HeapId heapID);
void PokedexGraphics_InitSpeciesLabelGraphics(PokedexSpeciesLabel *pokedexSpeciesLabel, SpriteResourceCollection **spriteResourceCollection, enum HeapId heapID, NARC *narc);
u32 PokedexGraphics_LoadGraphicNarcCharacterData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BgConfig *bgConfig, u32 bgLayer, u32 tileStart, u32 size, BOOL isCompressed, enum HeapID heapID);
void PokedexGraphics_LoadGraphicNarcPaletteData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, enum PaletteLoadLocation loadLocation, u32 offset, u32 szByte, enum HeapID heapID);
void *PokedexGraphics_GetGraphicNarcScreenData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, NNSG2dScreenData **screenData, enum HeapID heapID);
void *PokedexGraphics_GetGraphicNarcPaletteData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, NNSG2dPaletteData **paletteData, enum HeapID heapID);
void *PokedexGraphics_GetGraphicNarcCharacterData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, NNSG2dCharacterData **characterData, enum HeapID heapID);
void PokedexGraphics_InitSpeciesLabelGraphics(PokedexSpeciesLabel *pokedexSpeciesLabel, SpriteResourceCollection **spriteResourceCollection, enum HeapID heapID, NARC *narc);
void PokedexGraphics_FreeSpeciesLabelGraphics(PokedexSpeciesLabel *pokedexSpeciesLabel, SpriteResourceCollection **spriteResourceCollection);
void PokedexGraphics_NewSpeciesLabel(PokedexSpeciesLabel *pokedexSpeciesLabel, SpriteList *spriteList, SpriteResourceCollection **spriteResourceCollection, enum HeapId heapID, int headerPriority);
void PokedexGraphics_NewSpeciesLabel(PokedexSpeciesLabel *pokedexSpeciesLabel, SpriteList *spriteList, SpriteResourceCollection **spriteResourceCollection, enum HeapID heapID, int headerPriority);
void PokedexGraphics_FreeSpeciesLabel(PokedexSpeciesLabel *pokedexSpeciesLabel);
void PokedexGraphics_SetSpeciesLabelDraw(PokedexSpeciesLabel *pokedexSpeciesLabel, BOOL draw);

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

@ -5,7 +5,7 @@
typedef struct PokedexGraphicsManager {
int state;
enum HeapId heapID;
enum HeapID heapID;
void *pageGraphics;
} PokedexGraphicsManager;

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

@ -6,7 +6,7 @@
#include "heap.h"
void ov21_021E6014(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
void ov21_021E6014(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void ov21_021E6074(PokedexScreenManager *param0);
#endif // POKEPLATINUM_POKEDEX_HEIGHT_CHECK_H

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

@ -48,9 +48,9 @@ typedef struct {
int PokedexMain_Init(ApplicationManager *appMan, int *state);
int PokedexMain_Main(ApplicationManager *appMan, int *state);
int PokedexMain_Exit(ApplicationManager *appMan, int *state);
PokedexApp *PokedexMain_NewPokedexApp(enum HeapId heapID, const PokedexOverlayArgs *pokedexOverlayArgs);
PokedexApp *PokedexMain_NewPokedexApp(enum HeapID heapID, const PokedexOverlayArgs *pokedexOverlayArgs);
BOOL ov21_021D10B8(PokedexApp *pokedexApp);
void PokedexMain_InitGX(enum HeapId heapID);
void PokedexMain_InitGX(enum HeapID heapID);
void PokedexMain_FreeGraphics(void);
void ov21_021D12D8(PokedexApp *pokedexApp);
PokedexUpdater *ov21_021D12EC(PokedexApp *pokedexApp);
@ -94,6 +94,6 @@ u32 PokedexMain_DisplayDeoxysSprite(PokedexGraphicData *pokedexGraphicData, cons
u32 PokedexMain_DisplayShayminSprite(PokedexGraphicData *pokedexGraphicData, const PokedexSortData *pokedexSortData, int face, int param3, int param4, int formIndex, int param6);
u32 PokedexMain_DisplayGiratinaSprite(PokedexGraphicData *pokedexGraphicData, const PokedexSortData *pokedexSortData, int face, int param3, int param4, int formIndex, int param6);
u32 PokedexMain_DisplayRotomSprite(PokedexGraphicData *pokedexGraphicData, const PokedexSortData *pokedexSortData, int face, int param3, int param4, int formIndex, int param6);
Strbuf *PokedexMain_GetMessage(int entryID, enum HeapId heapID);
Strbuf *PokedexMain_GetMessage(int entryID, enum HeapID heapID);
#endif // POKEPLATINUM_POKEDEX_MAIN_H

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

@ -43,7 +43,7 @@ typedef struct PokedexPanelData {
int row;
} PokedexPanelData;
PokedexPanelData *PokedexPanel_Alloc(enum HeapId heapID);
PokedexPanelData *PokedexPanel_Alloc(enum HeapID heapID);
void PokedexPanel_Free(PokedexPanelData *pokedexPanelData);
void PokedexPanel_New(PokedexPanelData *pokedexPanelData, const PokedexCursorData *pokedexCursorData, int numCols, int numRows);
void PokedexPanel_Move(PokedexPanelData *pokedexPanelData, enum PanelMovementType movementType, int val);

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

@ -15,7 +15,7 @@ enum FilterMethod {
MAX_FILTER_METHOD
};
void PokedexSearch_TransitionFunctions(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
void PokedexSearch_TransitionFunctions(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void PokedexSearch_FreeData(PokedexScreenManager *param0);
void PokedexSearch_SetFilterMethod(PokedexScreenManager *param0, enum FilterMethod filterMethod);
enum FilterMethod PokedexSearch_GetFilterMethod(const PokedexScreenManager *param0);

6
include/applications/pokedex/pokedex_sort.h
View File

@ -88,7 +88,7 @@ typedef struct PokedexDefaultSortParams {
u32 bootMode;
} PokedexDefaultSortParams;
void PokedexSort_DefaultPokedexSort(PokedexSortData *param0, PokedexDefaultSortParams *param1, enum HeapId heapID);
void PokedexSort_DefaultPokedexSort(PokedexSortData *param0, PokedexDefaultSortParams *param1, enum HeapID heapID);
void PokedexSort_PokedexStatusFreeHWData(PokedexSortData *param0);
u32 PokedexSort_Gender(const PokedexSortData *param0, int species, int formIndex);
u32 PokedexSort_UnownForm(const PokedexSortData *param0, int formIndex);
@ -107,8 +107,8 @@ void PokedexSort_SetCurrentSpecies(PokedexSortData *param0, u32 param1);
u32 PokedexSort_GetCurrentSpecies(const PokedexSortData *param0);
void PokedexSort_SetBootMode(PokedexSortData *param0, u32 param1);
u32 PokedexSort_GetBootMode(const PokedexSortData *param0);
BOOL PokedexSort_Sort(PokedexSortData *param0, enum SortOrder sortOrder, enum FilterName filterName, enum FilterType typeFilter1, enum FilterType typeFilter2, enum FilterForm filterForm, int isNationalDex, enum HeapId heapID, BOOL isFiltered);
BOOL PokedexSort_SortUnfiltered(PokedexSortData *param0, enum SortOrder sortOrder, enum FilterName filterName, enum FilterType filterType1, enum FilterType filterType2, enum FilterForm filterForm, int isNationalDex, enum HeapId heapID);
BOOL PokedexSort_Sort(PokedexSortData *param0, enum SortOrder sortOrder, enum FilterName filterName, enum FilterType typeFilter1, enum FilterType typeFilter2, enum FilterForm filterForm, int isNationalDex, enum HeapID heapID, BOOL isFiltered);
BOOL PokedexSort_SortUnfiltered(PokedexSortData *param0, enum SortOrder sortOrder, enum FilterName filterName, enum FilterType filterType1, enum FilterType filterType2, enum FilterForm filterForm, int isNationalDex, enum HeapID heapID);
BOOL ov21_021D36A4(const PokedexSortData *param0, int param1);
BOOL ov21_021D36C0(PokedexSortData *param0, int param1);
int PokedexSort_IsNationalDex(const PokedexSortData *param0);

6
include/applications/pokedex/pokedex_text.h
View File

@ -7,8 +7,8 @@
void PokedexText_Free(Strbuf *strbuf);
int PokedexText_ForeignLanguage(int languageIndex);
Strbuf *PokedexText_NameNumber(int species, int language, enum HeapId heapID);
Strbuf *PokedexText_Category(int species, int language, enum HeapId heapID);
Strbuf *PokedexText_DexEntry(int species, int language, int entryOffset, enum HeapId heapID);
Strbuf *PokedexText_NameNumber(int species, int language, enum HeapID heapID);
Strbuf *PokedexText_Category(int species, int language, enum HeapID heapID);
Strbuf *PokedexText_DexEntry(int species, int language, int entryOffset, enum HeapID heapID);
#endif // POKEPLATINUM_POKEDEX_TEXT_H

6
include/applications/pokedex/pokedex_text_manager.h
View File

@ -25,14 +25,14 @@ typedef struct PokedexTextManager {
BgConfig *bgConfig;
PokedexTextData *textData;
int numTextData;
enum HeapId heapID;
enum HeapID heapID;
} PokedexTextManager;
typedef struct PokedexTextManagerTemplate {
SpriteList *spriteList;
BgConfig *bgConfig;
int numTextData;
enum HeapId heapID;
enum HeapID heapID;
} PokedexTextManagerTemplate;
typedef struct PokedexDisplayBox {
@ -45,7 +45,7 @@ typedef struct PokedexDisplayBox {
int spriteResourcePriority;
int spriteListPriority;
enum NNS_G2D_VRAM_TYPE vramType;
enum HeapId heapID;
enum HeapID heapID;
} PokedexDisplayBox;
PokedexTextManager *PokedexTextManager_New(const PokedexTextManagerTemplate *textManTemplate);

4
include/applications/pokedex/pokedex_updater.h
View File

@ -18,7 +18,7 @@ typedef struct PokedexUpdater {
PokedexDataFunction dataFunc[3];
PokedexGraphicsManager graphicsMan;
PokedexGraphicsFunction graphicsFunc[3];
enum HeapId heapID;
enum HeapID heapID;
} PokedexUpdater;
typedef struct PokedexUpdaterTemplate {
@ -28,7 +28,7 @@ typedef struct PokedexUpdaterTemplate {
const PokedexGraphicsFunction *graphicsFunc;
} PokedexUpdaterTemplate;
PokedexUpdater *PokedexUpdater_New(enum HeapId heapID);
PokedexUpdater *PokedexUpdater_New(enum HeapID heapID);
void PokedexUpdater_PopulateUpdater(PokedexUpdater *pokedexUpdater, const PokedexUpdaterTemplate *pokedexUpdaterTemplate);
BOOL PokedexUpdater_UpdateData(PokedexUpdater *pokedexUpdater);
BOOL PokedexUpdater_UpdateGraphics(PokedexUpdater *pokedexUpdater);

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

@ -42,7 +42,7 @@ void PoketchAnimation_SetCParam(PoketchAnimation_AnimatedSpriteData *animatedSpr
void PoketchAnimation_SetSpriteCharNo(PoketchAnimation_AnimatedSpriteData *animatedSprite, u32 value);
void PoketchAnimation_SetMosaic(PoketchAnimation_AnimatedSpriteData *animatedSprite, BOOL isMosaic);
void PoketchAnimation_SetSpriteRotation(PoketchAnimation_AnimatedSpriteData *animatedSprite, u16 rotation);
BOOL PoketchAnimation_LoadSpriteFromNARC(PoketchAnimation_SpriteData *spriteData, enum NarcID narcID, u32 spriteID, u32 animID, enum HeapId heapID);
BOOL PoketchAnimation_LoadSpriteFromNARC(PoketchAnimation_SpriteData *spriteData, enum NarcID narcID, u32 spriteID, u32 animID, enum HeapID heapID);
void PoketchAnimation_FreeSpriteData(PoketchAnimation_SpriteData *spriteData);
#endif // POKEPLATINUM_POKETCH_ANIMATION_H

18
include/bag.h
View File

@ -53,22 +53,22 @@ typedef struct BagCursor {
} BagCursor;
int Bag_SaveSize(void);
Bag *Bag_New(enum HeapId heapID);
Bag *Bag_New(enum HeapID heapID);
void Bag_Init(Bag *bag);
void Bag_Copy(const Bag *src, Bag *dst);
u32 Bag_GetRegisteredItem(const Bag *bag);
void Bag_RegisterItem(Bag *bag, u32 item);
BOOL Bag_CanFitItem(Bag *bag, u16 item, u16 count, enum HeapId heapID);
BOOL Bag_TryAddItem(Bag *bag, u16 item, u16 count, enum HeapId heapID);
BOOL Bag_TryRemoveItem(Bag *bag, u16 item, u16 count, enum HeapId heapID);
BOOL Pocket_TryRemoveItem(BagItem *pocket, u32 pocketSize, u16 item, u16 count, enum HeapId heapID);
BOOL Bag_CanRemoveItem(Bag *bag, u16 item, u16 count, enum HeapId heapID);
BOOL Bag_CanFitItem(Bag *bag, u16 item, u16 count, enum HeapID heapID);
BOOL Bag_TryAddItem(Bag *bag, u16 item, u16 count, enum HeapID heapID);
BOOL Bag_TryRemoveItem(Bag *bag, u16 item, u16 count, enum HeapID heapID);
BOOL Pocket_TryRemoveItem(BagItem *pocket, u32 pocketSize, u16 item, u16 count, enum HeapID heapID);
BOOL Bag_CanRemoveItem(Bag *bag, u16 item, u16 count, enum HeapID heapID);
BOOL Bag_HasItemsInPocket(Bag *bag, u32 pocketID);
u16 Bag_GetItemQuantity(Bag *bag, u16 item, enum HeapId heapID);
u16 Pocket_GetItemQuantity(BagItem *pocket, u32 pocketSize, u16 item, enum HeapId heapID);
u16 Bag_GetItemQuantity(Bag *bag, u16 item, enum HeapID heapID);
u16 Pocket_GetItemQuantity(BagItem *pocket, u32 pocketSize, u16 item, enum HeapID heapID);
void Pocket_SortEmpty(BagItem *pocket, const u32 size); // Moves empty slots to the end of the pocket
void Pocket_Sort(BagItem *pocket, const u32 size); // Same as Pocket_SortEmpty, but also sorts by item ID
void *sub_0207D824(Bag *bag, const u8 *pockets, enum HeapId heapID);
void *sub_0207D824(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);

6
include/battle_anim/battle_anim_helpers.h
View File

@ -209,11 +209,11 @@ BOOL Afterimage_Update(AfterimageContext *ctx);
void RevolutionContext_InitOvalRevolutions(XYTransformContext *ctx, int revs, int stepsPerRev);
void AlphaFadeContext_Init(AlphaFadeContext *ctx, s16 sev1, s16 eev1, s16 sev2, s16 eev2, int steps);
BOOL AlphaFadeContext_IsDone(const AlphaFadeContext *ctx);
CustomBgScrollContext *CustomBgScrollContext_New(u32 offsetReg, u32 initValue, enum HeapId heapID);
CustomBgScrollContext *CustomBgScrollContext_New(u32 offsetReg, u32 initValue, enum HeapID heapID);
void CustomBgScrollContext_Free(CustomBgScrollContext *ctx);
void *CustomBgScrollContext_GetWriteBuffer(const CustomBgScrollContext *ctx);
void CustomBgScrollContext_Stop(CustomBgScrollContext *ctx);
BgScrollContext *BgScrollContext_New(u8 startY, u8 endY, u16 angleIncrement, fx32 amplitude, s16 speed, u32 bgID, u32 priority, u32 initValue, enum HeapId heapID);
BgScrollContext *BgScrollContext_New(u8 startY, u8 endY, u16 angleIncrement, fx32 amplitude, s16 speed, u32 bgID, u32 priority, u32 initValue, enum HeapID heapID);
void BgScrollContext_Free(BgScrollContext *ctx);
void *BgScrollContext_GetWriteBuffer(const BgScrollContext *ctx);
void BgScrollContext_Stop(BgScrollContext *ctx);
@ -225,7 +225,7 @@ void ov12_0222676C(s16 param0, s16 param1, s16 param2, s16 param3, u16 *param4);
BOOL ov12_022267A8(int *param0, int param1, s32 param2);
BOOL PaletteFadeContext_IsActive(PaletteFadeContext *ctx);
void PaletteFadeContext_Free(PaletteFadeContext *ctx);
PaletteFadeContext *PaletteFadeContext_New(PaletteData *paletteData, enum HeapId heapID, enum PaletteBufferID bufferID, u16 index, u16 count, s8 stepFrames, s8 step, u8 startFrac, u8 endFrac, u16 color, int priority);
PaletteFadeContext *PaletteFadeContext_New(PaletteData *paletteData, enum HeapID heapID, enum PaletteBufferID bufferID, u16 index, u16 count, s8 stepFrames, s8 step, u8 startFrac, u8 endFrac, u16 color, int priority);
void BattleAnimUtil_MakeBgPalsGrayscale(BattleAnimSystem *ctx);
void BattleAnimUtil_ReturnBgPalsToNormal(BattleAnimSystem *ctx);

6
include/battle_anim/battle_anim_system.h
View File

@ -192,7 +192,7 @@ typedef struct BgTrackingTask {
} BgTrackingTask;
typedef struct BattleAnimSystem {
enum HeapId heapID;
enum HeapID heapID;
enum NarcID moveArcID;
BOOL isContest;
BOOL isActive;
@ -234,10 +234,10 @@ typedef struct BattleAnimSystem {
typedef void (*BattleAnimScriptCmd)(BattleAnimSystem *);
BattleAnimSystem *BattleAnimSystem_New(enum HeapId heapID);
BattleAnimSystem *BattleAnimSystem_New(enum HeapID heapID);
void BattleAnimSystem_SetIsContest(BattleAnimSystem *system, BOOL isContest);
BOOL BattleAnimSystem_IsContest(BattleAnimSystem *system);
enum HeapId BattleAnimSystem_GetHeapID(BattleAnimSystem *system);
enum HeapID BattleAnimSystem_GetHeapID(BattleAnimSystem *system);
BOOL BattleAnimSystem_Delete(BattleAnimSystem *system);
BOOL BattleAnimSystem_StartMove(BattleAnimSystem *system, UnkStruct_ov16_02265BBC *param1, u16 move, BattleAnimBattlerContext *param3);
BOOL BattleAnimSystem_ExecuteScript(BattleAnimSystem *system);

8
include/battle_anim/battle_particle_util.h
View File

@ -4,10 +4,10 @@
#include "narc.h"
#include "particle_system.h"
ParticleSystem *BattleParticleUtil_CreateParticleSystem(enum HeapId heapID, int narcMemberIndex, BOOL uploadResImmediately);
ParticleSystem *BattleParticleUtil_CreateParticleSystemEx(enum HeapId heapID, enum NarcID narcID, int memberIndex, BOOL uploadResImmediately);
void *BattleParticleUtil_ReadMemberFromNARC(NARC *param0, int param1, enum HeapId heapID);
ParticleSystem *ov12_0222384C(NARC *param0, enum HeapId heapID, int param2, BOOL param3);
ParticleSystem *BattleParticleUtil_CreateParticleSystem(enum HeapID heapID, int narcMemberIndex, BOOL uploadResImmediately);
ParticleSystem *BattleParticleUtil_CreateParticleSystemEx(enum HeapID heapID, enum NarcID narcID, int memberIndex, BOOL uploadResImmediately);
void *BattleParticleUtil_ReadMemberFromNARC(NARC *param0, int param1, enum HeapID heapID);
ParticleSystem *ov12_0222384C(NARC *param0, enum HeapID heapID, int param2, BOOL param3);
SPLEmitter *BattleParticleUtil_CreateEmitter(ParticleSystem *param0, int param1, int param2, void *param3);
void BattleParticleUtil_FreeParticleSystem(ParticleSystem *param0);

4
include/berry_patches.h
View File

@ -48,8 +48,8 @@ typedef struct BerryGrowthData {
} BerryGrowthData;
void BerryPatches_Clear(BerryPatch *patches);
void BerryPatches_Init(BerryPatch *patches, enum HeapId heapID, const u16 *initPatches, int initSize);
BerryGrowthData *BerryGrowthData_Init(enum HeapId heapID);
void BerryPatches_Init(BerryPatch *patches, enum HeapID heapID, const u16 *initPatches, int initSize);
BerryGrowthData *BerryGrowthData_Init(enum HeapID heapID);
enum BerryGrowthStage BerryPatches_GetPatchGrowthStage(const BerryPatch *patches, int patchID);
int BerryPatches_GetPatchBerryID(const BerryPatch *patches, int patchID);
enum SoilMoisture BerryPatches_GetPatchMoisture(const BerryPatch *patches, int patchID);

2
include/buffer_manager.h
View File

@ -18,7 +18,7 @@ typedef struct BufferManager {
u8 padding[2];
} BufferManager;
BufferManager *BufferManager_New(enum HeapId heapID, void *buffer1, void *buffer2);
BufferManager *BufferManager_New(enum HeapID heapID, void *buffer1, void *buffer2);
void BufferManager_Delete(BufferManager *bufferManager);
void *BufferManager_GetWriteBuffer(const BufferManager *bufferManager);
const void *BufferManager_GetReadBuffer(const BufferManager *bufferManager);

4
include/camera.h
View File

@ -69,9 +69,9 @@ typedef struct Camera {
extern GXBufferMode gBufferMode;
void Camera_InitHistory(int historySize, int delay, int delayMask, enum HeapId heapID, Camera *camera);
void Camera_InitHistory(int historySize, int delay, int delayMask, enum HeapID heapID, Camera *camera);
void Camera_DeleteHistory(Camera *camera);
Camera *Camera_Alloc(const enum HeapId heapID);
Camera *Camera_Alloc(const enum HeapID heapID);
void Camera_Delete(Camera *camera);
void Camera_Copy(Camera const *src, Camera *dst);
void Camera_SetAsActive(Camera *camera);

2
include/cell_transfer.h
View File

@ -5,7 +5,7 @@
#include "constants/heap.h"
NNSG2dCellTransferState *CellTransfer_New(int capacity, enum HeapId heapID);
NNSG2dCellTransferState *CellTransfer_New(int capacity, enum HeapID heapID);
void CellTransfer_Update(void);
void CellTransfer_Free(NNSG2dCellTransferState *transferStates);

2
include/char_transfer.h
View File

@ -10,7 +10,7 @@ typedef struct CharTransferTemplate {
int maxTasks;
int sizeMain;
int sizeSub;
enum HeapId heapID;
enum HeapID heapID;
} CharTransferTemplate;
typedef struct CharTransferTemplateWithModes {

8
include/constants/heap.h
View File

@ -1,19 +1,19 @@
#ifndef POKEPLATINUM_CONSTANTS_HEAP_H
#define POKEPLATINUM_CONSTANTS_HEAP_H
enum HeapId {
enum HeapID {
HEAP_ID_SYSTEM = 0,
HEAP_ID_SAVE,
HEAP_ID_DEBUG,
HEAP_ID_APPLICATION,
HEAP_ID_FIELD,
HEAP_ID_FIELD1,
HEAP_ID_BATTLE,
HEAP_ID_6,
HEAP_ID_POKETCH_MAIN,
HEAP_ID_POKETCH_APP,
HEAP_ID_BOX_DATA,
HEAP_ID_BOX_GRAPHICS,
HEAP_ID_FIELDMAP,
HEAP_ID_FIELD2,
HEAP_ID_12,
HEAP_ID_13,
HEAP_ID_14,
@ -34,7 +34,7 @@ enum HeapId {
HEAP_ID_MINING,
HEAP_ID_DISTORTION_WORLD_WARP,
HEAP_ID_31,
HEAP_ID_FIELD_TASK,
HEAP_ID_FIELD3,
HEAP_ID_33,
HEAP_ID_34,
HEAP_ID_35,

8
include/field_battle_data_transfer.h
View File

@ -79,10 +79,10 @@ typedef struct FieldBattleDTO {
u32 unk_19C;
} FieldBattleDTO;
FieldBattleDTO *FieldBattleDTO_New(enum HeapId heapID, u32 battleType);
FieldBattleDTO *FieldBattleDTO_NewSafari(enum HeapId heapID, int countSafariBalls);
FieldBattleDTO *FieldBattleDTO_NewPalPark(enum HeapId heapID, int countParkBalls);
FieldBattleDTO *FieldBattleDTO_NewCatchingTutorial(enum HeapId heapID, const FieldSystem *fieldSystem);
FieldBattleDTO *FieldBattleDTO_New(enum HeapID heapID, u32 battleType);
FieldBattleDTO *FieldBattleDTO_NewSafari(enum HeapID heapID, int countSafariBalls);
FieldBattleDTO *FieldBattleDTO_NewPalPark(enum HeapID heapID, int countParkBalls);
FieldBattleDTO *FieldBattleDTO_NewCatchingTutorial(enum HeapID heapID, const FieldSystem *fieldSystem);
void FieldBattleDTO_Free(FieldBattleDTO *dto);
void FieldBattleDTO_AddPokemonToBattler(FieldBattleDTO *dto, Pokemon *src, int battler);
void FieldBattleDTO_CopyPartyToBattler(FieldBattleDTO *dto, const Party *src, int battler);

6
include/g3d_pipeline.h
View File

@ -4,7 +4,7 @@
#include "constants/heap.h"
typedef struct G3DPipelineBuffers {
enum HeapId heapID;
enum HeapID heapID;
void *paletteBuffer;
void *textureBuffer;
} G3DPipelineBuffers;
@ -32,10 +32,10 @@ enum PaletteVramSize {
typedef void (*G3DPipelineSetupCallback)(void);
G3DPipelineBuffers *G3DPipeline_InitEx(enum HeapId heapID, enum VramManagerType texVramManagerType, enum TextureVramSize texVramSize, enum VramManagerType plttVramManagerType, enum PaletteVramSize plttVramSize, G3DPipelineSetupCallback cb);
G3DPipelineBuffers *G3DPipeline_InitEx(enum HeapID heapID, enum VramManagerType texVramManagerType, enum TextureVramSize texVramSize, enum VramManagerType plttVramManagerType, enum PaletteVramSize plttVramSize, G3DPipelineSetupCallback cb);
void G3DPipelineBuffers_Free(G3DPipelineBuffers *state);
static inline G3DPipelineBuffers *G3DPipeline_Init(enum HeapId heapID, enum TextureVramSize texVramSize, enum PaletteVramSize plttVramSize, G3DPipelineSetupCallback cb)
static inline G3DPipelineBuffers *G3DPipeline_Init(enum HeapID heapID, enum TextureVramSize texVramSize, enum PaletteVramSize plttVramSize, G3DPipelineSetupCallback cb)
{
return G3DPipeline_InitEx(heapID, VRAM_MANAGER_TYPE_LINKED_LIST, texVramSize, VRAM_MANAGER_TYPE_LINKED_LIST, plttVramSize, cb);
}

22
include/heap.h
View File

@ -1,5 +1,5 @@
#ifndef POKEPLATINUM_UNK_02017E74_H
#define POKEPLATINUM_UNK_02017E74_H
#ifndef POKEPLATINUM_HEAP_H
#define POKEPLATINUM_HEAP_H
#include <nnsys.h>
@ -11,16 +11,16 @@ typedef struct HeapParam {
} HeapParam;
void Heap_InitSystem(const HeapParam *templates, u32 nTemplates, u32 totalNumHeaps, u32 preSize);
BOOL Heap_Create(u32 parent, u32 child, u32 size);
BOOL Heap_CreateAtEnd(u32 parent, u32 child, u32 size);
void Heap_Destroy(u32 heapID);
void *Heap_AllocFromHeap(u32 heapID, u32 size);
void *Heap_AllocFromHeapAtEnd(u32 heapID, u32 size);
BOOL Heap_Create(enum HeapID parent, enum HeapID child, u32 size);
BOOL Heap_CreateAtEnd(enum HeapID parent, enum HeapID child, u32 size);
void Heap_Destroy(enum HeapID heapID);
void *Heap_Alloc(u32 heapID, u32 size);
void *Heap_AllocAtEnd(u32 heapID, u32 size);
void Heap_Free(void *ptr);
void Heap_FreeExplicit(u32 heapID, void *ptr);
u32 Heap_FndGetTotalFreeSizeForExpHeap(u32 heapID);
void Heap_FndInitAllocatorForExpHeap(NNSFndAllocator *pAllocator, u32 heapID, int alignment);
void Heap_ReallocFromHeap(void *ptr, u32 newSize);
u32 HeapExp_FndGetTotalFreeSize(u32 heapID);
void HeapExp_FndInitAllocator(NNSFndAllocator *pAllocator, u32 heapID, int alignment);
void Heap_Realloc(void *ptr, u32 newSize);
BOOL GF_heap_c_dummy_return_true(u32 heapID);
#endif // POKEPLATINUM_UNK_02017E74_H
#endif // POKEPLATINUM_HEAP_H

2
include/item.h
View File

@ -328,7 +328,7 @@ u8 Item_IsHerbalMedicine(u16 item);
* @param heapID The heap which will own the item table's allocation.
* @return The full table of item data.
*/
void *ItemTable_Load(enum HeapId heapID);
void *ItemTable_Load(enum HeapID heapID);
/**
* @brief Get the ItemData value at a given index from within a loaded table.

8
include/item_use_pokemon.h
View File

@ -4,10 +4,10 @@
#include "party.h"
#include "pokemon.h"
u8 Pokemon_CheckItemEffects(Pokemon *mon, u16 itemId, u16 moveSlot, enum HeapId heapID);
u8 Pokemon_ApplyItemEffects(Pokemon *mon, u16 itemId, u16 moveSlot, u16 location, enum HeapId heapID);
u8 Party_CheckItemEffectsOnMember(Party *party, u16 itemId, u8 partySlot, u8 moveSlot, enum HeapId heapID);
u8 Party_ApplyItemEffectsToMember(Party *party, u16 itemId, u8 partySlot, u8 moveSlot, u16 location, enum HeapId heapID);
u8 Pokemon_CheckItemEffects(Pokemon *mon, u16 itemId, u16 moveSlot, enum HeapID heapID);
u8 Pokemon_ApplyItemEffects(Pokemon *mon, u16 itemId, u16 moveSlot, u16 location, enum HeapID heapID);
u8 Party_CheckItemEffectsOnMember(Party *party, u16 itemId, u8 partySlot, u8 moveSlot, enum HeapID heapID);
u8 Party_ApplyItemEffectsToMember(Party *party, u16 itemId, u8 partySlot, u8 moveSlot, u16 location, enum HeapID heapID);
void Party_HealAllMembers(Party *party);
#endif // POKEPLATINUM_ITEM_USE_POKEMON_H

2
include/main_menu/distribution_cartridge.h
View File

@ -3,7 +3,7 @@
#include "constants/heap.h"
void DistributionCartridge_UseHeap(enum HeapId heapID);
void DistributionCartridge_UseHeap(enum HeapID heapID);
int DistributionCartridge_ReadLength(void);
BOOL DistributionCartridge_ReadData(void *dest, int size);

8
include/main_menu/main_menu_util.h
View File

@ -60,8 +60,8 @@ typedef struct MainMenuWindow {
int renderDelay;
} MainMenuWindow;
void MainMenuUtil_Init(enum HeapId heapID);
void *MainMenuUtil_InitAppAndFadeToBlack(ApplicationManager *appMan, enum HeapId heapID, int appDataSize, enum HeapSize heapSize);
void MainMenuUtil_Init(enum HeapID heapID);
void *MainMenuUtil_InitAppAndFadeToBlack(ApplicationManager *appMan, enum HeapID heapID, int appDataSize, enum HeapSize heapSize);
void MainMenuUtil_InitBGLayer(BgConfig *bgConfig, enum BgLayer bgLayer, u8 screenSize, u32 screenBase, u32 charBase);
void MainMenuUtil_SetFadeToWhite(BOOL enable);
void MainMenuUtil_StartScreenFadeToState(enum FadeType fadeType, int destState, int *state, int waitState);
@ -84,8 +84,8 @@ Sprite *MainMenuUtil_InitSprite(enum DSScreen screen, Sprite *sprite, int x, int
void MainMenuUtil_FreeSprites(void);
u32 MainMenuUtil_CalcMysteryGiftVersionBit(enum Version version);
void MainMenuUtil_LoadGiftSprite(BgConfig *bgConfig, WonderCard *wonderCard);
void MainMenuUtil_EncryptWonderCard(MysteryGiftEventData *eventData, WonderCard *wonderCard, enum HeapId heapID);
void MainMenuUtil_DecryptReceivedWonderCard(MysteryGiftEventData *param0, WonderCard *param1, enum HeapId heapID);
void MainMenuUtil_EncryptWonderCard(MysteryGiftEventData *eventData, WonderCard *wonderCard, enum HeapID heapID);
void MainMenuUtil_DecryptReceivedWonderCard(MysteryGiftEventData *param0, WonderCard *param1, enum HeapID heapID);
void MainMenuUtil_ListMenuCursorCB(ListMenu *param0, u32 param1, u8 param2);
void MainMenuUtil_ToggleTerminateOnGBACartRemoved(BOOL enable);
void MainMenuUtil_UnsetGBACartIRQFunc(void);

2
include/main_menu/wonder_cards_app.h
View File

@ -6,6 +6,6 @@
#include "bg_window.h"
#include "mystery_gift.h"
void WonderCardsApp_ShowWondercard(BgConfig *bgConfig, WonderCard *wonderCard, enum HeapId heapID);
void WonderCardsApp_ShowWondercard(BgConfig *bgConfig, WonderCard *wonderCard, enum HeapID heapID);
#endif // POKEPLATINUM_WONDER_CARDS_APP_H

2
include/map_header_data.h
View File

@ -65,7 +65,7 @@ typedef struct MapHeaderData {
WildEncounters wildEncounters;
} MapHeaderData;
void MapHeaderData_Init(FieldSystem *fieldSystem, enum HeapId heapID);
void MapHeaderData_Init(FieldSystem *fieldSystem, enum HeapID heapID);
void MapHeaderData_Free(FieldSystem *fieldSystem);
void MapHeaderData_Load(FieldSystem *fieldSystem, int headerID);
void sub_0203A418(FieldSystem *fieldSystem);

2
include/math_util.h
View File

@ -53,6 +53,6 @@ u32 SumBytes(const void *data, u32 size);
void EncodeData(void *data, u32 size, u32 seed);
void DecodeData(void *data, u32 size, u32 seed);
u16 CalcCRC16Checksum(const void *data, u32 dataLen);
void InitCRC16Table(enum HeapId heapID);
void InitCRC16Table(enum HeapID heapID);
#endif // POKEPLATINUM_MATH_UTIL_H

2
include/overlay005/hblank_system.h
View File

@ -20,7 +20,7 @@ typedef struct HBlankSystem {
HBlankTask tasks[MAX_HBLANK_TASKS];
} HBlankSystem;
HBlankSystem *HBlankSystem_New(enum HeapId heapID);
HBlankSystem *HBlankSystem_New(enum HeapID heapID);
void HBlankSystem_Delete(HBlankSystem *hBlankSystem);
void HBlankSystem_Start(HBlankSystem *hBlankSystem);
void HBlankSystem_Stop(HBlankSystem *hBlankSystem);

2
include/overlay005/motion_blur.h
View File

@ -18,7 +18,7 @@ typedef struct MotionBlurParams {
GXCaptureDest captureDestination;
int blendCoeffA;
int blendCoeffB;
enum HeapId heapID;
enum HeapID heapID;
} MotionBlurParams;
typedef struct MotionBlur {

4
include/overlay005/save_info_window.h
View File

@ -37,7 +37,7 @@ typedef struct SaveInfo {
typedef struct SaveInfoWindow {
FieldSystem *fieldSystem;
enum HeapId heapID;
enum HeapID heapID;
u8 bgLayer;
BgConfig *bgConfig;
Window *window;
@ -50,7 +50,7 @@ typedef struct SaveInfoWindow {
void SaveInfoWindow_Draw(SaveInfoWindow *saveInfoWin);
void SaveInfoWindow_Erase(SaveInfoWindow *saveInfoWin);
SaveInfoWindow *SaveInfoWindow_New(FieldSystem *fieldSystem, enum HeapId heapID, u8 bgLayer);
SaveInfoWindow *SaveInfoWindow_New(FieldSystem *fieldSystem, enum HeapID heapID, u8 bgLayer);
void SaveInfoWindow_Free(SaveInfoWindow *saveInfoWin);
BOOL FieldSystem_Save(FieldSystem *fieldSystem);
void FieldSystem_SaveStateIfCommunicationOff(FieldSystem *fieldSystem);

8
include/overlay007/accessory_shop.h
View File

@ -98,11 +98,11 @@ typedef struct AccessoryShopItemList {
typedef struct AccessoryShopYesNoChoice {
BOOL active;
Menu *menu;
enum HeapId heapID;
enum HeapID heapID;
} AccessoryShopYesNoChoice;
typedef struct AccessoryShopDataPtrs {
enum HeapId heapID;
enum HeapID heapID;
BgConfig *bgConfig;
AccessoryShopDescBox *descBox;
const AccessoryShopItem *items;
@ -116,7 +116,7 @@ typedef struct AccessoryShop {
UnkStruct_02029D04 *unk_0C;
Bag *bag;
BgConfig *bgConfig;
enum HeapId heapID;
enum HeapID heapID;
SpriteList *spriteList;
G2dRenderer g2dRenderer;
MessageLoader *msgLoader;
@ -129,7 +129,7 @@ typedef struct AccessoryShop {
AccessoryShopDataPtrs dataPtr;
} AccessoryShop;
AccessoryShop *AccessoryShop_New(enum HeapId heapID, SaveData *saveData, BgConfig *bgConfig);
AccessoryShop *AccessoryShop_New(enum HeapID heapID, SaveData *saveData, BgConfig *bgConfig);
void AccessoryShop_Free(AccessoryShop *shop);
BOOL AccessoryShop_Main(AccessoryShop *shop);

4
include/overlay011/particle_helper.h
View File

@ -3,8 +3,8 @@
#include "particle_system.h"
ParticleSystem *ParticleHelper_CreateParticleSystem(enum HeapId heapID);
ParticleSystem *ov11_0221F888(enum HeapId heapID);
ParticleSystem *ParticleHelper_CreateParticleSystem(enum HeapID heapID);
ParticleSystem *ov11_0221F888(enum HeapID heapID);
void ParticleHelper_FreeParticleSystem(ParticleSystem *param0);
void ParticleHelper_DrawParticleSystems(void);

2
include/overlay070/ov70_0225C858.h
View File

@ -6,7 +6,7 @@
#include "overlay063/struct_ov63_0222BCE8_decl.h"
#include "overlay070/struct_ov70_0225C894_decl.h"
UnkStruct_ov70_0225C894 *ov70_0225C858(enum HeapId heapID);
UnkStruct_ov70_0225C894 *ov70_0225C858(enum HeapID heapID);
void ov70_0225C894(UnkStruct_ov70_0225C894 *param0);
u16 ov70_0225C8A8(const UnkStruct_ov70_0225C894 *param0);
BOOL ov70_0225C8AC(const UnkStruct_ov70_0225C894 *param0, u16 param1, u16 param2);

2
include/overlay104/ov104_02231F74.h
View File

@ -27,7 +27,7 @@ void ov104_02232624(UnkStruct_ov104_02232B5C *param0);
void ov104_02232B5C(UnkStruct_ov104_02232B5C *param0);
void ov104_02232B78(SysTask *param0, void *param1);
void ov104_02232C80(UnkStruct_ov63_0222CCB8 *param0, UnkStruct_ov63_0222BEC0 *param1, int param2, int param3);
void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, enum HeapId heapID, int param3, int param4, int param5, int param6, int param7, int param8, u16 param9);
void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, enum HeapID heapID, int param3, int param4, int param5, int param6, int param7, int param8, u16 param9);
void ov104_02232E80(UnkStruct_ov104_0223C4CC *param0, int param1);
void ov104_02232EC0(UnkStruct_ov104_0223C4CC *param0);
void ov104_02232F28(UnkStruct_ov104_0223C4CC *param0);

4
include/overlay_manager.h
View File

@ -28,9 +28,9 @@ struct ApplicationManager {
ApplicationManager *child;
};
ApplicationManager *ApplicationManager_New(const ApplicationManagerTemplate *template, void *args, const enum HeapId heapID);
ApplicationManager *ApplicationManager_New(const ApplicationManagerTemplate *template, void *args, const enum HeapID heapID);
void ApplicationManager_Free(ApplicationManager *appMan);
void *ApplicationManager_NewData(ApplicationManager *appMan, u32 size, enum HeapId heapID);
void *ApplicationManager_NewData(ApplicationManager *appMan, u32 size, enum HeapID heapID);
void *ApplicationManager_Data(ApplicationManager *appMan);
void ApplicationManager_FreeData(ApplicationManager *appMan);
void *ApplicationManager_Args(ApplicationManager *appMan);

2
include/pal_pad.h
View File

@ -61,7 +61,7 @@ BOOL PalPad_AreTrainersEqual(const PalPad *first, const PalPad *second);
* @param destination The pad to push entries into
* @param source The pad to push from
* @param numberToCopy The number of elements to take from {source}
* @param heapId Heap area for pointer operations
* @param heapID Heap area for pointer operations
*/
void PalPad_PushEntries(PalPad *destination, PalPad *source, int numberToCopy, int heapID);

2
include/palette.h
View File

@ -114,7 +114,7 @@ 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);
PaletteData *PaletteData_New(enum HeapId heapID);
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);

4
include/particle_system.h
View File

@ -59,10 +59,10 @@ void ParticleSystem_ZeroAll(void);
// When using a custom texture/palette allocator function, be sure to use
// ParticleSystem_RegisterTextureKey or ParticleSystem_RegisterPaletteKey to register
// allocated textures in the particle system.
ParticleSystem *ParticleSystem_New(SPLTexVRAMAllocFunc texAllocFunc, SPLPalVRAMAllocFunc palAllocFunc, void *heap, int heapSize, BOOL hasCamera, enum HeapId heapID);
ParticleSystem *ParticleSystem_New(SPLTexVRAMAllocFunc texAllocFunc, SPLPalVRAMAllocFunc palAllocFunc, void *heap, int heapSize, BOOL hasCamera, enum HeapID heapID);
void ParticleSystem_Free(ParticleSystem *particleSystem);
void ParticleSystem_FreeAll(void);
void *ParticleSystem_LoadResourceFromNARC(enum NarcID narcID, int memberIndex, enum HeapId heapID);
void *ParticleSystem_LoadResourceFromNARC(enum NarcID narcID, int memberIndex, enum HeapID heapID);
void ParticleSystem_SetResource(ParticleSystem *particleSystem, void *resource, enum VRAMAutoRelease autoRelease, BOOL uploadImmediately);
void ParticleSystem_RegisterTextureKey(NNSGfdTexKey key);
void ParticleSystem_RegisterPaletteKey(NNSGfdPlttKey key);

2
include/party.h
View File

@ -14,7 +14,7 @@ typedef struct Party {
} Party;
int Party_SaveSize(void);
Party *Party_New(enum HeapId heapID);
Party *Party_New(enum HeapID heapID);
void Party_Init(Party *party);
void Party_InitWithCapacity(Party *party, int capacity);
BOOL Party_AddPokemon(Party *party, Pokemon *pokemon);

2
include/pltt_transfer.h
View File

@ -12,7 +12,7 @@ typedef struct PlttTransferTaskTemplate {
u32 resourceID;
} PlttTransferTaskTemplate;
void PlttTransfer_Init(int capacity, enum HeapId heapID);
void PlttTransfer_Init(int capacity, enum HeapID heapID);
void PlttTransfer_MarkReservedSlots(u16 reservedMask, NNS_G2D_VRAM_TYPE vramType);
void PlttTransfer_Free(void);
void PlttTransfer_Clear(void);

2
include/pokedex.h
View File

@ -8,7 +8,7 @@
#include "savedata.h"
int Pokedex_SaveSize(void);
Pokedex *Pokedex_New(enum HeapId heapID);
Pokedex *Pokedex_New(enum HeapID heapID);
void Pokedex_Copy(const Pokedex *src, Pokedex *dest);
void Pokedex_Init(Pokedex *pokedex);
u16 Pokedex_CountCaught_National(const Pokedex *pokedex);

2
include/pokemon.h
View File

@ -806,7 +806,7 @@ void PlayCryWithParams(ChatotCry *chatotCry, enum PokemonCryMod cryMod, u16 spec
*/
void Species_PlayDelayedCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 species, int form, int pan, int volume, int forceDefaultChatot, int heapID, u8 delay);
BOOL Pokemon_PlayCry(Pokemon *mon);
void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *trainerInfo, int monPokeball, int metLocation, int metTerrain, enum HeapId heapID);
void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *trainerInfo, int monPokeball, int metLocation, int metTerrain, enum HeapID heapID);
void Pokemon_UpdateAfterCatch(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
void Pokemon_GiveHeldItem(Pokemon *mon, u32 battleType, int itemRates);
BOOL Pokemon_CanLearnTM(Pokemon *mon, u8 tmID);

4
include/pokemon_sprite.h
View File

@ -159,7 +159,7 @@ typedef struct PokemonSpriteManager {
PokemonSprite sprites[MAX_MON_SPRITES];
NNSG2dImageProxy imageProxy;
NNSG2dImagePaletteProxy plttProxy;
enum HeapId heapID;
enum HeapID heapID;
u32 charBaseAddr;
u32 charSize;
u32 plttBaseAddr;
@ -188,7 +188,7 @@ typedef struct {
const SpriteAnimationFrame *animFrames;
} PokemonSpriteTaskAnim;
void *PokemonSpriteManager_New(enum HeapId heapID);
void *PokemonSpriteManager_New(enum HeapID heapID);
void PokemonSpriteManager_DrawSprites(PokemonSpriteManager *monSpriteMan);
void PokemonSpriteManager_Free(PokemonSpriteManager *monSpriteMan);
void PokemonSprite_InitAnim(PokemonSprite *monSprite, int dummy);

6
include/render_oam.h
View File

@ -25,13 +25,13 @@ void RenderOam_Init(int mainOamStart,
int subOamCount,
int subAffineOamStart,
int subAffineOamCount,
enum HeapId heapID);
enum HeapID heapID);
void RenderOam_InitSurface(NNSG2dRenderSurface *surface, NNSG2dViewRect *viewRect, NNSG2dSurfaceType surfaceType, NNSG2dRendererInstance *renderer);
void RenderOam_Transfer(void);
void RenderOam_Free(void);
NNSG2dOamManagerInstance *RenderOam_GetScreenOam(enum DSScreen screen);
void RenderOam_ClearMain(enum HeapId heapID);
void RenderOam_ClearSub(enum HeapId heapID);
void RenderOam_ClearMain(enum HeapID heapID);
void RenderOam_ClearSub(enum HeapID heapID);
#endif // POKEPLATINUM_RENDER_OAM_H

4
include/render_window.h
View File

@ -42,7 +42,7 @@ void *Window_AddWaitDial(Window *window, u32 baseTile);
void DestroyWaitDial(void *taskData);
void DestroyWaitDialTaskOnly(void *taskData);
u8 *DrawPokemonPreview(BgConfig *bgConfig, u8 bgLayer, u8 x, u8 y, u8 palette, u16 baseTile, u16 species, u8 gender, enum HeapId heapID);
u8 *DrawPokemonPreviewFromStruct(BgConfig *bgConfig, u8 bgLayer, u8 x, u8 y, u8 palette, u16 baseTile, Pokemon *mon, enum HeapId heapID);
u8 *DrawPokemonPreview(BgConfig *bgConfig, u8 bgLayer, u8 x, u8 y, u8 palette, u16 baseTile, u16 species, u8 gender, enum HeapID heapID);
u8 *DrawPokemonPreviewFromStruct(BgConfig *bgConfig, u8 bgLayer, u8 x, u8 y, u8 palette, u16 baseTile, Pokemon *mon, enum HeapID heapID);
#endif // POKEPLATINUM_RENDER_WINDOW_H

10
include/resource_collection.h
View File

@ -39,11 +39,11 @@ typedef struct TextureResourceManager {
TextureResource *textures;
} TextureResourceManager;
ResourceCollection *ResourceCollection_New(s32 maxResources, enum HeapId heapID);
ResourceCollection *ResourceCollection_New(s32 maxResources, enum HeapID heapID);
void ResourceCollection_Delete(ResourceCollection *collection);
BOOL ResourceCollection_IsIDUnused(ResourceCollection *collection, int id);
Resource *ResourceCollection_Add(ResourceCollection *collection, void *data, int id);
Resource *ResourceCollection_AddFromFile(ResourceCollection *collection, const char *filename, int id, enum HeapId heapID);
Resource *ResourceCollection_AddFromFile(ResourceCollection *collection, const char *filename, int id, enum HeapID heapID);
void ResourceCollection_Remove(ResourceCollection *collection, Resource *resource);
void ResourceCollection_Clear(ResourceCollection *collection);
Resource *ResourceCollection_FindResource(ResourceCollection *collection, int id);
@ -51,11 +51,11 @@ void *Resource_GetData(Resource *resource);
void Resource_SetData(Resource *resource, void *data);
int Resource_GetID(Resource *resource);
TextureResourceManager *TextureResourceManager_New(s32 maxTextures, enum HeapId heapID);
TextureResourceManager *TextureResourceManager_New(s32 maxTextures, enum HeapID heapID);
void TextureResourceManager_Delete(TextureResourceManager *texMgr);
BOOL TextureResourceManager_IsIDUnused(const TextureResourceManager *texMgr, int id);
TextureResource *TextureResourceManager_AddTexture(const TextureResourceManager *texMgr, void *data, int id, enum TextureResourceMode mode, enum HeapId heapID);
TextureResource *TextureResourceManager_AddTextureAndAllocVRam(TextureResourceManager *texMgr, void *data, int id, enum TextureResourceMode mode, enum HeapId heapID);
TextureResource *TextureResourceManager_AddTexture(const TextureResourceManager *texMgr, void *data, int id, enum TextureResourceMode mode, enum HeapID heapID);
TextureResource *TextureResourceManager_AddTextureAndAllocVRam(TextureResourceManager *texMgr, void *data, int id, enum TextureResourceMode mode, enum HeapID heapID);
void TextureResourceManager_RemoveTexture(TextureResourceManager *texMgr, TextureResource *texResource);
void TextureResourceManager_RemoveTextureWithID(TextureResourceManager *texMgr, int id);
void TextureResourceManager_Clear(TextureResourceManager *texMgr);

8
include/screen_fade.h
View File

@ -94,7 +94,7 @@ typedef struct ScreenFade {
void *data;
HardwareWindowSettings *hwSettings;
ScreenFadeHBlanks *hblanks;
enum HeapId heapID;
enum HeapID heapID;
u16 color;
// u8 padding_26[2];
@ -102,7 +102,7 @@ typedef struct ScreenFade {
enum FadeMethod method;
} ScreenFade;
void StartScreenFade(enum FadeMode mode, enum FadeType typeMain, enum FadeType typeSub, u16 color, int steps, int framesPerStep, enum HeapId heapID);
void StartScreenFade(enum FadeMode mode, enum FadeType typeMain, enum FadeType typeSub, u16 color, int steps, int framesPerStep, enum HeapID heapID);
void ExecScreenFade(void);
BOOL IsScreenFadeDone(void);
void FinishScreenFade(void);
@ -113,7 +113,7 @@ void SetColorBrightness(u16 color);
void SetupScreenFadeRegisters(enum DSScreen screen, u16 color);
void SetScreenBackgroundColor(u16 color);
void SetScreenMasterBrightness(enum DSScreen screen, int brightness);
void RequestEnableScreenHBlank(ScreenFadeHBlanks *hblanks, void *data, Callback callback, enum DSScreen screen, enum HeapId heapID);
void RequestDisableScreenHBlank(ScreenFadeHBlanks *hblanks, enum DSScreen screen, enum HeapId heapID);
void RequestEnableScreenHBlank(ScreenFadeHBlanks *hblanks, void *data, Callback callback, enum DSScreen screen, enum HeapID heapID);
void RequestDisableScreenHBlank(ScreenFadeHBlanks *hblanks, enum DSScreen screen, enum HeapID heapID);
#endif // POKEPLATINUM_SCREEN_FADE_H

2
include/screen_scroll_manager.h
View File

@ -27,7 +27,7 @@ typedef struct ScreenScrollManager {
s16 scrollSpeed;
} ScreenScrollManager;
ScreenScrollManager *ScreenScrollManager_New(enum HeapId heapID);
ScreenScrollManager *ScreenScrollManager_New(enum HeapID heapID);
void ScreenScrollManager_ScrollX(ScreenScrollManager *screenScrollMgr, u8 start, u8 end, u16 angleIncrement, fx32 amplitude, s16 speed, u32 bg, u32 initValue, u32 priority);
void ScreenScrollManager_ScrollY(ScreenScrollManager *screenScrollMgr, u8 start, u8 end, u16 angleIncrement, fx32 amplitude, s16 speed, u32 bg, u32 initValue, u32 priority);
void ScreenScrollManager_Stop(ScreenScrollManager *screenScrollMgr);

2
include/scroll_prompts.h
View File

@ -18,7 +18,7 @@ typedef struct ScrollPrompts {
ManagedSprite *arrowSprites[SCROLL_PROMPT_ARROW_COUNT];
} ScrollPrompts;
ScrollPrompts *ScrollPrompts_New(enum HeapId heapID);
ScrollPrompts *ScrollPrompts_New(enum HeapID heapID);
void ScrollPrompts_Free(ScrollPrompts *prompts);
void ScrollPrompts_UpdateAnim(ScrollPrompts *prompts);
void ScrollPrompts_SetPosition(ScrollPrompts *prompts, s16 x, s16 topArrowY, s16 bottomArrowY);

10
include/sprite.h
View File

@ -92,7 +92,7 @@ struct SpriteList {
typedef struct SpriteListParams {
int maxElements;
NNSG2dRendererInstance *renderer;
enum HeapId heapID;
enum HeapID heapID;
} SpriteListParams;
typedef struct SpriteResourcesHeader {
@ -126,7 +126,7 @@ typedef struct SpriteListTemplate {
VecFx32 position;
u32 priority;
enum NNS_G2D_VRAM_TYPE vramType;
enum HeapId heapID;
enum HeapID heapID;
} SpriteListTemplate;
typedef struct AffineSpriteListTemplate {
@ -137,7 +137,7 @@ typedef struct AffineSpriteListTemplate {
u16 affineZRotation;
u32 priority;
enum NNS_G2D_VRAM_TYPE vramType;
enum HeapId heapID;
enum HeapID heapID;
} AffineSpriteListTemplate;
SpriteList *SpriteList_New(const SpriteListParams *params);
@ -190,8 +190,8 @@ void Sprite_SetMosaicFlag(Sprite *sprite, BOOL mosaic);
enum NNS_G2D_VRAM_TYPE Sprite_GetVRamType(const Sprite *sprite);
BOOL Sprite_IsAnimated(Sprite *sprite);
void Sprite_SetExplicitOAMMode(Sprite *sprite, GXOamMode mode);
void Utility_Clear2DMainOAM(enum HeapId heapID);
void Utility_Clear2DSubOAM(enum HeapId heapID);
void Utility_Clear2DMainOAM(enum HeapID heapID);
void Utility_Clear2DSubOAM(enum HeapID heapID);
u32 Sprite_GetUserAttrForAnimFrame(const Sprite *sprite, u32 animID, u32 frame);
u32 Sprite_GetUserAttrForCurrentAnimFrame(const Sprite *sprite);

34
include/sprite_resource.h
View File

@ -64,23 +64,23 @@ typedef struct SpriteResourceList {
int count;
} SpriteResourceList;
SpriteResourceCollection *SpriteResourceCollection_New(int capacity, enum SpriteResourceType type, enum HeapId heapID);
SpriteResourceCollection *SpriteResourceCollection_New(int capacity, enum SpriteResourceType type, enum HeapID heapID);
void SpriteResourceCollection_Delete(SpriteResourceCollection *spriteResources);
SpriteResource *SpriteResourceCollection_AddFromTable(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, int index, enum HeapId heapID);
SpriteResource *SpriteResourceCollection_AddTiles(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID);
SpriteResource *SpriteResourceCollection_AddPalette(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID);
SpriteResource *SpriteResourceCollection_Add(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, enum SpriteResourceType type, enum HeapId heapID);
void SpriteResourceCollection_ModifyTiles(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, enum NarcID narcID, int memberIdx, BOOL compressed, enum HeapId heapID);
void SpriteResourceCollection_ModifyPalette(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, enum NarcID narcID, int memberIdx, BOOL compressed, enum HeapId heapID);
SpriteResource *SpriteResourceCollection_AddTilesFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID);
SpriteResource *SpriteResourceCollection_AddTilesFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID, BOOL allocAtEnd);
SpriteResource *SpriteResourceCollection_AddPaletteFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID);
SpriteResource *SpriteResourceCollection_AddPaletteFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID, BOOL allocAtEnd);
SpriteResource *SpriteResourceCollection_AddFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, enum SpriteResourceType type, enum HeapId heapID);
void SpriteResourceCollection_ModifyTilesFrom(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, NARC *narc, int memberIdx, BOOL compressed, enum HeapId heapID);
int SpriteResourceCollection_Extend(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, SpriteResourceList *outList, enum HeapId heapID);
void SpriteResoureCollection_ExtendEx(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, int first, int count, SpriteResourceList *outList, enum HeapId heapID);
SpriteResourceList *SpriteResourceList_New(int capacity, enum HeapId heapID);
SpriteResource *SpriteResourceCollection_AddFromTable(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, int index, enum HeapID heapID);
SpriteResource *SpriteResourceCollection_AddTiles(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapID heapID);
SpriteResource *SpriteResourceCollection_AddPalette(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapID heapID);
SpriteResource *SpriteResourceCollection_Add(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, enum SpriteResourceType type, enum HeapID heapID);
void SpriteResourceCollection_ModifyTiles(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, enum NarcID narcID, int memberIdx, BOOL compressed, enum HeapID heapID);
void SpriteResourceCollection_ModifyPalette(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, enum NarcID narcID, int memberIdx, BOOL compressed, enum HeapID heapID);
SpriteResource *SpriteResourceCollection_AddTilesFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapID heapID);
SpriteResource *SpriteResourceCollection_AddTilesFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapID heapID, BOOL allocAtEnd);
SpriteResource *SpriteResourceCollection_AddPaletteFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapID heapID);
SpriteResource *SpriteResourceCollection_AddPaletteFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapID heapID, BOOL allocAtEnd);
SpriteResource *SpriteResourceCollection_AddFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, enum SpriteResourceType type, enum HeapID heapID);
void SpriteResourceCollection_ModifyTilesFrom(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, NARC *narc, int memberIdx, BOOL compressed, enum HeapID heapID);
int SpriteResourceCollection_Extend(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, SpriteResourceList *outList, enum HeapID heapID);
void SpriteResoureCollection_ExtendEx(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, int first, int count, SpriteResourceList *outList, enum HeapID heapID);
SpriteResourceList *SpriteResourceList_New(int capacity, enum HeapID heapID);
void SpriteResourceList_Delete(SpriteResourceList *list);
BOOL SpriteResourceCollection_IsIDUnused(const SpriteResourceCollection *spriteResources, int id);
void SpriteResource_ReleaseData(SpriteResource *spriteRes);
@ -100,7 +100,7 @@ int SpriteResource_GetPaletteIndex(const SpriteResource *spriteRes);
void SpriteResource_SetVRAMType(SpriteResource *spriteRes, NNS_G2D_VRAM_TYPE vramType);
int SpriteResourceTable_Size(void);
SpriteResourceTable *SpriteResourceTable_GetArrayElement(SpriteResourceTable *table, int index);
void SpriteResourceTable_LoadFromBinary(const void *data, SpriteResourceTable *table, enum HeapId heapID);
void SpriteResourceTable_LoadFromBinary(const void *data, SpriteResourceTable *table, enum HeapID heapID);
void SpriteResourceTable_Clear(SpriteResourceTable *table);
int SpriteResourceTable_GetCount(const SpriteResourceTable *table);
int SpriteResourceTable_GetEntryID(const SpriteResourceTable *table, int index);

4
include/sprite_system.h
View File

@ -16,7 +16,7 @@
#define SPRITE_RESOURCE_NONE -1
typedef struct SpriteSystem {
enum HeapId heapID;
enum HeapID heapID;
int spriteManagerCount;
BOOL inUse;
NNSG2dCellTransferState *cellTransferStates;
@ -86,7 +86,7 @@ typedef union SpriteResourceCapacities {
} asStruct;
} SpriteResourceCapacities;
SpriteSystem *SpriteSystem_Alloc(enum HeapId heapID);
SpriteSystem *SpriteSystem_Alloc(enum HeapID heapID);
SpriteManager *SpriteManager_New(SpriteSystem *spriteSys);
G2dRenderer *SpriteSystem_GetRenderer(SpriteSystem *spriteSys);
BOOL SpriteSystem_Init(SpriteSystem *spriteSys, const RenderOamTemplate *oamTemplate, const CharTransferTemplateWithModes *transferTemplate, int plttCapacity);

4
include/sprite_util.h
View File

@ -43,7 +43,7 @@ void SpriteResourcesHeader_Init(SpriteResourcesHeader *resourceHeader,
void SpriteResourcesHeader_Clear(SpriteResourcesHeader *resourceHeader);
SpriteResourcesHeaderList *SpriteResourcesHeaderList_NewFromResdat(const ResdatTableEntry *resdatEntries,
enum HeapId heapID,
enum HeapID heapID,
SpriteResourceCollection *charResources,
SpriteResourceCollection *plttResources,
SpriteResourceCollection *cellResources,
@ -52,7 +52,7 @@ SpriteResourcesHeaderList *SpriteResourcesHeaderList_NewFromResdat(const ResdatT
SpriteResourceCollection *manimResources);
void SpriteResourcesHeaderList_Free(SpriteResourcesHeaderList *param0);
SpriteList *SpriteList_InitRendering(int maxElements, G2dRenderer *g2dRenderer, enum HeapId heapID);
SpriteList *SpriteList_InitRendering(int maxElements, G2dRenderer *g2dRenderer, enum HeapID heapID);
void SetMainScreenViewRect(G2dRenderer *g2dRenderer, fx32 x, fx32 y);
void SetSubScreenViewRect(G2dRenderer *g2dRenderer, fx32 x, fx32 y);
void ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE vramType, GXOBJVRamModeChar vramMode);

2
include/system.h
View File

@ -84,7 +84,7 @@ void ReadKeypadAndTouchpad(void);
void SetAutorepeat(int rate, int delay);
void ResetLock(u8 mask);
void ResetUnlock(u8 mask);
void InitHeapCanary(enum HeapId param0);
void InitHeapCanary(enum HeapID param0);
void FreeHeapCanary(void);
BOOL HeapCanaryOK(void);

2
include/trainer_info.h
View File

@ -35,7 +35,7 @@ int TrainerInfo_Size(void);
* @param heapID Heap on which to allocate the new struct.
* @return Address of the new struct.
*/
TrainerInfo *TrainerInfo_New(enum HeapId heapID);
TrainerInfo *TrainerInfo_New(enum HeapID heapID);
/**
* @brief Copy a source TrainerInfo struct into a destination struct, byte-for-byte.

14
include/unk_020131EC.h
View File

@ -9,12 +9,12 @@
void sub_020133D4(enum NarcID narcID, int param1, int param2, int param3, int param4, int param5, int param6, void *param7);
void sub_020134E4(int param0, int param1, int param2, int param3, int param4, int param5, int *param6, const void *param7, void *param8);
void sub_02013560(int param0, int param1, const UnkStruct_02013610 *param2, int *param3, const void *param4, void *param5);
void sub_020135F0(enum NarcID narcID, int param1, enum HeapId heapID, const UnkStruct_02013610 *param3, void *param4);
void sub_02013610(enum NarcID narcID, int param1, enum HeapId heapID, void *param3);
void *sub_0201363C(enum NarcID narcID, int param1, enum HeapId heapID);
void *sub_02013660(enum NarcID narcID, int param1, enum HeapId heapID);
void sub_020136A4(enum NarcID narcID, int param1, enum HeapId heapID, int param3, int param4, int param5, int param6, void *param7, u32 param8, BOOL param9, int param10, int param11);
void sub_02013720(enum NarcID narcID, int param1, enum HeapId heapID, const UnkStruct_02013610 *param3, void *param4, u32 param5, BOOL param6, int param7, int param8);
void sub_02013750(enum NarcID narcID, int charID, enum HeapId heapID, void *param3, u32 personality, BOOL param5, int param6, int param7);
void sub_020135F0(enum NarcID narcID, int param1, enum HeapID heapID, const UnkStruct_02013610 *param3, void *param4);
void sub_02013610(enum NarcID narcID, int param1, enum HeapID heapID, void *param3);
void *sub_0201363C(enum NarcID narcID, int param1, enum HeapID heapID);
void *sub_02013660(enum NarcID narcID, int param1, enum HeapID heapID);
void sub_020136A4(enum NarcID narcID, int param1, enum HeapID heapID, int param3, int param4, int param5, int param6, void *param7, u32 param8, BOOL param9, int param10, int param11);
void sub_02013720(enum NarcID narcID, int param1, enum HeapID heapID, const UnkStruct_02013610 *param3, void *param4, u32 param5, BOOL param6, int param7, int param8);
void sub_02013750(enum NarcID narcID, int charID, enum HeapID heapID, void *param3, u32 personality, BOOL param5, int param6, int param7);
#endif // POKEPLATINUM_UNK_020131EC_H

2
include/unk_02030880.h
View File

@ -12,6 +12,6 @@ void Frontier_Extra_Init(BattleFrontierStage *param0);
BattleFrontierStage *sub_020308A0(SaveData *saveData, int param1, int *param2);
int sub_020308A8(SaveData *saveData, BattleFrontierStage *param1);
u16 sub_020308BC(SaveData *saveData, BattleFrontierStage *param1, int param2, int param3);
BOOL sub_020309A0(SaveData *saveData, int param1, int param2, int param3, int param4, enum HeapId heapID, int *param6, int *param7);
BOOL sub_020309A0(SaveData *saveData, int param1, int param2, int param3, int param4, enum HeapID heapID, int *param6, int *param7);
#endif // POKEPLATINUM_UNK_02030880_H

2
include/unk_0203D1B8.h
View File

@ -46,7 +46,7 @@ void *sub_0203D578(int param0, FieldSystem *fieldSystem, int param2, int param3,
void *sub_0203D5C8(int param0, FieldSystem *fieldSystem, int param2);
void *sub_0203D644(FieldSystem *fieldSystem, int param1);
PokemonSummary *sub_0203D670(FieldSystem *fieldSystem, int heapID, int mode);
void *FieldSystem_OpenSummaryScreenSelectMove(enum HeapId heapID, FieldSystem *fieldSystem, u8 partyIndex);
void *FieldSystem_OpenSummaryScreenSelectMove(enum HeapID heapID, FieldSystem *fieldSystem, u8 partyIndex);
int PokemonSummary_GetSelectedMoveSlot(void *summary);
void FieldSystem_OpenPokemonStorage(FieldSystem *fieldSystem, PokemonStorageSession *pokemonStorageSession);
void sub_0203D80C(FieldTask *param0, u16 *param1, u16 *param2, u16 *param3);

2
include/unk_02054884.h
View File

@ -8,7 +8,7 @@
#define PARTY_SLOT_NONE 0xFF
BOOL Pokemon_CanBattle(Pokemon *mon);
BOOL Pokemon_GiveMonFromScript(enum HeapId heapID, SaveData *saveData, u16 species, u8 level, u16 heldItem, int metLocation, int metTerrain);
BOOL Pokemon_GiveMonFromScript(enum HeapID heapID, SaveData *saveData, u16 species, u8 level, u16 heldItem, int metLocation, int metTerrain);
BOOL sub_02054930(int unused, SaveData *saveData, u16 param2, u8 param3, int param4, int param5);
void sub_02054988(Party *party, int param1, int param2, u16 param3);
int Party_HasMonWithMove(Party *party, u16 moveID);

2
include/vram_transfer.h
View File

@ -3,7 +3,7 @@
#include "constants/heap.h"
void VramTransfer_New(u32 capacity, enum HeapId heapID);
void VramTransfer_New(u32 capacity, enum HeapID heapID);
void VramTransfer_Free(void);
BOOL VramTransfer_Request(NNS_GFD_DST_TYPE type, u32 destAddr, void *buf, u32 size);
void VramTransfer_Process(void);

4
src/applications/naming_screen.c
View File

@ -1472,13 +1472,13 @@ static BOOL NamingScreen_Exit(ApplicationManager *appMan, int *unusedState)
}
NamingScreenArgs *NamingScreenArgs_Init(
enum HeapId heapID,
enum HeapID heapID,
enum NamingScreenType type,
int playerGenderOrMonSpecies,
int maxChars,
Options *options)
{
NamingScreenArgs *args = (NamingScreenArgs *)Heap_AllocFromHeap(heapID, sizeof(NamingScreenArgs));
NamingScreenArgs *args = (NamingScreenArgs *)Heap_Alloc(heapID, sizeof(NamingScreenArgs));
args->type = type;
args->playerGenderOrMonSpecies = playerGenderOrMonSpecies;

8
src/applications/options_menu.c
View File

@ -77,7 +77,7 @@ typedef struct OptionsMenuEntry {
} OptionsMenuEntry;
typedef struct OptionsMenuData {
enum HeapId heapID;
enum HeapID heapID;
int state;
int subState;
int dummy0C;
@ -545,7 +545,7 @@ static void LoadBgTiles(OptionsMenuData *menuData)
NARC *narc = NARC_ctor(NARC_INDEX_GRAPHIC__CONFIG_GRA, menuData->heapID);
u32 memberSize = NARC_GetMemberSize(narc, tiles_NCGR);
void *memberBuffer = Heap_AllocFromHeapAtEnd(menuData->heapID, memberSize);
void *memberBuffer = Heap_AllocAtEnd(menuData->heapID, memberSize);
NARC_ReadWholeMember(narc, tiles_NCGR, memberBuffer);
NNS_G2dGetUnpackedCharacterData(memberBuffer, &cursorTiles);
Bg_LoadTiles(menuData->bgConfig, BG_LAYER_MAIN_0, cursorTiles->pRawData, cursorTiles->szByte, 0);
@ -553,7 +553,7 @@ static void LoadBgTiles(OptionsMenuData *menuData)
Heap_Free(memberBuffer);
memberSize = NARC_GetMemberSize(narc, tiles_NCLR);
memberBuffer = Heap_AllocFromHeapAtEnd(menuData->heapID, memberSize);
memberBuffer = Heap_AllocAtEnd(menuData->heapID, memberSize);
NARC_ReadWholeMember(narc, tiles_NCLR, memberBuffer);
NNS_G2dGetUnpackedPaletteData(memberBuffer, &cursorPalette);
Bg_LoadPalette(BG_LAYER_MAIN_0, cursorPalette->pRawData, PALETTE_SIZE_BYTES, 0);
@ -561,7 +561,7 @@ static void LoadBgTiles(OptionsMenuData *menuData)
Heap_Free(memberBuffer);
memberSize = NARC_GetMemberSize(narc, tilemap_bin);
menuData->nscrBuffer = Heap_AllocFromHeap(menuData->heapID, memberSize);
menuData->nscrBuffer = Heap_Alloc(menuData->heapID, memberSize);
NARC_ReadWholeMember(narc, tilemap_bin, menuData->nscrBuffer);
NNS_G2dGetUnpackedScreenData(menuData->nscrBuffer, &(menuData->tilemapData));

4
src/applications/pc_boxes/box_app_manager.c
View File

@ -3307,7 +3307,7 @@ static void BoxAppMan_Load(BoxApplicationManager *boxAppMan, PokemonStorageSessi
boxAppMan->natureNameLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_NATURE_NAMES, HEAP_ID_BOX_DATA);
boxAppMan->abilityNameLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_ABILITY_NAMES, HEAP_ID_BOX_DATA);
boxAppMan->MessageVariableBuffer = StringTemplate_Default(HEAP_ID_BOX_DATA);
boxAppMan->mon = Heap_AllocFromHeap(HEAP_ID_BOX_DATA, Pokemon_StructSize());
boxAppMan->mon = Heap_Alloc(HEAP_ID_BOX_DATA, Pokemon_StructSize());
GF_ASSERT(boxAppMan->MessageVariableBuffer);
boxAppMan->namingScreenArgs = NamingScreenArgs_Init(HEAP_ID_BOX_DATA, NAMING_SCREEN_TYPE_BOX, 0, BOX_NAME_LEN, boxAppMan->options);
@ -3391,7 +3391,7 @@ static void BoxAppMan_InitCursor(BoxApplicationManager *boxAppMan)
static void BoxMonSelection_Init(BoxMonSelection *selection)
{
selection->boxMon = Heap_AllocFromHeap(HEAP_ID_BOX_DATA, MAX_MONS_PER_BOX * BoxPokemon_GetStructSize());
selection->boxMon = Heap_Alloc(HEAP_ID_BOX_DATA, MAX_MONS_PER_BOX * BoxPokemon_GetStructSize());
selection->selectedMonCount = 0;
selection->cursorMonIsPartyMon = FALSE;
}

4
src/applications/pc_boxes/ov19_021D61B0.c
View File

@ -206,7 +206,7 @@ static const struct {
BOOL BoxGraphics_Load(UnkStruct_ov19_021D61B0 **param0, const BoxApplication *param1, const BoxApplicationManager *param2)
{
UnkStruct_ov19_021D61B0 *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021D61B0));
UnkStruct_ov19_021D61B0 *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021D61B0));
if (v0 != NULL) {
v0->unk_1C4 = param1;
@ -325,7 +325,7 @@ void BoxGraphics_TaskHandler(UnkStruct_ov19_021D61B0 *param0, enum BoxGraphicsFu
for (u32 i = 0; i < 4; i++) {
if (param0->unk_08[i] == NULL) {
taskParams = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(BoxTaskParams) + sBoxGraphicsTaskHandlers[function].unk_04);
taskParams = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(BoxTaskParams) + sBoxGraphicsTaskHandlers[function].unk_04);
if (taskParams != NULL) {
taskParams->function = function;

2
src/applications/pc_boxes/ov19_021D79F8.c
View File

@ -439,7 +439,7 @@ static void ov19_021D81B8(UnkStruct_ov19_021D8318 *param0, int param1, int param
UnkStruct_ov19_021D81B8 *v0;
param0->unk_A3 = 0;
v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021D81B8));
v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021D81B8));
if (v0) {
v0->unk_00 = param0;

2
src/applications/pc_boxes/ov19_021D8B54.c
View File

@ -534,7 +534,7 @@ BOOL ov19_021D9530(UnkStruct_ov19_021D8E00 *param0)
static void ov19_021D9554(UnkStruct_ov19_021D8E00 *param0, Sprite *param1, fx32 param2, s32 param3, u32 param4)
{
UnkStruct_ov19_021D9554 *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021D9554));
UnkStruct_ov19_021D9554 *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021D9554));
if (v0) {
VecFx32 v1;

2
src/applications/pc_boxes/ov19_021DA92C.c
View File

@ -235,7 +235,7 @@ static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 *param0)
static void ov19_021DAC4C(UnkStruct_ov19_021DA9E0 *param0)
{
if (param0->unk_4C == NULL) {
UnkStruct_ov19_021DAE2C *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DAE2C));
UnkStruct_ov19_021DAE2C *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DAE2C));
if (v0) {
const PCMonPreview *preview = BoxApp_GetPCMonPreview(param0->unk_10);

6
src/applications/pc_boxes/ov19_021DB8E4.c
View File

@ -479,7 +479,7 @@ static void ov19_021DC034(UnkStruct_ov19_021DBA9C *param0, int param1)
ov19_021DC0A0,
ov19_021DC1CC,
};
UnkStruct_ov19_021DC034 *v1 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DC034));
UnkStruct_ov19_021DC034 *v1 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DC034));
if (v1) {
v1->unk_00 = param0;
@ -592,7 +592,7 @@ static void ov19_021DC1CC(SysTask *param0, void *param1)
void ov19_021DC29C(UnkStruct_ov19_021DBA9C *param0)
{
UnkStruct_ov19_021DC29C *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DC29C));
UnkStruct_ov19_021DC29C *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DC29C));
if (v0) {
u32 v1 = BoxApp_GetCursorOrPreviewedItem(param0->unk_0C);
@ -655,7 +655,7 @@ static void ov19_021DC37C(SysTask *param0, void *param1)
void ov19_021DC3F4(UnkStruct_ov19_021DBA9C *param0)
{
UnkStruct_ov19_021DC29C *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DC29C));
UnkStruct_ov19_021DC29C *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DC29C));
if (v0) {
v0->unk_16 = 0;

2
src/applications/pc_boxes/ov19_021DC5F0.c
View File

@ -66,7 +66,7 @@ BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 *param0, UnkStruct_ov19_021D61B0 *par
ov19_021DA3CC(param0->unk_38, param0->unk_3C, 6);
param0->unk_1C = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(VecFx32) * 6 * 8);
param0->unk_1C = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(VecFx32) * 6 * 8);
param0->unk_14 = Graphics_GetScrnDataFromOpenNARC(param5, 6, 1, &(param0->unk_18), HEAP_ID_BOX_GRAPHICS);
if ((param0->unk_14 == NULL) || (param0->unk_1C == NULL)) {

10
src/applications/pc_boxes/ov19_021DCF88.c
View File

@ -305,7 +305,7 @@ BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 **param0, UnkStruct_ov19_021D61B0 *pa
*param0 = NULL;
return 1;
} else {
UnkStruct_ov19_021DCF88 *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DCF88));
UnkStruct_ov19_021DCF88 *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DCF88));
if (v0) {
int v1;
@ -1142,7 +1142,7 @@ static void ov19_021DDD80(UnkStruct_ov19_021DCF88 *param0)
UnkStruct_ov19_021DDBF8 *v0;
int v1;
v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DDBF8));
v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DDBF8));
if (v0) {
SysTask *v2;
@ -1257,7 +1257,7 @@ static void ov19_021DDFA8(UnkStruct_ov19_021DCF88 *param0)
UnkStruct_ov19_021DDBF8 *v0;
int v1;
v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DDBF8));
v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DDBF8));
if (v0) {
SysTask *v2;
@ -1316,7 +1316,7 @@ static void ov19_021DE0A0(UnkStruct_ov19_021DCF88 *param0)
UnkStruct_ov19_021DDBF8 *v0;
int v1;
v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DDBF8));
v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DDBF8));
if (v0) {
SysTask *v2;
@ -1440,7 +1440,7 @@ static void ov19_021DE2A4(UnkStruct_ov19_021DCF88 *param0)
UnkStruct_ov19_021DDBF8 *v0;
int v1;
v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DDBF8));
v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DDBF8));
if (v0) {
SysTask *v2;

4
src/applications/pc_boxes/ov19_021DE3E8.c
View File

@ -72,7 +72,7 @@ static void ov19_021DE8E0(SysTask *param0, void *param1);
BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 **param0, UnkStruct_ov19_021D61B0 *param1, const BoxApplication *param2, BgConfig *param3, SpriteList *param4)
{
UnkStruct_ov19_021DE3E8 *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DE3E8));
UnkStruct_ov19_021DE3E8 *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DE3E8));
if (v0) {
v0->unk_04 = param1;
@ -332,7 +332,7 @@ BOOL ov19_021DE800(UnkStruct_ov19_021DE3E8 *param0)
static void ov19_021DE858(UnkStruct_ov19_021DE3E8 *param0, int param1, const VecFx32 *param2, int param3, int param4)
{
UnkStruct_ov19_021DE858 *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DE858));
UnkStruct_ov19_021DE858 *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DE858));
if (v0) {
v0->unk_00 = param0;

2
src/applications/pc_boxes/ov19_021DEC04.c
View File

@ -91,7 +91,7 @@ BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 **param0, UnkStruct_ov19_021D61B0 *pa
*param0 = NULL;
return 1;
} else {
UnkStruct_ov19_021DEC04 *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DEC04));
UnkStruct_ov19_021DEC04 *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DEC04));
if (v0) {
v0->unk_04 = param1;

58
src/applications/pokedex/crysub.c
View File

@ -185,9 +185,9 @@ typedef struct PokedexCrySubGraphics {
BOOL pokeballActive;
} PokedexCrySubGraphics;
static PokedexCrySubData *LoadAppData(enum HeapId heapID, PokedexApp *pokedexApp);
static PokedexGraphicData **LoadAppGraphics(enum HeapId heapID, PokedexApp *pokedexApp);
static UnkStruct_ov21_021D4660 *ScreenStates(enum HeapId heapID, PokedexApp *pokedexApp);
static PokedexCrySubData *LoadAppData(enum HeapID heapID, PokedexApp *pokedexApp);
static PokedexGraphicData **LoadAppGraphics(enum HeapID heapID, PokedexApp *pokedexApp);
static UnkStruct_ov21_021D4660 *ScreenStates(enum HeapID heapID, PokedexApp *pokedexApp);
static void FreePokedexCrySubData(PokedexCrySubData *pokedexCrySubData);
static void FreeGraphicData(PokedexGraphicData **graphicData);
static void FreeScreenStates(UnkStruct_ov21_021D4660 *screenStates);
@ -202,7 +202,7 @@ static void SetSpriteOAMModesXLU(PokedexCrySubGraphics *pokedexCrySubGraphics);
static void SetSpriteOAMModesNormal(PokedexCrySubGraphics *pokedexCrySubGraphics);
static void InitBlendTransition(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, const PokedexCrySubData *pokedexCrySubData, BOOL isEntering);
static BOOL AdvanceBlendTransition(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, const PokedexCrySubData *pokedexCrySubData, BOOL isEntering);
static void SetTouchScreen(PokedexCrySubPageData *pokedexCrySubPageData, PokedexCrySubData *pokedexCrySubData, enum HeapId heapID);
static void SetTouchScreen(PokedexCrySubPageData *pokedexCrySubPageData, PokedexCrySubData *pokedexCrySubData, enum HeapID heapID);
static void ResetButtons(PokedexCrySubPageData *pokedexCrySubPageData, PokedexCrySubData *pokedexCrySubData);
static void FreeTouchScreen(PokedexCrySubPageData *pokedexCrySubPageData);
static void AdjustmentTouchActions(u32 adjustor, enum TouchScreenButtonState buttonState, void *data);
@ -239,22 +239,22 @@ static void StopReverbFilter(PokedexCrySubPageData *pokedexCrySubPageData);
static void UpdateWheelPosition(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, const PokedexCrySubPageData *pokedexCrySubPageData);
static void UpdateEchoVolume(PokedexCrySubPageData *pokedexCrySubPageData, int touchX);
static void UpdatePan(PokedexCrySubPageData *pokedexCrySubPageData, int touchX);
static void LoadCrySubGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapId heapID);
static void FreeGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapId heapID);
static void LoadBackgroundTileMaps(PokedexGraphicData **graphicData, enum HeapId heapID);
static void LoadCrySubGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapID heapID);
static void FreeGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapID heapID);
static void LoadBackgroundTileMaps(PokedexGraphicData **graphicData, enum HeapID heapID);
static void FreeBackgroundTileMaps(PokedexGraphicData **graphicData);
static void LoadCryDialSprite(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapId heapID);
static void LoadCryDialSprite(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapID heapID);
static void FreeDialSpriteResource(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData);
static void AnimateSprites(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapId heapID);
static void AnimateSprites(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapID heapID);
static void FreeSprites(PokedexCrySubGraphics *pokedexCrySubGraphics);
static void LoadSwitchText(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapId heapID);
static void LoadSwitchText(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapID heapID);
static void FreeSwitchLabel(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData);
static void LoadCryPalette(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapId heapID);
static void LoadCryPalette(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapID heapID);
static void FreeCryPalette(PokedexCrySubGraphics *pokedexCrySubGraphics);
static void PokeballPaletteActive(PokedexCrySubGraphics *pokedexCrySubGraphics);
static void PokeballPaletteDefault(PokedexCrySubGraphics *pokedexCrySubGraphics);
void CrySub_Init(PokedexScreenManager *screenMan, PokedexApp *pokedexApp, enum HeapId heapID)
void CrySub_Init(PokedexScreenManager *screenMan, PokedexApp *pokedexApp, enum HeapID heapID)
{
PokedexCrySubData *pokedexCrySubData = LoadAppData(heapID, pokedexApp);
PokedexGraphicData **pokedexGraphicData = LoadAppGraphics(heapID, pokedexApp);
@ -287,9 +287,9 @@ int CrySub_GetPitch(const PokedexScreenManager *screenMan)
return pokedexCrySubData->pitch;
}
static PokedexCrySubData *LoadAppData(enum HeapId heapID, PokedexApp *pokedexApp)
static PokedexCrySubData *LoadAppData(enum HeapID heapID, PokedexApp *pokedexApp)
{
PokedexCrySubData *pokedexCrySubData = Heap_AllocFromHeap(heapID, sizeof(PokedexCrySubData));
PokedexCrySubData *pokedexCrySubData = Heap_Alloc(heapID, sizeof(PokedexCrySubData));
GF_ASSERT(pokedexCrySubData);
memset(pokedexCrySubData, 0, sizeof(PokedexCrySubData));
@ -301,9 +301,9 @@ static PokedexCrySubData *LoadAppData(enum HeapId heapID, PokedexApp *pokedexApp
return pokedexCrySubData;
}
static PokedexGraphicData **LoadAppGraphics(enum HeapId heapID, PokedexApp *pokedexApp)
static PokedexGraphicData **LoadAppGraphics(enum HeapID heapID, PokedexApp *pokedexApp)
{
PokedexGraphicData **graphicData = Heap_AllocFromHeap(heapID, sizeof(PokedexGraphicData **));
PokedexGraphicData **graphicData = Heap_Alloc(heapID, sizeof(PokedexGraphicData **));
GF_ASSERT(graphicData);
memset(graphicData, 0, sizeof(PokedexGraphicData **));
@ -313,7 +313,7 @@ static PokedexGraphicData **LoadAppGraphics(enum HeapId heapID, PokedexApp *poke
return graphicData;
}
static UnkStruct_ov21_021D4660 *ScreenStates(enum HeapId heapID, PokedexApp *pokedexApp)
static UnkStruct_ov21_021D4660 *ScreenStates(enum HeapID heapID, PokedexApp *pokedexApp)
{
return NULL;
}
@ -346,7 +346,7 @@ static BOOL CrySubDataEnter(PokedexDataManager *dataMan, void *data)
PokedexCrySubPageData *pokedexCrySubPageData = dataMan->pageData;
enum Species species = PokedexSort_CurrentSpecies(pokedexCrySubData->sortData);
pokedexCrySubPageData = Heap_AllocFromHeap(dataMan->heapID, sizeof(PokedexCrySubPageData));
pokedexCrySubPageData = Heap_Alloc(dataMan->heapID, sizeof(PokedexCrySubPageData));
memset(pokedexCrySubPageData, 0, sizeof(PokedexCrySubPageData));
SetTouchScreen(pokedexCrySubPageData, pokedexCrySubData, dataMan->heapID);
@ -417,7 +417,7 @@ static BOOL CrySubGraphicsEnter(void *graphics, PokedexGraphicsManager *graphics
switch (graphicsMan->state) {
case 0:
graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(PokedexCrySubGraphics));
graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(PokedexCrySubGraphics));
memset(graphicsMan->pageGraphics, 0, sizeof(PokedexCrySubGraphics));
graphicsMan->state++;
break;
@ -554,10 +554,10 @@ static BOOL AdvanceBlendTransition(PokedexCrySubGraphics *pokedexCrySubGraphics,
return FALSE;
}
static void SetTouchScreen(PokedexCrySubPageData *pokedexCrySubPageData, PokedexCrySubData *pokedexCrySubData, enum HeapId heapID)
static void SetTouchScreen(PokedexCrySubPageData *pokedexCrySubPageData, PokedexCrySubData *pokedexCrySubData, enum HeapID heapID)
{
pokedexCrySubPageData->asjustorHitTables = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * MAX_CRYSUBADJUSTORS);
pokedexCrySubPageData->buttonHitTables = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * MAX_CRYSUBBUTTONS);
pokedexCrySubPageData->asjustorHitTables = Heap_Alloc(heapID, sizeof(TouchScreenHitTable) * MAX_CRYSUBADJUSTORS);
pokedexCrySubPageData->buttonHitTables = Heap_Alloc(heapID, sizeof(TouchScreenHitTable) * MAX_CRYSUBBUTTONS);
PokedexMain_SetHitTableRect(&pokedexCrySubPageData->asjustorHitTables[CRYSUB_SWITCH], SWITCH_Y - (SWITCH_HEIGHT / 2), SWITCH_Y + (SWITCH_HEIGHT / 2), SWITCH_X - (SWITCH_WIDTH / 2), SWITCH_X + (SWITCH_WIDTH / 2));
@ -815,7 +815,7 @@ static void AdjustorOOB(enum CrySubAdjustors adjustor, PokedexCrySubData *pokede
}
}
static void LoadCrySubGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapId heapID)
static void LoadCrySubGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapID heapID)
{
LoadBackgroundTileMaps(graphicData, heapID);
LoadCryDialSprite(pokedexCrySubGraphics, graphicData, heapID);
@ -824,7 +824,7 @@ static void LoadCrySubGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, Pok
LoadCryPalette(pokedexCrySubGraphics, graphicData, heapID);
}
static void FreeGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapId heapID)
static void FreeGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapID heapID)
{
FreeSprites(pokedexCrySubGraphics);
FreeSwitchLabel(pokedexCrySubGraphics, graphicData);
@ -833,7 +833,7 @@ static void FreeGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGr
FreeCryPalette(pokedexCrySubGraphics);
}
static void LoadBackgroundTileMaps(PokedexGraphicData **graphicData, enum HeapId heapID)
static void LoadBackgroundTileMaps(PokedexGraphicData **graphicData, enum HeapID heapID)
{
NNSG2dScreenData *screenData;
@ -862,7 +862,7 @@ static void FreeBackgroundTileMaps(PokedexGraphicData **graphicData)
Bg_SetPriority(BG_LAYER_SUB_3, 1);
}
static void LoadCryDialSprite(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapId heapID)
static void LoadCryDialSprite(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapID heapID)
{
PokedexGraphicData *graphicsData = *graphics;
NARC *narc = PokedexGraphics_GetNARC(*graphics);
@ -893,7 +893,7 @@ static void FreeDialSpriteResource(PokedexCrySubGraphics *pokedexCrySubGraphics,
SpriteResourceCollection_Remove(graphicData->spriteResourceCollection[SPRITE_RESOURCE_ANIM], pokedexCrySubGraphics->dialSpriteResource[SPRITE_RESOURCE_ANIM]);
}
static void AnimateSprites(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapId heapID)
static void AnimateSprites(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapID heapID)
{
SpriteResourcesHeader spriteResourcesHeader;
SpriteListTemplate spriteListTemplate;
@ -970,7 +970,7 @@ static void FreeSprites(PokedexCrySubGraphics *pokedexCrySubGraphics)
Sprite_Delete(pokedexCrySubGraphics->loopButtonSprite);
}
static void LoadSwitchText(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapId heapID)
static void LoadSwitchText(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapID heapID)
{
PokedexDisplayBox displayBox;
PokedexGraphicData *graphicData = *graphics;
@ -1330,7 +1330,7 @@ static void SetLoop(PokedexCrySubPageData *pokedexCrySubPageData, BOOL loop)
pokedexCrySubPageData->cryCooldown = CRY_COOLDOWN;
}
static void LoadCryPalette(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapId heapID)
static void LoadCryPalette(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapID heapID)
{
pokedexCrySubGraphics->backgroundPalette = PokedexGraphics_GetGraphicNarcPaletteData(*graphicData, 20, &pokedexCrySubGraphics->paletteData, heapID);
}

4
src/applications/pokedex/ov21_021D423C.c
View File

@ -19,9 +19,9 @@ static BOOL ov21_021D42EC(UnkStruct_ov21_021D423C *param0);
static UnkStruct_ov21_021D4660 *ov21_021D42FC(UnkStruct_ov21_021D423C *param0, int param1);
static void ov21_021D4334(UnkStruct_ov21_021D423C *param0, UnkStruct_ov21_021D4660 *param1);
UnkStruct_ov21_021D423C *ov21_021D423C(enum HeapId heapID)
UnkStruct_ov21_021D423C *ov21_021D423C(enum HeapID heapID)
{
UnkStruct_ov21_021D423C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D423C));
UnkStruct_ov21_021D423C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D423C));
GF_ASSERT(v0);
memset(v0, 0, sizeof(UnkStruct_ov21_021D423C));

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