Leahnaya/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2026-04-26 00:23:14 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

heapId -> heapID

Browse Source
This commit is contained in:
Eduardo Quezada 2025-07-25 18:13:43 -04:00
parent 6876c0dfc6
commit d433a35ffb
264 changed files with 2137 additions and 2137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/application/pokegear/phone/phone_internal.h
View File

@ -115,7 +115,7 @@ typedef struct PhoneContactListUISlotData {
} PhoneContactListUISlotData;
typedef struct PokegearPhoneCallContextParam {
enum HeapID heapId; // 0x00
enum HeapID heapID; // 0x00
MenuInputState *menuInputStatePtr; // 0x04
Sprite *sprite; // 0x08
PokegearPhoneAppData *phoneApp; // 0x0C
@ -166,7 +166,7 @@ typedef struct PokegearPhoneCallState {
} PokegearPhoneCallState; // size: 0x54
typedef struct PokegearPhoneCallContext {
enum HeapID heapId; // 0x00
enum HeapID heapID; // 0x00
PokegearPhoneAppData *phoneApp; // 0x04
BgConfig *bgConfig; // 0x08
Window *phoneCallMsgWindow; // 0x0C
@ -249,7 +249,7 @@ typedef struct PhoneContactListUI {
} PhoneContactListUI; // size 0x408
struct PokegearPhoneAppData {
enum HeapID heapId; // 0x000
enum HeapID heapID; // 0x000
int subtaskState; // 0x004
int subsubtaskState; // 0x008
PokegearAppData *pokegear; // 0x00C

12
include/application/pokegear/pokegear_internal.h
View File

@ -85,7 +85,7 @@ typedef struct UnkStruct_ov100_021E6E20 {
} UnkStruct_ov100_021E6E20;
typedef struct PokegearApp_UnkSub094 {
enum HeapID heapId;
enum HeapID heapID;
int unk_004;
u16 unk_008;
u16 unk_00A;
@ -100,7 +100,7 @@ typedef struct PokegearApp_UnkSub094 {
typedef struct PokegearAppData PokegearAppData;
struct PokegearAppData {
enum HeapID heapId; // 0x000
enum HeapID heapID; // 0x000
u8 app; // 0x004
u8 registeredCards : 7; // 0x005
u8 isSwitchApp : 1; // 0x005
@ -170,22 +170,22 @@ void PokegearApp_CreateSpriteManager(PokegearAppData *pokegearApp, int a1);
void PokegearApp_DestroySpriteManager(PokegearAppData *pokegearApp);
void PokegearApp_DrawSprites(PokegearAppData *pokegearApp);
PokegearApp_UnkSub094 *ov100_021E69F8(enum HeapID heapId, u16 a1, u16 a2, u16 a3, u16 a4, int a5);
PokegearApp_UnkSub094 *ov100_021E69F8(enum HeapID heapID, u16 a1, u16 a2, u16 a3, u16 a4, int a5);
void ov100_021E6A3C(PokegearApp_UnkSub094 *a0);
void ov100_021E6AB0(PokegearApp_UnkSub094 *a0);
ManagedSprite *ov100_021E6AC0(PokegearApp_UnkSub094 *a0, u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7, int a8);
void ov100_021E6C44(ManagedSprite *a0);
UnkStruct_ov100_021E6E20 *ov100_021E6E20(int a1, enum HeapID heapId);
UnkStruct_ov100_021E6E20 *ov100_021E6E20(int a1, enum HeapID heapID);
void ov100_021E6E58(UnkStruct_ov100_021E6E20 *a0);
void ov100_021E6E84(UnkStruct_ov100_021E6E20 *a0);
u16 ov100_021E6EC4(UnkStruct_ov100_021E6E20 *a0, Sprite *a1);
void ov100_021E6EF4(UnkStruct_ov100_021E6E20 *a0);
void ov100_021E6F34(UnkStruct_ov100_021E6E20 *a0, u8 a1);
PokegearAppSwitch *PokegearAppSwitch_Alloc(int count, enum HeapID heapId);
PokegearAppSwitch *PokegearAppSwitch_Alloc(int count, enum HeapID heapID);
void PokegearAppSwitch_Free(PokegearAppSwitch *appSwitch);
u16 PokegearAppSwitch_AddButtons(PokegearAppSwitch *appSwitch, const PokegearAppSwitchButtonSpec *buttonSpec, u8 numSpecs, u8 cursorPos, BOOL managedSprites, enum HeapID heapId, PokegearSpriteUnion cursorSprite1, PokegearSpriteUnion cursorSprite2, PokegearSpriteUnion cursorSprite3, PokegearSpriteUnion cursorSprite4);
u16 PokegearAppSwitch_AddButtons(PokegearAppSwitch *appSwitch, const PokegearAppSwitchButtonSpec *buttonSpec, u8 numSpecs, u8 cursorPos, BOOL managedSprites, enum HeapID heapID, PokegearSpriteUnion cursorSprite1, PokegearSpriteUnion cursorSprite2, PokegearSpriteUnion cursorSprite3, PokegearSpriteUnion cursorSprite4);
BOOL PokegearAppSwitch_RemoveButtons(PokegearAppSwitch *appSwitch, u16 a1);
u16 PokegearAppSwitchCursor_SetCursorSpritesDrawState(PokegearAppSwitch *appSwitch, u16 index, BOOL draw);
u16 PokegearAppSwitch_SetSpecIndexAndCursorPos(PokegearAppSwitch *appSwitch, u16 index, u8 cursorPos);

4
include/application/pokegear/radio/radio_internal.h
View File

@ -73,7 +73,7 @@ typedef struct RadioShow {
} RadioShow; // size: 0x74
typedef struct PokegearRadioAppData {
enum HeapID heapId; // 0x00
enum HeapID heapID; // 0x00
int state; // 0x04
int substate; // 0x08
PokegearAppData *pokegear; // 0x0C
@ -115,7 +115,7 @@ int Radio_HandleDragCursor(PokegearRadioAppData *radioApp);
BOOL Radio_CoordsToStation(PokegearRadioAppData *radioApp, s16 x, s16 y);
void Radio_SnapCursorToChannelHitbox(PokegearRadioAppData *radioApp, u8 channel);
RadioShow *RadioShow_Create(SaveData *saveData, u16 mapID, u16 mapHeader, BOOL inKanto, Window *win1, Window *win2, Window *win3, u32 textColor, enum HeapID heapId);
RadioShow *RadioShow_Create(SaveData *saveData, u16 mapID, u16 mapHeader, BOOL inKanto, Window *win1, Window *win2, Window *win3, u32 textColor, enum HeapID heapID);
void RadioShow_Delete(RadioShow *radioShow);
void RadioShow_BeginSegment(RadioShow *radioShow, int station, int statik);
void RadioShow_EndSegment(RadioShow *radioShow);

36
include/bag.h
View File

@ -19,15 +19,15 @@
u32 Save_Bag_sizeof(void);
/*
* Bag *Save_Bag_New(enum HeapID heapId)
* Bag *Save_Bag_New(enum HeapID heapID)
*
* Allocates a new Bag
*
* @param heapId: ID of the heap to alloc from
* @param heapID: ID of the heap to alloc from
*
* @returns: Pointer to the Bag instance
*/
Bag *Save_Bag_New(enum HeapID heapId);
Bag *Save_Bag_New(enum HeapID heapID);
/*
* void Save_Bag_Init(Bag *bagData)
@ -89,10 +89,10 @@ RegisterItemResult Bag_TryRegisterItem(Bag *bag, u16 itemId);
void Bag_UnregisterItem(Bag *bag, u16 itemId);
/*
* BOOL Bag_HasSpaceForItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapId)
* BOOL Bag_AddItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapId)
* BOOL Bag_TakeItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapId)
* BOOL Bag_HasItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapId)
* BOOL Bag_HasSpaceForItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID)
* BOOL Bag_AddItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID)
* BOOL Bag_TakeItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID)
* BOOL Bag_HasItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID)
*
* Inventory checkers and modifiers.
* HasSpaceForItem checks whether there is an empty slot
@ -113,15 +113,15 @@ void Bag_UnregisterItem(Bag *bag, u16 itemId);
* @param bag: Pointer to Bag
* @param itemId: ID of item to act upon
* @param quantity: Amount to add, remove, or check
* @param heapId: Heap to allocate temp buffers from
* @param heapID: Heap to allocate temp buffers from
*
* @returns: TRUE if the action succeeded or would succeed,
* otherwise FALSE.
*/
BOOL Bag_HasSpaceForItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapId);
BOOL Bag_AddItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapId);
BOOL Bag_TakeItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapId);
BOOL Bag_HasItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapId);
BOOL Bag_HasSpaceForItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID);
BOOL Bag_AddItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID);
BOOL Bag_TakeItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID);
BOOL Bag_HasItem(Bag *bag, u16 itemId, u16 quantity, enum HeapID heapID);
/*
* BOOL Pocket_TakeItem(ItemSlot *slots, u32 count, u16 itemId, u16 quantity)
@ -151,7 +151,7 @@ BOOL Pocket_TakeItem(ItemSlot *slots, u32 count, u16 itemId, u16 quantity);
BOOL Bag_PocketNotEmpty(Bag *bag, u32 pocket);
/*
* u16 Bag_GetQuantity(Bag *bag, u16 itemId, enum HeapID heapId)
* u16 Bag_GetQuantity(Bag *bag, u16 itemId, enum HeapID heapID)
* u16 Pocket_GetQuantity(ItemSlot *slots, u32 count, u16 itemId)
*
* Looks up the item in its pocket or the specified ItemSlot
@ -162,26 +162,26 @@ BOOL Bag_PocketNotEmpty(Bag *bag, u32 pocket);
* @param slots: (Pocket_*) Pointer to ItemSlot array
* @param count: (Pocket_*) Number of ItemSlot in slots
* @param itemId: Item to look up
* @param heapId: (Bag_*) Heap to allocate temp buffers from
* @param heapID: (Bag_*) Heap to allocate temp buffers from
*
* @returns: Quantity of that item in the bag or array.
*/
u16 Bag_GetQuantity(Bag *bag, u16 itemId, enum HeapID heapId);
u16 Bag_GetQuantity(Bag *bag, u16 itemId, enum HeapID heapID);
u16 Pocket_GetQuantity(ItemSlot *slots, u32 count, u16 itemId);
/*
* BagView *Bag_CreateView(Bag *bag, const u8 *pockets, enum HeapID heapId)
* BagView *Bag_CreateView(Bag *bag, const u8 *pockets, enum HeapID heapID)
*
* Creates a BagView with a specified subset of pockets.
*
* @param bag: Pointer to Bag
* @param pockets: Char array of POCKET_XXX IDs, terminated
* with POCKET_BAG_VIEW_END
* @param heapId: Heap to allocate from
* @param heapID: Heap to allocate from
*
* @returns: Pointer to newly-allocated BagView
*/
BagView *Bag_CreateView(Bag *bag, const u8 *pockets, enum HeapID heapId);
BagView *Bag_CreateView(Bag *bag, const u8 *pockets, enum HeapID heapID);
/*
* ItemSlot *Bag_GetPocketSlotN(Bag *bag, u8 pocket, u32 slot)

6
include/bag_cursor.h
View File

@ -33,15 +33,15 @@ typedef struct BagCursor {
} BagCursor;
/*
* BagCursor *BagCursor_New(enum HeapID heapId)
* BagCursor *BagCursor_New(enum HeapID heapID)
*
* Allocates a new BagCursor
*
* @param heapId: Heap to allocate from
* @param heapID: Heap to allocate from
*
* @returns: Pointer to newly-allocated BagCursor
*/
BagCursor *BagCursor_New(enum HeapID heapId);
BagCursor *BagCursor_New(enum HeapID heapID);
/*
* void BagCursor_Field_PocketGetPosition(BagCursor *cursor, u32 pocket, u8 *position, u8 *scroll)

18
include/bag_view.h
View File

@ -8,15 +8,15 @@
#include "save.h"
/*
* BagView *BagView_New(u8 heapId)
* BagView *BagView_New(u8 heapID)
*
* Create a new BagView
*
* @param heapId: Heap to allocate from
* @param heapID: Heap to allocate from
*
* @returns: Pointer to new BagView
*/
BagView *BagView_New(u8 heapId);
BagView *BagView_New(u8 heapID);
/*
* u32 BagView_sizeof(void)
@ -53,7 +53,7 @@ u8 sub_02077914(BagView *bagView);
u8 sub_0207791C(BagView *bagView);
/*
* BOOL TryFormatRegisteredKeyItemUseMessage(SaveData *saveData, String *dest, u16 itemId, u32 heapId)
* BOOL TryFormatRegisteredKeyItemUseMessage(SaveData *saveData, String *dest, u16 itemId, u32 heapID)
*
* Some key items, when used, only print a non_npc_msg.
* If the selected item is one of these, formats the
@ -63,14 +63,14 @@ u8 sub_0207791C(BagView *bagView);
* @param saveData: Persistent game state
* @param dest: Output String
* @param itemId: ID of item to check
* @param heapId: Heap in which to allocate temp buffers
* @param heapID: Heap in which to allocate temp buffers
*
* @returns: TRUE if non_npc_msg formatted, else FALSE
*/
BOOL TryFormatRegisteredKeyItemUseMessage(SaveData *saveData, String *dest, u16 itemId, enum HeapID heapId);
BOOL TryFormatRegisteredKeyItemUseMessage(SaveData *saveData, String *dest, u16 itemId, enum HeapID heapID);
/*
* void GetItemUseErrorMessage(PLAYERDATA *playerData, String *dest, u32 unused, enum ItemUseError code, u32 heapId)
* void GetItemUseErrorMessage(PLAYERDATA *playerData, String *dest, u32 unused, enum ItemUseError code, u32 heapID)
*
* If you can't use the item for whatever reason, this
* routine is called to format the non_npc_msg.
@ -83,8 +83,8 @@ BOOL TryFormatRegisteredKeyItemUseMessage(SaveData *saveData, String *dest, u16
* @param dest: Pointer to output String
* @param itemId: Unused
* @param code: Which non_npc_msg to output
* @param heapId: Heap to allocate temp buffers from
* @param heapID: Heap to allocate temp buffers from
*/
void GetItemUseErrorMessage(PlayerProfile *playerProfile, String *dest, u16 itemId, enum ItemUseError code, enum HeapID heapId);
void GetItemUseErrorMessage(PlayerProfile *playerProfile, String *dest, u16 itemId, enum ItemUseError code, enum HeapID heapID);
#endif // POKEHEARTGOLD_BAG_VIEW_H

4
include/battle/battle_cursor.h
View File

@ -10,9 +10,9 @@ typedef struct BattleCursor {
SysTask *task;
} BattleCursor;
void BattleCursor_LoadResources(SpriteSystem *renderer, SpriteManager *gfxHandler, PaletteData *plttData, enum HeapID heapId, u32 character, u32 pal, u32 cell, u32 animation);
void BattleCursor_LoadResources(SpriteSystem *renderer, SpriteManager *gfxHandler, PaletteData *plttData, enum HeapID heapID, u32 character, u32 pal, u32 cell, u32 animation);
void BattleCursor_FreeResources(SpriteManager *gfxHandler, u32 character, u32 pal, u32 cell, u32 animation);
BattleCursor *BattleCursor_New(SpriteSystem *renderer, SpriteManager *gfxHandler, enum HeapID heapId, u32 character, u32 pal, u32 cell, u32 animation, u32 a7, u32 a8);
BattleCursor *BattleCursor_New(SpriteSystem *renderer, SpriteManager *gfxHandler, enum HeapID heapID, u32 character, u32 pal, u32 cell, u32 animation, u32 a7, u32 a8);
void BattleCursor_Delete(BattleCursor *cursor);
void ov12_0226BA4C(BattleCursor *cursor, int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3, fx32 a9);
void ov12_0226BAD4(BattleCursor *cursor, int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3);

4
include/battle/battle_finger.h
View File

@ -22,9 +22,9 @@ typedef struct BattleFinger {
u8 touchAnimationDelay;
} BattleFinger;
void BattleFinger_LoadResources(SpriteSystem *renderer, SpriteManager *gfxHandler, enum HeapID heapId, PaletteData *plttData, u32 character, u32 pal, u32 cell, u32 animation);
void BattleFinger_LoadResources(SpriteSystem *renderer, SpriteManager *gfxHandler, enum HeapID heapID, PaletteData *plttData, u32 character, u32 pal, u32 cell, u32 animation);
void BattleFinger_FreeResources(SpriteManager *gfxHandler, u32 character, u32 pal, u32 cell, u32 animation);
BattleFinger *BattleFinger_New(SpriteSystem *renderer, SpriteManager *gfxHandler, enum HeapID heapId, u32 character, u32 pal, u32 cell, u32 animation, u32 spritePriority, u32 bgPriority);
BattleFinger *BattleFinger_New(SpriteSystem *renderer, SpriteManager *gfxHandler, enum HeapID heapID, u32 character, u32 pal, u32 cell, u32 animation, u32 spritePriority, u32 bgPriority);
void BattleFinger_Delete(BattleFinger *finger);
void ov12_0226BCFC(BattleFinger *finger, int x, int y, fx32 a3);
void ov12_0226BD2C(BattleFinger *finger, int x, int y);

10
include/battle/battle_setup.h
View File

@ -76,11 +76,11 @@ struct BattleSetup { // declared in trainer_data.h
BOOL unk_1D0;
};
BattleSetup *BattleSetup_New(enum HeapID heapId, u32 battleFlags);
BattleSetup *BattleSetup_New_SafariZone(enum HeapID heapId, int balls);
BattleSetup *BattleSetup_New_BugContest(enum HeapID heapId, int balls, Pokemon *bugmon);
BattleSetup *BattleSetup_New_PalPark(enum HeapID heapId, int balls);
BattleSetup *BattleSetup_New_Tutorial(enum HeapID heapId, FieldSystem *fieldSystem);
BattleSetup *BattleSetup_New(enum HeapID heapID, u32 battleFlags);
BattleSetup *BattleSetup_New_SafariZone(enum HeapID heapID, int balls);
BattleSetup *BattleSetup_New_BugContest(enum HeapID heapID, int balls, Pokemon *bugmon);
BattleSetup *BattleSetup_New_PalPark(enum HeapID heapID, int balls);
BattleSetup *BattleSetup_New_Tutorial(enum HeapID heapID, FieldSystem *fieldSystem);
void BattleSetup_Delete(BattleSetup *setup);
void BattleSetup_AddMonToParty(BattleSetup *setup, Pokemon *mon, int battler);
void sub_02051D18(BattleSetup *setup, FieldSystem *fieldSystem, SaveData *savedata, u32 mapno, BagCursor *bagCursor, void *arg5);

2
include/battle_regulation.h
View File

@ -17,7 +17,7 @@ typedef enum BattleRegulationComplianceMessage {
BTL_REG_COMPLIANCE_FAIL_SOUL_DEW,
} BattleRegulationComplianceMessage;
PokedexData *PokedexData_CreateAndLoad(enum HeapID heapId);
PokedexData *PokedexData_CreateAndLoad(enum HeapID heapID);
void PokedexData_UnloadAndDelete(PokedexData *pokedex);
BOOL LinkBattleRuleset_CheckDexBasedRules(LinkBattleRuleset *ruleset, Pokemon *pokemon, PokedexData *pokedex);
BattleRegulationComplianceMessage LinkBattleRuleset_GetPartySelectionComplianceMessage(LinkBattleRuleset *ruleset, Party *party, PokedexData *pokedex, u8 *a3);

2
include/berry_pots_app_internal.h
View File

@ -60,7 +60,7 @@ typedef struct BerryPotsAppData_UnkSub20 {
} BerryPotsAppData_UnkSub20;
typedef struct BerryPotsAppData {
enum HeapID heapId;
enum HeapID heapID;
BerryPotsAppArgs *args;
void *unk8;
Bag *bag;

12
include/bg_window.h
View File

@ -43,7 +43,7 @@ typedef struct Background {
} Background;
typedef struct BgConfig {
enum HeapID heapId;
enum HeapID heapID;
u16 scrollScheduled;
u16 bufferTransferScheduled;
Background bgs[8];
@ -202,7 +202,7 @@ typedef struct GraphicsModes {
#define TILEMAP_FILL_KEEP_PAL 16 // Do not replace the selected palette index
#define TILEMAP_FILL_OVWT_PAL 17 // Fill value includes palette
BgConfig *BgConfig_Alloc(enum HeapID heapId);
BgConfig *BgConfig_Alloc(enum HeapID heapID);
enum HeapID BgConfig_GetHeapId(BgConfig *bgConfig);
void SetBothScreensModesAndDisable(const GraphicsModes *modes);
void SetScreenModeAndDisable(const struct GraphicsModes *gfxModes, enum GFScreen screen);
@ -221,10 +221,10 @@ void BgCommitTilemapBufferToVram(BgConfig *bgConfig, u8 bgId);
void BgCopyOrUncompressTilemapBufferRangeToVram(BgConfig *bgConfig, u8 bgId, const void *buffer, u32 bufferSize, u32 baseTile);
void BG_LoadScreenTilemapData(BgConfig *bgConfig, u8 bgId, const void *data, u32 size);
void BG_LoadCharTilesData(BgConfig *bgConfig, u8 bgId, const void *data, u32 size, u32 tileStart);
void BG_ClearCharDataRange(u8 bgId, u32 size, u32 offset, enum HeapID heapId);
void BG_ClearCharDataRange(u8 bgId, u32 size, u32 offset, enum HeapID heapID);
void BG_FillCharDataRange(BgConfig *bgConfig, GFBgLayer bgId, u32 fillValue, u32 ntiles, u32 offset);
void BG_LoadPlttData(u32 location, const void *plttData, u16 size, u16 offset);
void BG_LoadBlankPltt(u32 location, u32 size, u32 offset, enum HeapID heapId);
void BG_LoadBlankPltt(u32 location, u32 size, u32 offset, enum HeapID heapID);
void BG_SetMaskColor(u8 bgId, u16 value);
void LoadRectToBgTilemapRect(BgConfig *bgConfig, u8 bgId, const void *buffer, u8 destX, u8 destY, u8 width, u8 height);
void CopyToBgTilemapRect(BgConfig *bgConfig, u8 bgId, u8 destX, u8 destY, u8 destWidth, u8 destHeight, const void *buffer, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight);
@ -235,13 +235,13 @@ void BgClearTilemapBufferAndCommit(BgConfig *bgConfig, u8 bgId);
void BgFillTilemapBufferAndCommit(BgConfig *bgConfig, u8 bgId, u16 fillValue);
void BgFillTilemapBufferAndSchedule(BgConfig *bgConfig, u8 bgId, u16 fillValue);
void *BgGetCharPtr(u8 bgId);
u8 *Convert4bppTo8bpp(u8 *src4Bpp, u32 size, u8 paletteNum, enum HeapID heapId);
u8 *Convert4bppTo8bpp(u8 *src4Bpp, u32 size, u8 paletteNum, enum HeapID heapID);
void *GetBgTilemapBuffer(BgConfig *bgConfig, u8 bgId);
int GetBgHOffset(BgConfig *bgConfig, u8 bgId);
u8 GetBgColorMode(BgConfig *bgConfig, u8 bgId);
u8 GetBgPriority(BgConfig *bgConfig, u8 bgId);
void BlitBitmapRect4Bit(const Bitmap *src, const Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u16 colorKey);
Window *AllocWindows(enum HeapID heapId, s32 num);
Window *AllocWindows(enum HeapID heapID, s32 num);
void InitWindow(Window *window);
BOOL WindowIsInUse(const Window *window);
void AddWindowParameterized(BgConfig *bgConfig, Window *window, u8 bgId, u8 x, u8 y, u8 width, u8 height, u8 paletteNum, u16 baseTile);

2
include/bug_contest.h
View File

@ -17,6 +17,6 @@ BOOL BugContest_ContestantIsRegisteredN(BugContest *bugContest, u8 id, u8 n);
void BugContest_InitOpponents(BugContest *bugContest);
void BugContest_InitEncounters(BugContest *bugContest);
u16 BugContest_JudgePlayerMon(BugContest *bugContest, Pokemon *pokemon);
ENC_SLOT *BugContest_GetEncounterSlot(BugContest *bugContest, enum HeapID heapId);
ENC_SLOT *BugContest_GetEncounterSlot(BugContest *bugContest, enum HeapID heapID);
#endif // POKEHEARTGOLD_BUG_CONTEST_H

2
include/bug_contest_internal.h
View File

@ -35,7 +35,7 @@ typedef struct BugContestant {
#define BUGCONTESTANT_COUNT (BUGCONTESTANT_NPC_COUNT + 1)
typedef struct BugContest {
enum HeapID heapId; // Always set to 3
enum HeapID heapID; // Always set to 3
SaveData *saveData; // Pointer to save data
Party *party_bak; // Player's party is held for the contest
Party *party_cur; // Only the lead Pokemon

4
include/camera.h
View File

@ -71,9 +71,9 @@ typedef struct Camera {
CameraHistory *history;
} Camera;
void Camera_History_New(s32 count, s32 initialWriteIdx, s32 updateEnableFlags, enum HeapID heapId, Camera *camera);
void Camera_History_New(s32 count, s32 initialWriteIdx, s32 updateEnableFlags, enum HeapID heapID, Camera *camera);
void Camera_History_Delete(Camera *camera);
Camera *Camera_New(enum HeapID heapId);
Camera *Camera_New(enum HeapID heapID);
void Camera_Delete(Camera *camera);
void Camera_Copy(Camera *src, Camera *dest);
void Camera_SetStaticPtr(Camera *camera);

2
include/camera_translation.h
View File

@ -22,7 +22,7 @@ typedef struct GFCameraTranslationWrapper {
SysTask *task; // returned from SysTask_CreateOnMainQueue
} GFCameraTranslationWrapper;
GFCameraTranslationWrapper *CreateCameraTranslationWrapper(enum HeapID heapId, Camera *camera);
GFCameraTranslationWrapper *CreateCameraTranslationWrapper(enum HeapID heapID, Camera *camera);
void DeleteCameraTranslationWrapper(GFCameraTranslationWrapper *wrapper);
void SetCameraTranslationPath(GFCameraTranslationWrapper *wrapper, struct CameraTranslationPathTemplate *template, int duration);
u8 IsCameraTranslationFinished(GFCameraTranslationWrapper *wrapper);

2
include/communication_error.h
View File

@ -3,6 +3,6 @@
#include "heap.h"
void ShowCommunicationError(enum HeapID heapId, u32 error, u32 errorCode);
void ShowCommunicationError(enum HeapID heapID, u32 error, u32 errorCode);
#endif // POKEHEARTGOLD_COMMUNICATION_ERROR_H

16
include/dex_mon_measures.h
View File

@ -13,9 +13,9 @@ typedef struct PokedexData {
u32 *unk_14;
} PokedexData; // size=0x18
struct PokedexData *PokedexData_Create(enum HeapID heapId);
struct PokedexData *PokedexData_Create(enum HeapID heapID);
void PokedexData_Delete(struct PokedexData *zkn);
void PokedexData_LoadAll(struct PokedexData *zkn, int mode, enum HeapID heapId);
void PokedexData_LoadAll(struct PokedexData *zkn, int mode, enum HeapID heapID);
void PokedexData_UnloadAll(struct PokedexData *zkn);
u32 PokedexData_GetHeight(struct PokedexData *zkn, int species);
u32 PokedexData_GetWeight(struct PokedexData *zkn, int species);
@ -24,12 +24,12 @@ NarcId GetPokedexDataNarcID(void);
int GetDexWeightMsgBank(void);
int GetDexHeightMsgBank(void);
static inline u32 SpeciesGetDexHeight(int species, enum HeapID heapId) {
static inline u32 SpeciesGetDexHeight(int species, enum HeapID heapID) {
u32 ret;
struct PokedexData *zkn;
zkn = PokedexData_Create(heapId);
PokedexData_LoadAll(zkn, 0, heapId);
zkn = PokedexData_Create(heapID);
PokedexData_LoadAll(zkn, 0, heapID);
ret = PokedexData_GetHeight(zkn, species);
PokedexData_UnloadAll(zkn);
PokedexData_Delete(zkn);
@ -37,12 +37,12 @@ static inline u32 SpeciesGetDexHeight(int species, enum HeapID heapId) {
return ret;
}
static inline u32 SpeciesGetDexWeight(int species, enum HeapID heapId) {
static inline u32 SpeciesGetDexWeight(int species, enum HeapID heapID) {
u32 ret;
struct PokedexData *zkn;
zkn = PokedexData_Create(heapId);
PokedexData_LoadAll(zkn, 0, heapId);
zkn = PokedexData_Create(heapID);
PokedexData_LoadAll(zkn, 0, heapID);
ret = PokedexData_GetWeight(zkn, species);
PokedexData_UnloadAll(zkn);
PokedexData_Delete(zkn);

6
include/easy_chat.h
View File

@ -9,7 +9,7 @@
typedef u16 ecword_t;
typedef struct EasyChatManager {
enum HeapID heapId;
enum HeapID heapID;
MsgData *msgData[EC_GROUP_MAX];
} EasyChatManager;
@ -23,7 +23,7 @@ typedef struct WallpaperPasswordBank {
u32 *words;
} WallpaperPasswordBank;
EasyChatManager *EasyChatManager_New(enum HeapID heapId);
EasyChatManager *EasyChatManager_New(enum HeapID heapID);
void EasyChatManager_Delete(EasyChatManager *easyChatManager);
void EasyChatManager_ReadWordIntoString(EasyChatManager *easyChatManager, u16 ecWord, String *dest);
void GetECWordIntoStringByIndex(u16 ecWord, String *dest);
@ -38,7 +38,7 @@ BOOL Save_EasyChat_TrendySayingsUnlockedAllCheck(SaveEasyChat *saveEasyChat);
ecword_t TrendyWordIdxToECWord(u32 word);
BOOL Save_EasyChat_GetGreetingsFlag(SaveEasyChat *saveEasyChat, u32 flag);
void Save_EasyChat_SetGreetingFlag(SaveEasyChat *saveEasyChat, u32 flag);
WallpaperPasswordBank *WallpaperPasswordBank_Create(enum HeapID heapId);
WallpaperPasswordBank *WallpaperPasswordBank_Create(enum HeapID heapID);
void WallpaperPasswordBank_Delete(WallpaperPasswordBank *wallpaperPasswordBank);
u32 WallpaperPasswordBank_GetCount(WallpaperPasswordBank *wallpaperPasswordBank);
ecword_t WallpaperPasswordBank_GetWordAtIndex(WallpaperPasswordBank *wallpaperPasswordBank, s32 index);

2
include/encounter.h
View File

@ -30,7 +30,7 @@ void SetupAndStartFatefulWildBattle(TaskManager *taskManager, u16 species, u8 le
void sub_020511F8(FieldSystem *fieldSystem, BattleSetup *setup);
void SetupAndStartFirstBattle(TaskManager *taskManager, u16 species, u8 level);
void SetupAndStartTutorialBattle(TaskManager *taskManager);
void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, u32 a4, u32 a5, enum HeapID heapId, u32 *winFlag);
void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, u32 a4, u32 a5, enum HeapID heapID, u32 *winFlag);
void CallTask_020508B8(TaskManager *taskManager, void *param1, u32 battleType);
void CallTask_02050960(TaskManager *taskManager, s32 target, s32 maxLevel, u32 flag);
void sub_02051598(FieldSystem *fieldSystem, void *param1, s32 battleType);

4
include/field/overlay_01_021E66E4.h
View File

@ -29,14 +29,14 @@ struct Field3dObjectTask {
typedef struct Field3dObjectTaskManager {
struct FieldSystem *fieldSystem;
enum HeapID heapId;
enum HeapID heapID;
int max;
Field3dObjectTask *tasks;
SysTaskQueue *taskQueue;
} Field3dObjectTaskManager;
// @red031000: struct keyword is necessary because cannot double-typedef and cannot circular include
Field3dObjectTaskManager *Field3dObjectTaskManager_Create(struct FieldSystem *fieldSystem, enum HeapID heapId, int num);
Field3dObjectTaskManager *Field3dObjectTaskManager_Create(struct FieldSystem *fieldSystem, enum HeapID heapID, int num);
void Field3dObjectTaskManager_Delete(Field3dObjectTaskManager *manager);
void Field3dObjectTaskManager_RunDrawTasks(Field3dObjectTaskManager *manager);
Field3dObjectTask *Field3dObjectTaskManager_CreateTask(Field3dObjectTaskManager *manager, const Field3dObjectTaskTemplate *template);

4
include/field/overlay_01_021FB878.h
View File

@ -28,9 +28,9 @@ typedef struct Field3dObject {
u16 padding;
} Field3dObject;
void Field3dModel_LoadFromFilesystem(Field3dModel *model, NarcId narcId, s32 fileId, enum HeapID heapId);
void Field3dModel_LoadFromFilesystem(Field3dModel *model, NarcId narcId, s32 fileId, enum HeapID heapID);
void Field3dModel_Unload(Field3dModel *model);
void Field3dModelAnimation_LoadFromFilesystem(Field3DModelAnimation *anim, Field3dModel *model, NarcId narcId, s32 fileId, enum HeapID heapId, NNSFndAllocator *alloc);
void Field3dModelAnimation_LoadFromFilesystem(Field3DModelAnimation *anim, Field3dModel *model, NarcId narcId, s32 fileId, enum HeapID heapID, NNSFndAllocator *alloc);
void Field3dModelAnimation_Unload(Field3DModelAnimation *anim, NNSFndAllocator *alloc);
BOOL Field3dModelAnimation_FrameAdvanceAndLoop(Field3DModelAnimation *anim, fx32 ov01_021FC004);
BOOL Field3dModelAnimation_FrameAdvanceAndCheck(Field3DModelAnimation *anim, fx32 framesBy);

2
include/field/overlay_01_02204004.h
View File

@ -17,7 +17,7 @@ typedef struct UnkStruct_FieldSysC0 {
int objectMax;
} UnkStruct_FieldSysC0;
UnkStruct_FieldSysC0 ov01_02204004(enum HeapID heapId, int indexMax, int objectMax, NNSG3dResFileHeader *a3);
UnkStruct_FieldSysC0 ov01_02204004(enum HeapID heapID, int indexMax, int objectMax, NNSG3dResFileHeader *a3);
UnkStruct_FieldSysC0_SubC *Field3dObjectList_GetRenderObjectByID(UnkStruct_FieldSysC0 *a0, int a1);
#endif // POKEHEARTGOLD_FIELD_OVERLAY_01_02204004_H

2
include/field_move_environment.h
View File

@ -14,6 +14,6 @@ typedef struct FieldMoveEnvironment {
FieldMoveData *moveData;
} FieldMoveEnvironment;
FieldMoveEnvironment *FieldMove_CreateEnvironment(enum HeapID heapId, u8 slotNo, SaveData *saveData);
FieldMoveEnvironment *FieldMove_CreateEnvironment(enum HeapID heapID, u8 slotNo, SaveData *saveData);
#endif // POKEHEARTGOLD_FIELD_MOVE_ENVIRONMENT_H

2
include/fieldmap.h
View File

@ -50,7 +50,7 @@ u16 HiddenItemScriptNoToFlagId(u16 script);
u16 HiddenItemScriptNoToHiddenItemIdx(u16 script);
u8 sub_02040578(u16 script);
BOOL GetHiddenItemParams(ScriptEnvironment *env, u16 script);
HiddenItemResponse *AllocAndFetchNearbyHiddenItems(FieldSystem *fieldSystem, enum HeapID heapId);
HiddenItemResponse *AllocAndFetchNearbyHiddenItems(FieldSystem *fieldSystem, enum HeapID heapID);
void RunInitScript(FieldSystem *fieldSystem);
void StartMapLoadScript(FieldSystem *fieldSystem, u16 script);
BOOL TryStartMapScriptByType(FieldSystem *fieldSystem, u8 type);

32
include/filesystem.h
View File

@ -33,20 +33,20 @@ typedef struct NARC {
void ReadWholeNarcMemberByIdPair(void *dest, NarcId narc_id, s32 file_id);
/*
* void * AllocAndReadWholeNarcMemberByIdPair(Narcid narc_id, s32 file_id, enum HeapID heapId)
* void * AllocAtEndAndReadWholeNarcMemberByIdPair(Narcid narc_id, s32 file_id, enum HeapID heapId)
* void * AllocAndReadWholeNarcMemberByIdPair(Narcid narc_id, s32 file_id, enum HeapID heapID)
* void * AllocAtEndAndReadWholeNarcMemberByIdPair(Narcid narc_id, s32 file_id, enum HeapID heapID)
*
* Creates a new buffer large enough to hold the content of the archive member, then reads its data.
* The AllocAtEnd variant is preferred for very short-lived buffers.
*
* @param narc_id: Ident of NARC to read
* @param file_id: Index of FAT member within the NARC
* @param heapId: ID of the heap to alloc from
* @param heapID: ID of the heap to alloc from
*
* @returns: Pointer to the allocated buffer which contains the data that was read.
*/
void *AllocAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum HeapID heapId);
void *AllocAtEndAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum HeapID heapId);
void *AllocAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum HeapID heapID);
void *AllocAtEndAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum HeapID heapID);
/*
* void ReadFromNarcMemberByIdPair(void * dest, NarcId narc_id, s32 file_id, u32 offset, u32 size)
@ -62,22 +62,22 @@ void *AllocAtEndAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum
void ReadFromNarcMemberByIdPair(void *dest, NarcId narc_id, s32 file_id, u32 offset, u32 size);
/*
* void * AllocAndReadFromNarcMemberByIdPair(Narcid narc_id, s32 file_id, enum HeapID heapId)
* void * AllocAtEndAndReadFromNarcMemberByIdPair(Narcid narc_id, s32 file_id, enum HeapID heapId)
* void * AllocAndReadFromNarcMemberByIdPair(Narcid narc_id, s32 file_id, enum HeapID heapID)
* void * AllocAtEndAndReadFromNarcMemberByIdPair(Narcid narc_id, s32 file_id, enum HeapID heapID)
*
* Creates a new buffer large enough to hold the size to read, then reads the specified data slice.
* The AllocAtEnd variant is preferred for very short-lived buffers.
*
* @param narc_id: Ident of NARC to read
* @param file_id: Index of FAT member within the NARC
* @param heapId: ID of the heap to alloc from
* @param heapID: ID of the heap to alloc from
* @param offset: Byte offset to start reading, relative to start of member, up to the end of member
* @param size: Number of bytes to read, up to the total size of member minus offset
*
* @returns: Pointer to the allocated buffer which contains the data that was read.
*/
void *AllocAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum HeapID heapId, u32 offset, u32 size);
void *AllocAtEndAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum HeapID heapId, u32 offset, u32 size);
void *AllocAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum HeapID heapID, u32 offset, u32 size);
void *AllocAtEndAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum HeapID heapID, u32 offset, u32 size);
/*
* u32 GetNarcMemberSizeByIdPair(NarcId narc_id, s32 file_idx)
@ -93,17 +93,17 @@ void *AllocAtEndAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, enum
u32 GetNarcMemberSizeByIdPair(NarcId narc_id, s32 file_idx);
/*
* NARC * NARC_New(NarcId narc_id, enum HeapID heapId)
* NARC * NARC_New(NarcId narc_id, enum HeapID heapID)
*
* Constructs a new NARC which contains an open FSFile to the corresponding archive.
* Useful to reduce overhead when reading from the same NARC multiple times.
*
* @param narc_id: Ident of NARC to open
* @param heapId: ID of the heap to alloc from
* @param heapID: ID of the heap to alloc from
*
* @returns: Pointer to the newly-allocated NARC
*/
NARC *NARC_New(NarcId narc_id, enum HeapID heapId);
NARC *NARC_New(NarcId narc_id, enum HeapID heapID);
/*
* void NARC_Delete(NARC * narc)
@ -115,17 +115,17 @@ NARC *NARC_New(NarcId narc_id, enum HeapID heapId);
void NARC_Delete(NARC *narc);
/*
* void * NARC_AllocAndReadWholeMember(NARC * narc, u32 file_id, enum HeapID heapId)
* void * NARC_AllocAndReadWholeMember(NARC * narc, u32 file_id, enum HeapID heapID)
*
* Creates a new buffer large enough to hold the content of the archive member, then reads its data.
*
* @param narc: Pointer to the NARC
* @param file_id: Index of FAT member within the NARC
* @param heapId: ID of the heap to alloc from
* @param heapID: ID of the heap to alloc from
*
* @returns: Pointer to the allocated buffer which contains the data that was read.
*/
void *NARC_AllocAndReadWholeMember(NARC *narc, u32 file_id, enum HeapID heapId);
void *NARC_AllocAndReadWholeMember(NARC *narc, u32 file_id, enum HeapID heapID);
/*
* void * NARC_ReadWholeMember(NARC * narc, u32 file_id, void * dest)

2
include/follow_mon.h
View File

@ -31,7 +31,7 @@ BOOL FollowMon_GetPermission(FieldSystem *fieldSystem);
BOOL FollowMon_GetPermissionBySpeciesAndMap(int species, u32 mapNo);
void sub_0206A040(LocalMapObject *mapObject, BOOL enableBit);
void sub_0206A054(FieldSystem *fieldSystem);
FieldSystemUnk108 *FieldSystem_UnkSub108_Alloc(enum HeapID heapId);
FieldSystemUnk108 *FieldSystem_UnkSub108_Alloc(enum HeapID heapID);
void FieldSystem_UnkSub108_AddMonMood(FieldSystemUnk108 *unk, s8 by);
void FieldSystem_UnkSub108_SetMonMood(FieldSystemUnk108 *unk, s8 mood);
s8 FieldSystem_UnkSub108_GetMonMood(FieldSystemUnk108 *unk);

8
include/font.h
View File

@ -6,8 +6,8 @@
#define FONT_NUM 6
void FontWork_Init(void);
void FontID_Alloc(FontID fontId, enum HeapID heapId);
void FontID_SetAccessDirect(FontID fontId, enum HeapID heapId);
void FontID_Alloc(FontID fontId, enum HeapID heapID);
void FontID_SetAccessDirect(FontID fontId, enum HeapID heapID);
void FontID_SetAccessLazy(FontID fontId);
void FontID_Release(FontID fontId);
struct GlyphInfo *FontID_TryLoadGlyph(FontID fontId, u16 glyphId);
@ -17,8 +17,8 @@ u32 FontID_FlatArray_GetWidthFirstLine(FontID fontId, const u16 *string, u32 let
u32 FontID_String_GetWidth(FontID fontId, String *string, u32 letterSpacing);
BOOL FontID_String_AllCharsValid(FontID fontId, String *str0, String *str1);
u8 GetFontAttribute(FontID fontId, int attr);
void LoadFontPal0(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, enum HeapID heapId);
void LoadFontPal1(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, enum HeapID heapId);
void LoadFontPal0(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, enum HeapID heapID);
void LoadFontPal1(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, enum HeapID heapID);
u32 FontID_String_GetWidthMultiline(u32 fontId, String *string, u32 letterSpacing);
u32 FontID_String_GetCenterAlignmentX(FontID fontId, String *string, u32 letterSpacing, u32 windowWidth);
u32 FontID_GetGlyphWidth(FontID fontId, u16 glyph);

4
include/font_data.h
View File

@ -7,9 +7,9 @@
#define FONTARC_MODE_DIRECT 0
#define FONTARC_MODE_LAZY 1
struct FontData *FontData_New(NarcId narcId, int fileId, int mode, BOOL isFixedWidth, enum HeapID heapId);
struct FontData *FontData_New(NarcId narcId, int fileId, int mode, BOOL isFixedWidth, enum HeapID heapID);
void FontData_Delete(struct FontData *fontData);
void FontData_ModeSwitch(struct FontData *fontData, int mode, enum HeapID heapId);
void FontData_ModeSwitch(struct FontData *fontData, int mode, enum HeapID heapID);
void TryLoadGlyph(struct FontData *fontData, u16 glyphId, struct GlyphInfo *dest);
u32 GetStringWidth(struct FontData *fontData, const u16 *string, u32 letterSpacing);
u32 GetStringWidthFirstLine(struct FontData *fontData, const u16 *string, u32 letterSpacing);

2
include/get_egg.h
View File

@ -20,6 +20,6 @@ void Save_Daycare_BufferMonStats(Daycare *dayCare, u32 nickname_idx, u32 level_i
u16 Save_Daycare_BufferTailMonNick(Daycare *dayCare, MessageFormat *msgFmt);
u8 Save_Daycare_GetState(Daycare *dayCare);
u8 Save_Daycare_CalcCompatibility(Daycare *dayCare);
void sub_0206D328(Pokemon *mon, enum HeapID heapId);
void sub_0206D328(Pokemon *mon, enum HeapID heapID);
#endif

10
include/gf_3d_loader.h
View File

@ -29,11 +29,11 @@ typedef struct GF_3DGfxRawResMan {
GF_3DGfxRawResObj *objs;
} GF_3DGfxRawResMan;
GF_2DGfxRawResMan *GF2dGfxRawResMan_Create(int num, enum HeapID heapId);
GF_2DGfxRawResMan *GF2dGfxRawResMan_Create(int num, enum HeapID heapID);
void GF2dGfxRawResObj_Destroy(GF_2DGfxRawResMan *man);
BOOL GF2dGfxRawResMan_DoesNotHaveObjWithId(GF_2DGfxRawResMan *resourceMgr, int id);
GF_2DGfxRawResObj *GF2dGfxRawResMan_AllocObj(GF_2DGfxRawResMan *resourceMgr, void *resource, int id);
GF_2DGfxRawResObj *GF2dGfxRawResMan_ReadAndAllocObj(GF_2DGfxRawResMan *resourceMgr, const char *name, int id, enum HeapID heapId);
GF_2DGfxRawResObj *GF2dGfxRawResMan_ReadAndAllocObj(GF_2DGfxRawResMan *resourceMgr, const char *name, int id, enum HeapID heapID);
void GF2dGfxRawResMan_FreeObj(GF_2DGfxRawResMan *resourceMgr, GF_2DGfxRawResObj *obj);
void GF2dGfxRawResMan_FreeAllObjs(GF_2DGfxRawResMan *resourceMgr);
GF_2DGfxRawResObj *GF2dGfxRawResMan_GetObjById(GF_2DGfxRawResMan *resourceMgr, int id);
@ -41,11 +41,11 @@ int Get2DGfxRawResObjId(GF_2DGfxRawResObj *resource);
void *GF2dGfxRawResObj_GetData(GF_2DGfxRawResObj *resource);
void GF2dGfxRawResObj_ReplaceData(GF_2DGfxRawResObj *resource, void *newPtr);
GF_3DGfxRawResMan *GF3dGfxRawResMan_Create(int num, enum HeapID heapId);
GF_3DGfxRawResMan *GF3dGfxRawResMan_Create(int num, enum HeapID heapID);
void GF3dGfxRawResMan_Destroy(GF_3DGfxRawResMan *man);
BOOL GF3dGfxRawResMan_DoesNotHaveObjWithId(GF_3DGfxRawResMan *man, int id);
GF_3DGfxRawResObj *GF3dGfxRawResMan_AllocObj(GF_3DGfxRawResMan *man, void *resource, int id, BOOL shouldCopyWithoutTex, enum HeapID heapId);
GF_3DGfxRawResObj *GF3dGfxRawResMan_AllocObjAndKeys(GF_3DGfxRawResMan *man, void *resource, int id, BOOL shouldCopyWithoutTex, enum HeapID heapId);
GF_3DGfxRawResObj *GF3dGfxRawResMan_AllocObj(GF_3DGfxRawResMan *man, void *resource, int id, BOOL shouldCopyWithoutTex, enum HeapID heapID);
GF_3DGfxRawResObj *GF3dGfxRawResMan_AllocObjAndKeys(GF_3DGfxRawResMan *man, void *resource, int id, BOOL shouldCopyWithoutTex, enum HeapID heapID);
void GF3dGfxRawResMan_FreeObjById(GF_3DGfxRawResMan *man, int id);
void GF3dGfxRawResMan_FreeAllObjs(GF_3DGfxRawResMan *man);
GF_3DGfxRawResObj *GF3dGfxRawResMan_GetObjById(GF_3DGfxRawResMan *man, int id);

4
include/gf_3d_vramman.h
View File

@ -9,14 +9,14 @@
#define GF_3D_PLTTALLOC_FRM 1
typedef struct GF3DVramMan {
enum HeapID heapId;
enum HeapID heapID;
void *plttWork;
void *texWork;
} GF3DVramMan;
typedef void (*GF3DVramManInitFunc)(void);
GF3DVramMan *GF_3DVramMan_Create(enum HeapID heapId, int texMode, int numTex, int plttMode, int numPltt, GF3DVramManInitFunc initializer);
GF3DVramMan *GF_3DVramMan_Create(enum HeapID heapID, int texMode, int numTex, int plttMode, int numPltt, GF3DVramManInitFunc initializer);
void GF_3DVramMan_Delete(GF3DVramMan *vramMan);
void GF_3DVramMan_DefaultInitializer(void);
void GF_3DVramMan_InitLinkedListTexVramManager(u32 szByte, u32 szByteFor4x4, void *pManagementWork, u32 szByteManagementWork, BOOL useAsDefault);

52
include/gf_gfx_loader.h
View File

@ -6,41 +6,41 @@
// These functions load (perhap-compressed) graphics resources to VRAM.
// A temporary file handle is used to read the data from the card.
u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, BgConfig *bgConfig, GFBgLayer layer, u32 tileStart, u32 szByte, BOOL isCompressed, enum HeapID heapId);
void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, BgConfig *bgConfig, GFBgLayer layer, u32 tileStart, u32 szByte, BOOL isCompressed, enum HeapID heapId);
void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 szByte, enum HeapID heapId);
void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, u32 srcOffset, enum GFPalSlotOffset palSlotOffset, u32 szByte, enum HeapID heapId);
void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberNo, NNS_G2D_VRAM_TYPE type, u32 baseAddr, enum HeapID heapId, NNSG2dImagePaletteProxy *pPltProxy);
u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberNo, BOOL isCompressed, GFBgLayer layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, enum HeapID heapId, NNSG2dImageProxy *pImgProxy);
u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, BgConfig *bgConfig, GFBgLayer layer, u32 tileStart, u32 szByte, BOOL isCompressed, enum HeapID heapID);
void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, BgConfig *bgConfig, GFBgLayer layer, u32 tileStart, u32 szByte, BOOL isCompressed, enum HeapID heapID);
void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 szByte, enum HeapID heapID);
void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, u32 srcOffset, enum GFPalSlotOffset palSlotOffset, u32 szByte, enum HeapID heapID);
void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberNo, NNS_G2D_VRAM_TYPE type, u32 baseAddr, enum HeapID heapID, NNSG2dImagePaletteProxy *pPltProxy);
u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberNo, BOOL isCompressed, GFBgLayer layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, enum HeapID heapID, NNSG2dImageProxy *pImgProxy);
// These functions return a pointer to the raw data in addition to populating
// the NitroSystem structs pointed to.
void *GfGfxLoader_GetCharData(NarcId narcId, s32 memberNo, BOOL isCompressed, NNSG2dCharacterData **ppCharData, enum HeapID heapId);
void *GfGfxLoader_GetScrnData(NarcId narcId, s32 memberNo, BOOL isCompressed, NNSG2dScreenData **ppScrnData, enum HeapID heapId);
void *GfGfxLoader_GetPlttData(NarcId narcId, s32 memberNo, NNSG2dPaletteData **ppPlttData, enum HeapID heapId);
void *GfGfxLoader_GetCellBank(NarcId narcId, s32 memberNo, BOOL isCompressed, NNSG2dCellDataBank **ppCellBank, enum HeapID heapId);
void *GfGfxLoader_GetAnimBank(NarcId narcId, s32 memberNo, BOOL isCompressed, NNSG2dAnimBankData **ppAnimBank, enum HeapID heapId);
void *GfGfxLoader_GetCharData(NarcId narcId, s32 memberNo, BOOL isCompressed, NNSG2dCharacterData **ppCharData, enum HeapID heapID);
void *GfGfxLoader_GetScrnData(NarcId narcId, s32 memberNo, BOOL isCompressed, NNSG2dScreenData **ppScrnData, enum HeapID heapID);
void *GfGfxLoader_GetPlttData(NarcId narcId, s32 memberNo, NNSG2dPaletteData **ppPlttData, enum HeapID heapID);
void *GfGfxLoader_GetCellBank(NarcId narcId, s32 memberNo, BOOL isCompressed, NNSG2dCellDataBank **ppCellBank, enum HeapID heapID);
void *GfGfxLoader_GetAnimBank(NarcId narcId, s32 memberNo, BOOL isCompressed, NNSG2dAnimBankData **ppAnimBank, enum HeapID heapID);
// Opens a new file handle to read (perhaps compressed) data from a NARC.
void *GfGfxLoader_LoadFromNarc(NarcId narcId, s32 fileId, BOOL isCompressed, enum HeapID heapId, BOOL atEnd);
void *GfGfxLoader_LoadFromNarc(NarcId narcId, s32 fileId, BOOL isCompressed, enum HeapID heapID, BOOL atEnd);
// Opens a new file handle to read (perhaps compressed) data from a NARC.
// The number of bytes read is returned to the sizeOut parameter.
void *GfGfxLoader_LoadFromNarc_GetSizeOut(NarcId narcId, s32 fileId, BOOL isCompressed, enum HeapID heapId, BOOL atEnd, u32 *sizeOut);
void *GfGfxLoader_LoadFromNarc_GetSizeOut(NarcId narcId, s32 fileId, BOOL isCompressed, enum HeapID heapID, BOOL atEnd, u32 *sizeOut);
// These functions are the same as above, but they use an existing file handle.
u32 GfGfxLoader_LoadCharDataFromOpenNarc(NARC *narc, s32 memberNo, BgConfig *bgConfig, GFBgLayer layer, u32 tileStart, u32 szByte, BOOL isCompressed, enum HeapID heapId);
void GfGfxLoader_LoadScrnDataFromOpenNarc(NARC *narc, s32 memberNo, BgConfig *bgConfig, GFBgLayer layer, u32 tileStart, u32 szByte, BOOL isCompressed, enum HeapID heapId);
void GfGfxLoader_GXLoadPalFromOpenNarc(NARC *narc, s32 memberNo, enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 szByte, enum HeapID heapId);
void GfGfxLoader_GXLoadPalWithSrcOffsetFromOpenNarc(NARC *narc, s32 memberNo, enum GFPalLoadLocation location, u32 srcOffset, enum GFPalSlotOffset palSlotOffset, u32 szByte, enum HeapID heapId);
void GfGfxLoader_PartiallyLoadPaletteFromOpenNarc(NARC *narc, s32 memberNo, NNS_G2D_VRAM_TYPE type, u32 baseAddr, enum HeapID heapId, struct NNSG2dImagePaletteProxy *pPltProxy);
u32 GfGfxLoader_LoadImageMappingFromOpenNarc(NARC *narc, s32 memberNo, BOOL isCompressed, GFBgLayer layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, enum HeapID heapId, NNSG2dImageProxy *pImgProxy);
void *GfGfxLoader_GetCharDataFromOpenNarc(NARC *narc, s32 memberNo, BOOL isCompressed, NNSG2dCharacterData **ppCharData, enum HeapID heapId);
void *GfGfxLoader_GetScrnDataFromOpenNarc(NARC *narc, s32 memberNo, BOOL isCompressed, NNSG2dScreenData **ppScrnData, enum HeapID heapId);
void *GfGfxLoader_GetPlttDataFromOpenNarc(NARC *narc, s32 memberNo, NNSG2dPaletteData **ppPlttData, enum HeapID heapId);
void *GfGfxLoader_GetCellBankFromOpenNarc(NARC *narc, s32 memberNo, BOOL isCompressed, NNSG2dCellDataBank **ppCellBank, enum HeapID heapId);
void *GfGfxLoader_GetAnimBankFromOpenNarc(NARC *narc, s32 memberNo, BOOL isCompressed, NNSG2dAnimBankData **ppAnimBank, enum HeapID heapId);
void *GfGfxLoader_LoadFromOpenNarc(NARC *narc, s32 fileId, BOOL isCompressed, enum HeapID heapId, BOOL atEnd);
void *GfGfxLoader_LoadFromOpenNarc_GetSizeOut(NARC *narc, s32 fileId, BOOL isCompressed, enum HeapID heapId, BOOL atEnd, u32 *sizeOut);
u32 GfGfxLoader_LoadCharDataFromOpenNarc(NARC *narc, s32 memberNo, BgConfig *bgConfig, GFBgLayer layer, u32 tileStart, u32 szByte, BOOL isCompressed, enum HeapID heapID);
void GfGfxLoader_LoadScrnDataFromOpenNarc(NARC *narc, s32 memberNo, BgConfig *bgConfig, GFBgLayer layer, u32 tileStart, u32 szByte, BOOL isCompressed, enum HeapID heapID);
void GfGfxLoader_GXLoadPalFromOpenNarc(NARC *narc, s32 memberNo, enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 szByte, enum HeapID heapID);
void GfGfxLoader_GXLoadPalWithSrcOffsetFromOpenNarc(NARC *narc, s32 memberNo, enum GFPalLoadLocation location, u32 srcOffset, enum GFPalSlotOffset palSlotOffset, u32 szByte, enum HeapID heapID);
void GfGfxLoader_PartiallyLoadPaletteFromOpenNarc(NARC *narc, s32 memberNo, NNS_G2D_VRAM_TYPE type, u32 baseAddr, enum HeapID heapID, struct NNSG2dImagePaletteProxy *pPltProxy);
u32 GfGfxLoader_LoadImageMappingFromOpenNarc(NARC *narc, s32 memberNo, BOOL isCompressed, GFBgLayer layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, enum HeapID heapID, NNSG2dImageProxy *pImgProxy);
void *GfGfxLoader_GetCharDataFromOpenNarc(NARC *narc, s32 memberNo, BOOL isCompressed, NNSG2dCharacterData **ppCharData, enum HeapID heapID);
void *GfGfxLoader_GetScrnDataFromOpenNarc(NARC *narc, s32 memberNo, BOOL isCompressed, NNSG2dScreenData **ppScrnData, enum HeapID heapID);
void *GfGfxLoader_GetPlttDataFromOpenNarc(NARC *narc, s32 memberNo, NNSG2dPaletteData **ppPlttData, enum HeapID heapID);
void *GfGfxLoader_GetCellBankFromOpenNarc(NARC *narc, s32 memberNo, BOOL isCompressed, NNSG2dCellDataBank **ppCellBank, enum HeapID heapID);
void *GfGfxLoader_GetAnimBankFromOpenNarc(NARC *narc, s32 memberNo, BOOL isCompressed, NNSG2dAnimBankData **ppAnimBank, enum HeapID heapID);
void *GfGfxLoader_LoadFromOpenNarc(NARC *narc, s32 fileId, BOOL isCompressed, enum HeapID heapID, BOOL atEnd);
void *GfGfxLoader_LoadFromOpenNarc_GetSizeOut(NARC *narc, s32 fileId, BOOL isCompressed, enum HeapID heapID, BOOL atEnd, u32 *sizeOut);
#endif // POKEHEARTGOLD_GF_GFX_LOADER_H

14
include/heap.h
View File

@ -13,14 +13,14 @@ typedef struct HeapParam {
void Heap_InitSystem(const HEAP_PARAM *templates, u32 nTemplates, u32 totalNumHeaps, u32 pre_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(enum HeapID heapId, u32 size);
void *Heap_AllocAtEnd(enum HeapID heapId, u32 size);
void Heap_Destroy(enum HeapID heapID);
void *Heap_Alloc(enum HeapID heapID, u32 size);
void *Heap_AllocAtEnd(enum HeapID heapID, u32 size);
void Heap_Free(void *ptr);
void Heap_FreeExplicit(enum HeapID heapId, void *ptr);
u32 HeapExp_FndGetTotalFreeSize(enum HeapID heapId);
void HeapExp_FndInitAllocator(NNSFndAllocator *pAllocator, enum HeapID heapId, int alignment);
void Heap_FreeExplicit(enum HeapID heapID, void *ptr);
u32 HeapExp_FndGetTotalFreeSize(enum HeapID heapID);
void HeapExp_FndInitAllocator(NNSFndAllocator *pAllocator, enum HeapID heapID, int alignment);
void Heap_Realloc(void *ptr, u32 newSize);
BOOL GF_heap_c_dummy_return_true(enum HeapID heapId);
BOOL GF_heap_c_dummy_return_true(enum HeapID heapID);
#endif // POKEHEARTGOLD_HEAP_H

44
include/item.h
View File

@ -95,7 +95,7 @@ typedef struct ItemData {
} ItemData;
/*
* void MoveItemSlotInList(ItemSlot *slots, int from, int to, int pocket, enum HeapID heapId)
* void MoveItemSlotInList(ItemSlot *slots, int from, int to, int pocket, enum HeapID heapID)
*
* Move item slot within an array, shifting the intermediate slots.
* Performs the operation out-of-place using a temporary array from the heap.
@ -104,9 +104,9 @@ typedef struct ItemData {
* @param from: Source slot index
* @param to: Destination slot index
* @param pocket: Pocket ID
* @param heapId: Heap ID to allocate the temporary array from
* @param heapID: Heap ID to allocate the temporary array from
*/
void MoveItemSlotInList(ItemSlot *slots, int from, int to, int pocket, enum HeapID heapId);
void MoveItemSlotInList(ItemSlot *slots, int from, int to, int pocket, enum HeapID heapID);
/*
* int GetItemIndexMapping(u16 itemId, int attrNo)
@ -156,13 +156,13 @@ int GetItemIconCell(void);
int GetItemIconAnim(void);
/*
* void *LoadItemDataOrGfx(u16 itemId, int attrno, enum HeapID heapId)
* void *LoadItemDataOrGfx(u16 itemId, int attrno, enum HeapID heapID)
*
* Loads the raw data corresponding to the given item. Allocates a new buffer.
*
* @param itemId: Item ID to look up
* @param attrno: Type of object to load
* @param heapId: ID of heap to allocate the result from
* @param heapID: ID of heap to allocate the result from
*
* @returns: Pointer to loaded data. If attrNo is ... then ...
* ITEMNARC_PARAM: ItemData* from itemtool/itemdata/item_data.narc
@ -171,45 +171,45 @@ int GetItemIconAnim(void);
*
* If itemId or attrno is invalid, or if allocation failed, returns NULL
*/
void *LoadItemDataOrGfx(u16 itemId, int attrno, enum HeapID heapId);
void *LoadItemDataOrGfx(u16 itemId, int attrno, enum HeapID heapID);
/*
* void GetItemNameIntoString(String *dest, u16 itemId, enum HeapID heapId)
* void GetItemNameIntoString(String *dest, u16 itemId, enum HeapID heapID)
*
* Reads the name of the indicated item into the preallocated string.
*
* @param dest: Pointer to String containing the result
* @param itemId: The item whose name you want to get
* @param heapId: Heap in which to allocate the temporary MsgData
* @param heapID: Heap in which to allocate the temporary MsgData
*/
void GetItemNameIntoString(String *dest, u16 itemId, enum HeapID heapId);
void GetItemNameIntoString(String *dest, u16 itemId, enum HeapID heapID);
/*
* void GetItemDescIntoString(String *dest, u16 itemId, enum HeapID heapId)
* void GetItemDescIntoString(String *dest, u16 itemId, enum HeapID heapID)
*
* Reads the description of the indicated item into the preallocated string.
*
* @param dest: Pointer to String containing the result
* @param itemId: The item whose description you want to get
* @param heapId: Heap in which to allocate the temporary MsgData
* @param heapID: Heap in which to allocate the temporary MsgData
*/
void GetItemDescIntoString(String *dest, u16 itemId, enum HeapID heapId);
void GetItemDescIntoString(String *dest, u16 itemId, enum HeapID heapID);
/*
* s32 GetItemAttr(u16 itemId, u16 attrno, enum HeapID heapId)
* s32 GetItemAttr(u16 itemId, u16 attrno, enum HeapID heapID)
*
* Gets the specified item effect parameter from itemtool/itemdata/item_data.narc
*
* @param itemId: The item you want to query
* @param attrno: The attribute you want to read
* @param heapId: Heap in which to allocate the temporary ItemData
* @param heapID: Heap in which to allocate the temporary ItemData
*
* @returns: Integer attribute value
*/
s32 GetItemAttr(u16 itemId, u16 attrno, enum HeapID heapId);
s32 GetItemAttr(u16 itemId, u16 attrno, enum HeapID heapID);
/*
* s32 GetItemAttr_PreloadedItemData(u16 itemId, u16 attrno, enum HeapID heapId)
* s32 GetItemAttr_PreloadedItemData(u16 itemId, u16 attrno, enum HeapID heapID)
*
* Gets the specified item effect parameter from itemtool/itemdata/item_data.narc
*
@ -331,27 +331,27 @@ BOOL ItemIdIsBerry(u16 itemId);
u16 BerryToItemId(u8 berryId);
/*
* String *GetNutName(u16 berryId, enum HeapID heapId)
* String *GetNutName(u16 berryId, enum HeapID heapID)
*
* Creates a new String containing the name of the berry
*
* @param berryId: Berry to get the name of
* @param heapId: Heap to allocate the String from
* @param heapID: Heap to allocate the String from
*
* @returns: New string containing the name of the berry
*/
String *GetNutName(u16 berryId, enum HeapID heapId);
String *GetNutName(u16 berryId, enum HeapID heapID);
/*
* ItemData *LoadAllItemData(enum HeapID heapId)
* ItemData *LoadAllItemData(enum HeapID heapID)
*
* Reads the entire FIMG of itemtool/itemdata/item_data.narc into a new buffer
*
* @param heapId: Heap to allocate the array from
* @param heapID: Heap to allocate the array from
*
* @returns: Pointer to new array.
*/
ItemData *LoadAllItemData(enum HeapID heapId);
ItemData *LoadAllItemData(enum HeapID heapID);
/*
* ItemData *GetItemDataPtrFromArray(ItemData *itemData, u32 itemDataIdx)

34
include/launch_application.h
View File

@ -96,15 +96,15 @@ static inline PCBoxArgs *PCBoxAppData_New(ScriptContext *ctx) {
return ret;
}
UseMailArgs *UseMail_CreateArgs(FieldSystem *fieldSystem, int n, u8 mailId, enum HeapID heapId);
UseMailArgs *UseMail_CreateArgs(FieldSystem *fieldSystem, int n, u8 mailId, enum HeapID heapID);
ApricornBoxArgs *ApricornBox_LaunchApp(FieldSystem *fieldSystem, int a1);
PalPadArgs *PalPad_LaunchApp(FieldSystem *fieldSystem, SaveData *saveData, enum HeapID heapId);
PalPadArgs *PalPad_LaunchApp(FieldSystem *fieldSystem, SaveData *saveData, enum HeapID heapID);
BerryPotsArgs *BerryPots_LaunchApp(FieldSystem *fieldSystem);
UnownReportArgs *UnownReport_LaunchApp(FieldSystem *fieldSystem);
PartyMenuArgs *PartyMenu_LaunchApp_Gracidea(FieldSystem *fieldSystem, enum HeapID heapId, u16 itemId);
PartyMenuArgs *PartyMenu_LaunchApp_Unk2(enum HeapID heapId, FieldSystem *fieldSystem); // todo: party select screen
PartyMenuArgs *PartyMenu_LaunchApp_InGameTrade(enum HeapID heapId, FieldSystem *fieldSystem); // todo: party trade screen
PartyMenuArgs *SelectPartyMonAndLearnMove(TaskManager *taskManager, enum HeapID heapId); // todo: union party select screen
PartyMenuArgs *PartyMenu_LaunchApp_Gracidea(FieldSystem *fieldSystem, enum HeapID heapID, u16 itemId);
PartyMenuArgs *PartyMenu_LaunchApp_Unk2(enum HeapID heapID, FieldSystem *fieldSystem); // todo: party select screen
PartyMenuArgs *PartyMenu_LaunchApp_InGameTrade(enum HeapID heapID, FieldSystem *fieldSystem); // todo: party trade screen
PartyMenuArgs *SelectPartyMonAndLearnMove(TaskManager *taskManager, enum HeapID heapID); // todo: union party select screen
int PartyMenuArgs_GetSlot(struct PartyMenuArgs *partyWork);
int sub_0203E5F8(struct PartyMenuArgs *partyWork);
void sub_0203F570(FieldSystem *fieldSystem, SaveData *saveData);
@ -113,10 +113,10 @@ void GeonetGlobe_LaunchApp(FieldSystem *fieldSystem);
void ChooseStarter_LaunchApp(FieldSystem *fieldSystem, ChooseStarterArgs *args);
u16 sub_0203E864(UnkStruct_0203E600 *a0);
u16 sub_0203E600(UnkStruct_0203E600 *a0);
PokemonSummaryArgs *LearnForgetMove_LaunchApp(enum HeapID heapId, FieldSystem *fieldSystem, u8 partySlot, u16 moveToLearn);
PokemonSummaryArgs *LearnForgetMove_LaunchApp(enum HeapID heapID, FieldSystem *fieldSystem, u8 partySlot, u16 moveToLearn);
ApricornBoxArgs *sub_0203ED80(FieldSystem *fieldSystem, u32 a1, u16 *a2);
BugContestSwapMonArgs *BugContestSwapMon_LaunchApp(FieldSystem *fieldSystem, Pokemon *a1, Pokemon *a2, BOOL a3);
PokemonSummaryArgs *PokemonSummary_LaunchApp(enum HeapID heapId, FieldSystem *fieldSystem, u16 partySlot, u16 moveToLearn);
PokemonSummaryArgs *PokemonSummary_LaunchApp(enum HeapID heapID, FieldSystem *fieldSystem, u16 partySlot, u16 moveToLearn);
void sub_0203F198(TaskManager *taskManager, u16 *ret, SaveData *saveData, u16 a3, u16 a4);
BOOL AccessoryPortrait_LaunchApp(FieldSystem *fieldSystem, FashionAppData *fashionData);
void sub_0203F0A8(FieldSystem *fieldSystem, UnkOv67Args *unk);
@ -132,16 +132,16 @@ void MoveRelearner_LaunchApp(FieldSystem *fieldSystem, MoveRelearnerArgs *moveRe
BagView *sub_0203E3FC(FieldSystem *fieldSystem, ItemCheckUseData *itemCheckUseData);
void Bag_LaunchApp(FieldSystem *fieldSystem, BagView *bagView);
void PokemonSummary_LearnForget_LaunchApp(FieldSystem *fieldSystem, PokemonSummaryArgs *pokemonSummayArgs);
PokemonSummaryArgs *PokemonSummary_CreateArgs(FieldSystem *fieldSystem, enum HeapID heapId, int a2);
PartyMenuArgs *TaskManager_LaunchPartyMenu_UnionRoomBattleSelect(TaskManager *taskman, enum HeapID heapId);
PokemonSummaryArgs *PokemonSummary_CreateArgs(FieldSystem *fieldSystem, enum HeapID heapID, int a2);
PartyMenuArgs *TaskManager_LaunchPartyMenu_UnionRoomBattleSelect(TaskManager *taskman, enum HeapID heapID);
PartyMenuArgs *PartyMenu_LaunchApp_Unk5(FieldSystem *fieldSystem, int partySlot);
void EasyChat_LaunchApp(FieldSystem *fieldSystem, EasyChatArgs *args);
PokegearArgs *PokegearTownMap_LaunchApp(FieldSystem *fieldSystem, int kind);
SafariAreaCustomizerArgs *SafariAreaCustomizer_LaunchApp(FieldSystem *fieldSystem);
PhotoAlbumArgs *PhotoAlbum_LaunchApp(FieldSystem *fieldSystem, int unused, int initialCursorPos);
OptionsMenuArgs *OptionsMenu_LaunchApp(FieldSystem *fieldSystem);
UseMailArgs *sub_0203EFEC(FieldSystem *fieldSystem, u16 a1, u8 partyIdx, u8 mailType, enum HeapID heapId);
UseMailArgs *sub_0203F050(FieldSystem *fieldSystem, Pokemon *mon, enum HeapID heapId);
UseMailArgs *sub_0203EFEC(FieldSystem *fieldSystem, u16 a1, u8 partyIdx, u8 mailType, enum HeapID heapID);
UseMailArgs *sub_0203F050(FieldSystem *fieldSystem, Pokemon *mon, enum HeapID heapID);
void TrainerCard_LaunchApp(FieldSystem *fieldSystem, TrainerCardAppArgs *a1);
int Pokedex_LaunchApp(FieldSystem *fieldSystem, PokedexArgs *a1);
NintendoWifiConnectArgs *NintendoWifiConnection_LaunchApp(FieldSystem *fieldSystem, u16 a1, u16 a2);
@ -155,11 +155,11 @@ void CallTask_NamingScreen(TaskManager *taskManager, NameScreenType type, int sp
void sub_0203E960(TaskManager *a0, int a1, UnkStruct_0203E8C8 *a2, u16 *a3, u16 *a4);
void TrainerCardSignature_LaunchApp(FieldSystem *fieldSystem);
void HatchEggInParty(FieldSystem *fieldSystem);
UnkStruct_0203F074 *sub_0203F074(FieldSystem *fieldSystem, enum HeapID heapId);
CertificatesArgs *Certificates_LaunchApp(FieldSystem *fieldSystem, enum HeapID heapId, u16 certificateId);
PartyMenuArgs *PartyMenu_LaunchApp_Unk4(enum HeapID heapId, FieldSystem *fieldSystem, u16 partySlot);
UnkStruct_0203FAB4 *sub_0203FAB4(FieldSystem *fieldSystem, u8 a1, u8 a2, u16 a3, enum HeapID heapId);
ScratchOffCardsArgs *ScratchOffCards_LaunchApp(FieldSystem *fieldSystem, enum HeapID heapId);
UnkStruct_0203F074 *sub_0203F074(FieldSystem *fieldSystem, enum HeapID heapID);
CertificatesArgs *Certificates_LaunchApp(FieldSystem *fieldSystem, enum HeapID heapID, u16 certificateId);
PartyMenuArgs *PartyMenu_LaunchApp_Unk4(enum HeapID heapID, FieldSystem *fieldSystem, u16 partySlot);
UnkStruct_0203FAB4 *sub_0203FAB4(FieldSystem *fieldSystem, u8 a1, u8 a2, u16 a3, enum HeapID heapID);
ScratchOffCardsArgs *ScratchOffCards_LaunchApp(FieldSystem *fieldSystem, enum HeapID heapID);
void sub_0203FC14(FieldSystem *fieldSystem, u16 a1, u16 a2);
PokegearArgs *PokegearPhone_LaunchApp(FieldSystem *fieldSystem);
PokeathlonMedalsArgs *PokeathlonMedals_LaunchApp(FieldSystem *fieldSystem);

4
include/launch_application_internal.h
View File

@ -36,7 +36,7 @@ typedef enum WirelessTradeState {
} WirelessTradeState;
typedef struct UnkStruct_0203E6D4 {
enum HeapID heapId;
enum HeapID heapID;
PartyMenuArgs *partyMenu;
u8 unk8[0x4];
} UnkStruct_0203E6D4;
@ -149,7 +149,7 @@ typedef struct UnkStruct_0203E644 {
} UnkStruct_0203E644;
typedef struct PartyMenuMoveSelectData {
enum HeapID heapId;
enum HeapID heapID;
UnkStruct_0203E644 *unk4;
PokemonSummaryArgs *pokemonSummary;
} PartyMenuMoveSelectData;

2
include/link_ruleset_data.h
View File

@ -17,7 +17,7 @@ typedef enum StdLinkBattleRuleset {
} StdLinkBattleRuleset;
LinkBattleRuleset *sub_020291E8(SaveData *saveData, int a1);
void sub_0202921C(SaveData *saveData, int a1, String *a2, enum HeapID heapId);
void sub_0202921C(SaveData *saveData, int a1, String *a2, enum HeapID heapID);
LinkBattleRuleset *sub_0202925C(void);
int sub_02029264(const LinkBattleRuleset *ruleset);

4
include/list_menu.h
View File

@ -73,10 +73,10 @@ typedef struct ListMenu {
/*0x31*/ u8 unk_31;
/*0x32*/ u8 taskId;
/*0x33*/ u8 unk_33;
/*0x34*/ u8 heapId;
/*0x34*/ u8 heapID;
} ListMenu;
struct ListMenu *ListMenuInit(const struct ListMenuTemplate *template, u16 cursorPos, u16 itemsAbove, enum HeapID heapId);
struct ListMenu *ListMenuInit(const struct ListMenuTemplate *template, u16 cursorPos, u16 itemsAbove, enum HeapID heapID);
s32 ListMenu_ProcessInput(struct ListMenu *list);
void DestroyListMenu(struct ListMenu *list, u16 *cursorPos, u16 *itemsAbove);
void RedrawListMenu(struct ListMenu *list);

12
include/list_menu_2d.h
View File

@ -27,17 +27,17 @@ struct ListMenu2D {
u8 maxGlyphWidth;
u8 maxGlyphHeight;
u8 scheduledScroll;
u8 heapId;
u8 heapID;
u8 pad_1D[3];
}; // size=0x20
struct ListMenu2D *Create2dMenu(const struct ListMenu2DTemplate *template, u8 initialSelection, u8 heapId);
struct ListMenu2D *Create2dMenu(const struct ListMenu2DTemplate *template, u8 initialSelection, u8 heapID);
void Delete2dMenu(struct ListMenu2D *menu, u8 *ret_p);
int Handle2dMenuInput(struct ListMenu2D *menu);
u8 Get2dMenuSelection(struct ListMenu2D *menu);
struct ListMenu2D *CreateYesNoMenu(BgConfig *bgConfig, const WindowTemplate *windowTemplate, u16 tileNum, u8 paletteNum, u8 initialSelection, enum HeapID heapId);
struct ListMenu2D *Std_CreateYesNoMenu(BgConfig *bgConfig, const WindowTemplate *windowTemplate, u16 tileNum, u8 paletteNum, enum HeapID heapId);
int Handle2dMenuInput_DeleteOnFinish(struct ListMenu2D *menu, enum HeapID heapId);
void Clear2dMenuWindowAndDelete(struct ListMenu2D *menu, enum HeapID heapId);
struct ListMenu2D *CreateYesNoMenu(BgConfig *bgConfig, const WindowTemplate *windowTemplate, u16 tileNum, u8 paletteNum, u8 initialSelection, enum HeapID heapID);
struct ListMenu2D *Std_CreateYesNoMenu(BgConfig *bgConfig, const WindowTemplate *windowTemplate, u16 tileNum, u8 paletteNum, enum HeapID heapID);
int Handle2dMenuInput_DeleteOnFinish(struct ListMenu2D *menu, enum HeapID heapID);
void Clear2dMenuWindowAndDelete(struct ListMenu2D *menu, enum HeapID heapID);
#endif // POKEHEARTGOLD_LIST_MENU_2D_H

2
include/list_menu_cursor.h
View File

@ -5,7 +5,7 @@
struct ListMenuCursor;
struct ListMenuCursor *ListMenuCursorNew(enum HeapID heapId);
struct ListMenuCursor *ListMenuCursorNew(enum HeapID heapID);
void ListMenuCursorSetColor(struct ListMenuCursor *cursor, u32 color);
void DestroyListMenuCursorObj(struct ListMenuCursor *cursor);
void ListMenuUpdateCursorObj(struct ListMenuCursor *cursor, Window *window, u8 x, u8 y);

2
include/list_menu_items.h
View File

@ -18,7 +18,7 @@ typedef struct LISTMENUITEM {
s32 value;
} LISTMENUITEM;
LISTMENUITEM *ListMenuItems_New(u32 n, enum HeapID heapId);
LISTMENUITEM *ListMenuItems_New(u32 n, enum HeapID heapID);
void ListMenuItems_Delete(LISTMENUITEM *items);
void ListMenuItems_AppendFromMsgData(LISTMENUITEM *items, MsgData *msgData, int msgId, int value);
void ListMenuItems_AddItem(LISTMENUITEM *items, String *string, int value);

4
include/mail.h
View File

@ -13,7 +13,7 @@ typedef struct Mailbox {
Mail msgs[MAILBOX_MSG_COUNT];
} Mailbox;
Mail *Mail_New(enum HeapID heapId);
Mail *Mail_New(enum HeapID heapID);
void Mail_Copy(const Mail *src, Mail *dest);
void Mail_Init(Mail *mail);
BOOL Mail_TypeIsValid(Mail *mail);
@ -33,7 +33,7 @@ void Mail_SetMessage(Mail *mail, const MailMessage *src, int i);
Mailbox *Save_Mailbox_Get(SaveData *saveData);
u32 Save_Mailbox_sizeof(void);
void Save_Mailbox_Init(Mailbox *mailbox);
Mail *Mailbox_AllocAndFetchMailI(Mail *msgs, int n, int i, enum HeapID heapId);
Mail *Mailbox_AllocAndFetchMailI(Mail *msgs, int n, int i, enum HeapID heapID);
int Mailbox_GetFirstEmptySlotIdx(Mailbox *mailbox);
void Mailbox_DeleteSlotI(Mail *msgs, int n, int i);
void Mailbox_CopyMailToSlotI(Mail *msgs, int n, int i, const Mail *src);

6
include/mail_message.h
View File

@ -29,8 +29,8 @@ void MailMsg_Copy(MailMessage *dst, const MailMessage *src);
void MailMsg_Init_WithBank(MailMessage *mailMessage, u16 msgBank);
void MailMsg_Init_Default(MailMessage *mailMessage);
void MailMsg_Init_FromTemplate(MailMessage *mailMessage, const MailMessageTemplate *template);
String *MailMsg_GetExpandedString(const MailMessage *mailMessage, enum HeapID heapId);
String *MailMsg_GetRawString(MailMessage *mailMessage, enum HeapID heapId);
String *MailMsg_GetExpandedString(const MailMessage *mailMessage, enum HeapID heapID);
String *MailMsg_GetRawString(MailMessage *mailMessage, enum HeapID heapID);
BOOL MailMsg_IsInit(MailMessage *mailMessage);
BOOL MailMsg_AllFieldsAreInit(MailMessage *mailMessage);
u32 MailMsg_NumFields(u16 msg_bank, u16 msg_no);
@ -39,7 +39,7 @@ u16 MailMsg_GetMsgBank(const MailMessage *mailMessage);
u16 MailMsg_GetMsgNo(const MailMessage *mailMessage);
u32 MailMsg_NumMsgsInBank(u16 msg_bank);
void MailMsg_SetTrailingFieldsEmpty(MailMessage *mailMessage);
String *MailMsg_GetExpandedString(const MailMessage *mailMessage, enum HeapID heapId);
String *MailMsg_GetExpandedString(const MailMessage *mailMessage, enum HeapID heapID);
#endif // PM_ASM

14
include/mail_misc.h
View File

@ -44,7 +44,7 @@ typedef struct UseMailArgs {
MenuInputStateMgr *menuInputStatePtr;
} UseMailArgs;
EasyChatArgs *EasyChat_CreateArgs(u8 a0, u8 a1, SaveData *saveData, MenuInputStateMgr *menuInputStateMgr, enum HeapID heapId);
EasyChatArgs *EasyChat_CreateArgs(u8 a0, u8 a1, SaveData *saveData, MenuInputStateMgr *menuInputStateMgr, enum HeapID heapID);
void EasyChat_FreeArgs(EasyChatArgs *args);
void sub_02090D14(EasyChatArgs *args, u16 a1);
void sub_02090D18(EasyChatArgs *args, u16 a1, u16 a2);
@ -68,14 +68,14 @@ BOOL sub_02090DC0(EasyChatArgs *args, MailMessage *msg1, MailMessage *msg2);
void sub_02090E04(EasyChatArgs *args, MailMessage *msg1, MailMessage *msg2);
int sub_02090E44(EasyChatArgs *args);
void sub_02090E5C(EasyChatArgs *args, MenuInputState menuInputState);
UseMailArgs *sub_02090E68(SaveData *saveData, u16 a1, u8 partyIdx, u8 mailType, enum HeapID heapId);
UseMailArgs *sub_02090EC0(SaveData *saveData, int n, u16 i, enum HeapID heapId);
UseMailArgs *sub_02090F00(SaveData *saveData, Pokemon *mon, enum HeapID heapId);
UseMailArgs *sub_02090F38(SaveData *saveData, u8 mailType, enum HeapID heapId);
UseMailArgs *sub_02090E68(SaveData *saveData, u16 a1, u8 partyIdx, u8 mailType, enum HeapID heapID);
UseMailArgs *sub_02090EC0(SaveData *saveData, int n, u16 i, enum HeapID heapID);
UseMailArgs *sub_02090F00(SaveData *saveData, Pokemon *mon, enum HeapID heapID);
UseMailArgs *sub_02090F38(SaveData *saveData, u8 mailType, enum HeapID heapID);
u32 sub_02090F6C(UseMailArgs *args);
BOOL sub_02090F70(UseMailArgs *args, Pokemon *mon);
void sub_02090F90(UseMailArgs *args);
int Mailbox_MoveMessageFromMon(Mailbox *mailbox, Pokemon *mon, enum HeapID heapId);
int sub_02091004(Mail *msgs, int i, Pokemon *mon, enum HeapID heapId);
int Mailbox_MoveMessageFromMon(Mailbox *mailbox, Pokemon *mon, enum HeapID heapID);
int sub_02091004(Mail *msgs, int i, Pokemon *mon, enum HeapID heapID);
#endif // POKEHEARTGOLD_MAIL_MISC_H

2
include/map_events.h
View File

@ -6,7 +6,7 @@
#include "map_events_internal.h"
#include "map_header.h"
void Field_AllocateMapEvents(FieldSystem *work, enum HeapID heapId);
void Field_AllocateMapEvents(FieldSystem *work, enum HeapID heapID);
void Field_FreeMapEvents(FieldSystem *work);
void Field_InitMapEvents(FieldSystem *work, u32 mapno);
void Field_InitMapObjectsFromZoneEventData(FieldSystem *fieldSystem);

2
include/map_matrix.h
View File

@ -36,7 +36,7 @@ u8 MapMatrix_GetHeight(MAPMATRIX *map_matrix);
u16 MapMatrix_GetMapHeader(MAPMATRIX *map_matrix, s32 x, s32 y);
u8 MapMatrix_GetMatrixId(MAPMATRIX *map_matrix);
u8 MapMatrix_GetMapAltitude(MAPMATRIX *map_matrix, u8 matrix_id, u16 x, u16 y, int matrix_width);
MAPDATA *MapMatrix_MapData_New(enum HeapID heapId);
MAPDATA *MapMatrix_MapData_New(enum HeapID heapID);
void MapMatrix_MapData_Free(MAPDATA *map_data);
u16 GetMapModelNo(u32 map_no, MAPMATRIX *map_matrix);
void RemoveMahoganyTownAntennaTree(MAPMATRIX *map_matrix);

2
include/math_util.h
View File

@ -16,7 +16,7 @@ u32 PRandom(u32 seed);
void MTX22_2DAffine(MtxFx22 *mtx, u16 radians, fx32 x, fx32 y, u8 type);
u32 Math_CalcArraySum(const void *data, u32 size);
u16 GF_CalcCRC16(const void *data, u32 size);
void GF_CRC16Init(enum HeapID heapId);
void GF_CRC16Init(enum HeapID heapID);
u16 LCRandom(void);
void SetLCRNGSeed(u32 seed);
u32 GetLCRNGSeed(void);

6
include/message_format.h
View File

@ -19,13 +19,13 @@ typedef struct MessageFormatFields {
typedef struct MessageFormat {
u32 count;
enum HeapID heapId;
enum HeapID heapID;
MessageFormatFields *fields;
String *buffer;
} MessageFormat;
MessageFormat *MessageFormat_New(enum HeapID heapId);
MessageFormat *MessageFormat_New_Custom(u32 nstr, u32 _strlen, enum HeapID heapId);
MessageFormat *MessageFormat_New(enum HeapID heapID);
MessageFormat *MessageFormat_New_Custom(u32 nstr, u32 _strlen, enum HeapID heapID);
void MessageFormat_Delete(MessageFormat *messageFormat);
void StringExpandPlaceholders(MessageFormat *messageFormat, String *dest, String *src);
void BufferString(MessageFormat *messageFormat, u32 fieldno, const String *string, s32 a3, s32 a4, s32 a5);

2
include/message_printer.h
View File

@ -13,7 +13,7 @@ typedef struct MessagePrinter {
u32 backgroundColor;
} MessagePrinter;
MessagePrinter *MessagePrinter_New(u32 foreground, u32 shadow, u32 background, enum HeapID heapId);
MessagePrinter *MessagePrinter_New(u32 foreground, u32 shadow, u32 background, enum HeapID heapID);
void MessagePrinter_Delete(MessagePrinter *messagePrinter);
void sub_0200CDAC(MessagePrinter *messagePrinter, u8 glyphId, Window *window, u32 x, u32 y);
void PrintUIntOnWindow(MessagePrinter *messagePrinter, u32 num, u32 ndigits, PrintingMode mode, Window *window, u32 x, u32 y);

4
include/move_relearner.h
View File

@ -19,9 +19,9 @@ typedef struct MoveRelearnerArgs {
u8 padding_1A[2];
} MoveRelearnerArgs;
MoveRelearnerArgs *MoveRelearner_New(enum HeapID heapId);
MoveRelearnerArgs *MoveRelearner_New(enum HeapID heapID);
void MoveRelearner_Delete(MoveRelearnerArgs *moveRelearner);
u16 *MoveRelearner_GetEligibleLevelUpMoves(Pokemon *mon, enum HeapID heapId);
u16 *MoveRelearner_GetEligibleLevelUpMoves(Pokemon *mon, enum HeapID heapID);
BOOL MoveRelearner_IsValidMove(const u16 *ptr);
#endif // POKEHEARTGOLD_MOVE_RELEARNER_H

14
include/msgdata.h
View File

@ -23,7 +23,7 @@ typedef struct _MAT {
typedef struct MsgData {
u16 type;
u16 heapId;
u16 heapID;
u16 narc_id;
u16 file_id;
union {
@ -32,15 +32,15 @@ typedef struct MsgData {
};
} MsgData;
MsgData *NewMsgDataFromNarc(MsgDataLoadType type, NarcId narc, s32 fileId, enum HeapID heapId);
MsgData *NewMsgDataFromNarc(MsgDataLoadType type, NarcId narc, s32 fileId, enum HeapID heapID);
void DestroyMsgData(MsgData *msgData);
String *NewString_ReadMsgData(MsgData *msgData, s32 strno);
void ReadMsgDataIntoString(MsgData *msgData, s32 strno, String *dest);
void GetSpeciesNameIntoArray(u16 species, enum HeapID heapId, u16 *dest);
String *GetSpeciesName(u16 species, enum HeapID heapId);
void ReadMsgData_NewNarc_ExistingString(NarcId narcId, s32 fileId, u32 msgId, enum HeapID heapId, String *dest);
String *ReadMsgData_ExpandPlaceholders(MessageFormat *messageFormat, MsgData *msgData, u32 msgno, enum HeapID heapId);
String *ReadMsgData_NewNarc_NewString(NarcId narc_id, u32 group, u32 num, enum HeapID heapId);
void GetSpeciesNameIntoArray(u16 species, enum HeapID heapID, u16 *dest);
String *GetSpeciesName(u16 species, enum HeapID heapID);
void ReadMsgData_NewNarc_ExistingString(NarcId narcId, s32 fileId, u32 msgId, enum HeapID heapID, String *dest);
String *ReadMsgData_ExpandPlaceholders(MessageFormat *messageFormat, MsgData *msgData, u32 msgno, enum HeapID heapID);
String *ReadMsgData_NewNarc_NewString(NarcId narc_id, u32 group, u32 num, enum HeapID heapID);
u32 MsgDataGetCount(MsgData *msgData);
void ReadMsgDataIntoU16Array(MsgData *msgData, u32 msgno, u16 *dest);
String *GetMoveName(u32 move, enum HeapID heapno);

2
include/mystery_gift.h
View File

@ -176,7 +176,7 @@ void SaveMysteryGift_SetFlagx7FF(MysteryGiftSave *mg);
// effectively beginning a transaction.
// To use this implementation, define
// MYSTERY_GIFT_SAVE_TRANSACTION_IMPL.
void SaveMGDataPtr_Begin(SaveData *saveData, enum HeapID heapId);
void SaveMGDataPtr_Begin(SaveData *saveData, enum HeapID heapID);
// Unloads the internal MysteryGiftSave pointer.
// In the alternate implementation that clones the save

2
include/naming_screen.h
View File

@ -23,7 +23,7 @@ typedef struct NamingScreenArgs {
MenuInputStateMgr *pMenuInputState;
} NamingScreenArgs;
NamingScreenArgs *NamingScreen_CreateArgs(enum HeapID heapId, NameScreenType kind, int param, int maxLen, Options *options, MenuInputStateMgr *pMenuInputState);
NamingScreenArgs *NamingScreen_CreateArgs(enum HeapID heapID, NameScreenType kind, int param, int maxLen, Options *options, MenuInputStateMgr *pMenuInputState);
void NamingScreen_DeleteArgs(NamingScreenArgs *namingScreenArgs);
#endif // POKEHEARTGOLD_NAMING_SCREEN_H

4
include/npc_trade.h
View File

@ -36,10 +36,10 @@ typedef struct NPCTradeAppData {
Pokemon *mon;
PlayerProfile *profile;
NpcTradeNum tradeno;
enum HeapID heapId;
enum HeapID heapID;
} NPCTradeAppData;
NPCTradeAppData *NPCTradeApp_Init(enum HeapID heapId, NpcTradeNum tradeno);
NPCTradeAppData *NPCTradeApp_Init(enum HeapID heapID, NpcTradeNum tradeno);
void NPCTradeApp_Delete(NPCTradeAppData *work);
void NPCTrade_MakeAndGiveLoanMon(FieldSystem *fieldSystem, NpcTradeNum tradeno, u8 level, u16 mapno);
Mail *NPCTrade_MakeKenyaMail(void);

4
include/oaks_speech_internal.h
View File

@ -33,7 +33,7 @@ typedef struct OakSpeechMultichoice {
typedef struct OakSpeechYesNo OakSpeechYesNo;
typedef struct OakSpeechData {
enum HeapID heapId;
enum HeapID heapID;
SaveData *saveData;
Options *options;
int state;
@ -89,7 +89,7 @@ void OakSpeech_CleanupSpriteEngine(OakSpeechData *data);
void OakSpeech_CreateSprites(OakSpeechData *data);
void OakSpeech_SelectedGenderIndicatorSpritesAction(OakSpeechData *data, int a1);
OakSpeechYesNo *OakSpeechYesNo_Create(BgConfig *bgConfig, Sprite *sprite, int backgroundBgId, int buttonBgId, int buttonPalette, enum HeapID heapId);
OakSpeechYesNo *OakSpeechYesNo_Create(BgConfig *bgConfig, Sprite *sprite, int backgroundBgId, int buttonBgId, int buttonPalette, enum HeapID heapID);
void OakSpeechYesNo_Delete(OakSpeechYesNo *yesnoMenu);
void OakSpeechYesNo_SetBackgroundPalette(OakSpeechYesNo *yesnoMenu, int palette);
void OakSpeechYesNo_Start(OakSpeechYesNo *yesnoMenu, int msgBank, int msgId_Yes, int msgId_No);

2
include/obj_char_transfer.h
View File

@ -9,7 +9,7 @@ typedef struct ObjCharTransferTemplate {
int maxTasks;
u32 sizeMain;
u32 sizeSub;
enum HeapID heapId;
enum HeapID heapID;
} ObjCharTransferTemplate;
typedef struct UnkStruct_02021758 {

2
include/obj_pltt_transfer.h
View File

@ -10,7 +10,7 @@ typedef struct ObjPlttTransferTaskTemplate {
int id;
} ObjPlttTransferTaskTemplate;
void ObjPlttTransfer_Init(int num, enum HeapID heapId);
void ObjPlttTransfer_Init(int num, enum HeapID heapID);
void ObjPlttTransfer_SetReservedRegion(u32 flag, NNS_G2D_VRAM_TYPE type);
void ObjPlttTransfer_Destroy(void);
void ObjPlttTransfer_Reset(void);

2
include/options.h
View File

@ -14,7 +14,7 @@ typedef struct Options {
u16 dummy : 1;
} Options;
Options *Options_New(enum HeapID heapId);
Options *Options_New(enum HeapID heapID);
void Options_Copy(Options *src, Options *dest);
void Options_Init(Options *options);
void Options_SetButtonModeOnMain(SaveData *saveData, u32 buttonMode);

4
include/overlay_01.h
View File

@ -33,7 +33,7 @@ void ov01_021F35C4(FieldSystem *fieldSystem, int a1, int *a2);
u32 GetHoneySweetScentWorkSize(void);
BOOL Task_HoneyOrSweetScent(TaskManager *taskManager);
BOOL Task_OverworldFish(TaskManager *taskManager);
struct FishingRodWork *CreateFishingRodTaskEnv(FieldSystem *fieldSystem, enum HeapID heapId, int rod);
struct FishingRodWork *CreateFishingRodTaskEnv(FieldSystem *fieldSystem, enum HeapID heapID, int rod);
void ov01_021F4440(FieldSystem *fieldSystem);
void ov01_021F6A9C(FieldSystem *fieldSystem, int a1, void *a2);
int ov01_021F6B00(FieldSystem *fieldSystem);
@ -137,7 +137,7 @@ BOOL ov01_02206268(FieldSystem *fieldSystem);
void ov01_021F42F8(UnkStruct_field_021F4360 *a0);
void ov01_021F434C(UnkStruct_field_021F4360 *a0);
UnkStruct_field_021F4360 *ov01_021F4360(FieldSystem *fieldSystem, enum HeapID heapId, u8 a2);
UnkStruct_field_021F4360 *ov01_021F4360(FieldSystem *fieldSystem, enum HeapID heapID, u8 a2);
void ov01_021F43D0(UnkStruct_field_021F4360 *a0);
#endif // POKEHEARTGOLD_OVERLAY_01_H

14
include/overlay_02.h
View File

@ -41,9 +41,9 @@ typedef struct SafariDecorationArgs {
SysTask *ov02_0224B418(FieldSystem *fieldSystem, int gender);
BOOL ov02_0224B43C(SysTask *unk);
void ov02_0224B448(SysTask *unk);
struct FieldMoveTaskEnvironment *CreateFieldEscapeRopeTaskEnv(FieldSystem *fieldSystem, enum HeapID heapId);
struct FieldMoveTaskEnvironment *FieldMoveTask_CreateTeleportEnvironment(FieldSystem *fieldSystem, Pokemon *mon, u8 slotno, enum HeapID heapId);
struct FieldMoveTaskEnvironment *FieldMoveTask_CreateDigEnvironment(FieldSystem *fieldSystem, Pokemon *mon, u8 slotno, enum HeapID heapId);
struct FieldMoveTaskEnvironment *CreateFieldEscapeRopeTaskEnv(FieldSystem *fieldSystem, enum HeapID heapID);
struct FieldMoveTaskEnvironment *FieldMoveTask_CreateTeleportEnvironment(FieldSystem *fieldSystem, Pokemon *mon, u8 slotno, enum HeapID heapID);
struct FieldMoveTaskEnvironment *FieldMoveTask_CreateDigEnvironment(FieldSystem *fieldSystem, Pokemon *mon, u8 slotno, enum HeapID heapID);
BOOL Task_FieldEscapeRope(TaskManager *taskManager);
BOOL Task_FieldTeleport(TaskManager *taskManager);
BOOL Task_FieldDig(TaskManager *taskManager);
@ -61,13 +61,13 @@ void ShowLegendaryWing(TaskManager *taskMan, u8 a1);
void ov02_022462E8(TaskManager *taskMan);
void PokecenterAnimCreate(FieldSystem *fieldSystem, u8 kind);
void ov02_0224BDE8(FieldSystem *fieldSystem, u8 direction, u8 length);
int ov02_0224CD38(PlayerProfile *profile, u16 a, u16 b, u16 c, u16 d, enum HeapID heapId);
int ov02_0224CD74(PlayerProfile *profile, u16 a, u16 b, u16 c, u16 d, enum HeapID heapId);
int ov02_0224CD38(PlayerProfile *profile, u16 a, u16 b, u16 c, u16 d, enum HeapID heapID);
int ov02_0224CD74(PlayerProfile *profile, u16 a, u16 b, u16 c, u16 d, enum HeapID heapID);
void ov02_0224BF58(FieldSystem *fieldSystem, u8 a1);
void ov02_0224BFC0(FieldSystem *fieldSystem, u8 a1);
void ov02_0224BFCC(FieldSystem *fieldSystem, u8 a1);
void ov02_0224CDB0(FieldSystem *fieldSystem, u8 a1);
void ov02_0224E074(FieldSystem *fieldSystem, u16 *p_ret, int a2, enum HeapID heapId);
void ov02_0224E074(FieldSystem *fieldSystem, u16 *p_ret, int a2, enum HeapID heapID);
void ov02_0224E0BC(LocalMapObject *obj1, LocalMapObject *obj2, TaskManager *taskManager);
void FieldSystem_FollowMonInteract(FieldSystem *fieldSystem);
BOOL ov02_02250780(FieldSystem *fieldSystem, u8 a1);
@ -83,6 +83,6 @@ void ov02_02246714(TaskManager *man, u32 a1, u32 a2, u32 a3, u32 a4);
void ov02_022469B4(TaskManager *man, LocalMapObject *obj1, LocalMapObject *obj2);
void OpenAlphHiddenRoom(TaskManager *man, u32 a1);
SafariDecorationArgs *SafariDecoration_CreateArgs(FieldSystem *fieldSystem, enum HeapID heapId);
SafariDecorationArgs *SafariDecoration_CreateArgs(FieldSystem *fieldSystem, enum HeapID heapID);
#endif // POKEHEARTGOLD_OVERLAY_02_H

4
include/overlay_06.h
View File

@ -7,8 +7,8 @@
const u16 *ov06_0221BA00(int param_1);
void ov06_0221BA1C(PaletteData *palData, int param_2, int unused, PaletteBufferId param_4, u32 param_5);
SPLEmitter *ov06_0221BA40(enum HeapID heapId);
SPLEmitter *ov06_0221BA88(enum HeapID heapId);
SPLEmitter *ov06_0221BA40(enum HeapID heapID);
SPLEmitter *ov06_0221BA88(enum HeapID heapID);
void ov06_0221BAD8(SPLEmitter *param_1);
void ov06_0221BAF0(void);
u32 ov06_0221BB14(u32 szByte, BOOL is4x4comp);

6
include/overlay_16.h
View File

@ -18,7 +18,7 @@ typedef struct UnkStruct_ov16_022014A0 {
u8 unk2; // yield multiplier?
} UnkStruct_ov16_022014A0; // size: 0x3
UnkStruct_ov16_022014A0 *ov16_022014A0(enum HeapID heapId);
UnkStruct_ov16_022014A0 *ov16_022014A0(enum HeapID heapID);
u8 BerryPots_GetPotGrowthStage(BerryPot *berryPots, u32 idx);
u8 BerryPots_GetPotBerryId(BerryPot *berryPots, u32 idx);
u32 BerryPots_GetSoilState(BerryPot *berryPots, u32 idx);
@ -39,8 +39,8 @@ u16 BerryIdToItemId(u16 berryId);
u16 ItemIdToBerryId(u16 itemId);
u16 MulchIdToItemId(u16 mulchId);
u32 ItemIdToMulchId(u16 itemId);
u16 GetTotalBerryQuantity(Bag *bag, enum HeapID heapId);
u16 GetTotalMulchQuantity(Bag *bag, enum HeapID heapId);
u16 GetTotalBerryQuantity(Bag *bag, enum HeapID heapID);
u16 GetTotalMulchQuantity(Bag *bag, enum HeapID heapID);
BOOL BerryPots_Init(OverlayManager *manager, int *state);
BOOL BerryPots_Main(OverlayManager *manager, int *state);

2
include/overlay_2/overlay_02_gear_phone.h
View File

@ -3,7 +3,7 @@
#include "field_system.h"
String *GetPhoneBookEntryName(GearPhoneRingManager *gearPhone, enum HeapID heapId);
String *GetPhoneBookEntryName(GearPhoneRingManager *gearPhone, enum HeapID heapID);
void ov02_02251EB8(GearPhoneRingManager *phoneRingManager, u8 callerId, u8 a2, u8 a3, u8 a4, u8 a5);
u8 ov02_02251EE8(GearPhoneRingManager *gearPhone, u8 *a1);
BOOL ov02_02251F20(GearPhoneRingManager *gearPhone);

2
include/overlay_55.h
View File

@ -23,7 +23,7 @@ typedef struct UnkStruct_ov55_021E5B08 {
} UnkStruct_ov55_021E5B08;
typedef struct UnkStruct_ov55_021E5924 {
enum HeapID heapId;
enum HeapID heapID;
u8 unk4[0x4];
EasyChatArgs *unk8;
OverlayManager *unkC;

4
include/overlay_manager.h
View File

@ -27,9 +27,9 @@ struct OverlayManager {
u32 unk_24;
};
OverlayManager *OverlayManager_New(const OverlayManagerTemplate *template, void *parentWork, enum HeapID heapId);
OverlayManager *OverlayManager_New(const OverlayManagerTemplate *template, void *parentWork, enum HeapID heapID);
void OverlayManager_Delete(OverlayManager *man);
void *OverlayManager_CreateAndGetData(OverlayManager *man, u32 size, enum HeapID heapId);
void *OverlayManager_CreateAndGetData(OverlayManager *man, u32 size, enum HeapID heapID);
void *OverlayManager_GetData(OverlayManager *man);
void OverlayManager_FreeData(OverlayManager *man);
void *OverlayManager_GetArgs(OverlayManager *man);

2
include/overlay_trainer_card.h
View File

@ -31,7 +31,7 @@ typedef struct {
} Ov50_021E5A3C;
typedef struct {
enum HeapID heapId;
enum HeapID heapID;
u8 unk4[4];
OverlayManager *ov_mgr;
Ov50_021E5A3C *parentData;

6
include/palette.h
View File

@ -84,7 +84,7 @@ typedef struct PaletteData {
u8 unused[3];
} PaletteData;
PaletteData *PaletteData_Init(enum HeapID heapId);
PaletteData *PaletteData_Init(enum HeapID heapID);
void PaletteData_Free(PaletteData *data);
void PaletteData_SetBuffers(PaletteData *data, PaletteBufferId bufferID, u16 *opaque, u16 *transparent, u32 size);
void PaletteData_AllocBuffers(PaletteData *data, PaletteBufferId bufferID, u32 size, enum HeapID heapID);
@ -105,7 +105,7 @@ void PaletteData_PushTransparentBuffers(PaletteData *data);
u16 PaletteData_GetSelectedBuffersBitmask(PaletteData *data);
void PaletteData_SetAutoTransparent(PaletteData *data, BOOL autoTransparent);
void PaletteData_SetSelectedBufferAll(PaletteData *plttData, BOOL a1);
void ZeroPalettesByBitmask(u16 selectedBuffer, enum HeapID heapId);
void ZeroPalettesByBitmask(u16 selectedBuffer, enum HeapID heapID);
void PaletteData_FillPaletteInBuffer(PaletteData *plttData, PaletteBufferId bufferID, PaletteSelector which, u16 value, u16 begin, u16 end);
u16 PaletteData_GetBufferColorAtIndex(PaletteData *plttData, PaletteBufferId bufferID, PaletteSelector which, u16 palIdx);
void BlendPalette(const u16 *src, u16 *dest, u16 size, u8 cur, u16 target);
@ -113,7 +113,7 @@ void PaletteData_BlendPalette(PaletteData *data, PaletteBufferId bufferID, u16 o
void PaletteData_BlendPalettes(PaletteData *data, PaletteBufferId bufferID, u16 selectedBuffer, u8 cur, u16 target);
void TintPalette_GrayScale(u16 *palette, int count);
void TintPalette_CustomTone(u16 *palette, int count, int rTone, int gTone, int bTone);
void PaletteData_LoadNarc_CustomTint(PaletteData *data, NarcId narcId, s32 memberNo, enum HeapID heapId, PaletteBufferId bufferID, u32 size, u16 pos, int rTone, int gTone, int bTone);
void PaletteData_LoadNarc_CustomTint(PaletteData *data, NarcId narcId, s32 memberNo, enum HeapID heapID, PaletteBufferId bufferID, u32 size, u16 pos, int rTone, int gTone, int bTone);
void PaletteData_FadePalettesTowardsColorStep(PaletteData *plttData, int transparentBit, int opaqueBit, int duration, int step, u16 target);
#endif // POKEHEARTGOLD_PALETTE_H

2
include/party.h
View File

@ -5,7 +5,7 @@
u32 SaveArray_Party_sizeof(void);
u32 PartyCore_sizeof(void);
Party *SaveArray_Party_Alloc(enum HeapID heapId);
Party *SaveArray_Party_Alloc(enum HeapID heapID);
void SaveArray_Party_Init(Party *party);
void Party_InitWithMaxSize(Party *party, int maxSize);
BOOL Party_AddMon(Party *party, const Pokemon *mon);

2
include/party_context_menu.h
View File

@ -40,7 +40,7 @@ void sub_0207DF98(PartyMenu *partyMenu);
void sub_0207E04C(PartyMenu *partyMenu);
void sub_0207E068(PartyMenu *partyMenu);
void sub_0207E54C(PartyMenu *partyMenu, int numItems, int selection, int state);
PartyMenuContextMenuCursor *PartyMenu_CreateContextMenuCursor(PartyMenu *partyMenu, const PartyMenuContextMenu *template, int selection, enum HeapID heapId, int state);
PartyMenuContextMenuCursor *PartyMenu_CreateContextMenuCursor(PartyMenu *partyMenu, const PartyMenuContextMenu *template, int selection, enum HeapID heapID, int state);
void PartyMenu_CloseContextMenu(PartyMenu *partyMenu, PartyMenuContextMenuCursor *a1);
u32 PartyMenu_HandleInput_ContextMenu(PartyMenu *partyMenu, PartyMenuContextMenuCursor *a1);
u32 PartyMenu_HandleSubcontextMenuInput_TopLevel(PartyMenu *partyMenu, PartyMenuContextMenuCursor *a1);

2
include/party_menu.h
View File

@ -442,7 +442,7 @@ u32 sub_0207CA9C(void);
u32 sub_0207CAA0(void);
u32 sub_0207CAA4(void);
u32 sub_0207CAA8(void);
void sub_0207CAAC(enum HeapID heapId, u16 *a1, u16 *a2, u16 *a3);
void sub_0207CAAC(enum HeapID heapID, u16 *a1, u16 *a2, u16 *a3);
void PartyMenu_FormChangeScene_End(PartyMenu *partyMenu);
void PartyMenu_DeleteContextMenuAndList(PartyMenu *partyMenu);
void sub_0207CB3C(PartyMenu *partyMenu, MenuInputState menuInputState);

4
include/phonebook_dat.h
View File

@ -5,9 +5,9 @@
struct PhoneBookEntry;
struct PhoneBook *AllocAndReadPhoneBook(enum HeapID heapId);
struct PhoneBook *AllocAndReadPhoneBook(enum HeapID heapID);
void FreePhoneBook(struct PhoneBook *phoneBook);
u8 LoadPhoneBookEntryI(u16 idx, struct PhoneBookEntry *dest, enum HeapID heapId);
u8 LoadPhoneBookEntryI(u16 idx, struct PhoneBookEntry *dest, enum HeapID heapID);
int GetPhoneMessageGmm(int idx);
BOOL sub_02095FF8(int x);

2
include/photo_album.h
View File

@ -69,7 +69,7 @@ u8 PhotoAlbum_GetNumSaved(const PhotoAlbum *photoAlbum);
void PhotoAlbum_DeletePhotoByIndex(PhotoAlbum *photoAlbum, u8 idx);
BOOL PhotoAlbum_SetPhotoAtIndex(PhotoAlbum *photoAlbum, const Photo *photo, u8 idx);
BOOL PhotoAlbum_GetPhotoByIndex(const PhotoAlbum *photoAlbum, Photo *photo, u8 idx);
Photo *PhotoAlbum_LoadAllInUsePhotos(const PhotoAlbum *photoAlbum, enum HeapID heapId);
Photo *PhotoAlbum_LoadAllInUsePhotos(const PhotoAlbum *photoAlbum, enum HeapID heapID);
void Photo_Init(Photo *photo);
#endif // POKEHEARTGOLD_PHOTO_ALBUM_H

4
include/player_data.h
View File

@ -38,7 +38,7 @@ Options *Save_PlayerData_GetOptionsAddr(SaveData *saveData);
u16 *Save_PlayerData_GetCoinsAddr(SaveData *saveData);
IGT *Save_PlayerData_GetIGTAddr(SaveData *saveData);
u32 PlayerProfile_sizeof(void);
PlayerProfile *PlayerProfile_New(enum HeapID heapId);
PlayerProfile *PlayerProfile_New(enum HeapID heapID);
void PlayerProfile_Copy(const PlayerProfile *src, PlayerProfile *dest);
void PlayerProfile_Init(PlayerProfile *profile);
BOOL PlayerProfile_IsNameEmpty(PlayerProfile *profile);
@ -46,7 +46,7 @@ void Save_Profile_PlayerName_Set(PlayerProfile *profile, u16 *name);
void PlayerName_StringToFlat(PlayerProfile *profile, String *str);
const u16 *PlayerProfile_GetNamePtr(const PlayerProfile *profile);
void PlayerName_FlatToString(PlayerProfile *profile, String *str);
String *PlayerProfile_GetPlayerName_NewString(PlayerProfile *profile, enum HeapID heapId);
String *PlayerProfile_GetPlayerName_NewString(PlayerProfile *profile, enum HeapID heapID);
void PlayerProfile_SetTrainerID(PlayerProfile *profile, u32 id);
u32 PlayerProfile_GetTrainerID(PlayerProfile *profile);
u16 PlayerProfile_GetTrainerID_VisibleHalf(PlayerProfile *profile);

4
include/pm_string.h
View File

@ -13,7 +13,7 @@ typedef struct String {
u16 data[0];
} String;
String *String_New(u32 maxsize, enum HeapID heapId);
String *String_New(u32 maxsize, enum HeapID heapID);
void String_Delete(String *string);
void CopyStringToU16Array(const String *string, u16 *dest, u32 n);
void CopyU16ArrayToString(String *string, const u16 *src);
@ -21,7 +21,7 @@ void CopyU16ArrayToStringN(String *string, const u16 *src, u32 n);
int String_Compare(String *a, String *b);
void String_Copy(String *dest, const String *src);
void String_SetEmpty(String *str);
String *String_Dup(const String *src, enum HeapID heapId);
String *String_Dup(const String *src, enum HeapID heapID);
void String_AddChar(String *str, u16 _char);
void CopyU16ArrayToString(String *dest, const u16 *src);
void CopyU16ArrayToStringN(String *dest, const u16 *src, u32 n);

2
include/pokedex.h
View File

@ -43,7 +43,7 @@ typedef struct Pokedex {
} Pokedex; // size=0x340
u32 Save_Pokedex_sizeof(void);
Pokedex *Pokedex_New(enum HeapID heapId);
Pokedex *Pokedex_New(enum HeapID heapID);
void Save_Pokedex_Init(Pokedex *pokedex);
Pokedex *Save_Pokedex_Get(SaveData *saveData);
BOOL Pokedex_GetNatDexFlag(const Pokedex *pokedex);

24
include/pokemon.h
View File

@ -35,7 +35,7 @@ extern const s8 gNatureStatMods[NATURE_NUM][NUM_EV_STATS];
void ZeroMonData(Pokemon *mon);
void ZeroBoxMonData(BoxPokemon *boxMon);
u32 SizeOfStructPokemon(void);
Pokemon *AllocMonZeroed(enum HeapID heapId);
Pokemon *AllocMonZeroed(enum HeapID heapID);
BOOL AcquireMonLock(Pokemon *mon);
BOOL ReleaseMonLock(Pokemon *mon, BOOL decrypt_result);
BOOL AcquireBoxMonLock(BoxPokemon *boxMon);
@ -54,8 +54,8 @@ void SetMonData(Pokemon *mon, int attr, const void *ptr);
void SetBoxMonData(BoxPokemon *boxMon, int attr, const void *ptr);
void AddMonData(Pokemon *mon, int attr, int amount);
// void AddBoxMonData(BoxPokemon *boxMon, int attr, int amount);
BASE_STATS *AllocAndLoadMonPersonal_HandleAlternateForm(int species, int form, enum HeapID heapId);
BASE_STATS *AllocAndLoadMonPersonal(int species, enum HeapID heapId);
BASE_STATS *AllocAndLoadMonPersonal_HandleAlternateForm(int species, int form, enum HeapID heapID);
BASE_STATS *AllocAndLoadMonPersonal(int species, enum HeapID heapID);
int GetPersonalAttr(const BASE_STATS *baseStats, int attr);
void FreeMonPersonal(BASE_STATS *personal);
int GetMonBaseStat_HandleAlternateForm(int species, int form, int stat_id);
@ -132,7 +132,7 @@ BOOL IsPokemonBannedFromBattleFrontier(u16 species, u16 form);
u16 GetBannedBattleFrontierPokemon(u32 idx);
void Pokemon_RemoveCapsule(Pokemon *mon);
void RestoreBoxMonPP(BoxPokemon *boxMon);
BOOL SetTrMonCapsule(int a0, Pokemon *mon, enum HeapID heapId);
BOOL SetTrMonCapsule(int a0, Pokemon *mon, enum HeapID heapID);
int GetMonBaseStatEx_HandleAlternateForm(NARC *narc, int species, int form, int attr);
u16 ModifyStatByNature(u8 nature, u16 n, u8 statIndex);
@ -150,7 +150,7 @@ u8 sub_02070848(BoxPokemon *boxMon, u8 whichFacing);
u8 sub_02070854(BoxPokemon *boxMon, u8 whichFacing, BOOL a2);
u8 GetMonPicHeightBySpeciesGenderForm(u16 species, u8 gender, u8 whichFacing, u8 form, u32 pid);
u8 GetMonPicHeightBySpeciesGenderForme_PBR(u16 species, u8 gender, u8 whichFacing, u8 form, u32 pid);
struct ManagedSprite *sub_02070C24(SpriteSystem *renderer, SpriteManager *gfxHandler, PaletteData *plttData, int x, int y, int trainerClass, int battlerPosition, BOOL isLink, int resTag, enum HeapID heapId);
struct ManagedSprite *sub_02070C24(SpriteSystem *renderer, SpriteManager *gfxHandler, PaletteData *plttData, int x, int y, int trainerClass, int battlerPosition, BOOL isLink, int resTag, enum HeapID heapID);
void sub_02070D3C(s32 trainer_class, s32 a1, BOOL a2, struct UnkStruct_02070D3C *a3);
void sub_02070D84(s32 trainer_class, s32 a1, struct UnkStruct_02070D3C *a2);
u32 sub_02070D90(void);
@ -172,10 +172,10 @@ BOOL Mon_UpdateRotomForm(Pokemon *mon, int form, int defaultSlot);
void sub_02071FDC(SOUND_CHATOT *r6, u32 r5, u16 r4, s32 unused, s32 sp18, u32 sp1C, u32 sp20, u32 sp24);
void sub_0207204C(SOUND_CHATOT *r7, u32 r6, u16 r5, s32 r4, s32 sp20, u32 sp24, u32 sp28, u32 sp2C, u8 sp30);
void sub_020720D4(Pokemon *mon);
void sub_020720FC(Pokemon *mon, PlayerProfile *a1, u32 pokeball, u32 a3, u32 encounterType, enum HeapID heapId);
void sub_0207213C(BoxPokemon *boxMon, PlayerProfile *playerProfile, u32 pokeball, u32 a3, u32 encounterType, enum HeapID heapId);
void sub_0207217C(Pokemon *mon, PlayerProfile *a1, u32 pokeball, u32 a3, u32 encounterType, enum HeapID heapId);
void sub_02072190(BoxPokemon *boxMon, PlayerProfile *a1, u32 pokeball, u32 a3, u32 encounterType, enum HeapID heapId);
void sub_020720FC(Pokemon *mon, PlayerProfile *a1, u32 pokeball, u32 a3, u32 encounterType, enum HeapID heapID);
void sub_0207213C(BoxPokemon *boxMon, PlayerProfile *playerProfile, u32 pokeball, u32 a3, u32 encounterType, enum HeapID heapID);
void sub_0207217C(Pokemon *mon, PlayerProfile *a1, u32 pokeball, u32 a3, u32 encounterType, enum HeapID heapID);
void sub_02072190(BoxPokemon *boxMon, PlayerProfile *a1, u32 pokeball, u32 a3, u32 encounterType, enum HeapID heapID);
void WildMonSetRandomHeldItem(Pokemon *mon, u32 a1, u32 a2);
BOOL GetMonTMHMCompat(Pokemon *mon, u8 tmhm);
BOOL GetBoxMonTMHMCompat(BoxPokemon *boxMon, u8 tmhm);
@ -192,7 +192,7 @@ int ResolveMonForm(int species, int form);
u32 MaskOfFlagNo(int flagno);
BOOL SpeciesIsMythical(u16 species);
BOOL MonCheckFrontierIneligibility(Pokemon *mon);
BOOL BoxmonBelongsToPlayer(BoxPokemon *boxMon, PlayerProfile *profile, enum HeapID heapId);
BOOL BoxmonBelongsToPlayer(BoxPokemon *boxMon, PlayerProfile *profile, enum HeapID heapID);
int TrainerClassToBackpicID(int trainerClass, BOOL a1);
void NARC_ReadPokepicAnimScript(NARC *narc, PokepicAnimScript *dest, u16 species, u16 a3);
void sub_0207294C(NARC *narc, void *a1, void *a2, u16 a3, int a4, int a5, int a6);
@ -206,7 +206,7 @@ u32 _u32_getDigitN(u32 num, u8 digit);
s16 PokeathlonStatScoreToStars(s16 a0);
void CalcBoxMonPokeathlonPerformance(BoxPokemon *boxMon, struct PokeathlonTodayPerformance *dest);
void CalcMonPokeathlonPerformance(Pokemon *mon, struct PokeathlonTodayPerformance *dest);
void CalcBoxmonPokeathlonStars(struct PokeathlonPerformanceStars *dest, BoxPokemon *boxMon, const s8 *aprijuice, enum HeapID heapId);
void CalcMonPokeathlonStars(struct PokeathlonPerformanceStars *dest, Pokemon *mon, const s8 *aprijuice, enum HeapID heapId);
void CalcBoxmonPokeathlonStars(struct PokeathlonPerformanceStars *dest, BoxPokemon *boxMon, const s8 *aprijuice, enum HeapID heapID);
void CalcMonPokeathlonStars(struct PokeathlonPerformanceStars *dest, Pokemon *mon, const s8 *aprijuice, enum HeapID heapID);
#endif // POKEDIAMOND_POKEMON_H

4
include/pokepic.h
View File

@ -161,7 +161,7 @@ typedef struct PokepicManager {
Pokepic pics[4];
NNSG2dImageProxy imageProxy;
NNSG2dImagePaletteProxy paletteProxy;
enum HeapID heapId;
enum HeapID heapID;
u32 charBaseAddr;
u32 charSize;
u32 plttBaseAddr;
@ -179,7 +179,7 @@ typedef struct PokepicManager {
} PokepicManager; // size: 0x338
// Allocates PokepicManager and auxiliary buffers
PokepicManager *PokepicManager_Create(enum HeapID heapId);
PokepicManager *PokepicManager_Create(enum HeapID heapID);
// Frame update pics
void PokepicManager_DrawAll(PokepicManager *pokepicManager);

10
include/render_window.h
View File

@ -7,17 +7,17 @@
typedef struct WaitingIcon WaitingIcon; // todo: copy from pokediamond
struct PokepicManager;
void LoadUserFrameGfx1(BgConfig *bg_config, GFBgLayer layer, u16 baseTile, u8 palette_num, u8 frame, enum HeapID heapId);
void LoadUserFrameGfx1(BgConfig *bg_config, GFBgLayer layer, u16 baseTile, u8 palette_num, u8 frame, enum HeapID heapID);
void DrawFrameAndWindow1(Window *window, BOOL dont_copy_to_vram, u16 baseTile, u8 palette_num);
void LoadUserFrameGfx2(BgConfig *bgConfig, GFBgLayer layer, u16 baseTile, u8 paletteNum, u8 frame, enum HeapID heapId);
void LoadUserFrameGfx2(BgConfig *bgConfig, GFBgLayer layer, u16 baseTile, u8 paletteNum, u8 frame, enum HeapID heapID);
void DrawFrameAndWindow2(Window *window, BOOL dont_copy_to_vram, u16 baseTile, u8 palette_num);
void ClearFrameAndWindow2(Window *window, BOOL dont_copy_to_vram);
void sub_0200E5D4(Window *window, BOOL dont_copy_to_vram);
WaitingIcon *WaitingIcon_New(Window *window, u16 tileNum);
void sub_0200F450(WaitingIcon *waitingIcon);
struct PokepicManager *DrawPokemonPicFromSpecies(BgConfig *bgConfig, GFBgLayer layer, int x, int y, u8 paletteNum, u16 baseTile, u16 species, u8 gender, enum HeapID heapId);
struct PokepicManager *DrawPokemonPicFromMon(BgConfig *bgConfig, GFBgLayer layer, int x, int y, u8 paletteNum, u16 baseTile, Pokemon *mon, enum HeapID heapId);
void sub_0200E398(BgConfig *bgConfig, u32 a1, u32 a2, u32 a3, enum HeapID heapId);
struct PokepicManager *DrawPokemonPicFromSpecies(BgConfig *bgConfig, GFBgLayer layer, int x, int y, u8 paletteNum, u16 baseTile, u16 species, u8 gender, enum HeapID heapID);
struct PokepicManager *DrawPokemonPicFromMon(BgConfig *bgConfig, GFBgLayer layer, int x, int y, u8 paletteNum, u16 baseTile, Pokemon *mon, enum HeapID heapID);
void sub_0200E398(BgConfig *bgConfig, u32 a1, u32 a2, u32 a3, enum HeapID heapID);
u32 sub_0200E3D8(void);
void sub_0200EB68(Window *window, int a1);

2
include/safari_zone.h
View File

@ -76,7 +76,7 @@ u8 SafariZone_IncObjectUnlockLevel(SafariZone *safari_zone, s32 a1);
void SafariZone_SetObjectUnlockLevel(SafariZone *safari_zone, u8 a1);
void sub_0202F784(SafariZone *safari_zone, IGT *igt);
u32 sub_0202F798(SafariZone *safari_zone, IGT *igt, s32 a2);
void SafariZone_SetLinkLeaderFromProfile(SafariZone *safari_zone, PlayerProfile *profile, enum HeapID heapId);
void SafariZone_SetLinkLeaderFromProfile(SafariZone *safari_zone, PlayerProfile *profile, enum HeapID heapID);
void SafariZone_GetLinkLeaderToProfile(SafariZone *safari_zone, PlayerProfile *profile);
u8 SafariZone_GetLinkLeaderGender(SafariZone *safari_zone);
u8 SafariZone_IsCurrentlyLinked(SafariZone *safari_zone);

2
include/sav_chatot.h
View File

@ -10,7 +10,7 @@ typedef struct SOUND_CHATOT {
u32 Save_Chatot_sizeof(void);
void Save_Chatot_Init(SOUND_CHATOT *chatot);
SOUND_CHATOT *Chatot_New(enum HeapID heapId);
SOUND_CHATOT *Chatot_New(enum HeapID heapID);
SOUND_CHATOT *Save_Chatot_Get(SaveData *saveData);
BOOL Chatot_Exists(SOUND_CHATOT *chatot);
void Chatot_Invalidate(SOUND_CHATOT *chatot);

4
include/save.h
View File

@ -113,8 +113,8 @@ u16 SaveArray_CalcCRC16(SaveData *saveData, const void *data, u32 size);
void Save_WipeExtraChunks(SaveData *saveData);
int WriteExtraSaveChunk(SaveData *saveData, int idx, void *data);
int sub_02028230(SaveData *saveData, int idx, void *data);
void *ReadExtraSaveChunk(SaveData *saveData, enum HeapID heapId, int idx, int *ret_p);
void *sub_020284A4(SaveData *saveData, enum HeapID heapId, int idx, int *ret_p, int *ret2_p);
void *ReadExtraSaveChunk(SaveData *saveData, enum HeapID heapID, int idx, int *ret_p);
void *sub_020284A4(SaveData *saveData, enum HeapID heapID, int idx, int *ret_p, int *ret2_p);
BOOL SaveSubstruct_AssertCRC(int idx);
void SaveSubstruct_UpdateCRC(int idx);

6
include/save_arrays.h
View File

@ -36,11 +36,11 @@ UnkStruct_0202E474 *sub_020270C4(SaveData *saveData);
PCStorage *SaveArray_PCStorage_Get(SaveData *saveData);
MysteryGiftSave *Save_MysteryGift_Get(SaveData *saveData);
struct MigratedPokemonSav *Save_MigratedPokemon_Get(SaveData *saveData);
HallOfFame *LoadHallOfFame(SaveData *saveData, enum HeapID heapId, int *ret_p);
HallOfFame *LoadHallOfFame(SaveData *saveData, enum HeapID heapID, int *ret_p);
int SaveHallOfFame(SaveData *saveData, HallOfFame *hallOfFame);
struct UnkStruct_0202FBCC *sub_0202711C(SaveData *saveData, enum HeapID heapId, int *ret_p, int idx);
struct UnkStruct_0202FBCC *sub_0202711C(SaveData *saveData, enum HeapID heapID, int *ret_p, int idx);
int sub_02027134(SaveData *saveData, struct UnkStruct_0202FBCC *data, int idx);
struct UnkStruct_02030A98 *sub_02027144(SaveData *saveData, enum HeapID heapId, int *ret_p);
struct UnkStruct_02030A98 *sub_02027144(SaveData *saveData, enum HeapID heapID, int *ret_p);
int sub_02027158(SaveData *saveData, struct UnkStruct_02030A98 *data);
u32 PCStorage_GetSizeOfBox(void);
u32 PCStorage_GetNumBoxes(void);

4
include/save_data_read_error.h
View File

@ -3,7 +3,7 @@
#include "heap.h"
void ShowSaveDataReadError(enum HeapID heapId);
void ShowGBACartRemovedError(enum HeapID heapId);
void ShowSaveDataReadError(enum HeapID heapID);
void ShowGBACartRemovedError(enum HeapID heapID);
#endif // POKEHEARTGOLD_SAVE_DATA_READ_ERROR_H

2
include/save_data_write_error.h
View File

@ -3,6 +3,6 @@
#include "heap.h"
void ShowSaveDataWriteError(enum HeapID heapId, int code);
void ShowSaveDataWriteError(enum HeapID heapID, int code);
#endif // POKEHEARTGOLD_SAVE_DATA_WRITE_ERROR_H

2
include/save_link_ruleset.h
View File

@ -49,7 +49,7 @@ u32 Save_LinkBattleRuleset_sizeof(void);
void LinkBattleRuleset_Copy(const LinkBattleRuleset *src, LinkBattleRuleset *dst);
void Save_LinkBattleRuleset_Init(Save_LinkBattleRuleset *ruleset);
void LinkBattleRuleset_CopyNameToString(const LinkBattleRuleset *rule, String *dest);
String *LinkBattleRuleset_CreateStringFromName(const LinkBattleRuleset *rule, enum HeapID heapId);
String *LinkBattleRuleset_CreateStringFromName(const LinkBattleRuleset *rule, enum HeapID heapID);
int LinkBattleRuleset_GetRuleValue(const LinkBattleRuleset *ruleset, LinkBattleRule rule);
LinkBattleRuleset *Save_LinkBattleRuleset_GetByIndex(SaveData *saveData, int a1);
void Save_LinkBattleRuleset_Set(SaveData *saveData, const LinkBattleRuleset *rule);

2
include/save_palpad.h
View File

@ -21,7 +21,7 @@ SavePalPad *Save_PalPad_Get(SaveData *saveData);
void Save_PalPad_Init(SavePalPad *palPad);
SavePalPad *PalPad_GetNthEntry(SavePalPad *arr, int n);
u8 PalPadEntry_GetFromUnk68Array(SavePalPad *palPad, int n);
void SavePalPad_Merge(SavePalPad *a, SavePalPad *b, int n, enum HeapID heapId);
void SavePalPad_Merge(SavePalPad *a, SavePalPad *b, int n, enum HeapID heapID);
int PalPad_PlayerIdIsFriendOrMutual(SavePalPad *palPad, u32 otId);
#endif // POKEHEARTGOLD_SAVE_PALPAD_H

4
include/save_pokegear.h
View File

@ -97,7 +97,7 @@ void Pokegear_GetRadioCursorCoords(SavePokegear *pokegear, s16 *px, s16 *py);
u8 SavePokegear_FindEmptyPhonebookSlot(SavePokegear *pokegear);
u8 SavePokegear_IsNumberRegistered(SavePokegear *pokegear, u8 contact);
void SavePokegear_RegisterPhoneNumber(SavePokegear *pokegear, u8 contact);
PhoneContact *SavePokegear_AllocAndCopyPhonebook(SavePokegear *pokegear, enum HeapID heapId);
PhoneContact *SavePokegear_AllocAndCopyPhonebook(SavePokegear *pokegear, enum HeapID heapID);
void SavePokegear_SetPhonebookFromBuffer(SavePokegear *pokegear, PhoneContact *contacts, u8 num);
void sub_0202F01C(PhoneCallPersistentState *callPersistentState, u8 idx);
@ -119,7 +119,7 @@ BOOL PhoneCallPersistentState_BlackBeltKenji_GetActiveFlag(PhoneCallPersistentSt
int PhoneCallPersistentState_BlackBeltKenji_GetWaitDays(PhoneCallPersistentState *callPersistentState);
void sub_0202F294(PhoneCallPersistentState *callPersistentState, int a1);
void PhoneCallPersistentState_SafariZoneArrangement_Set(PhoneCallPersistentState *callPersistentState, u8 *areas, u8 numAreas);
u8 *PhoneCallPersistentState_SafariZoneArrangement_AllocAndGet(PhoneCallPersistentState *callPersistentState, u8 *numAreasRet, enum HeapID heapId);
u8 *PhoneCallPersistentState_SafariZoneArrangement_AllocAndGet(PhoneCallPersistentState *callPersistentState, u8 *numAreasRet, enum HeapID heapID);
BOOL sub_0202F370(UnkPokegearSub8 *unk);
void sub_0202F388(UnkPokegearSub8 *unk);

8
include/save_rankings.h
View File

@ -27,10 +27,10 @@ void Save_Rankings_Init(SaveRankings *saveRankings);
SaveRankings *Save_Rankings_Get(SaveData *saveData);
void Save_Rankings_DeleteEntryByIndex(SaveRankings *saveRankings, int stat, u8 index);
u32 Save_Rankings_GetMixingSize(void);
SaveRankingsEntry *Save_GetPlayerMixingRankingEntry(SaveData *saveData, enum HeapID heapId);
void Save_UpdateRankingsFromMixing(SaveData *saveData, u8 playerIdx, u8 countIn, SaveRankingsEntry **ppEntries, enum HeapID heapId);
ViewRankingsPage *Save_GetPlayerViewRankingPage(SaveData *saveData, int page, enum HeapID heapId);
ViewRankingsPage *Save_GetReceivedViewRankingPage(SaveRankings *saveRankings, int page, enum HeapID heapId);
SaveRankingsEntry *Save_GetPlayerMixingRankingEntry(SaveData *saveData, enum HeapID heapID);
void Save_UpdateRankingsFromMixing(SaveData *saveData, u8 playerIdx, u8 countIn, SaveRankingsEntry **ppEntries, enum HeapID heapID);
ViewRankingsPage *Save_GetPlayerViewRankingPage(SaveData *saveData, int page, enum HeapID heapID);
ViewRankingsPage *Save_GetReceivedViewRankingPage(SaveRankings *saveRankings, int page, enum HeapID heapID);
void ViewRankingsPage_Delete(ViewRankingsPage *viewRankingsPage);
#endif // GUARD_POKEHEARTGOLD_UNK_0202E4B0_H

2
include/scrcmd_9.h
View File

@ -51,7 +51,7 @@ typedef struct UnkStruct_0204A824_7E8 {
typedef struct UnkStruct_Fsys_A0 {
u32 unk00;
enum HeapID heapId;
enum HeapID heapID;
u32 unk08;
u8 unk0c;
u8 curWinStreak;

4
include/script_pokemon_util.h
View File

@ -4,8 +4,8 @@
#include "map_section.h"
#include "pokemon.h"
BOOL GiveMon(enum HeapID heapId, SaveData *saveData, int species, int level, int form, u8 ability, u16 heldItem, int ball, int encounterType);
BOOL GiveEgg(enum HeapID heapId, SaveData *saveData, int species, u8 metLocation, MapsecType mapsecType, int mapLoc);
BOOL GiveMon(enum HeapID heapID, SaveData *saveData, int species, int level, int form, u8 ability, u16 heldItem, int ball, int encounterType);
BOOL GiveEgg(enum HeapID heapID, SaveData *saveData, int species, u8 metLocation, MapsecType mapsecType, int mapLoc);
void PartyMonSetMoveInSlot(Party *party, int mon_slot, int move_slot, u16 moveId);
int GetIdxOfFirstPartyMonWithMove(Party *party, u16 move);
int CountAlivePokemon(Party *party);

8
include/sprite.h
View File

@ -16,7 +16,7 @@ typedef struct SimpleSpriteTemplate {
VecFx32 position; // 008
u32 priority; // 014
NNS_G2D_VRAM_TYPE whichScreen; // 018
enum HeapID heapId; // 01C
enum HeapID heapID; // 01C
} SimpleSpriteTemplate;
typedef struct SpriteTemplate {
@ -27,7 +27,7 @@ typedef struct SpriteTemplate {
u16 rotation; // 020
u32 priority; // 024
NNS_G2D_VRAM_TYPE whichScreen; // 028
enum HeapID heapId; // 02C
enum HeapID heapID; // 02C
} SpriteTemplate;
typedef struct SpriteAnimationData {
@ -158,8 +158,8 @@ NNS_G2D_VRAM_TYPE Sprite_GetVramType(Sprite *sprite);
int Sprite_IsAnimated(Sprite *sprite);
void Sprite_SetOamMode(Sprite *sprite, GXOamMode mode);
GXOamMode Sprite_GetOamMode(Sprite *sprite);
void ClearMainOAM(enum HeapID heapId);
void ClearSubOAM(enum HeapID heapId);
void ClearMainOAM(enum HeapID heapID);
void ClearSubOAM(enum HeapID heapID);
u32 Sprite_GetCurrentAnimFrameExAttr(Sprite *sprite);
NNSG2dCellAnimation *Sprite_GetCellAnim(Sprite *sprite);

4
include/sprite_system.h
View File

@ -36,7 +36,7 @@ typedef struct ManagedSpriteTemplate {
} ManagedSpriteTemplate; // size=0x34
typedef struct SpriteSystem {
enum HeapID heapId;
enum HeapID heapID;
u32 numGfxHandlers;
BOOL hasOamManager;
NNSG2dCellTransferState *cellTransferState; // 00C
@ -84,7 +84,7 @@ typedef union SpriteResourceCountsListUnion {
};
} SpriteResourceCountsListUnion;
SpriteSystem *SpriteSystem_Alloc(enum HeapID heapId);
SpriteSystem *SpriteSystem_Alloc(enum HeapID heapID);
SpriteManager *SpriteManager_New(SpriteSystem *spriteSystem);
G2dRenderer *SpriteSystem_GetRenderer(SpriteSystem *spriteSystem);
BOOL SpriteSystem_Init(SpriteSystem *spriteSystem, const OamManagerParam *oamManagerParam, const OamCharTransferParam *oamTransferParam, int a3);

2
include/systask_environment.h
View File

@ -4,7 +4,7 @@
#include "heap.h"
#include "sys_task_api.h"
SysTask *CreateSysTaskAndEnvironment(SysTaskFunc function, u32 environmentSize, u32 priority, enum HeapID heapId);
SysTask *CreateSysTaskAndEnvironment(SysTaskFunc function, u32 environmentSize, u32 priority, enum HeapID heapID);
void DestroySysTaskAndEnvironment(SysTask *task);
#endif

4
include/system.h
View File

@ -65,7 +65,7 @@ void HBlankInterruptDisable(void);
BOOL Main_SetHBlankIntrCB(GFIntrCB cb, void *arg);
void InitSystemForTheGame(void);
void InitGraphicMemory(void);
void *Sys_AllocAndReadFile(enum HeapID heapId, const char *path);
void *Sys_AllocAndReadFile(enum HeapID heapID, const char *path);
void sub_0201A3F8(const char *path, void **mem);
void sub_0201A430(void);
void InitKeypadAndTouchpad(void);
@ -76,7 +76,7 @@ void ReadKeypadAndTouchpad(void);
void SetKeyRepeatTimers(int cont, int start);
void sub_0201A728(int a0);
void sub_0201A738(int a0);
void sub_0201A748(enum HeapID heapId);
void sub_0201A748(enum HeapID heapID);
void sub_0201A774(void);
BOOL sub_0201A79C(void);

2
include/touch_hitbox_controller.h
View File

@ -20,7 +20,7 @@ typedef struct TouchHitboxController {
TouchHitboxControllerTemplate *templates;
} TouchHitboxController;
TouchHitboxController *TouchHitboxController_Create(const TouchscreenHitbox *hitboxes, u32 num_templates, TouchHitboxControllerCallback callback, void *callbackArg, enum HeapID heapId);
TouchHitboxController *TouchHitboxController_Create(const TouchscreenHitbox *hitboxes, u32 num_templates, TouchHitboxControllerCallback callback, void *callbackArg, enum HeapID heapID);
BOOL TouchHitboxController_IsTriggered(TouchHitboxController *controller);
void TouchHitboxController_Destroy(TouchHitboxController *controller);

6
include/touchscreen_list_menu.h
View File

@ -29,7 +29,7 @@ typedef struct TouchscreenListMenuHeader {
} TouchscreenListMenuHeader;
typedef struct TouchscreenListMenuSpawner {
enum HeapID heapId;
enum HeapID heapID;
NNSG2dCharacterData *pCharData;
NNSG2dPaletteData *pPlttData;
void *charDataRaw;
@ -55,12 +55,12 @@ struct TouchscreenListMenu {
u8 y;
u8 selection;
u8 animTimer;
enum HeapID heapId;
enum HeapID heapID;
TouchscreenListMenuCallback callback;
void *callbackArg;
};
TouchscreenListMenuSpawner *TouchscreenListMenuSpawner_Create(enum HeapID heapId, PaletteData *paletteData);
TouchscreenListMenuSpawner *TouchscreenListMenuSpawner_Create(enum HeapID heapID, PaletteData *paletteData);
void TouchscreenListMenuSpawner_Destroy(TouchscreenListMenuSpawner *spawner);
TouchscreenListMenu *TouchscreenListMenu_Create(TouchscreenListMenuSpawner *spawner, TouchscreenListMenuHeader *header, u8 isTouch, u8 x, u8 y, u8 width, u8 selection);
TouchscreenListMenu *TouchscreenListMenu_CreateWithAlignment(TouchscreenListMenuSpawner *spawner, TouchscreenListMenuHeader *header, u8 isTouch, u8 x, u8 y, u8 width, u8 selection, int alignment);

8
include/trainer_data.h
View File

@ -108,11 +108,11 @@ typedef struct BattleSetup BattleSetup;
void TrainerData_ReadTrData(u32 trno, Trainer *dest);
TrainerGender TrainerClass_GetGenderOrTrainerCount(int trainerClass);
int TrainerData_GetAttr(u32 tr_idx, TrainerAttr attr_no);
void EnemyTrainerSet_Init(BattleSetup *battleSetup, SaveData *saveData, enum HeapID heapId);
BOOL TrainerMessageWithIdPairExists(u32 trainer_idx, u32 msg_id, enum HeapID heapId);
void GetTrainerMessageByIdPair(u32 trainer_idx, u32 msg_id, String *str, enum HeapID heapId);
void EnemyTrainerSet_Init(BattleSetup *battleSetup, SaveData *saveData, enum HeapID heapID);
BOOL TrainerMessageWithIdPairExists(u32 trainer_idx, u32 msg_id, enum HeapID heapID);
void GetTrainerMessageByIdPair(u32 trainer_idx, u32 msg_id, String *str, enum HeapID heapID);
void TrainerData_ReadTrPoke(u32 idx, TRPOKE *dest);
void CreateNPCTrainerParty(BattleSetup *enemies, int party_id, enum HeapID heapId);
void CreateNPCTrainerParty(BattleSetup *enemies, int party_id, enum HeapID heapID);
void TrMon_OverridePidGender(int species, int form, int overrideParam, u32 *pid);
void TrMon_FrustrationCheckAndSetFriendship(Pokemon *mon);
#endif // PM_ASM

6
include/trainer_memo.h
View File

@ -21,7 +21,7 @@ typedef struct MemoNotepad {
} MemoNotepad;
typedef struct Unk0208E600 {
enum HeapID heapId;
enum HeapID heapID;
MsgData *msgData;
MessageFormat *msgFmt;
Pokemon *mon;
@ -29,8 +29,8 @@ typedef struct Unk0208E600 {
MemoNotepad notepad;
} Unk0208E600;
void MonSetTrainerMemo(Pokemon *mon, PlayerProfile *profile, int strat, int mapsec, enum HeapID heapId);
void BoxMonSetTrainerMemo(BoxPokemon *boxMon, PlayerProfile *profile, int strat, int mapsec, enum HeapID heapId);
void MonSetTrainerMemo(Pokemon *mon, PlayerProfile *profile, int strat, int mapsec, enum HeapID heapID);
void BoxMonSetTrainerMemo(BoxPokemon *boxMon, PlayerProfile *profile, int strat, int mapsec, enum HeapID heapID);
BOOL MonMetadataMatchesEvent(u8 eventNo, Pokemon *mon, BOOL isMine);
Unk0208E600 *sub_0208E600(Pokemon *a0, int a1, enum HeapID a2, int a3);
void sub_0208E994(Unk0208E600 *a0);

6
include/unk_02009D48.h
View File

@ -41,13 +41,13 @@ typedef struct G2dRenderer {
typedef struct SpriteListParam {
int num;
NNSG2dRendererInstance *rendererInstance;
enum HeapID heapId;
enum HeapID heapID;
} SpriteListParam;
void CreateSpriteResourcesHeader(SpriteResourcesHeader *hdr, int charId, int plttId, int cellId, int cellAnmId, int multiCellId, int multiCellAnmId, int transfer, int priority, GF_2DGfxResMan *charMan, GF_2DGfxResMan *plttMan, GF_2DGfxResMan *cellMan, GF_2DGfxResMan *cellAnmMan, GF_2DGfxResMan *multiCellMan, GF_2DGfxResMan *multiCellAnmMan);
SpriteResourceHeaderList *SpriteResourceHeaderList_Create(const struct ResdatNarcEntry *resdatNarcEntry, enum HeapID heapId, GF_2DGfxResMan *charMan, GF_2DGfxResMan *plttMan, GF_2DGfxResMan *cellMan, GF_2DGfxResMan *animMan, GF_2DGfxResMan *mcelMan, GF_2DGfxResMan *manmMan);
SpriteResourceHeaderList *SpriteResourceHeaderList_Create(const struct ResdatNarcEntry *resdatNarcEntry, enum HeapID heapID, GF_2DGfxResMan *charMan, GF_2DGfxResMan *plttMan, GF_2DGfxResMan *cellMan, GF_2DGfxResMan *animMan, GF_2DGfxResMan *mcelMan, GF_2DGfxResMan *manmMan);
void SpriteResourceHeaderList_Destroy(SpriteResourceHeaderList *list);
SpriteList *G2dRenderer_Init(int numSprites, G2dRenderer *renderer, enum HeapID heapId);
SpriteList *G2dRenderer_Init(int numSprites, G2dRenderer *renderer, enum HeapID heapID);
void G2dRenderer_SetMainSurfaceCoords(G2dRenderer *renderer, fx32 x, fx32 y);
void G2dRenderer_SetSubSurfaceCoords(G2dRenderer *renderer, fx32 x, fx32 y);
void G2dRenderer_SetObjCharTransferReservedRegion(NNS_G2D_VRAM_TYPE vram, GXOBJVRamModeChar mode);

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