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

Document params used with Heap_AllocFromHeap - Part 2

Browse Source
This commit is contained in:
Eduardo Quezada 2025-03-03 18:49:10 -03:00
parent f7f2ade2b6
commit ac2f9c1941
95 changed files with 364 additions and 375 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/overlay012/ov12_0221FC20.h
View File

@ -19,7 +19,7 @@
#include "sprite_system.h"
#include "sys_task_manager.h"
UnkStruct_ov12_0221FCDC *ov12_0221FCDC(int param0);
UnkStruct_ov12_0221FCDC *ov12_0221FCDC(int heapID);
void ov12_0221FDC0(UnkStruct_ov12_0221FCDC *param0, BOOL param1);
BOOL ov12_0221FDD4(UnkStruct_ov12_0221FCDC *param0);
int ov12_0221FDE4(UnkStruct_ov12_0221FCDC *param0);

6
include/overlay012/ov12_022380BC.h
View File

@ -3,9 +3,9 @@
#include "overlay012/struct_ov12_022380DC.h"
void ov12_022380BC(UnkStruct_ov12_022380DC *param0, int param1);
void ov12_022380CC(UnkStruct_ov12_022380DC *param0, int param1);
void ov12_022382BC(UnkStruct_ov12_022380DC *param0, int param1);
void ov12_022380BC(UnkStruct_ov12_022380DC *param0, int heapID);
void ov12_022380CC(UnkStruct_ov12_022380DC *param0, int heapID);
void ov12_022382BC(UnkStruct_ov12_022380DC *param0, int heapID);
void ov12_02238390(UnkStruct_ov12_022380DC *param0, int param1);
s16 ov12_022384CC(int param0, int param1);

2
include/overlay066/ov66_022343A8.h
View File

@ -8,7 +8,7 @@
#include "overlay066/struct_ov66_02234548_decl.h"
#include "overlay066/struct_ov66_02234798_decl.h"
UnkStruct_ov66_02234548 *ov66_022343A8(u32 param0, u32 param1, u32 param2, u32 param3);
UnkStruct_ov66_02234548 *ov66_022343A8(u32 param0, u32 param1, u32 heapID, u32 param3);
void ov66_02234548(UnkStruct_ov66_02234548 *param0);
void ov66_02234590(UnkStruct_ov66_02234548 *param0);
void ov66_022345C4(UnkStruct_ov66_02234548 *param0);

2
include/overlay070/ov70_0225C9B4.h
View File

@ -9,7 +9,7 @@
#include "overlay070/struct_ov70_0225CA20_decl.h"
#include "overlay070/struct_ov70_0225CC54_decl.h"
UnkStruct_ov70_0225CA20 *ov70_0225C9B4(u32 param0, u32 param1, const UnkStruct_ov70_0225C894 *param2, u32 param3, u32 param4);
UnkStruct_ov70_0225CA20 *ov70_0225C9B4(u32 param0, u32 param1, const UnkStruct_ov70_0225C894 *param2, u32 heapID, u32 param4);
void ov70_0225CA20(UnkStruct_ov70_0225CA20 *param0);
void ov70_0225CA44(UnkStruct_ov70_0225CA20 *param0);
void ov70_0225CA5C(UnkStruct_ov70_0225CA20 *param0);

2
include/overlay070/ov70_02260A70.h
View File

@ -4,7 +4,7 @@
#include "overlay070/struct_ov70_0225CC54_decl.h"
#include "overlay070/struct_ov70_02260AD4_decl.h"
UnkStruct_ov70_02260AD4 *ov70_02260A70(u32 param0);
UnkStruct_ov70_02260AD4 *ov70_02260A70(u32 heapID);
void ov70_02260AD4(UnkStruct_ov70_02260AD4 *param0);
void ov70_02260AEC(UnkStruct_ov70_02260AD4 *param0);
void ov70_02260B18(UnkStruct_ov70_02260AD4 *param0, fx32 param1, fx32 param2, fx32 param3);

2
include/overlay079/struct_ov79_021D0E1C.h
View File

@ -19,7 +19,7 @@
#include "string_list.h"
typedef struct UnkStruct_ov79_021D0E1C_t {
int unk_00;
int heapID;
int unk_04;
int unk_08;
int unk_0C;

2
include/overlay097/ov97_02237694.h
View File

@ -14,7 +14,7 @@
#include "savedata.h"
#include "sprite.h"
void ov97_02237694(int param0);
void ov97_02237694(int heapID);
void *ov97_022376C4(OverlayManager *param0, int param1, int param2, int param3);
void ov97_022376FC(BgConfig *param0, int param1, u8 param2, u32 param3, u32 param4);
void ov97_02237784(int param0);

2
include/overlay104/ov104_02231F74.h
View File

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

2
include/unk_020041CC.h
View File

@ -47,7 +47,7 @@ BOOL sub_02004D04(u32 param0);
void sub_02004D14(u32 param0, u8 param1);
void sub_02004D2C(u32 param0, u32 param1);
void sub_02004D40(u32 param0, int param1);
BOOL sub_02004D78(u16 param0, int param1, int param2, u32 param3, int param4);
BOOL sub_02004D78(u16 param0, int param1, int param2, u32 param3, int heapID);
void sub_02004E84(u32 param0);
BOOL sub_02004EC0(void);
BOOL sub_02004EC8(int param0);

4
include/unk_02005474.h
View File

@ -25,8 +25,8 @@ BOOL sub_02005844(u16 param0, u8 param1);
BOOL sub_0200590C(u16 param0, u8 param1, u8 param2);
void sub_0200592C(int param0);
int sub_0200598C(void);
BOOL Sound_PlayPokemonCry(int param0, u16 param1, int param2, int param3, int param4, u8 param5);
void Sound_PlayDelayedPokemonCry(int param0, u16 param1, int param2, int param3, int param4, u8 param5, u8 param6);
BOOL Sound_PlayPokemonCry(int param0, u16 species, int param2, int param3, int heapID, u8 param5);
void Sound_PlayDelayedPokemonCry(int param0, u16 param1, int param2, int param3, int heapID, u8 param5, u8 param6);
void sub_0200605C(void);
BOOL sub_02006150(u16 param0);
int sub_0200619C(void);

6
include/unk_020131EC.h
View File

@ -12,8 +12,8 @@ void sub_020135F0(int param0, int param1, int param2, const UnkStruct_02013610 *
void sub_02013610(int param0, int param1, int param2, void *param3);
void *sub_0201363C(int param0, int param1, int param2);
void *sub_02013660(int param0, int param1, int param2);
void sub_020136A4(int param0, int param1, int param2, int param3, int param4, int param5, int param6, void *param7, u32 param8, BOOL param9, int param10, int param11);
void sub_02013720(int param0, int param1, int param2, const UnkStruct_02013610 *param3, void *param4, u32 param5, BOOL param6, int param7, int param8);
void sub_02013750(int param0, int param1, int param2, void *param3, u32 param4, BOOL param5, int param6, int param7);
void sub_020136A4(int param0, int param1, int heapID, int param3, int param4, int param5, int param6, void *param7, u32 param8, BOOL param9, int param10, int param11);
void sub_02013720(int param0, int param1, int heapID, const UnkStruct_02013610 *param3, void *param4, u32 param5, BOOL param6, int param7, int param8);
void sub_02013750(int param0, int param1, int heapID, void *param3, u32 param4, BOOL param5, int param6, int param7);
#endif // POKEPLATINUM_UNK_020131EC_H

2
include/unk_02014D38.h
View File

@ -8,7 +8,7 @@
#include "savedata.h"
#include "strbuf.h"
UnkStruct_02014D38 *sub_02014D38(u32 param0);
UnkStruct_02014D38 *sub_02014D38(u32 heapID);
void sub_02014D70(UnkStruct_02014D38 *param0);
void sub_02014D90(UnkStruct_02014D38 *param0, u16 param1, Strbuf *param2);
void sub_02014DB8(u16 param0, Strbuf *param1);

2
include/unk_02015F84.h
View File

@ -5,7 +5,7 @@
#include "struct_defs/poke_animation_settings.h"
#include "struct_defs/pokemon_sprite.h"
PokemonAnimationSys *sub_02015F84(const int param0, const int param1, const u8 param2);
PokemonAnimationSys *sub_02015F84(const int heapID, const int param1, const u8 param2);
void sub_02015FB8(PokemonAnimationSys *param0);
void PokeAnimation_Init(PokemonAnimationSys *param0, PokemonSprite *param1, const PokeAnimationSettings *param2, const u8 param3);
BOOL sub_020160F4(PokemonAnimationSys *param0, const u8 param1);

2
include/unk_02020AEC.h
View File

@ -15,7 +15,7 @@
#include "overlay005/struct_ov5_021EDDAC.h"
void sub_02020B14(UnkStruct_020216E0 *param0);
void sub_02020B90(int param0, int param1);
void sub_02020B90(int param0, int heapIDs);
void sub_02020BD0(void);
void sub_02020C08(void);
UnkStruct_02020C44 *sub_02020C44(const UnkStruct_ov5_021EDDAC *param0);

2
include/unk_02023FCC.h
View File

@ -7,7 +7,7 @@
#include "touch_screen.h"
UnkStruct_02023FCC *sub_02023FCC(const TouchScreenHitTable *hitTable, u32 param1, UnkFuncPtr_02023FCC param2, void *param3, u32 param4);
UnkStruct_02023FCC *sub_02023FCC(const TouchScreenHitTable *hitTable, u32 param1, UnkFuncPtr_02023FCC param2, void *param3, u32 heapID);
void sub_02024034(UnkStruct_02023FCC *param0);
void sub_0202404C(UnkStruct_02023FCC *param0);

2
include/unk_02027F84.h
View File

@ -11,7 +11,7 @@ void PalPad_Init(UnkStruct_02027F8C *param0);
const u16 *sub_02027FBC(const UnkStruct_02027F8C *param0, int param1);
u8 sub_02027FC4(const UnkStruct_02027F8C *param0, int param1);
BOOL sub_02027FCC(const UnkStruct_02027F8C *param0, const UnkStruct_02027F8C *param1);
void sub_02027FEC(UnkStruct_02027F8C *param0, UnkStruct_02027F8C *param1, int param2, int param3);
void sub_02027FEC(UnkStruct_02027F8C *param0, UnkStruct_02027F8C *param1, int param2, int heapID);
int sub_020280E0(UnkStruct_02027F8C *param0, u32 param1);
#endif // POKEPLATINUM_UNK_02027F84_H

2
include/unk_02030A80.h
View File

@ -7,7 +7,7 @@
#include "savedata.h"
#include "strbuf.h"
UnkStruct_02030A80 *sub_02030A80(int param0);
UnkStruct_02030A80 *sub_02030A80(int heapID);
void sub_02030A98(UnkStruct_02030A80 *param0);
void sub_02030AA0(UnkStruct_02030A80 *param0, SaveData *param1);
Strbuf *sub_02030B94(const UnkStruct_02030A80 *param0, int param1);

2
include/unk_02038FFC.h
View File

@ -5,7 +5,7 @@
#include "savedata.h"
int sub_02038FFC(int param0);
int sub_02038FFC(int heapID);
void sub_02039034(UnkStruct_0202B370 *param0);
int sub_02039058(UnkStruct_0202B370 *param0);
BOOL sub_02039074(SaveData *param0);

2
include/unk_02039A64.h
View File

@ -1,6 +1,6 @@
#ifndef POKEPLATINUM_UNK_02039A64_H
#define POKEPLATINUM_UNK_02039A64_H
void sub_02039A64(int param0, int param1);
void sub_02039A64(int heapID, int unused);
#endif // POKEPLATINUM_UNK_02039A64_H

2
include/unk_02055C50.h
View File

@ -6,7 +6,7 @@
#include "field/field_system_decl.h"
UnkStruct_02055CBC *sub_02055C8C(FieldSystem *fieldSystem, int param1);
UnkStruct_02055CBC *sub_02055C8C(FieldSystem *fieldSystem, int heapID);
void sub_02055CBC(UnkStruct_02055CBC *param0);
void sub_02055CD4(FieldSystem *fieldSystem, int param1);
void sub_02055D94(FieldSystem *fieldSystem);

2
include/unk_02071D40.h
View File

@ -6,7 +6,7 @@
#include "field/field_system_decl.h"
void sub_02071D40(const u8 param0, const u8 param1, const u8 param2, const u8 param3, FieldSystem *param4, TrainerCard *param5);
TrainerCard *sub_02071F04(const u16 param0);
TrainerCard *sub_02071F04(const u16 headID);
void sub_02071F20(TrainerCard *param0);
u8 sub_02071F28(FieldSystem *fieldSystem);
void sub_020721D4(FieldSystem *fieldSystem, const TrainerCard *param1);

2
include/unk_020998EC.h
View File

@ -6,7 +6,7 @@
#include "strbuf.h"
UnkStruct_020998EC *sub_020998EC(u32 param0, const UnkStruct_0209747C *param1);
UnkStruct_020998EC *sub_020998EC(u32 heapID, const UnkStruct_0209747C *param1);
void sub_0209992C(UnkStruct_020998EC *param0);
u32 sub_02099CA0(const UnkStruct_020998EC *param0, u32 param1);
void sub_02099CA8(const UnkStruct_020998EC *param0, u32 param1, u32 param2, Strbuf *param3);

2
include/unk_0209C370.h
View File

@ -1,7 +1,7 @@
#ifndef POKEPLATINUM_UNK_0209C370_H
#define POKEPLATINUM_UNK_0209C370_H
u8 *sub_0209C370(int param0);
u8 *sub_0209C370(int heapID);
void sub_0209C388(u8 *param0);
#endif // POKEPLATINUM_UNK_0209C370_H

12
src/battle/battle_display.c
View File

@ -1360,7 +1360,7 @@ void ov16_0225E294(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
UnkStruct_ov12_022380DC v0;
ov16_02264530(battleSys, param2, &v0, param1->battler);
ov12_022382BC(&v0, 5);
ov12_022382BC(&v0, HEAP_ID_BATTLE);
ClearCommand(battleSys, param1->battler, param2->unk_00);
}
@ -1901,7 +1901,7 @@ static void ov16_0225EA80(SysTask *param0, void *param1)
{
UnkStruct_ov16_02265BBC v8;
v0->unk_24 = ov12_0221FCDC(5);
v0->unk_24 = ov12_0221FCDC(HEAP_ID_BATTLE);
ov16_02266B78(v0->unk_00, NULL, &v8, 1, 11, v0->unk_81, v0->unk_81, NULL);
ov16_02264408(v0->unk_00, v0->unk_04, v0->unk_24, &v8);
}
@ -2169,7 +2169,7 @@ static void ov16_0225F764(SysTask *param0, void *param1)
UnkStruct_ov16_02265BBC v4;
ov16_02264530(v0->unk_00, &v0->unk_10, &v3, v0->unk_69);
ov12_022382BC(&v3, 5);
ov12_022382BC(&v3, HEAP_ID_BATTLE);
ov16_02266B78(v0->unk_00, NULL, &v4, 1, 16, v0->unk_69, v0->unk_69, NULL);
ov16_02264408(v0->unk_00, v0->unk_04, v1, &v4);
v0->unk_04->unk_19C = 0;
@ -4602,7 +4602,7 @@ static void ov16_022626C0(SysTask *param0, void *param1)
UnkStruct_ov16_02265BBC v3;
ov16_02264530(v0->unk_00, &v0->unk_10, &v2, v0->unk_69);
ov12_022382BC(&v2, 5);
ov12_022382BC(&v2, HEAP_ID_BATTLE);
ov16_02266B78(v0->unk_00, NULL, &v3, 1, 16, v0->unk_69, v0->unk_69, NULL);
ov16_02264408(v0->unk_00, v0->unk_04, v0->unk_0C, &v3);
@ -4797,7 +4797,7 @@ static void ov16_02262A9C(SysTask *param0, void *param1)
UnkStruct_ov16_02265BBC v6;
ov16_02264530(v0->unk_00, &v0->unk_0C, &v5, v0->unk_65);
ov12_022382BC(&v5, 5);
ov12_022382BC(&v5, HEAP_ID_BATTLE);
ov16_02266B78(v0->unk_00, NULL, &v6, 1, 16, v0->unk_65, v0->unk_65, NULL);
ov16_02264408(v0->unk_00, v0->unk_04, v1, &v6);
@ -5709,7 +5709,7 @@ static PokemonSprite *ov16_02263B30(BattleSystem *battleSys, UnkStruct_02007768
v3 = 0;
}
sub_02013750(param2->archive, param2->character, 5, v1, param2->personality, 0, v3, param2->spindaSpots);
sub_02013750(param2->archive, param2->character, HEAP_ID_BATTLE, v1, param2->personality, 0, v3, param2->spindaSpots);
ov16_0223F2CC(ov16_0223E0C8(battleSys), param10, param2->archive);
ov16_0223F2E4(ov16_0223E0C8(battleSys), param10, param2->palette);
ov16_0223F2FC(ov16_0223E0C8(battleSys), param10, param6);

2
src/battle/battle_io_command.c
View File

@ -743,7 +743,7 @@ static void ov16_0225C684(BattleSystem *battleSys, BattlerData *param1)
*v2 = v1;
sub_020089A0(param1->unk_20);
sub_02013750(v2->archive, v2->character, 5, ov16_0223F2B8(ov16_0223E0C8(battleSys), param1->battler), v0->unk_08, 0, v4, v2->spindaSpots);
sub_02013750(v2->archive, v2->character, HEAP_ID_BATTLE, ov16_0223F2B8(ov16_0223E0C8(battleSys), param1->battler), v0->unk_08, 0, v4, v2->spindaSpots);
ov16_0223F2CC(ov16_0223E0C8(battleSys), param1->battler, v2->archive);
ov16_0223F2E4(ov16_0223E0C8(battleSys), param1->battler, v2->palette);

4
src/battle/ov16_0223B140.c
View File

@ -606,7 +606,7 @@ static void ov16_0223B790(OverlayManager *param0)
ov16_0223F36C(battleSys);
ov16_0223CE28();
battleSys->unk_8C = ov12_0221FCDC(5);
battleSys->unk_8C = ov12_0221FCDC(HEAP_ID_BATTLE);
ov16_0223C210(battleSys);
@ -645,7 +645,7 @@ static void ov16_0223B790(OverlayManager *param0)
ov16_0223DD4C(battleSys);
BagCursor_ResetBattle(BattleSystem_BagCursor(battleSys));
battleSys->unk_1C4 = sub_02015F84(5, 4, 0);
battleSys->unk_1C4 = sub_02015F84(HEAP_ID_BATTLE, 4, 0);
battleSys->cellTransferState = CellTransfer_New(4, HEAP_ID_BATTLE);
if (battleSys->battleStatusMask & 0x10) {

4
src/main.c
View File

@ -88,8 +88,8 @@ void NitroMain(void)
sub_02003B60(GetChatotCryDataFromSave(sApplication.args.saveData), SaveData_Options(sApplication.args.saveData));
sub_02022844();
if (sub_02038FFC(3) == DWC_INIT_RESULT_DESTROY_OTHER_SETTING) {
sub_02039A64(3, 0);
if (sub_02038FFC(HEAP_ID_APPLICATION) == DWC_INIT_RESULT_DESTROY_OTHER_SETTING) {
sub_02039A64(HEAP_ID_APPLICATION, 0);
}
if (SaveData_BackupExists(sApplication.args.saveData) == FALSE) {

2
src/overlay005/fieldmap.c
View File

@ -189,7 +189,7 @@ static BOOL FieldMap_Init(OverlayManager *overlayMan, int *param1)
ov5_021D1414();
VramTransfer_New(128, HEAP_ID_FIELD);
sub_02020B90(4, 4);
sub_02020B90(4, HEAP_ID_FIELD);
Easy3D_Init(HEAP_ID_FIELD);
ov5_021D15B4();

8
src/overlay005/ov5_021D431C.c
View File

@ -295,7 +295,7 @@ BOOL ov5_021D453C(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1)
(param1->unk_00)++;
} break;
case 1:
sub_02056B30(fieldSystem->task, 0, 9, 1, 0x0, 6, 1, 11);
sub_02056B30(fieldSystem->task, 0, 9, 1, 0x0, 6, 1, HEAP_ID_FIELDMAP);
{
int v9;
int v10;
@ -978,7 +978,7 @@ BOOL ov5_021D4FA0(FieldTask *param0)
v1->unk_04 = 0;
Sound_PlayEffect(1539);
sub_02056B30(param0, 0, 16, 0, 0x0, 6, 1, 11);
sub_02056B30(param0, 0, 16, 0, 0x0, 6, 1, HEAP_ID_FIELDMAP);
v1->unk_08 = 1;
(v1->unk_00)++;
@ -1045,7 +1045,7 @@ BOOL ov5_021D5020(FieldTask *param0)
GF_ASSERT(0);
}
sub_02056B30(param0, 0, v4, 1, 0x0, 6, 1, 11);
sub_02056B30(param0, 0, v4, 1, 0x0, 6, 1, HEAP_ID_FIELDMAP);
v2->unk_08 = 1;
} break;
case 1:
@ -1099,7 +1099,7 @@ BOOL ov5_021D5150(FieldTask *param0)
(v2->unk_00) = 3;
}
sub_02056B30(param0, 0, 1, 1, 0x0, 6, 1, 11);
sub_02056B30(param0, 0, 1, 1, 0x0, 6, 1, HEAP_ID_FIELDMAP);
} break;
case 1:
v0 = Player_MapObject(fieldSystem->playerAvatar);

6
src/overlay006/ov6_0223E140.c
View File

@ -1122,7 +1122,7 @@ static BOOL ov6_0223EBDC(UnkStruct_ov6_0223EA98 *param0)
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
if (v0[0] && v0[1]) {
Sound_PlayPokemonCry(0, 480, 0, 100, 4, 0);
Sound_PlayPokemonCry(0, 480, 0, 100, HEAP_ID_FIELD, 0);
param0->unk_18++;
}
break;
@ -1345,7 +1345,7 @@ static BOOL ov6_0223EE5C(UnkStruct_ov6_0223EA98 *param0)
}
param0->unk_D0 = 0;
Sound_PlayPokemonCry(0, 481, 0, 100, 4, 0);
Sound_PlayPokemonCry(0, 481, 0, 100, HEAP_ID_FIELD, 0);
param0->unk_18++;
break;
case 16:
@ -1486,7 +1486,7 @@ static BOOL ov6_0223F744(UnkStruct_ov6_0223EA98 *param0)
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
if (v0[0] && v0[1]) {
Sound_PlayPokemonCry(0, 482, 0, 100, 4, 0);
Sound_PlayPokemonCry(0, 482, 0, 100, HEAP_ID_FIELD, 0);
param0->unk_18++;
}

8
src/overlay006/ov6_02243258.c
View File

@ -282,7 +282,7 @@ static void ov6_02244F8C(UnkStruct_ov6_02243FFC *param0);
static void ov6_02244FB4(UnkStruct_ov6_02243FFC *param0);
static void ov6_02244FE4(SysTask *param0, void *param1);
static void ov6_0224508C(UnkStruct_ov6_02243FFC *param0, ArchivedSprite *param1);
static void *ov6_0224509C(Pokemon *param0, ArchivedSprite *param1, u32 param2);
static void *ov6_0224509C(Pokemon *param0, ArchivedSprite *param1, u32 heapID);
static void *ov6_022450E4(ArchivedSprite *param0, u32 param1);
static SpriteResource *ov6_022450F4(UnkStruct_ov6_02243FFC *param0, NARC *param1);
static void ov6_02245118(UnkStruct_ov6_02243FFC *param0, void *param1);
@ -1787,7 +1787,7 @@ static void ov6_02244928(UnkStruct_ov6_02243FFC *param0, NARC *param1)
param0->unk_23C[v0] = SpriteResourceCollection_AddFrom(param0->unk_20C, param1, 18, 0, 1, 3, 4);
}
param0->unk_270 = ov6_0224509C(param0->unk_5C, &param0->unk_258, 4);
param0->unk_270 = ov6_0224509C(param0->unk_5C, &param0->unk_258, HEAP_ID_FIELD);
param0->unk_274 = ov6_022450E4(&param0->unk_258, 4);
}
@ -2056,7 +2056,7 @@ static void ov6_0224508C(UnkStruct_ov6_02243FFC *param0, ArchivedSprite *param1)
Pokemon_BuildArchivedSprite(param1, param0->unk_5C, 2);
}
static void *ov6_0224509C(Pokemon *param0, ArchivedSprite *param1, u32 param2)
static void *ov6_0224509C(Pokemon *param0, ArchivedSprite *param1, u32 heapID)
{
void *v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, (32 * 10) * 10);
@ -2064,7 +2064,7 @@ static void *ov6_0224509C(Pokemon *param0, ArchivedSprite *param1, u32 param2)
{
int v1 = Pokemon_GetValue(param0, MON_DATA_PERSONALITY, NULL);
sub_02013750(param1->archive, param1->character, param2, v0, v1, 0, 2, param1->spindaSpots);
sub_02013750(param1->archive, param1->character, heapID, v0, v1, 0, 2, param1->spindaSpots);
}
return v0;

90
src/overlay012/ov12_0221FC20.c
View File

@ -97,7 +97,7 @@ typedef struct {
} UnkStruct_ov12_02221810;
typedef struct UnkStruct_ov12_0221FCDC_t {
int unk_00;
int heapID;
int unk_04;
BOOL unk_08;
BOOL unk_0C;
@ -415,12 +415,12 @@ static void ov12_0221FCA4(u8 param0, UnkStruct_ov12_0221FCDC *param1, SysTask *p
SysTask_Done(param2);
}
UnkStruct_ov12_0221FCDC *ov12_0221FCDC(int param0)
UnkStruct_ov12_0221FCDC *ov12_0221FCDC(int heapID)
{
int v0;
UnkStruct_ov12_0221FCDC *v1 = NULL;
v1 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov12_0221FCDC));
v1 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov12_0221FCDC));
if (v1 == NULL) {
GF_ASSERT(v1 != NULL);
@ -429,15 +429,15 @@ UnkStruct_ov12_0221FCDC *ov12_0221FCDC(int param0)
memset(v1, 0, sizeof(UnkStruct_ov12_0221FCDC));
v1->unk_00 = param0;
v1->heapID = heapID;
v1->unk_08 = 0;
v1->unk_BC = Heap_AllocFromHeap(v1->unk_00, sizeof(UnkStruct_ov12_02223178));
v1->unk_1A0[0] = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, param0);
v1->unk_1A0[1] = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, param0);
v1->unk_1A0[2] = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECHAR, param0);
v1->unk_1A0[3] = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WEPLTT, param0);
v1->unk_1A0[4] = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECELL, param0);
v1->unk_1A0[5] = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECELLANM, param0);
v1->unk_BC = Heap_AllocFromHeap(v1->heapID, sizeof(UnkStruct_ov12_02223178));
v1->unk_1A0[0] = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, heapID);
v1->unk_1A0[1] = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, heapID);
v1->unk_1A0[2] = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECHAR, heapID);
v1->unk_1A0[3] = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WEPLTT, heapID);
v1->unk_1A0[4] = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECELL, heapID);
v1->unk_1A0[5] = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECELLANM, heapID);
if (v1->unk_BC == NULL) {
GF_ASSERT(v1->unk_BC != NULL);
@ -478,7 +478,7 @@ BOOL ov12_0221FDD4(UnkStruct_ov12_0221FCDC *param0)
int ov12_0221FDE4(UnkStruct_ov12_0221FCDC *param0)
{
GF_ASSERT(param0 != NULL);
return param0->unk_00;
return param0->heapID;
}
BOOL ov12_0221FDF4(UnkStruct_ov12_0221FCDC *param0)
@ -596,7 +596,7 @@ BOOL ov12_0221FE30(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov16_02265BBC *par
}
param0->unk_04 = param3->unk_50;
param0->unk_14 = NARC_AllocAndReadWholeMemberByIndexPair(param0->unk_04, v1, param0->unk_00);
param0->unk_14 = NARC_AllocAndReadWholeMemberByIndexPair(param0->unk_04, v1, param0->heapID);
if (param0->unk_14 == NULL) {
GF_ASSERT(param0->unk_14 != NULL);
@ -788,7 +788,7 @@ static UnkStruct_ov12_02220314 *ov12_02220314(UnkStruct_ov12_0221FCDC *param0)
{
UnkStruct_ov12_02220314 *v0 = NULL;
v0 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_ov12_02220314));
v0 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov12_02220314));
if (v0 == NULL) {
GF_ASSERT(FALSE);
@ -1177,11 +1177,11 @@ static void ov12_022206A4(UnkStruct_ov12_0221FCDC *param0)
ov12_02220590(param0, &v1, v0);
if (v0 == 2) {
ov12_02238390(&v1, param0->unk_00);
ov12_02238390(&v1, param0->heapID);
} else if (v0 == 3) {
ov12_022380CC(&v1, param0->unk_00);
ov12_022380CC(&v1, param0->heapID);
} else {
ov12_022380BC(&v1, param0->unk_00);
ov12_022380BC(&v1, param0->heapID);
}
}
@ -1195,7 +1195,7 @@ static void ov12_022206E8(UnkStruct_ov12_0221FCDC *param0)
param0->unk_18 += 1;
ov12_02220590(param0, &v1, v0);
ov12_022382BC(&v1, param0->unk_00);
ov12_022382BC(&v1, param0->heapID);
}
static void ov12_0222070C(UnkStruct_ov12_0221FCDC *param0)
@ -1575,7 +1575,7 @@ static void ov12_02220D3C(UnkStruct_ov12_0221FCDC *param0)
v0 = (u32)inline_ov12_022204C4(param0->unk_18);
param0->unk_18 += 1;
param0->unk_BC->unk_1C[v1] = ov12_022237F0(param0->unk_00, v0, 0);
param0->unk_BC->unk_1C[v1] = ov12_022237F0(param0->heapID, v0, 0);
param0->unk_89 = 2;
param0->unk_B8 = ov12_0221FC20;
}
@ -1599,7 +1599,7 @@ static void ov12_02220D90(UnkStruct_ov12_0221FCDC *param0)
v0 = (u32)inline_ov12_022204C4(param0->unk_18);
param0->unk_18 += 1;
param0->unk_BC->unk_1C[v2] = ov12_02223818(param0->unk_00, v1, v0, 0);
param0->unk_BC->unk_1C[v2] = ov12_02223818(param0->heapID, v1, v0, 0);
param0->unk_89 = 2;
param0->unk_B8 = ov12_0221FC20;
}
@ -2040,13 +2040,13 @@ static void ov12_0222128C(UnkStruct_ov12_0221FCDC *param0)
Bg_ToggleLayer(2, 0);
Bg_LoadTiles(param0->unk_C0, 2, v0, (10 * 10 * ((8 / 2) * 8)), 0);
PaletteData_LoadBufferFromFileStart(param0->unk_C4, v4, v5, param0->unk_00, 0, 0, (8 * 16));
Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A0[0], v6, param0->unk_C0, 2, 0, 0, 0, param0->unk_00);
PaletteData_LoadBufferFromFileStart(param0->unk_C4, v4, v5, param0->heapID, 0, 0, (8 * 16));
Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A0[0], v6, param0->unk_C0, 2, 0, 0, 0, param0->heapID);
if (v2 == 1) {
SysTask *v9;
param0->unk_174 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_ov12_0222118C));
param0->unk_174 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov12_0222118C));
param0->unk_174->unk_00 = param0->unk_C0;
param0->unk_174->unk_04.unk_04 = ov12_022232FC(param0, v3);
param0->unk_174->unk_04.unk_00 = 0;
@ -2227,7 +2227,7 @@ static void ov12_02221580(UnkStruct_ov12_0221FCDC *param0)
v19 = Sprite_GetPaletteProxy(v1->sprite);
v20 = PlttTransfer_GetPlttOffset(v19, NNS_G2D_VRAM_TYPE_2DMAIN);
PaletteData_LoadBufferFromFileStart(param0->unk_C4, v8, v9, param0->unk_00, 2, 0x20, v20 * 16);
PaletteData_LoadBufferFromFileStart(param0->unk_C4, v8, v9, param0->heapID, 2, 0x20, v20 * 16);
}
GF_ASSERT(param0->unk_138[v5] == NULL);
@ -2242,7 +2242,7 @@ static void ov12_02221580(UnkStruct_ov12_0221FCDC *param0)
return;
}
param0->unk_160[v5] = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_ov12_0222118C));
param0->unk_160[v5] = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov12_0222118C));
param0->unk_160[v5]->unk_00 = v1;
param0->unk_160[v5]->unk_04.unk_04 = ov12_022232FC(param0, v7);
param0->unk_160[v5]->unk_04.unk_00 = 0;
@ -2512,8 +2512,8 @@ static BOOL ov12_02221A54(UnkStruct_ov12_02221BBC *param0, UnkStruct_ov12_0221FC
static void ov12_02221AA8(UnkStruct_ov12_02221BBC *param0, UnkStruct_ov12_0221FCDC *param1, int param2, int param3)
{
Graphics_LoadTilesToBgLayer(7, ov12_022234E4(param3, 0), param1->unk_C0, param2, 0, 0, 1, param1->unk_00);
PaletteData_LoadBufferFromFileStart(param1->unk_C4, 7, ov12_022234E4(param3, 1), param1->unk_00, 0, 0x20, (9 * 16));
Graphics_LoadTilesToBgLayer(7, ov12_022234E4(param3, 0), param1->unk_C0, param2, 0, 0, 1, param1->heapID);
PaletteData_LoadBufferFromFileStart(param1->unk_C4, 7, ov12_022234E4(param3, 1), param1->heapID, 0, 0x20, (9 * 16));
Bg_ClearTilemap(param1->unk_C0, param2);
{
@ -2525,7 +2525,7 @@ static void ov12_02221AA8(UnkStruct_ov12_02221BBC *param0, UnkStruct_ov12_0221FC
v0 = 3;
}
Graphics_LoadTilemapToBgLayer(7, ov12_022234E4(param3, v0), param1->unk_C0, param2, 0, 0, 1, param1->unk_00);
Graphics_LoadTilemapToBgLayer(7, ov12_022234E4(param3, v0), param1->unk_C0, param2, 0, 0, 1, param1->heapID);
}
}
@ -2577,7 +2577,7 @@ static UnkStruct_ov12_02221BBC *ov12_02221BBC(UnkStruct_ov12_0221FCDC *param0)
{
UnkStruct_ov12_02221BBC *v0 = NULL;
v0 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_ov12_02221BBC));
v0 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov12_02221BBC));
if (v0 == NULL) {
GF_ASSERT(FALSE);
@ -2745,11 +2745,11 @@ static BOOL ov12_02221D50(SysTask *param0, UnkStruct_ov12_02221BBC *param1)
ov12_02223460(param1->unk_48, 3);
ov12_02223488(param1->unk_48);
} else {
Graphics_LoadTilesToBgLayer(param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_04, param1->unk_48->unk_C0, 3, 0, 0, 1, param1->unk_48->unk_00);
PaletteData_LoadBufferFromFileStart(param1->unk_48->unk_C4, param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_08, param1->unk_48->unk_00, 0, param1->unk_48->unk_180.unk_14 * 0x20, param1->unk_48->unk_180.unk_10);
Graphics_LoadTilesToBgLayer(param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_04, param1->unk_48->unk_C0, 3, 0, 0, 1, param1->unk_48->heapID);
PaletteData_LoadBufferFromFileStart(param1->unk_48->unk_C4, param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_08, param1->unk_48->heapID, 0, param1->unk_48->unk_180.unk_14 * 0x20, param1->unk_48->unk_180.unk_10);
}
Graphics_LoadTilemapToBgLayer(param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_0C, param1->unk_48->unk_C0, 3, 0, 0, 1, param1->unk_48->unk_00);
Graphics_LoadTilemapToBgLayer(param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_0C, param1->unk_48->unk_C0, 3, 0, 0, 1, param1->unk_48->heapID);
param1->unk_05++;
break;
case 4:
@ -2849,11 +2849,11 @@ static BOOL ov12_0222206C(SysTask *param0, UnkStruct_ov12_02221BBC *param1)
ov12_02223460(param1->unk_48, 3);
ov12_02223488(param1->unk_48);
} else {
Graphics_LoadTilesToBgLayer(param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_04, param1->unk_48->unk_C0, 3, 0, 0, 1, param1->unk_48->unk_00);
PaletteData_LoadBufferFromFileStart(param1->unk_48->unk_C4, param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_08, param1->unk_48->unk_00, 0, param1->unk_48->unk_180.unk_14 * 0x20, param1->unk_48->unk_180.unk_10);
Graphics_LoadTilesToBgLayer(param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_04, param1->unk_48->unk_C0, 3, 0, 0, 1, param1->unk_48->heapID);
PaletteData_LoadBufferFromFileStart(param1->unk_48->unk_C4, param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_08, param1->unk_48->heapID, 0, param1->unk_48->unk_180.unk_14 * 0x20, param1->unk_48->unk_180.unk_10);
}
Graphics_LoadTilemapToBgLayer(param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_0C, param1->unk_48->unk_C0, 3, 0, 0, 1, param1->unk_48->unk_00);
Graphics_LoadTilemapToBgLayer(param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_0C, param1->unk_48->unk_C0, 3, 0, 0, 1, param1->unk_48->heapID);
Bg_ToggleLayer(3, 1);
param1->unk_05++;
@ -2948,7 +2948,7 @@ static BOOL ov12_02222360(UnkStruct_ov12_02221BBC *param0)
int v0;
UnkStruct_ov12_022222D4 *v1;
v1 = Heap_AllocFromHeap(param0->unk_48->unk_00, sizeof(UnkStruct_ov12_022222D4));
v1 = Heap_AllocFromHeap(param0->unk_48->heapID, sizeof(UnkStruct_ov12_022222D4));
v1->unk_00 = param0->unk_48->unk_C0;
v1->unk_04 = param0->unk_48->unk_90[2];
@ -2983,15 +2983,15 @@ static BOOL ov12_0222240C(UnkStruct_ov12_02221BBC *param0)
UnkStruct_ov12_022222D4 *v3;
v2 = param0->unk_48;
v3 = Heap_AllocFromHeap(param0->unk_48->unk_00, sizeof(UnkStruct_ov12_022222D4));
v3 = Heap_AllocFromHeap(param0->unk_48->heapID, sizeof(UnkStruct_ov12_022222D4));
v3->unk_1C = Heap_AllocFromHeap(v2->unk_00, sizeof(UnkStruct_ov12_022224F8));
v3->unk_1C = Heap_AllocFromHeap(v2->heapID, sizeof(UnkStruct_ov12_022224F8));
v2->unk_17C = v3;
param0->unk_44_1 = 1;
v3->unk_18 = 0;
v3->unk_1C->unk_C0 = ov12_02226544(ov12_022266F0(ov12_022233EC(v2, 2)), ov12_022266E8(0, 0), v2->unk_00);
v3->unk_1C->unk_C0 = ov12_02226544(ov12_022266F0(ov12_022233EC(v2, 2)), ov12_022266E8(0, 0), v2->heapID);
for (v0 = 0; v0 < ((192 - 64) / 8); v0++) {
v3->unk_1C->unk_00[v0].unk_00 = (v0 * 8);
@ -3069,12 +3069,12 @@ void ov12_02222590(UnkStruct_ov12_0221FCDC *param0, int param1)
Bg_ClearTilemap(param0->unk_C0, param1);
if (ov12_0221FDD4(param0) == 1) {
Graphics_LoadTilesToBgLayer(param0->unk_180.unk_00, param0->unk_180.unk_04, param0->unk_C0, param1, 0, 0, 1, param0->unk_00);
Graphics_LoadTilesToBgLayer(param0->unk_180.unk_00, param0->unk_180.unk_04, param0->unk_C0, param1, 0, 0, 1, param0->heapID);
} else {
ov12_02223460(param0, param1);
}
Graphics_LoadTilemapToBgLayer(param0->unk_180.unk_00, param0->unk_180.unk_0C, param0->unk_C0, param1, 0, 0, 1, param0->unk_00);
Graphics_LoadTilemapToBgLayer(param0->unk_180.unk_00, param0->unk_180.unk_0C, param0->unk_C0, param1, 0, 0, 1, param0->heapID);
}
void ov12_02222664(UnkStruct_ov12_0221FCDC *param0, int param1)
@ -3223,9 +3223,9 @@ static void ov12_02222860(UnkStruct_ov12_0221FCDC *param0)
v0 = inline_ov12_022204C4(param0->unk_18);
param0->unk_18 += 1;
Graphics_LoadTilesToBgLayer(7, ov12_022234E4(v0, 0), param0->unk_C0, 3, 0, 0, 1, param0->unk_00);
Graphics_LoadPalette(7, ov12_022234E4(v0, 1), 0, 0, 0, param0->unk_00);
Graphics_LoadTilemapToBgLayer(7, ov12_022234E4(v0, 2), param0->unk_C0, 3, 0, 0, 1, param0->unk_00);
Graphics_LoadTilesToBgLayer(7, ov12_022234E4(v0, 0), param0->unk_C0, 3, 0, 0, 1, param0->heapID);
Graphics_LoadPalette(7, ov12_022234E4(v0, 1), 0, 0, 0, param0->heapID);
Graphics_LoadTilemapToBgLayer(7, ov12_022234E4(v0, 2), param0->unk_C0, 3, 0, 0, 1, param0->heapID);
}
static void ov12_022228DC(UnkStruct_ov12_0221FCDC *param0)
@ -3813,7 +3813,7 @@ static void ov12_022230D4(UnkStruct_ov12_0221FCDC *param0)
v3 = param0->unk_BC->unk_D8[param0->unk_BC->unk_14];
v4 = param0->unk_BC->unk_E8[param0->unk_BC->unk_14];
Pokemon_PlayCry(param0->unk_BC->unk_10C, v0, v3, v4, v1, v2, param0->unk_BC->unk_118, param0->unk_00);
Pokemon_PlayCry(param0->unk_BC->unk_10C, v0, v3, v4, v1, v2, param0->unk_BC->unk_118, param0->heapID);
}
static void ov12_02223134(UnkStruct_ov12_0221FCDC *param0)

20
src/overlay012/ov12_022380BC.c
View File

@ -15,7 +15,7 @@
#include "unk_0200762C.h"
#include "unk_020131EC.h"
static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param2, int param3);
static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param2, int heapID);
const s16 Unk_ov12_0223B0B8[][3] = {
{ 0x150, 0x70, 0xFFFFFFFFFFFFFE00 },
@ -44,17 +44,17 @@ const s16 Unk_ov12_0223B0DC[][3] = {
{ 0x150, 0x32, 0xFFFFFFFFFFFFFE00 }
};
void ov12_022380BC(UnkStruct_ov12_022380DC *param0, int param1)
void ov12_022380BC(UnkStruct_ov12_022380DC *param0, int heapID)
{
ov12_022380DC(param0, param0->unk_00, 0, param1);
ov12_022380DC(param0, param0->unk_00, 0, heapID);
}
void ov12_022380CC(UnkStruct_ov12_022380DC *param0, int param1)
void ov12_022380CC(UnkStruct_ov12_022380DC *param0, int heapID)
{
ov12_022380DC(param0, param0->unk_04, 1, param1);
ov12_022380DC(param0, param0->unk_04, 1, heapID);
}
static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param2, int param3)
static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param2, int heapID)
{
ArchivedSprite v0;
ArchivedSprite *v1;
@ -98,7 +98,7 @@ static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param
*v1 = v0;
sub_020089A0(param0->unk_18[param0->unk_00]);
sub_02013750(v1->archive, v1->character, param3, param0->unk_08[param0->unk_00]->unk_00, v7, 0, v4, v1->spindaSpots);
sub_02013750(v1->archive, v1->character, heapID, param0->unk_08[param0->unk_00]->unk_00, v7, 0, v4, v1->spindaSpots);
param0->unk_08[param0->unk_00]->unk_04 = v1->archive;
param0->unk_08[param0->unk_00]->unk_08 = v1->palette;
@ -109,7 +109,7 @@ static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param
sub_02007DEC(param0->unk_18[param0->unk_00], 1, v8 + v11);
if (v4 == 2) {
NARC *v13 = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, param3);
NARC *v13 = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, heapID);
PokeSprite_LoadYOffset(v13, &v9, v2);
PokeSprite_LoadXOffsetShadow(v13, &v10, v2);
@ -124,7 +124,7 @@ static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param
}
}
void ov12_022382BC(UnkStruct_ov12_022380DC *param0, int param1)
void ov12_022382BC(UnkStruct_ov12_022380DC *param0, int heapID)
{
ArchivedSprite *v0;
int v1;
@ -148,7 +148,7 @@ void ov12_022382BC(UnkStruct_ov12_022380DC *param0, int param1)
v3 = 0;
}
sub_02013750(v0->archive, v0->character, param1, param0->unk_08[param0->unk_00]->unk_00, v5, 0, v3, v0->spindaSpots);
sub_02013750(v0->archive, v0->character, heapID, param0->unk_08[param0->unk_00]->unk_00, v5, 0, v3, v0->spindaSpots);
param0->unk_08[param0->unk_00]->unk_04 = v0->archive;
param0->unk_08[param0->unk_00]->unk_08 = v0->palette;

2
src/overlay017/ov17_0223B140.c
View File

@ -200,7 +200,7 @@ int ov17_0223B140(OverlayManager *param0, int *param1)
v0->unk_0C.unk_04 = sub_0200762C(21);
ov17_0223B884();
v0->unk_0C.unk_20 = ov12_0221FCDC(21);
v0->unk_0C.unk_20 = ov12_0221FCDC(HEAP_ID_21);
ov12_0221FDC0(v0->unk_0C.unk_20, 1);
v0->unk_0C.unk_38 = MessageLoader_Init(0, 26, 204, HEAP_ID_21);

6
src/overlay019/ov19_021D0D80.c
View File

@ -3134,12 +3134,12 @@ static void ov19_021D4BE0(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_02042434 *p
param0->unk_128 = sub_0208712C(9, 2, 0, 8, param0->unk_1A4);
if (param1->unk_04 != 4) {
param0->unk_17C = sub_02023FCC(Unk_ov19_021DFDF6, NELEMS(Unk_ov19_021DFDF6), ov19_021D53B8, param0, 9);
param0->unk_17C = sub_02023FCC(Unk_ov19_021DFDF6, NELEMS(Unk_ov19_021DFDF6), ov19_021D53B8, param0, HEAP_ID_9);
} else {
param0->unk_17C = sub_02023FCC(Unk_ov19_021DFE02, NELEMS(Unk_ov19_021DFE02), ov19_021D53B8, param0, 9);
param0->unk_17C = sub_02023FCC(Unk_ov19_021DFE02, NELEMS(Unk_ov19_021DFE02), ov19_021D53B8, param0, HEAP_ID_9);
}
param0->unk_180 = sub_02023FCC(Unk_ov19_021DFE12, NELEMS(Unk_ov19_021DFE12), ov19_021D4BB0, param0, 9);
param0->unk_180 = sub_02023FCC(Unk_ov19_021DFE12, NELEMS(Unk_ov19_021DFE12), ov19_021D4BB0, param0, HEAP_ID_9);
param0->unk_00.unk_00 = param0->unk_120;
param0->unk_00.unk_04 = param0->unk_124;
param0->unk_00.unk_110 = 0;

4
src/overlay020/ov20_021D0D80.c
View File

@ -244,9 +244,9 @@ static UnkStruct_ov20_021D16E8 *ov20_021D0EC8(OverlayManager *param0)
ov20_021D0F64(&v1->unk_60, &v1->unk_08);
}
v1->unk_18 = sub_020998EC(34, v1->unk_00);
v1->unk_18 = sub_020998EC(HEAP_ID_34, v1->unk_00);
v1->unk_14 = ov20_021D2098(v1, v1->unk_18);
v1->unk_40 = sub_02023FCC(v0, NELEMS(v0), ov20_021D0E38, v1, 34);
v1->unk_40 = sub_02023FCC(v0, NELEMS(v0), ov20_021D0E38, v1, HEAP_ID_34);
v1->unk_44 = 0;
v1->unk_48 = 0;
v1->unk_65 = 0;

2
src/overlay022/ov22_02259C58.c
View File

@ -195,7 +195,7 @@ void ov22_02259DBC(UnkStruct_ov22_02259D2C *param0, UnkStruct_ov22_0225A0E4 *par
ov22_0225A2A8(param1);
ov22_02259D98(&param0->unk_00[2]);
param0->unk_68 = sub_02023FCC(param0->unk_6C, 5, ov22_0225A02C, param0, 13);
param0->unk_68 = sub_02023FCC(param0->unk_6C, 5, ov22_0225A02C, param0, HEAP_ID_13);
}
void ov22_02259F24(UnkStruct_ov22_02259D2C *param0, UnkStruct_ov22_0225A0E4 *param1)

2
src/overlay062/ov62_0222F2C0.c
View File

@ -687,7 +687,7 @@ void ov62_0222FF40(UnkStruct_0208C06C *param0)
param0->unk_534.unk_C8[v0].unk_10 = &param0->unk_14.unk_1C[v0];
}
param0->unk_14.unk_18 = sub_02023FCC(param0->unk_14.unk_1C, 5, ov62_0222FE1C, param0, 102);
param0->unk_14.unk_18 = sub_02023FCC(param0->unk_14.unk_1C, 5, ov62_0222FE1C, param0, HEAP_ID_102);
}
void ov62_0222FF7C(UnkStruct_0208C06C *param0)

8
src/overlay062/ov62_02231690.c
View File

@ -2097,7 +2097,7 @@ void ov62_022338A8(UnkStruct_0208C06C *param0)
param0->unk_88C[v0] = NULL;
if (v0 == 0) {
param0->unk_88C[v0] = sub_02030A80(102);
param0->unk_88C[v0] = sub_02030A80(HEAP_ID_102);
sub_02030AA0(param0->unk_88C[v0], param0->unk_830);
}
break;
@ -2106,7 +2106,7 @@ void ov62_022338A8(UnkStruct_0208C06C *param0)
param0->unk_88C[v0] = NULL;
if (v0 == 0) {
param0->unk_88C[v0] = sub_02030A80(102);
param0->unk_88C[v0] = sub_02030A80(HEAP_ID_102);
sub_02030AA0(param0->unk_88C[v0], param0->unk_830);
}
break;
@ -2115,7 +2115,7 @@ void ov62_022338A8(UnkStruct_0208C06C *param0)
param0->unk_88C[v0] = NULL;
if (v0 == 0) {
param0->unk_88C[v0] = sub_02030A80(102);
param0->unk_88C[v0] = sub_02030A80(HEAP_ID_102);
sub_02030AA0(param0->unk_88C[v0], param0->unk_830);
}
break;
@ -2123,7 +2123,7 @@ void ov62_022338A8(UnkStruct_0208C06C *param0)
param0->unk_87C[v0] = sub_0202FD88(HEAP_ID_102);
if (v0 == 0) {
param0->unk_88C[v0] = sub_02030A80(102);
param0->unk_88C[v0] = sub_02030A80(HEAP_ID_102);
sub_02030AA0(param0->unk_88C[v0], param0->unk_830);
} else {
param0->unk_88C[v0] = sub_0202FDB8(HEAP_ID_102);

4
src/overlay062/ov62_02235E64.c
View File

@ -173,7 +173,7 @@ static BOOL ov62_0223604C(UnkStruct_0208C06C *param0)
break;
case 1:
ov62_02236B2C(param0);
v0->unk_174[0] = sub_02023FCC(Unk_ov62_02248C1C, NELEMS(Unk_ov62_02248C1C), ov62_02236AB0, param0, 102);
v0->unk_174[0] = sub_02023FCC(Unk_ov62_02248C1C, NELEMS(Unk_ov62_02248C1C), ov62_02236AB0, param0, HEAP_ID_102);
param0->unk_08++;
break;
case 2:
@ -594,7 +594,7 @@ static BOOL ov62_02236920(UnkStruct_0208C06C *param0)
break;
case 1:
ov62_02236B2C(param0);
v0->unk_174[0] = sub_02023FCC(Unk_ov62_02248C1C, NELEMS(Unk_ov62_02248C1C), ov62_02236AB0, param0, 102);
v0->unk_174[0] = sub_02023FCC(Unk_ov62_02248C1C, NELEMS(Unk_ov62_02248C1C), ov62_02236AB0, param0, HEAP_ID_102);
param0->unk_08++;
break;
case 2:

6
src/overlay062/ov62_02237D24.c
View File

@ -219,7 +219,7 @@ static BOOL ov62_02237D24(UnkStruct_0208C06C *param0)
{
v0->unk_230.unk_08 = sub_02029C68(102);
v0->unk_250.unk_00 = sub_02030A80(102);
v0->unk_250.unk_00 = sub_02030A80(HEAP_ID_102);
}
Bg_ClearTilemap(param0->unk_14.unk_10, 2);
@ -412,7 +412,7 @@ static BOOL ov62_022380B0(UnkStruct_0208C06C *param0)
sub_0208B9E0(param0->unk_6F0, 1);
sub_0208BA08(param0->unk_6F0, 24, 24);
ov62_02231AAC(param0, 286);
v0->unk_2DC = sub_02030A80(102);
v0->unk_2DC = sub_02030A80(HEAP_ID_102);
sub_02030AA0(v0->unk_2DC, param0->unk_830);
Sound_PlayEffect(1381);
param0->unk_08++;
@ -606,7 +606,7 @@ static BOOL ov62_02238610(UnkStruct_0208C06C *param0)
GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 1);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 1);
v0->unk_1D0[0] = sub_02023FCC(Unk_ov62_022491F0, NELEMS(Unk_ov62_022491F0), ov62_02239BAC, param0, 102);
v0->unk_1D0[0] = sub_02023FCC(Unk_ov62_022491F0, NELEMS(Unk_ov62_022491F0), ov62_02239BAC, param0, HEAP_ID_102);
param0->unk_08++;
break;
case 1:

14
src/overlay062/ov62_02239D60.c
View File

@ -167,7 +167,7 @@ static void ov62_02239D60(UnkStruct_0208C06C *param0, int param1)
{
UnkStruct_ov62_02239DBC *v0 = param0->unk_860;
v0->unk_2ED8.unk_00 = sub_02030A80(102);
v0->unk_2ED8.unk_00 = sub_02030A80(HEAP_ID_102);
ov61_0222AFC0(&v0->unk_38C[param1]->unk_00, v0->unk_2ED8.unk_00);
}
@ -465,12 +465,12 @@ static BOOL ov62_0223A17C(UnkStruct_0208C06C *param0)
ov62_0223A138(v0);
ov62_022315C8(&v0->unk_1A4, &v0->unk_1A8, 0);
v0->unk_330[0] = sub_02023FCC(Unk_ov62_02248DB4, NELEMS(Unk_ov62_02248DB4), ov62_02239E0C, param0, 102);
v0->unk_330[1] = sub_02023FCC(Unk_ov62_02248DDC, NELEMS(Unk_ov62_02248DDC), ov62_02239EC0, param0, 102);
v0->unk_330[2] = sub_02023FCC(Unk_ov62_02248DDC, NELEMS(Unk_ov62_02248DDC), ov62_02239EFC, param0, 102);
v0->unk_330[3] = sub_02023FCC(Unk_ov62_02248D6C, NELEMS(Unk_ov62_02248D6C), ov62_02239F38, param0, 102);
v0->unk_330[4] = sub_02023FCC(Unk_ov62_02248D54, NELEMS(Unk_ov62_02248D54), ov62_02239F98, param0, 102);
v0->unk_380.unk_04 = sub_02030A80(102);
v0->unk_330[0] = sub_02023FCC(Unk_ov62_02248DB4, NELEMS(Unk_ov62_02248DB4), ov62_02239E0C, param0, HEAP_ID_102);
v0->unk_330[1] = sub_02023FCC(Unk_ov62_02248DDC, NELEMS(Unk_ov62_02248DDC), ov62_02239EC0, param0, HEAP_ID_102);
v0->unk_330[2] = sub_02023FCC(Unk_ov62_02248DDC, NELEMS(Unk_ov62_02248DDC), ov62_02239EFC, param0, HEAP_ID_102);
v0->unk_330[3] = sub_02023FCC(Unk_ov62_02248D6C, NELEMS(Unk_ov62_02248D6C), ov62_02239F38, param0, HEAP_ID_102);
v0->unk_330[4] = sub_02023FCC(Unk_ov62_02248D54, NELEMS(Unk_ov62_02248D54), ov62_02239F98, param0, HEAP_ID_102);
v0->unk_380.unk_04 = sub_02030A80(HEAP_ID_102);
sub_02030AA0(v0->unk_380.unk_04, param0->unk_830);
ov62_0222FB60(param0, 1);

2
src/overlay062/ov62_0223CAEC.c
View File

@ -910,7 +910,7 @@ static BOOL ov62_0223D5A4 (UnkStruct_0208C06C * param0)
Bg_ClearTilemap(param0->unk_14.unk_10, 7);
ov62_022315C8(&v0->unk_00, &v0->unk_04, 0);
v0->unk_DC = sub_02023FCC(Unk_ov62_02248E94, NELEMS(Unk_ov62_02248E94), ov62_0223D540, param0, 102);
v0->unk_DC = sub_02023FCC(Unk_ov62_02248E94, NELEMS(Unk_ov62_02248E94), ov62_0223D540, param0, HEAP_ID_102);
ov62_0222FB60(param0, 1);
return 0;

14
src/overlay062/ov62_0223DFA8.c
View File

@ -1510,9 +1510,9 @@ static BOOL ov62_0223FCC4 (UnkStruct_0208C06C * param0)
break;
case 1:
ov62_02240B94(param0);
v0->unk_188[0] = sub_02023FCC(Unk_ov62_02248FC8, NELEMS(Unk_ov62_02248FC8), ov62_02240A50, param0, 102);
v0->unk_188[1] = sub_02023FCC(Unk_ov62_02248F98, NELEMS(Unk_ov62_02248F98), ov62_02240AEC, param0, 102);
v0->unk_188[2] = sub_02023FCC(Unk_ov62_02248F84, NELEMS(Unk_ov62_02248F84), ov62_02240B5C, param0, 102);
v0->unk_188[0] = sub_02023FCC(Unk_ov62_02248FC8, NELEMS(Unk_ov62_02248FC8), ov62_02240A50, param0, HEAP_ID_102);
v0->unk_188[1] = sub_02023FCC(Unk_ov62_02248F98, NELEMS(Unk_ov62_02248F98), ov62_02240AEC, param0, HEAP_ID_102);
v0->unk_188[2] = sub_02023FCC(Unk_ov62_02248F84, NELEMS(Unk_ov62_02248F84), ov62_02240B5C, param0, HEAP_ID_102);
param0->unk_08++;
break;
case 2:
@ -1703,9 +1703,9 @@ static BOOL ov62_02240084 (UnkStruct_0208C06C * param0)
break;
case 1:
ov62_02240B94(param0);
v0->unk_188[0] = sub_02023FCC(Unk_ov62_02248FC8, NELEMS(Unk_ov62_02248FC8), ov62_02240A50, param0, 102);
v0->unk_188[1] = sub_02023FCC(Unk_ov62_02248F98, NELEMS(Unk_ov62_02248F98), ov62_02240AEC, param0, 102);
v0->unk_188[2] = sub_02023FCC(Unk_ov62_02248F84, NELEMS(Unk_ov62_02248F84), ov62_02240B5C, param0, 102);
v0->unk_188[0] = sub_02023FCC(Unk_ov62_02248FC8, NELEMS(Unk_ov62_02248FC8), ov62_02240A50, param0, HEAP_ID_102);
v0->unk_188[1] = sub_02023FCC(Unk_ov62_02248F98, NELEMS(Unk_ov62_02248F98), ov62_02240AEC, param0, HEAP_ID_102);
v0->unk_188[2] = sub_02023FCC(Unk_ov62_02248F84, NELEMS(Unk_ov62_02248F84), ov62_02240B5C, param0, HEAP_ID_102);
param0->unk_08++;
break;
case 2:
@ -2503,7 +2503,7 @@ static void ov62_02240B94 (UnkStruct_0208C06C * param0)
{
UnkStruct_ov62_0223E01C * v0 = param0->unk_860;
v0->unk_194.unk_00 = sub_02030A80(102);
v0->unk_194.unk_00 = sub_02030A80(HEAP_ID_102);
ov61_0222AFC0(&param0->unk_8B4.unk_1D58[param0->unk_14.unk_48C.unk_38.unk_00]->unk_00, v0->unk_194.unk_00);
v0->unk_220.unk_00 = v0->unk_194.unk_00;
v0->unk_220.unk_04 = sub_0202FF2C(HEAP_ID_102);

38
src/overlay062/ov62_02241204.c
View File

@ -871,8 +871,8 @@ static BOOL ov62_02241D24 (UnkStruct_0208C06C * param0)
ov62_02245C08(param0, 0);
v0->unk_50C.unk_08 = 500;
v0->unk_608[0] = sub_02023FCC(Unk_ov62_022491AC, NELEMS(Unk_ov62_022491AC), ov62_022458A0, param0, 102);
v0->unk_608[1] = sub_02023FCC(Unk_ov62_022491F0, NELEMS(Unk_ov62_022491F0), ov62_02245968, param0, 102);
v0->unk_608[0] = sub_02023FCC(Unk_ov62_022491AC, NELEMS(Unk_ov62_022491AC), ov62_022458A0, param0, HEAP_ID_102);
v0->unk_608[1] = sub_02023FCC(Unk_ov62_022491F0, NELEMS(Unk_ov62_022491F0), ov62_02245968, param0, HEAP_ID_102);
param0->unk_08++;
break;
case 1:
@ -2002,8 +2002,8 @@ static BOOL ov62_0224312C (UnkStruct_0208C06C * param0)
ov62_022343B8(param0, 59, 7);
ov62_02245C08(param0, 0);
v0->unk_608[0] = sub_02023FCC(Unk_ov62_022491AC, NELEMS(Unk_ov62_022491AC), ov62_022458A0, param0, 102);
v0->unk_608[1] = sub_02023FCC(Unk_ov62_022491F0, NELEMS(Unk_ov62_022491F0), ov62_02245968, param0, 102);
v0->unk_608[0] = sub_02023FCC(Unk_ov62_022491AC, NELEMS(Unk_ov62_022491AC), ov62_022458A0, param0, HEAP_ID_102);
v0->unk_608[1] = sub_02023FCC(Unk_ov62_022491F0, NELEMS(Unk_ov62_022491F0), ov62_02245968, param0, HEAP_ID_102);
ov62_02241AA4(param0, 0);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
@ -2045,9 +2045,9 @@ static BOOL ov62_0224324C (UnkStruct_0208C06C * param0)
break;
case 1:
ov62_0224443C(param0);
v0->unk_608[0] = sub_02023FCC(Unk_ov62_0224919C, NELEMS(Unk_ov62_0224919C), ov62_02245994, param0, 102);
v0->unk_608[1] = sub_02023FCC(Unk_ov62_0224915C, NELEMS(Unk_ov62_0224915C), ov62_02245A28, param0, 102);
v0->unk_608[2] = sub_02023FCC(Unk_ov62_0224913C, NELEMS(Unk_ov62_0224913C), ov62_02245A90, param0, 102);
v0->unk_608[0] = sub_02023FCC(Unk_ov62_0224919C, NELEMS(Unk_ov62_0224919C), ov62_02245994, param0, HEAP_ID_102);
v0->unk_608[1] = sub_02023FCC(Unk_ov62_0224915C, NELEMS(Unk_ov62_0224915C), ov62_02245A28, param0, HEAP_ID_102);
v0->unk_608[2] = sub_02023FCC(Unk_ov62_0224913C, NELEMS(Unk_ov62_0224913C), ov62_02245A90, param0, HEAP_ID_102);
param0->unk_08++;
break;
case 2:
@ -2482,9 +2482,9 @@ static BOOL ov62_02243B1C (UnkStruct_0208C06C * param0)
break;
case 1:
ov62_0224443C(param0);
v0->unk_608[0] = sub_02023FCC(Unk_ov62_0224919C, NELEMS(Unk_ov62_0224919C), ov62_02245994, param0, 102);
v0->unk_608[1] = sub_02023FCC(Unk_ov62_0224915C, NELEMS(Unk_ov62_0224915C), ov62_02245A28, param0, 102);
v0->unk_608[2] = sub_02023FCC(Unk_ov62_0224913C, NELEMS(Unk_ov62_0224913C), ov62_02245A90, param0, 102);
v0->unk_608[0] = sub_02023FCC(Unk_ov62_0224919C, NELEMS(Unk_ov62_0224919C), ov62_02245994, param0, HEAP_ID_102);
v0->unk_608[1] = sub_02023FCC(Unk_ov62_0224915C, NELEMS(Unk_ov62_0224915C), ov62_02245A28, param0, HEAP_ID_102);
v0->unk_608[2] = sub_02023FCC(Unk_ov62_0224913C, NELEMS(Unk_ov62_0224913C), ov62_02245A90, param0, HEAP_ID_102);
param0->unk_08++;
break;
case 2:
@ -2904,7 +2904,7 @@ static void ov62_022443EC (UnkStruct_0208C06C * param0)
{
UnkStruct_ov62_02241204 * v0 = param0->unk_860;
v0->unk_80.unk_00 = sub_02030A80(102);
v0->unk_80.unk_00 = sub_02030A80(HEAP_ID_102);
ov61_0222AFC0(&v0->unk_4BC->unk_00, v0->unk_80.unk_00);
v0->unk_10C.unk_00 = v0->unk_80.unk_00;
v0->unk_10C.unk_04 = sub_0202FF2C(HEAP_ID_102);
@ -2915,7 +2915,7 @@ static void ov62_0224443C (UnkStruct_0208C06C * param0)
{
UnkStruct_ov62_02241204 * v0 = param0->unk_860;
v0->unk_80.unk_00 = sub_02030A80(102);
v0->unk_80.unk_00 = sub_02030A80(HEAP_ID_102);
ov61_0222AFC0(&param0->unk_8B4.unk_1D58[param0->unk_14.unk_48C.unk_38.unk_00]->unk_00, v0->unk_80.unk_00);
v0->unk_10C.unk_00 = v0->unk_80.unk_00;
v0->unk_10C.unk_04 = sub_0202FF2C(HEAP_ID_102);
@ -2963,9 +2963,9 @@ static BOOL ov62_022444BC (UnkStruct_0208C06C * param0)
ov62_022443EC(param0);
ov62_02245C64(param0);
v0->unk_608[0] = sub_02023FCC(Unk_ov62_0224919C, NELEMS(Unk_ov62_0224919C), ov62_022457A0, param0, 102);
v0->unk_608[1] = sub_02023FCC(Unk_ov62_0224915C, NELEMS(Unk_ov62_0224915C), ov62_02245800, param0, 102);
v0->unk_608[2] = sub_02023FCC(Unk_ov62_0224913C, NELEMS(Unk_ov62_0224913C), ov62_02245868, param0, 102);
v0->unk_608[0] = sub_02023FCC(Unk_ov62_0224919C, NELEMS(Unk_ov62_0224919C), ov62_022457A0, param0, HEAP_ID_102);
v0->unk_608[1] = sub_02023FCC(Unk_ov62_0224915C, NELEMS(Unk_ov62_0224915C), ov62_02245800, param0, HEAP_ID_102);
v0->unk_608[2] = sub_02023FCC(Unk_ov62_0224913C, NELEMS(Unk_ov62_0224913C), ov62_02245868, param0, HEAP_ID_102);
param0->unk_08++;
break;
case 2:
@ -3494,9 +3494,9 @@ static BOOL ov62_02245018 (UnkStruct_0208C06C * param0)
Bg_SetPriority(6, 0);
Bg_SetPriority(7, 2);
v0->unk_608[0] = sub_02023FCC(Unk_ov62_0224919C, NELEMS(Unk_ov62_0224919C), ov62_022457A0, param0, 102);
v0->unk_608[1] = sub_02023FCC(Unk_ov62_0224915C, NELEMS(Unk_ov62_0224915C), ov62_02245800, param0, 102);
v0->unk_608[2] = sub_02023FCC(Unk_ov62_0224913C, NELEMS(Unk_ov62_0224913C), ov62_02245868, param0, 102);
v0->unk_608[0] = sub_02023FCC(Unk_ov62_0224919C, NELEMS(Unk_ov62_0224919C), ov62_022457A0, param0, HEAP_ID_102);
v0->unk_608[1] = sub_02023FCC(Unk_ov62_0224915C, NELEMS(Unk_ov62_0224915C), ov62_02245800, param0, HEAP_ID_102);
v0->unk_608[2] = sub_02023FCC(Unk_ov62_0224913C, NELEMS(Unk_ov62_0224913C), ov62_02245868, param0, HEAP_ID_102);
param0->unk_08++;
}
break;
@ -3591,7 +3591,7 @@ static BOOL ov62_0224536C (UnkStruct_0208C06C * param0)
int v2;
sub_0202F298(param0->unk_830, 102, &v2, NULL, 0);
v0->unk_1D0 = sub_02030A80(102);
v0->unk_1D0 = sub_02030A80(HEAP_ID_102);
sub_02030AA0(v0->unk_1D0, param0->unk_830);
if (ov61_0222B338(ov62_0224112C(param0), v0->unk_1D0) == 1) {

2
src/overlay062/ov62_02246B00.c
View File

@ -424,7 +424,7 @@ void ov62_02247220(UnkStruct_ov62_02246BF4 *param0)
param0->unk_220.unk_18[23].rect.right = 224;
}
param0->unk_220.unk_14 = sub_02023FCC(param0->unk_220.unk_18, 24, ov62_0224730C, param0, 102);
param0->unk_220.unk_14 = sub_02023FCC(param0->unk_220.unk_18, 24, ov62_0224730C, param0, HEAP_ID_102);
}
void ov62_0224730C(u32 param0, u32 param1, void *param2)

20
src/overlay066/ov66_022343A8.c
View File

@ -142,17 +142,17 @@ static const UnkStruct_ov66_02258B38 Unk_ov66_02258B38[20] = {
{ 0xEA, 0x18D, 0x0 }
};
UnkStruct_ov66_02234548 *ov66_022343A8(u32 param0, u32 param1, u32 param2, u32 param3)
UnkStruct_ov66_02234548 *ov66_022343A8(u32 param0, u32 param1, u32 heapID, u32 param3)
{
UnkStruct_ov66_02234548 *v0;
v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_02234548));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02234548));
memset(v0, 0, sizeof(UnkStruct_ov66_02234548));
{
int v1;
v0->unk_10 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_02234798) * param0);
v0->unk_10 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02234798) * param0);
v0->unk_14 = param0;
for (v1 = 0; v1 < v0->unk_14; v1++) {
@ -160,17 +160,17 @@ UnkStruct_ov66_02234548 *ov66_022343A8(u32 param0, u32 param1, u32 param2, u32 p
}
}
v0->unk_00 = ResourceCollection_New(1, param2);
v0->unk_04 = ResourceCollection_New(2, param2);
v0->unk_08 = TextureResourceManager_New(20, param2);
v0->unk_00 = ResourceCollection_New(1, heapID);
v0->unk_04 = ResourceCollection_New(2, heapID);
v0->unk_08 = TextureResourceManager_New(20, heapID);
{
UnkStruct_ov5_021EDDAC v2;
sub_02020B90(1, param2);
sub_02020B90(1, heapID);
v2.unk_00 = param0;
v2.heapID = param2;
v2.heapID = heapID;
v0->unk_0C = sub_02020C44(&v2);
}
@ -180,8 +180,8 @@ UnkStruct_ov66_02234548 *ov66_022343A8(u32 param0, u32 param1, u32 param2, u32 p
void *v5;
int v6;
v3 = NARC_ctor(NARC_INDEX_DATA__MMODEL__MMODEL, param2);
v4 = NARC_ctor(NARC_INDEX_GRAPHIC__WIFI_LOBBY_OTHER, param2);
v3 = NARC_ctor(NARC_INDEX_DATA__MMODEL__MMODEL, heapID);
v4 = NARC_ctor(NARC_INDEX_GRAPHIC__WIFI_LOBBY_OTHER, heapID);
{
v5 = LoadMemberFromOpenNARC(v4, 127, 0, param3, 0);

12
src/overlay070/ov70_0225C9B4.c
View File

@ -174,18 +174,18 @@ static const u32 Unk_ov70_0226D518[6] = {
{ 0x0 }
};
UnkStruct_ov70_0225CA20 *ov70_0225C9B4(u32 param0, u32 param1, const UnkStruct_ov70_0225C894 *param2, u32 param3, u32 param4)
UnkStruct_ov70_0225CA20 *ov70_0225C9B4(u32 param0, u32 param1, const UnkStruct_ov70_0225C894 *param2, u32 heapID, u32 param4)
{
UnkStruct_ov70_0225CA20 *v0;
v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov70_0225CA20));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_0225CA20));
memset(v0, 0, sizeof(UnkStruct_ov70_0225CA20));
v0->unk_00 = ov63_0222BE18(param0, param3);
v0->unk_04 = ov66_022343A8(param0, param1, param3, param4);
v0->unk_10 = ov63_0222D848(32, param3);
v0->unk_00 = ov63_0222BE18(param0, heapID);
v0->unk_04 = ov66_022343A8(param0, param1, heapID, param4);
v0->unk_10 = ov63_0222D848(32, heapID);
v0->unk_0C = param0;
v0->unk_08 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov70_0225CC54) * param0);
v0->unk_08 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_0225CC54) * param0);
memset(v0->unk_08, 0, sizeof(UnkStruct_ov70_0225CC54) * param0);

4
src/overlay070/ov70_0225D9A4.c
View File

@ -615,11 +615,11 @@ int ov70_0225D9A4(OverlayManager *param0, int *param1)
u32 v2;
v2 = TrainerInfo_Gender(v0->unk_458);
v0->unk_444 = ov70_0225C9B4(24, v2, v0->unk_44C, 112, 113);
v0->unk_444 = ov70_0225C9B4(24, v2, v0->unk_44C, HEAP_ID_112, 113);
}
v0->unk_448 = ov70_02261E10(v1->unk_04, v1->unk_08, v0->unk_44C, 112, 113);
v0->unk_450 = ov70_02260A70(112);
v0->unk_450 = ov70_02260A70(HEAP_ID_112);
ov70_0225E9C8(&v0->unk_35C, &v0->unk_3C, v1->unk_00, 112);
ov70_0225EBA8(&v0->unk_37C, &v0->unk_3C, v1->unk_00, 112);

6
src/overlay070/ov70_02260A70.c
View File

@ -22,14 +22,14 @@ static const CameraAngle Unk_ov70_0226D904 = {
0x0
};
UnkStruct_ov70_02260AD4 *ov70_02260A70(u32 param0)
UnkStruct_ov70_02260AD4 *ov70_02260A70(u32 heapID)
{
UnkStruct_ov70_02260AD4 *v0;
VecFx32 v1;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov70_02260AD4));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_02260AD4));
memset(v0, 0, sizeof(UnkStruct_ov70_02260AD4));
v0->camera = Camera_Alloc(param0);
v0->camera = Camera_Alloc(heapID);
Camera_InitWithTarget(&v0->unk_08, 0x29aec1, &Unk_ov70_0226D904, 0x5c1, 0, 1, v0->camera);
Camera_SetAsActive(v0->camera);

2
src/overlay076/ov76_0223D338.c
View File

@ -689,7 +689,7 @@ void ov76_0223DCC0(UnkStruct_ov76_0223DE00 *param0)
param0->unk_324[v0 - 13].unk_0C = &param0->unk_D4.unk_FC[v0];
}
param0->unk_D4.unk_F8 = sub_02023FCC(param0->unk_D4.unk_FC, 21, ov76_0223DA34, param0, 53);
param0->unk_D4.unk_F8 = sub_02023FCC(param0->unk_D4.unk_FC, 21, ov76_0223DA34, param0, HEAP_ID_53);
}
void ov76_0223DD88(UnkStruct_ov76_0223DE00 *param0)

48
src/overlay079/ov79_021D0D80.c
View File

@ -81,7 +81,7 @@ int ov79_021D0D80(OverlayManager *param0, int *param1)
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov79_021D0E1C), 45);
MI_CpuClear8(v0, sizeof(UnkStruct_ov79_021D0E1C));
v0->unk_00 = 45;
v0->heapID = HEAP_ID_45;
v0->unk_20 = v1;
v0->unk_1B = v1->unk_03;
v0->unk_14 = 0xFFFF;
@ -111,7 +111,7 @@ int ov79_021D0DDC(OverlayManager *param0, int *param1)
v0->unk_20->unk_06 = v0->unk_82;
OverlayManager_FreeData(param0);
Heap_Destroy(v0->unk_00);
Heap_Destroy(v0->heapID);
return 1;
}
@ -142,7 +142,7 @@ static int ov79_021D0E1C(UnkStruct_ov79_021D0E1C *param0)
}
param0->unk_0C = 0;
StartScreenTransition(0, 1, 1, 0x0, 6, 1, param0->unk_00);
StartScreenTransition(0, 1, 1, 0x0, 6, 1, param0->heapID);
break;
case 2:
ov79_021D21F8(param0);
@ -159,7 +159,7 @@ static int ov79_021D0E1C(UnkStruct_ov79_021D0E1C *param0)
}
param0->unk_0C = 0;
StartScreenTransition(0, 0, 0, 0x0, 6, 1, param0->unk_00);
StartScreenTransition(0, 0, 0, 0x0, 6, 1, param0->heapID);
break;
case 4:
ov79_021D21F8(param0);
@ -353,7 +353,7 @@ static int ov79_021D114C(UnkStruct_ov79_021D0E1C *param0)
static int ov79_021D116C(UnkStruct_ov79_021D0E1C *param0)
{
switch (Menu_ProcessInputAndHandleExit(param0->unk_D4, param0->unk_00)) {
switch (Menu_ProcessInputAndHandleExit(param0->unk_D4, param0->heapID)) {
case 0:
Sound_PlayEffect(1500);
ov79_021D2008(param0);
@ -480,7 +480,7 @@ static void ov79_021D132C(UnkStruct_ov79_021D0E1C *param0)
ov79_021D130C();
param0->unk_24 = BgConfig_New(param0->unk_00);
param0->unk_24 = BgConfig_New(param0->heapID);
{
GraphicsModes v2 = {
@ -592,7 +592,7 @@ static void ov79_021D132C(UnkStruct_ov79_021D0E1C *param0)
for (v0 = 0; v0 < 6; v0++) {
Bg_InitFromTemplate(param0->unk_24, v1, &(v3[v0]), 0);
Bg_ClearTilemap(param0->unk_24, v1);
Bg_ClearTilesRange(v1, 32, 0, param0->unk_00);
Bg_ClearTilesRange(v1, 32, 0, param0->heapID);
++v1;
}
}
@ -613,14 +613,14 @@ static void ov79_021D13C4(UnkStruct_ov79_021D0E1C *param0)
{
NARC *v0;
v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PORU_GRA, param0->unk_00);
v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PORU_GRA, param0->heapID);
sub_0208C210(param0->unk_24, param0->unk_00, v0, 83, 2, 0, 0, 0, 0);
sub_0208C210(param0->unk_24, param0->unk_00, v0, 83, 3, 5, 0, 0, 0);
sub_0208C210(param0->unk_24, param0->unk_00, v0, 83, 0, 0, 2, 0x20 * 0xC, 0);
sub_0208C210(param0->unk_24, param0->unk_00, v0, 83, 0, 4, 2, 0x20 * 0xC, 0);
sub_0208C210(param0->unk_24, param0->unk_00, v0, 83, 10, 3, 1, 0, 0);
sub_0208C210(param0->unk_24, param0->unk_00, v0, 83, 11, 5, 1, 0, 0);
sub_0208C210(param0->unk_24, param0->heapID, v0, 83, 2, 0, 0, 0, 0);
sub_0208C210(param0->unk_24, param0->heapID, v0, 83, 3, 5, 0, 0, 0);
sub_0208C210(param0->unk_24, param0->heapID, v0, 83, 0, 0, 2, 0x20 * 0xC, 0);
sub_0208C210(param0->unk_24, param0->heapID, v0, 83, 0, 4, 2, 0x20 * 0xC, 0);
sub_0208C210(param0->unk_24, param0->heapID, v0, 83, 10, 3, 1, 0, 0);
sub_0208C210(param0->unk_24, param0->heapID, v0, 83, 11, 5, 1, 0, 0);
NARC_dtor(v0);
Bg_ScheduleTilemapTransfer(param0->unk_24, 3);
Bg_ScheduleTilemapTransfer(param0->unk_24, 5);
@ -653,11 +653,11 @@ static void ov79_021D14A4(UnkStruct_ov79_021D0E1C *param0)
{ 0x4, 0xC, 0xD, 0x8, 0x3, 0xA, 0xB9 }
};
LoadStandardWindowGraphics(param0->unk_24, 1, 1 + 18 + 12, 15, 0, param0->unk_00);
LoadMessageBoxGraphics(param0->unk_24, 1, 1, 14, Options_Frame(param0->unk_20->unk_18), param0->unk_00);
Font_LoadTextPalette(0, 13 * 32, param0->unk_00);
Font_LoadScreenIndicatorsPalette(0, 12 * 32, param0->unk_00);
Font_LoadTextPalette(4, 13 * 32, param0->unk_00);
LoadStandardWindowGraphics(param0->unk_24, 1, 1 + 18 + 12, 15, 0, param0->heapID);
LoadMessageBoxGraphics(param0->unk_24, 1, 1, 14, Options_Frame(param0->unk_20->unk_18), param0->heapID);
Font_LoadTextPalette(0, 13 * 32, param0->heapID);
Font_LoadScreenIndicatorsPalette(0, 12 * 32, param0->heapID);
Font_LoadTextPalette(4, 13 * 32, param0->heapID);
for (v0 = 0; v0 < 13; v0++) {
Window_Add(param0->unk_24, &param0->unk_E8[v0], v1[v0].unk_00, v1[v0].unk_01, v1[v0].unk_02, v1[v0].unk_03, v1[v0].unk_04, v1[v0].unk_05, v1[v0].unk_06);
@ -681,12 +681,12 @@ static void ov79_021D1568(UnkStruct_ov79_021D0E1C *param0)
{
int v0 = 0;
Font_InitManager(FONT_SUBSCREEN, param0->unk_00);
Font_InitManager(FONT_SUBSCREEN, param0->heapID);
param0->unk_2C = MessageLoader_Init(0, 26, 463, param0->unk_00);
param0->unk_28 = sub_020158A8(param0->unk_00);
param0->unk_30.unk_00 = StringTemplate_New(2, 64, param0->unk_00);
param0->unk_30.unk_04 = Strbuf_Init(64, param0->unk_00);
param0->unk_2C = MessageLoader_Init(0, 26, 463, param0->heapID);
param0->unk_28 = sub_020158A8(param0->heapID);
param0->unk_30.unk_00 = StringTemplate_New(2, 64, param0->heapID);
param0->unk_30.unk_04 = Strbuf_Init(64, param0->heapID);
param0->unk_30.unk_08 = MessageLoader_GetNewStrbuf(param0->unk_2C, 6);
param0->unk_30.unk_0C = MessageLoader_GetNewStrbuf(param0->unk_2C, 22);
param0->unk_30.unk_10 = MessageLoader_GetNewStrbuf(param0->unk_2C, 4);

10
src/overlay079/ov79_021D183C.c
View File

@ -149,7 +149,7 @@ void ov79_021D196C(UnkStruct_ov79_021D0E1C *param0)
UnkStruct_020989DC *v2;
param0->unk_1C = ov79_021D18B4(param0->unk_20, param0);
param0->unk_CC = StringList_New(param0->unk_1C, param0->unk_00);
param0->unk_CC = StringList_New(param0->unk_1C, param0->heapID);
for (v0 = param0->unk_1E; v0 != 0xFF; v0 = v1) {
v2 = &(param0->unk_20->unk_1C[v0]);
@ -186,7 +186,7 @@ void ov79_021D196C(UnkStruct_ov79_021D0E1C *param0)
param0->unk_84.parent = (void *)param0;
param0->unk_84.count = param0->unk_1C;
param0->unk_16 = 0;
param0->unk_C4 = ListMenu_New(&param0->unk_84, param0->unk_80, param0->unk_82, param0->unk_00);
param0->unk_C4 = ListMenu_New(&param0->unk_84, param0->unk_80, param0->unk_82, param0->heapID);
param0->unk_16 = 1;
}
@ -367,7 +367,7 @@ void ov79_021D1ED8(UnkStruct_ov79_021D0E1C *param0)
{
u8 v0 = 0;
param0->unk_D0 = StringList_New(3, param0->unk_00);
param0->unk_D0 = StringList_New(3, param0->heapID);
for (v0 = 0; v0 < 3; v0++) {
StringList_AddFromMessageBank(param0->unk_D0, param0->unk_2C, 1 + v0, v0);
@ -382,7 +382,7 @@ void ov79_021D1ED8(UnkStruct_ov79_021D0E1C *param0)
Window_DrawStandardFrame(&param0->unk_E8[3], 1, 1 + 18 + 12, 15);
param0->unk_C8 = ListMenu_New(&param0->unk_A4, 0, 0, param0->unk_00);
param0->unk_C8 = ListMenu_New(&param0->unk_A4, 0, 0, param0->heapID);
}
void ov79_021D1F60(UnkStruct_ov79_021D0E1C *param0)
@ -430,7 +430,7 @@ void ov79_021D2054(UnkStruct_ov79_021D0E1C *param0)
1, 26, 13, 5, 4, 13, 463
};
param0->unk_D4 = Menu_MakeYesNoChoice(param0->unk_24, &v0, 1 + 18 + 12, 15, param0->unk_00);
param0->unk_D4 = Menu_MakeYesNoChoice(param0->unk_24, &v0, 1 + 18 + 12, 15, param0->heapID);
}
void ov79_021D2078(UnkStruct_ov79_021D0E1C *param0)

10
src/overlay079/ov79_021D20F4.c
View File

@ -20,9 +20,9 @@ void ov79_021D21F8(UnkStruct_ov79_021D0E1C *param0);
void ov79_021D20F4(UnkStruct_ov79_021D0E1C *param0)
{
VramTransfer_New(32, param0->unk_00);
VramTransfer_New(32, param0->heapID);
param0->unk_1B8 = SpriteSystem_Alloc(param0->unk_00);
param0->unk_1B8 = SpriteSystem_Alloc(param0->heapID);
param0->unk_1BC = SpriteManager_New(param0->unk_1B8);
{
@ -47,8 +47,8 @@ void ov79_021D20F4(UnkStruct_ov79_021D0E1C *param0)
SpriteSystem_Init(param0->unk_1B8, &v0, &v1, 32);
SpriteSystem_InitSprites(param0->unk_1B8, param0->unk_1BC, 3 + 5 + 6);
RenderOam_ClearMain(param0->unk_00);
RenderOam_ClearSub(param0->unk_00);
RenderOam_ClearMain(param0->heapID);
RenderOam_ClearSub(param0->heapID);
}
{
@ -65,7 +65,7 @@ void ov79_021D20F4(UnkStruct_ov79_021D0E1C *param0)
SpriteSystem_LoadResourceDataFromFilepaths(param0->unk_1B8, param0->unk_1BC, &v2);
}
param0->unk_1F8 = sub_02098FFC(param0->unk_00, 1, 1, (NNS_G2D_VRAM_TYPE_2DMAIN), 0);
param0->unk_1F8 = sub_02098FFC(param0->heapID, 1, 1, (NNS_G2D_VRAM_TYPE_2DMAIN), 0);
if (CommSys_IsInitialized()) {
sub_02039734();

4
src/overlay086/ov86_0223B140.c
View File

@ -843,12 +843,12 @@ static void ov86_0223BAC8(UnkStruct_ov86_0223B3C8 *param0, NNSG2dCellDataBank *p
param0->unk_2E0[v12] = Pokemon_GetValue((Pokemon *)v11, MON_DATA_SPECIES, NULL);
param0->unk_2F8[v12] = Pokemon_GetValue((Pokemon *)v11, MON_DATA_FORM, NULL);
sub_02013720(v1.archive, v1.character, 63, &v0[0], param0->unk_310, Pokemon_GetValue((Pokemon *)v11, MON_DATA_PERSONALITY, NULL), 1, 2, param0->unk_2E0[v12]);
sub_02013720(v1.archive, v1.character, HEAP_ID_63, &v0[0], param0->unk_310, Pokemon_GetValue((Pokemon *)v11, MON_DATA_PERSONALITY, NULL), 1, 2, param0->unk_2E0[v12]);
DC_FlushRange(param0->unk_310, 3200);
GX_LoadOBJ(param0->unk_310, v12 * 2 * 3200, 3200);
sub_02013720(v1.archive, v1.character, 63, &v0[1], param0->unk_310, Pokemon_GetValue((Pokemon *)v11, MON_DATA_PERSONALITY, NULL), 1, 2, param0->unk_2E0[v12]);
sub_02013720(v1.archive, v1.character, HEAP_ID_63, &v0[1], param0->unk_310, Pokemon_GetValue((Pokemon *)v11, MON_DATA_PERSONALITY, NULL), 1, 2, param0->unk_2E0[v12]);
DC_FlushRange(param0->unk_310, 3200);
GX_LoadOBJ(param0->unk_310, v12 * 2 * 3200 + 3200, 3200);

2
src/overlay087/ov87_021D106C.c
View File

@ -542,7 +542,7 @@ static void ov87_021D1970(UnkStruct_ov87_021D106C *param0)
Pokemon_InitWith(param0->unk_1FC, v2->unk_20[v3].unk_10, v2->unk_20[v3].unk_12, INIT_IVS_RANDOM, TRUE, v2->unk_20[v3].unk_08, OTID_SET, v2->unk_20[v3].unk_0C);
Pokemon_SetValue(param0->unk_1FC, MON_DATA_FORM, (void *)(&(v2->unk_20[v3].unk_13)));
Pokemon_BuildArchivedSprite(&v1, param0->unk_1FC, 2);
sub_02013720(v1.archive, v1.character, 61, &v0, param0->unk_200, v2->unk_20[v3].unk_08, 0, 2, v2->unk_20[v3].unk_10);
sub_02013720(v1.archive, v1.character, HEAP_ID_61, &v0, param0->unk_200, v2->unk_20[v3].unk_08, 0, 2, v2->unk_20[v3].unk_10);
DC_FlushRange(param0->unk_200, sizeof(param0->unk_200));
GX_LoadOBJ(param0->unk_200, 3200 * v3, 3200);

2
src/overlay088/ov88_0223B140.c
View File

@ -1270,7 +1270,7 @@ static int ov88_0223C800(int param0, Pokemon *param1, u8 *param2, ArchivedSprite
int v0 = Pokemon_GetValue(param1, MON_DATA_PERSONALITY, NULL);
int v1 = Pokemon_GetValue(param1, MON_DATA_SPECIES, NULL);
sub_020136A4(param3->archive, param3->character, 26, 0, 0, 10, 10, param2, v0, 0, 2, v1);
sub_020136A4(param3->archive, param3->character, HEAP_ID_26, 0, 0, 10, 10, param2, v0, 0, 2, v1);
}
DC_FlushRange(param2, 0x20 * 10 * 10);

2
src/overlay094/ov94_0223D0C4.c
View File

@ -593,7 +593,7 @@ void ov94_0223DB2C(Pokemon *param0)
int v2 = Pokemon_GetValue(param0, MON_DATA_PERSONALITY, NULL);
int v3 = Pokemon_GetValue(param0, MON_DATA_SPECIES, NULL);
sub_020136A4(v0.archive, v0.character, 62, 0, 0, 10, 10, v1, v2, 0, 2, v3);
sub_020136A4(v0.archive, v0.character, HEAP_ID_62, 0, 0, 10, 10, v1, v2, 0, 2, v3);
}
DC_FlushRange(v1, (0x20 * 10 * 10));

2
src/overlay095/ov95_02246C20.c
View File

@ -578,7 +578,7 @@ void ov95_022473E8(UnkStruct_ov95_02247628 *param0, int param1, u32 param2, u32
v4.unk_08 *= 2;
}
sub_02013720(v0.archive, v0.character, 57, &v4, v3, v7, param4, 2, v8);
sub_02013720(v0.archive, v0.character, HEAP_ID_57, &v4, v3, v7, param4, 2, v8);
DC_FlushRange(v3, v2);
Bg_LoadTiles(param0->unk_08, param2, v3, v2, 0);

2
src/overlay097/ov97_0222AE60.c
View File

@ -992,7 +992,7 @@ static int ov97_0222BD70(OverlayManager *param0, int *param1)
v0->unk_50 = TrainerInfo_BadgeCount(v0->unk_0C);
v0->unk_12C = 15;
ov97_02237694(81);
ov97_02237694(HEAP_ID_81);
if (!SaveData_DataExists(v0->unk_04)) {
v0->unk_14C = 1;

36
src/overlay097/ov97_0222C174.c
View File

@ -346,7 +346,7 @@ UnkStruct_ov97_0223E0B0 Unk_ov97_0223E0B0[] = {
};
typedef struct {
int unk_00;
int heapID;
BgConfig *unk_04;
SaveData *unk_08;
Pokedex *unk_0C;
@ -540,15 +540,15 @@ static void ov97_0222C254(UnkStruct_ov97_0222C388 *param0)
ov97_022376FC(param0->unk_04, 5, 1, 0x7000, 0x4000);
Text_ResetAllPrinters();
Font_LoadTextPalette(0, 0 * 32, param0->unk_00);
LoadStandardWindowGraphics(param0->unk_04, 0, 1, 1, 0, param0->unk_00);
Font_LoadTextPalette(0, 0 * 32, param0->heapID);
LoadStandardWindowGraphics(param0->unk_04, 0, 1, 1, 0, param0->heapID);
v0 = Options_Frame(param0->unk_14);
LoadMessageBoxGraphics(param0->unk_04, 0, (1 + 9), 2, v0, param0->unk_00);
Graphics_LoadPalette(116, 0, 0, 16 * 2 * 8, 16 * 2, param0->unk_00);
Graphics_LoadTilesToBgLayer(116, 1, param0->unk_04, 1, 0, 10 * 16 * 0x20, 1, param0->unk_00);
Graphics_LoadTilemapToBgLayer(116, 2, param0->unk_04, 1, 0, 32 * 24 * 2, 1, param0->unk_00);
LoadMessageBoxGraphics(param0->unk_04, 0, (1 + 9), 2, v0, param0->heapID);
Graphics_LoadPalette(116, 0, 0, 16 * 2 * 8, 16 * 2, param0->heapID);
Graphics_LoadTilesToBgLayer(116, 1, param0->unk_04, 1, 0, 10 * 16 * 0x20, 1, param0->heapID);
Graphics_LoadTilemapToBgLayer(116, 2, param0->unk_04, 1, 0, 32 * 24 * 2, 1, param0->heapID);
Bg_ChangeTilemapRectPalette(param0->unk_04, 1, 0, 0, 32, 24, 8);
Bg_CopyTilemapBufferToVRAM(param0->unk_04, 1);
@ -557,9 +557,9 @@ static void ov97_0222C254(UnkStruct_ov97_0222C388 *param0)
static void ov97_0222C388(UnkStruct_ov97_0222C388 *param0)
{
Graphics_LoadPalette(116, 0, 4, 16 * 2 * 8, 16 * 2, param0->unk_00);
Graphics_LoadTilesToBgLayer(116, 1, param0->unk_04, 4, 0, 10 * 16 * 0x20, 1, param0->unk_00);
Graphics_LoadTilemapToBgLayer(116, 2, param0->unk_04, 4, 0, 32 * 24 * 2, 1, param0->unk_00);
Graphics_LoadPalette(116, 0, 4, 16 * 2 * 8, 16 * 2, param0->heapID);
Graphics_LoadTilesToBgLayer(116, 1, param0->unk_04, 4, 0, 10 * 16 * 0x20, 1, param0->heapID);
Graphics_LoadTilemapToBgLayer(116, 2, param0->unk_04, 4, 0, 32 * 24 * 2, 1, param0->heapID);
Bg_ChangeTilemapRectPalette(param0->unk_04, 4, 0, 0, 32, 24, 8);
Bg_CopyTilemapBufferToVRAM(param0->unk_04, 4);
}
@ -618,7 +618,7 @@ static void ov97_0222C578(UnkStruct_ov97_0222C388 *param0)
UnkStruct_ov97_022335A8 v5;
StringTemplate *v6;
v6 = StringTemplate_Default(param0->unk_00);
v6 = StringTemplate_Default(param0->heapID);
ov97_02237808(&param0->unk_F0, &param0->unk_38, 0, 421, 1, 1);
ov97_02237858(&param0->unk_F0, 26, 4, param0->unk_144);
@ -677,14 +677,14 @@ static int ov97_0222C6F8(OverlayManager *param0, int *param1)
v0 = ov97_022376C4(param0, 85, sizeof(UnkStruct_ov97_0222C388), 0x20000);
v0->unk_00 = 85;
v0->unk_04 = BgConfig_New(v0->unk_00);
v0->heapID = HEAP_ID_85;
v0->unk_04 = BgConfig_New(v0->heapID);
v0->unk_08 = ((ApplicationArgs *)OverlayManager_Args(param0))->saveData;
v0->unk_10 = SaveData_GetTrainerInfo(v0->unk_08);
v0->unk_0C = SaveData_GetPokedex(v0->unk_08);
v0->unk_14 = SaveData_Options(v0->unk_08);
ov97_02237694(v0->unk_00);
ov97_02237694(v0->heapID);
v0->unk_3174 = SaveData_MysteryGift(v0->unk_08);
v0->unk_14C = UnkEnum_ov97_0222C78C_09;
@ -800,11 +800,11 @@ static void ov97_0222C974(UnkStruct_ov97_0222C388 *param0)
MI_CpuClear8(v4, sizeof(UnkStruct_0202DBAC));
v3 = MessageLoader_Init(1, 26, 421, param0->unk_00);
v2 = StringTemplate_Default(param0->unk_00);
v3 = MessageLoader_Init(1, 26, 421, param0->heapID);
v2 = StringTemplate_Default(param0->heapID);
v4->unk_00 = 7;
v1 = MessageUtil_ExpandedStrbuf(v2, v3, 76, param0->unk_00);
v1 = MessageUtil_ExpandedStrbuf(v2, v3, 76, param0->heapID);
Strbuf_ToChars((const Strbuf *)v1, v4->unk_104.unk_00, 36);
Strbuf_Free(v1);
@ -817,7 +817,7 @@ static void ov97_0222C974(UnkStruct_ov97_0222C388 *param0)
v4->unk_104.unk_4E_3 = 1;
v4->unk_104.unk_4E_5 = 0;
v1 = MessageUtil_ExpandedStrbuf(v2, v3, 75, param0->unk_00);
v1 = MessageUtil_ExpandedStrbuf(v2, v3, 75, param0->heapID);
Strbuf_ToChars((const Strbuf *)v1, v4->unk_154, 250);
Strbuf_Free(v1);

2
src/overlay097/ov97_0222D30C.c
View File

@ -1983,7 +1983,7 @@ static int ov97_0222F75C(OverlayManager *param0, int *param1)
switch (*param1) {
case 0:
ov97_02237694(86);
ov97_02237694(HEAP_ID_86);
v3->unk_163C = param1;
*param1 = 1;
break;

2
src/overlay097/ov97_02230410.c
View File

@ -835,7 +835,7 @@ static int ov97_02231224(OverlayManager *param0, int *param1)
v0->unk_2C20 = 3 - 1;
v0->unk_2C9C = 1;
ov97_02237694(87);
ov97_02237694(HEAP_ID_87);
Heap_Create(0, 91, 0x300);
return 1;

46
src/overlay097/ov97_02237694.c
View File

@ -49,7 +49,7 @@
typedef struct {
BgConfig *unk_00;
BOOL unk_04;
int unk_08;
int heapID;
int unk_0C;
int unk_10;
int unk_14;
@ -70,14 +70,14 @@ static void ov97_02237E58(void *param0);
static UnkStruct_ov97_0223F550 Unk_ov97_0223F550;
void ov97_02237694(int param0)
void ov97_02237694(int heapID)
{
UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550;
memset(v0, 0, sizeof(UnkStruct_ov97_0223F550));
v0->unk_04 = 1;
v0->unk_08 = param0;
v0->heapID = heapID;
}
void *ov97_022376C4(OverlayManager *param0, int param1, int param2, int param3)
@ -148,9 +148,9 @@ void ov97_02237790(int param0, int param1, int *param2, int param3)
UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550;
if (v0->unk_10 == 0) {
StartScreenTransition(0, param0, param0, 0x0, 6, 1, v0->unk_08);
StartScreenTransition(0, param0, param0, 0x0, 6, 1, v0->heapID);
} else {
StartScreenTransition(0, param0, param0, 0x7fff, 6, 1, v0->unk_08);
StartScreenTransition(0, param0, param0, 0x7fff, 6, 1, v0->heapID);
}
if (param2) {
@ -226,15 +226,15 @@ static int ov97_02237870(UnkStruct_ov97_02237808 *param0, int param1)
}
if (param0->unk_4C != -1) {
v3 = MessageLoader_Init(1, 26, param0->unk_34, v4->unk_08);
v3 = MessageLoader_Init(1, 26, param0->unk_34, v4->heapID);
if (param0->unk_14 == NULL) {
v2 = StringTemplate_Default(v4->unk_08);
v2 = StringTemplate_Default(v4->heapID);
} else {
v2 = param0->unk_14;
}
v1 = MessageUtil_ExpandedStrbuf(v2, v3, param0->unk_4C, v4->unk_08);
v1 = MessageUtil_ExpandedStrbuf(v2, v3, param0->unk_4C, v4->heapID);
if (param0->unk_0C == 0) {
v0 = Text_AddPrinterWithParamsAndColor(param0->unk_10, param0->unk_40, v1, param0->unk_20, param0->unk_24, param0->unk_50, param0->unk_44, NULL);
@ -307,10 +307,10 @@ void ov97_02237A20(void)
NULL,
};
v1.heapID = v0->unk_08;
v1.heapID = v0->heapID;
CharTransfer_InitWithVramModes(&v1, GX_OBJVRAMMODE_CHAR_1D_32K, GX_OBJVRAMMODE_CHAR_1D_32K);
PlttTransfer_Init(30, v0->unk_08);
PlttTransfer_Init(30, v0->heapID);
CharTransfer_ClearBuffers();
PlttTransfer_Clear();
@ -330,14 +330,14 @@ void ov97_02237A74(void)
NNS_G2dInitOamManagerModule();
RenderOam_Init(0, 126, 0, 32, 0, 126, 0, 32, v1->unk_08);
v1->unk_34.unk_00 = SpriteList_InitRendering(128, &v1->unk_34.unk_04, v1->unk_08);
RenderOam_Init(0, 126, 0, 32, 0, 126, 0, 32, v1->heapID);
v1->unk_34.unk_00 = SpriteList_InitRendering(128, &v1->unk_34.unk_04, v1->heapID);
SetSubScreenViewRect(&v1->unk_34.unk_04, 0, (256 * FX32_ONE));
v1->unk_274 = (192 << FX32_SHIFT);
for (v0 = 0; v0 < 6; v0++) {
v1->unk_34.unk_190[v0] = SpriteResourceCollection_New(32, v0, v1->unk_08);
v1->unk_34.unk_190[v0] = SpriteResourceCollection_New(32, v0, v1->heapID);
}
}
@ -364,19 +364,19 @@ void ov97_02237B0C(int param0, int param1, int param2, int param3, int param4, i
}
if (param1 != -1) {
v0->unk_34.unk_1A8[param5][0] = SpriteResourceCollection_AddTiles(v0->unk_34.unk_190[0], param0, param1, v2, param5, v1, v0->unk_08);
v0->unk_34.unk_1A8[param5][0] = SpriteResourceCollection_AddTiles(v0->unk_34.unk_190[0], param0, param1, v2, param5, v1, v0->heapID);
}
if (param2 != -1) {
v0->unk_34.unk_1A8[param5][1] = SpriteResourceCollection_AddPalette(v0->unk_34.unk_190[1], param0, param2, 0, param5, v1, 3, v0->unk_08);
v0->unk_34.unk_1A8[param5][1] = SpriteResourceCollection_AddPalette(v0->unk_34.unk_190[1], param0, param2, 0, param5, v1, 3, v0->heapID);
}
if (param3 != -1) {
v0->unk_34.unk_1A8[param5][2] = SpriteResourceCollection_Add(v0->unk_34.unk_190[2], param0, param3, v2, param5, 2, v0->unk_08);
v0->unk_34.unk_1A8[param5][2] = SpriteResourceCollection_Add(v0->unk_34.unk_190[2], param0, param3, v2, param5, 2, v0->heapID);
}
if (param4 != -1) {
v0->unk_34.unk_1A8[param5][3] = SpriteResourceCollection_Add(v0->unk_34.unk_190[3], param0, param4, v2, param5, 3, v0->unk_08);
v0->unk_34.unk_1A8[param5][3] = SpriteResourceCollection_Add(v0->unk_34.unk_190[3], param0, param4, v2, param5, 3, v0->heapID);
}
SpriteTransfer_RequestChar(v0->unk_34.unk_1A8[param5][0]);
@ -450,7 +450,7 @@ Sprite *ov97_02237D14(int param0, Sprite *param1, int param2, int param3, int pa
v1.position.y = FX32_ONE * param3;
v1.priority = 10;
v1.vramType = (param0 == 0) ? NNS_G2D_VRAM_TYPE_2DMAIN : NNS_G2D_VRAM_TYPE_2DSUB;
v1.heapID = v0->unk_08;
v1.heapID = v0->heapID;
if (v1.vramType == NNS_G2D_VRAM_TYPE_2DSUB) {
v1.position.y += v0->unk_274;
@ -578,7 +578,7 @@ static void ov97_02237EF8(Sprite *param0, Pokemon *param1, int param2, int param
BuildArchivedPokemonSprite(param5, param2, v0, 2, v1, param3, 0);
v2 = Pokemon_GetValue(param1, MON_DATA_PERSONALITY, NULL);
sub_020136A4(param5->archive, param5->character, v3->unk_08, 0, 0, 10, 10, param4, v2, 0, 2, param2);
sub_020136A4(param5->archive, param5->character, v3->heapID, 0, 0, 10, 10, param4, v2, 0, 2, param2);
DC_FlushRange(param4, 0x20 * 10 * 10);
@ -593,7 +593,7 @@ static void ov97_02237EF8(Sprite *param0, Pokemon *param1, int param2, int param
NNSG2dImagePaletteProxy *v6 = Sprite_GetPaletteProxy(param0);
u32 v7 = NNS_G2dGetImagePaletteLocation(v6, NNS_G2D_VRAM_TYPE_2DSUB);
Graphics_LoadPalette(param5->archive, param5->palette, 5, 0x20 * (2 + 1) + v7, 32, v3->unk_08);
Graphics_LoadPalette(param5->archive, param5->palette, 5, 0x20 * (2 + 1) + v7, 32, v3->heapID);
}
}
@ -660,7 +660,7 @@ static void ov97_022380C8(UnkStruct_ov97_0223F550 *param0, int param1, UnkStruct
static void ov97_02238174(void *param0)
{
UnkStruct_ov97_0223F550 *v0 = (UnkStruct_ov97_0223F550 *)param0;
Graphics_LoadPalette(116, 29, 4, 16 * 2 * 8, 16 * 2 * 6, v0->unk_08);
Graphics_LoadPalette(116, 29, 4, 16 * 2 * 8, 16 * 2 * 6, v0->heapID);
}
void ov97_02238194(BgConfig *param0, UnkStruct_0202DF40 *param1)
@ -671,11 +671,11 @@ void ov97_02238194(BgConfig *param0, UnkStruct_0202DF40 *param1)
v1 = param1->unk_00;
v0 = ov97_02237EA8(v1);
Graphics_LoadTilesToBgLayer(116, 30, param0, 5, 0, 10 * 16 * 0x20, 1, v2->unk_08);
Graphics_LoadTilesToBgLayer(116, 30, param0, 5, 0, 10 * 16 * 0x20, 1, v2->heapID);
{
NNSG2dScreenData *v3;
void *v4 = LoadMemberFromNARC(116, 31, 1, v2->unk_08, 1);
void *v4 = LoadMemberFromNARC(116, 31, 1, v2->heapID, 1);
NNS_G2dGetUnpackedScreenData(v4, &v3);

2
src/overlay100/ov100_021D13E4.c
View File

@ -127,7 +127,7 @@ BOOL ov100_021D14A8(void *param0)
}
if (v0->unk_04 == v2[v0->unk_08]) {
Sound_PlayPokemonCry(0, v4[v0->unk_08], 0, 100, 111, 0);
Sound_PlayPokemonCry(0, v4[v0->unk_08], 0, 100, HEAP_ID_111, 0);
}
if ((++v0->unk_04) >= v1[v0->unk_08]) {

8
src/overlay100/ov100_021D1C44.c
View File

@ -513,11 +513,11 @@ BOOL ov100_021D2428(void *param0)
}
if (v0->unk_04 == 15 + 25) {
Sound_PlayPokemonCry(0, 483, -80, 40, 111, 0);
Sound_PlayPokemonCry(0, 483, -80, 40, HEAP_ID_111, 0);
}
if (v0->unk_04 == 40 + 25) {
Sound_PlayPokemonCry(0, 484, +80, 40, 111, 0);
Sound_PlayPokemonCry(0, 484, +80, 40, HEAP_ID_111, 0);
}
if (v0->unk_04 < 15 + 25) {
@ -555,7 +555,7 @@ BOOL ov100_021D2428(void *param0)
Easy3DObject_SetVisibility(&v0->unk_1A0.unk_934[1].unk_00, 0);
Easy3DObject_SetVisibility(&v0->unk_1A0.unk_934[2].unk_00, 1);
Sound_PlayPokemonCry(2, 487, 0, 127, 111, 0);
Sound_PlayPokemonCry(2, 487, 0, 127, HEAP_ID_111, 0);
v0->unk_04 = 0;
v0->unk_00++;
@ -595,7 +595,7 @@ BOOL ov100_021D2428(void *param0)
break;
case 19:
if ((++v0->unk_04) == 238) {
Sound_PlayPokemonCry(2, 487, 0, 127, 111, 0);
Sound_PlayPokemonCry(2, 487, 0, 127, HEAP_ID_111, 0);
}
if (v0->unk_04 == 170) {

2
src/overlay100/ov100_021D2F0C.c
View File

@ -373,7 +373,7 @@ static void ov100_021D37F4(SysTask *param0, void *param1)
break;
case 1:
if ((++v0->unk_04) >= NELEMS(v1)) {
Sound_PlayPokemonCry(0, v0->unk_08, v0->unk_0C, 80, 111, 0);
Sound_PlayPokemonCry(0, v0->unk_08, v0->unk_0C, 80, HEAP_ID_111, 0);
v0->unk_00++;
} else {
Easy3DObject_SetScale(&v0->unk_10->unk_00, FX32_CONST(v1[v0->unk_04]), FX32_CONST(1.00f), FX32_CONST(1.00f));

2
src/overlay104/ov104_0222FBE4.c
View File

@ -2743,7 +2743,7 @@ static BOOL ov104_02231D1C(UnkStruct_ov104_0222E930 *param0)
v8 = 8;
v9 = (GX_RGB(0, 0, 0));
ov104_02232CE0(v3, v1, 11, v7, v5, v6, 0, 0, v8, v9);
ov104_02232CE0(v3, v1, HEAP_ID_FIELDMAP, v7, v5, v6, 0, 0, v8, v9);
return 0;
}

10
src/overlay104/ov104_02231F74.c
View File

@ -864,7 +864,7 @@ void ov104_02232C80(UnkStruct_ov63_0222CCB8 *param0, UnkStruct_ov63_0222BEC0 *pa
}
}
void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, u16 param9)
void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, int heapID, int param3, int param4, int param5, int param6, int param7, int param8, u16 param9)
{
SpriteSystem *v0 = param0->unk_34.unk_00;
SpriteManager *v1 = param0->unk_34.unk_04;
@ -876,7 +876,7 @@ void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, int param
{
NARC *v6;
v6 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, param2);
v6 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, heapID);
SpriteSystem_LoadCharResObjFromOpenNarc(v0, v1, v6, 112, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, param3);
SpriteSystem_LoadPaletteBufferFromOpenNarc(v2, PLTTBUF_MAIN_OBJ, v0, v1, v6, 111, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param3);
@ -912,12 +912,12 @@ void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, int param
{
u32 v9, v10;
v4 = Heap_AllocFromHeap(param2, (10 * 10 * ((8 / 2) * 8)));
v4 = Heap_AllocFromHeap(heapID, (10 * 10 * ((8 / 2) * 8)));
v9 = Pokemon_GetValue(param1, MON_DATA_PERSONALITY, NULL);
v10 = Pokemon_GetValue(param1, MON_DATA_SPECIES, NULL);
Pokemon_BuildArchivedSprite(&v3, param1, 2);
sub_020136A4(v3.archive, v3.character, param2, 0, 0, 10, 10, v4, v9, 0, 2, v10);
sub_020136A4(v3.archive, v3.character, heapID, 0, 0, 10, 10, v4, v9, 0, 2, v10);
}
{
@ -932,7 +932,7 @@ void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, int param
v12 = Sprite_GetPaletteProxy(v5->sprite);
v13 = PlttTransfer_GetPlttOffset(v12, NNS_G2D_VRAM_TYPE_2DMAIN);
PaletteData_LoadBufferFromFileStart(v2, v3.archive, v3.palette, param2, 2, 0x20, v13 * 16);
PaletteData_LoadBufferFromFileStart(v2, v3.archive, v3.palette, heapID, 2, 0x20, v13 * 16);
if (param8 > 0) {
PaletteData_Blend(v2, 2, v13 * 16, 16, param8, param9);

2
src/start_menu.c
View File

@ -1376,7 +1376,7 @@ static BOOL StartMenu_TrainerCard(FieldTask *taskMan)
fieldSystem = FieldTask_GetFieldSystem(taskMan);
menu = FieldTask_GetEnv(taskMan);
menu->unk_25C = sub_02071F04(11);
menu->unk_25C = sub_02071F04(HEAP_ID_FIELDMAP);
sub_02071D40(1, 1, 0, 0xff, fieldSystem, (TrainerCard *)menu->unk_25C);
sub_0203E09C(fieldSystem, (TrainerCard *)menu->unk_25C);

5
src/unk_020041CC.c
View File

@ -58,7 +58,6 @@ void sub_02004D40(u32 param0, int param1);
BOOL sub_02004CB4(UnkStruct_02004CB4 *param0, u32 param1);
void sub_02004CF4(u32 param0);
BOOL sub_02004D04(u32 param0);
BOOL sub_02004D78(u16 param0, int param1, int param2, u32 param3, int param4);
void sub_02004E84(u32 param0);
static void sub_02004E64(u8 *param0, u32 param1);
BOOL sub_02004EC0(void);
@ -998,7 +997,7 @@ void sub_02004D40(u32 param0, int param1)
return;
}
BOOL sub_02004D78(u16 param0, int param1, int param2, u32 param3, int param4)
BOOL sub_02004D78(u16 param0, int param1, int param2, u32 param3, int heapID)
{
u8 *v0;
const NNSSndArcWaveArcInfo *v1;
@ -1026,7 +1025,7 @@ BOOL sub_02004D78(u16 param0, int param1, int param2, u32 param3, int param4)
}
if (param3 == 14) {
*v6 = Heap_AllocFromHeap(param4, v2);
*v6 = Heap_AllocFromHeap(heapID, v2);
if (*v6 == NULL) {
GF_ASSERT(FALSE);

40
src/unk_02005474.c
View File

@ -47,15 +47,13 @@ BOOL sub_02005844(u16 param0, u8 param1);
BOOL sub_0200590C(u16 param0, u8 param1, u8 param2);
void sub_0200592C(int param0);
int sub_0200598C(void);
BOOL Sound_PlayPokemonCry(int param0, u16 species, int param2, int param3, int param4, u8 param5);
void sub_02005E64(int param0, int param1);
static void sub_02005EB0(SysTask *param0, void *param1);
void sub_02005F24(void);
void Sound_PlayDelayedPokemonCry(int param0, u16 param1, int param2, int param3, int param4, u8 param5, u8 param6);
static BOOL sub_02006038(u16 param0, u8 param1);
void sub_0200605C(void);
static BOOL sub_020060EC(u16 param0, s8 param1, u8 param2);
static BOOL sub_02006120(u16 param0, s8 param1, int param2, int param3, int param4);
static BOOL sub_02006120(u16 param0, s8 param1, int param2, int param3, int heapID);
BOOL sub_02006150(u16 param0);
int sub_0200619C(void);
static void sub_020061C8(int param0);
@ -439,7 +437,7 @@ BOOL sub_02005844(u16 param0, u8 param1)
BOOL sub_0200590C(u16 param0, u8 param1, u8 param2)
{
Sound_PlayDelayedPokemonCry(0, param0, 0, 127, 11, param1, param2);
Sound_PlayDelayedPokemonCry(0, param0, 0, 127, HEAP_ID_FIELDMAP, param1, param2);
return 1;
}
@ -486,7 +484,7 @@ int sub_0200598C(void)
return sub_02004B04(0);
}
BOOL Sound_PlayPokemonCry(int param0, u16 species, int param2, int param3, int param4, u8 param5)
BOOL Sound_PlayPokemonCry(int param0, u16 species, int param2, int param3, int heapID, u8 param5)
{
int v0, v1;
u16 v2;
@ -579,7 +577,7 @@ BOOL Sound_PlayPokemonCry(int param0, u16 species, int param2, int param3, int p
v4 = sub_02005844(v2, param5);
sub_02004F94(1, 0xffff, param2);
sub_02005E4C(v2, 1, param3);
sub_02005E64(20, param4);
sub_02005E64(20, heapID);
break;
case 2:
v4 = sub_02005844(v2, param5);
@ -594,7 +592,7 @@ BOOL Sound_PlayPokemonCry(int param0, u16 species, int param2, int param3, int p
v4 = sub_02005844(v2, param5);
sub_02004F94(1, 0xffff, param2);
sub_02005E4C(v2, 1, param3);
sub_02005E64(30, param4);
sub_02005E64(30, heapID);
sub_02004F68(1, 0xffff, 192);
v6 = sub_020060EC(v2, 16, param5);
sub_02004F94(8, 0xffff, param2);
@ -602,11 +600,11 @@ BOOL Sound_PlayPokemonCry(int param0, u16 species, int param2, int param3, int p
break;
case 4:
v5 = sub_02004BCC(14);
v5 = sub_02004D78(v2, param3, v0, 14, param4);
v5 = sub_02004D78(v2, param3, v0, 14, heapID);
sub_02004D14(14, v0);
sub_02005E64(15, param4);
sub_02005E64(15, heapID);
sub_02004D2C(14, (32768 + 1536));
v7 = sub_02006120(v2, -64, v1, v0, param4);
v7 = sub_02006120(v2, -64, v1, v0, heapID);
sub_02004D2C(15, (32768 + 1536));
break;
case 5:
@ -628,28 +626,28 @@ BOOL Sound_PlayPokemonCry(int param0, u16 species, int param2, int param3, int p
v4 = sub_02005844(v2, param5);
sub_02004F94(1, 0xffff, param2);
sub_02005E4C(v2, 1, param3);
sub_02005E64(11, param4);
sub_02005E64(11, heapID);
sub_02004F68(1, 0xffff, -128);
break;
case 8:
v4 = sub_02005844(v2, param5);
sub_02004F94(1, 0xffff, param2);
sub_02005E4C(v2, 1, param3);
sub_02005E64(60, param4);
sub_02005E64(60, heapID);
sub_02004F68(1, 0xffff, 60);
break;
case 9:
v5 = sub_02004BCC(14);
v5 = sub_02004D78(v2, param3, v0, 14, param4);
v5 = sub_02004D78(v2, param3, v0, 14, heapID);
sub_02004D14(14, v0);
sub_02005E64(13, param4);
sub_02005E64(13, heapID);
sub_02004D2C(14, (32768 - 6144));
break;
case 10:
v4 = sub_02005844(v2, param5);
sub_02004F94(1, 0xffff, param2);
sub_02005E4C(v2, 1, param3);
sub_02005E64(100, param4);
sub_02005E64(100, heapID);
sub_02004F68(1, 0xffff, -44);
break;
case 11:
@ -662,7 +660,7 @@ BOOL Sound_PlayPokemonCry(int param0, u16 species, int param2, int param3, int p
v4 = sub_02005844(v2, param5);
sub_02004F94(1, 0xffff, param2);
sub_02005E4C(v2, 1, param3);
sub_02005E64(20, param4);
sub_02005E64(20, heapID);
sub_02004F68(1, 0xffff, -96);
break;
case 13:
@ -766,7 +764,7 @@ void sub_02005F24()
return;
}
void Sound_PlayDelayedPokemonCry(int param0, u16 param1, int param2, int param3, int param4, u8 param5, u8 param6)
void Sound_PlayDelayedPokemonCry(int param0, u16 param1, int param2, int param3, int heapID, u8 param5, u8 param6)
{
u16 v0;
int *v1;
@ -809,7 +807,7 @@ void Sound_PlayDelayedPokemonCry(int param0, u16 param1, int param2, int param3,
}
if (param5 == 0) {
Sound_PlayPokemonCry(param0, v0, param2, param3, param4, param6);
Sound_PlayPokemonCry(param0, v0, param2, param3, heapID, param6);
return;
}
@ -817,7 +815,7 @@ void Sound_PlayDelayedPokemonCry(int param0, u16 param1, int param2, int param3,
*v2 = v0;
*v3 = param2;
*v4 = param3;
*v5 = param4;
*v5 = heapID;
*v6 = param5;
return;
@ -884,7 +882,7 @@ static BOOL sub_020060EC(u16 param0, s8 param1, u8 param2)
return v0;
}
static BOOL sub_02006120(u16 param0, s8 param1, int param2, int param3, int param4)
static BOOL sub_02006120(u16 param0, s8 param1, int param2, int param3, int heapID)
{
int v0;
u8 *v1 = sub_02003D5C(18);
@ -892,7 +890,7 @@ static BOOL sub_02006120(u16 param0, s8 param1, int param2, int param3, int para
*v1 = 1;
v0 = sub_02004BCC(15);
v0 = sub_02004D78(param0, param2, param3, 15, param4);
v0 = sub_02004D78(param0, param2, param3, 15, heapID);
return v0;
}

4
src/unk_02006224.c
View File

@ -177,7 +177,7 @@ BOOL Sound_PlayChatotCry(ChatotCry *param0, u32 param1, int param2, int param3)
if (v0 == 0) {
Sound_FlagDefaultChatotCry(1);
v0 = Sound_PlayPokemonCry(0, 441, param3, param2, 11, 0);
v0 = Sound_PlayPokemonCry(0, 441, param3, param2, HEAP_ID_FIELDMAP, 0);
}
return v0;
@ -196,7 +196,7 @@ BOOL Sound_PlayDelayedChatotCry(ChatotCry *param0, u32 param1, int param2, int p
if (v0 == 0) {
Sound_FlagDefaultChatotCry(1);
Sound_PlayDelayedPokemonCry(0, 441, param3, param2, 11, param4, 0);
Sound_PlayDelayedPokemonCry(0, 441, param3, param2, HEAP_ID_FIELDMAP, param4, 0);
v0 = 1;
}

18
src/unk_020131EC.c
View File

@ -114,15 +114,15 @@ static void sub_02013338(int param0, int param1, int param2, int param3, int par
sub_02013260(param3, param4, param5, param6, v1, param7);
}
static void *sub_02013388(int param0, int param1, int param2, int param3, int param4, int param5, int param6, u32 param7, BOOL param8, int param9, int param10)
static void *sub_02013388(int param0, int param1, int heapID, int param3, int param4, int param5, int param6, u32 param7, BOOL param8, int param9, int param10)
{
void *v0;
int v1;
v1 = ((param5 * param6) * ((8 / 2) * 8));
v0 = Heap_AllocFromHeap(param2, v1);
v0 = Heap_AllocFromHeap(heapID, v1);
sub_02013338(param0, param1, param2, param3, param4, param5, param6, v0, param7, param8, param9, param10);
sub_02013338(param0, param1, heapID, param3, param4, param5, param6, v0, param7, param8, param9, param10);
return v0;
}
@ -290,7 +290,7 @@ void *sub_02013660(int param0, int param1, int param2)
return v2;
}
void sub_020136A4(int param0, int param1, int param2, int param3, int param4, int param5, int param6, void *param7, u32 param8, BOOL param9, int param10, int param11)
void sub_020136A4(int param0, int param1, int heapID, int param3, int param4, int param5, int param6, void *param7, u32 param8, BOOL param9, int param10, int param11)
{
int v0;
int v1;
@ -308,7 +308,7 @@ void sub_020136A4(int param0, int param1, int param2, int param3, int param4, in
v1 = NELEMS(v4);
v2 = 0;
v3 = sub_02013388(param0, param1, param2, param3, param4, param5, param6, param8, param9, param10, param11);
v3 = sub_02013388(param0, param1, heapID, param3, param4, param5, param6, param8, param9, param10, param11);
for (v0 = 0; v0 < v1; v0++) {
sub_02013560(param5, param6, &v4[v0], &v2, v3, param7);
@ -317,12 +317,12 @@ void sub_020136A4(int param0, int param1, int param2, int param3, int param4, in
Heap_FreeToHeap(v3);
}
void sub_02013720(int param0, int param1, int param2, const UnkStruct_02013610 *param3, void *param4, u32 param5, BOOL param6, int param7, int param8)
void sub_02013720(int param0, int param1, int heapID, const UnkStruct_02013610 *param3, void *param4, u32 param5, BOOL param6, int param7, int param8)
{
sub_020136A4(param0, param1, param2, param3->unk_00, param3->unk_04, param3->unk_08, param3->unk_0C, param4, param5, param6, param7, param8);
sub_020136A4(param0, param1, heapID, param3->unk_00, param3->unk_04, param3->unk_08, param3->unk_0C, param4, param5, param6, param7, param8);
}
void sub_02013750(int param0, int param1, int param2, void *param3, u32 param4, BOOL param5, int param6, int param7)
void sub_02013750(int param0, int param1, int heapID, void *param3, u32 param4, BOOL param5, int param6, int param7)
{
const UnkStruct_02013610 v0 = {
0x0,
@ -331,5 +331,5 @@ void sub_02013750(int param0, int param1, int param2, void *param3, u32 param4,
0xA
};
sub_02013720(param0, param1, param2, &v0, param3, param4, param5, param6, param7);
sub_02013720(param0, param1, heapID, &v0, param3, param4, param5, param6, param7);
}

8
src/unk_02014D38.c
View File

@ -142,14 +142,14 @@ void include_unk_020E5538(void)
Unk_020E5538[0];
}
UnkStruct_02014D38 *sub_02014D38(u32 param0)
UnkStruct_02014D38 *sub_02014D38(u32 heapID)
{
int v0;
UnkStruct_02014D38 *v1 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02014D38));
UnkStruct_02014D38 *v1 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02014D38));
for (v0 = 0; v0 < 11; v0++) {
v1->unk_00 = param0;
v1->unk_04[v0] = MessageLoader_Init(1, 26, Unk_020E550C[v0], param0);
v1->unk_00 = heapID;
v1->unk_04[v0] = MessageLoader_Init(1, 26, Unk_020E550C[v0], heapID);
}
return v1;

8
src/unk_02015F84.c
View File

@ -173,15 +173,15 @@ static const UnkStruct_020E5598 Unk_020E5598[] = {
{ sub_02016F9C, 0x4, 0x0 }
};
PokemonAnimationSys *sub_02015F84(const int param0, const int param1, const u8 param2)
PokemonAnimationSys *sub_02015F84(const int heapID, const int param1, const u8 param2)
{
PokemonAnimationSys *v0;
v0 = Heap_AllocFromHeap(param0, sizeof(PokemonAnimationSys));
v0 = Heap_AllocFromHeap(heapID, sizeof(PokemonAnimationSys));
v0->reverse = param2;
v0->animation = param1;
v0->heapID = param0;
v0->pokeAnimation = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02016E64) * param1);
v0->heapID = heapID;
v0->pokeAnimation = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02016E64) * param1);
MI_CpuClear8(v0->pokeAnimation, sizeof(UnkStruct_02016E64) * param1);

4
src/unk_02020AEC.c
View File

@ -141,13 +141,13 @@ void sub_02020B14(UnkStruct_020216E0 *param0)
param0->unk_20 = NULL;
}
void sub_02020B90(int param0, int param1)
void sub_02020B90(int param0, int heapID)
{
int v0;
GF_ASSERT(Unk_021C0774 == NULL);
Unk_021C0774 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02020C44) * param0);
Unk_021C0774 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02020C44) * param0);
Unk_021C0778 = param0;
for (v0 = 0; v0 < param0; v0++) {

6
src/unk_02023FCC.c
View File

@ -27,20 +27,20 @@ static u32 sub_020240F4(UnkStruct_02024028 *param0, BOOL param1, BOOL param2);
static u32 sub_02024110(UnkStruct_02024028 *param0, BOOL param1, BOOL param2);
static void sub_02024144(UnkStruct_02024028 *param0, u32 param1);
UnkStruct_02023FCC *sub_02023FCC(const TouchScreenHitTable *hitTable, u32 param1, UnkFuncPtr_02023FCC param2, void *param3, u32 param4)
UnkStruct_02023FCC *sub_02023FCC(const TouchScreenHitTable *hitTable, u32 param1, UnkFuncPtr_02023FCC param2, void *param3, u32 heapID)
{
UnkStruct_02023FCC *v0;
GF_ASSERT(param1 > 0);
v0 = Heap_AllocFromHeap(param4, sizeof(UnkStruct_02023FCC));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02023FCC));
if (v0) {
v0->unk_00 = hitTable;
v0->unk_04 = param1;
v0->unk_08 = param2;
v0->unk_0C = param3;
v0->unk_10 = Heap_AllocFromHeap(param4, sizeof(UnkStruct_02024028) * param1);
v0->unk_10 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02024028) * param1);
if (v0->unk_10) {
u32 v1;

4
src/unk_02027F84.c
View File

@ -50,13 +50,13 @@ BOOL sub_02027FCC(const UnkStruct_02027F8C *param0, const UnkStruct_02027F8C *pa
return 0;
}
void sub_02027FEC(UnkStruct_02027F8C *param0, UnkStruct_02027F8C *param1, int param2, int param3)
void sub_02027FEC(UnkStruct_02027F8C *param0, UnkStruct_02027F8C *param1, int param2, int heapID)
{
int v0, v1, v2;
int v3[5];
UnkStruct_02027F8C *v4;
v4 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_02027F8C) * 16);
v4 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02027F8C) * 16);
PalPad_Init(v4);
for (v0 = 0; v0 < param2; v0++) {

6
src/unk_02030A80.c
View File

@ -23,11 +23,9 @@
#include "unk_0205C980.h"
#include "unk_020996D0.h"
UnkStruct_02030A80 *sub_02030A80(int param0)
UnkStruct_02030A80 *sub_02030A80(int heapID)
{
UnkStruct_02030A80 *v0;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02030A80));
UnkStruct_02030A80 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02030A80));
MI_CpuClear8(v0, sizeof(UnkStruct_02030A80));
return v0;

4
src/unk_02038FFC.c
View File

@ -11,7 +11,7 @@
#include "unk_0202ACE0.h"
#include "unk_02099550.h"
int sub_02038FFC(int param0)
int sub_02038FFC(int heapID)
{
int v0;
u8 *v1;
@ -20,7 +20,7 @@ int sub_02038FFC(int param0)
sub_02099550();
sub_020995B4();
v1 = Heap_AllocFromHeap(param0, DWC_INIT_WORK_SIZE + 32);
v1 = Heap_AllocFromHeap(heapID, DWC_INIT_WORK_SIZE + 32);
v2 = (u8 *)(((u32)v1 + 31) / 32 * 32);
v0 = DWC_Init(v2);

16
src/unk_02039A64.c
View File

@ -18,8 +18,6 @@
#include "text.h"
#include "unk_0200F174.h"
void sub_02039A64(int param0, int param1);
static const UnkStruct_02099F80 Unk_020E5F7C = {
GX_VRAM_BG_256_AB,
GX_VRAM_BGEXTPLTT_NONE,
@ -66,7 +64,7 @@ static const WindowTemplate Unk_020E5F48 = {
0x23
};
void sub_02039A64(int param0, int param1)
void sub_02039A64(int heapID, int unused)
{
BgConfig *v0;
Window v1;
@ -95,19 +93,19 @@ void sub_02039A64(int param0, int param1)
GXS_SetVisibleWnd(GX_WNDMASK_NONE);
GXLayers_SetBanks(&Unk_020E5F7C);
v0 = BgConfig_New(param0);
v0 = BgConfig_New(heapID);
SetAllGraphicsModes(&Unk_020E5F50);
Bg_InitFromTemplate(v0, 0, &Unk_020E5F60, 0);
Bg_ClearTilemap(v0, 0);
LoadStandardWindowGraphics(v0, 0, (512 - 9), 2, 0, param0);
Font_LoadTextPalette(0, 1 * (2 * 16), param0);
Bg_ClearTilesRange(0, 32, 0, param0);
LoadStandardWindowGraphics(v0, 0, (512 - 9), 2, 0, heapID);
Font_LoadTextPalette(0, 1 * (2 * 16), heapID);
Bg_ClearTilesRange(0, 32, 0, heapID);
Bg_MaskPalette(0, 0x6c21);
Bg_MaskPalette(4, 0x6c21);
v2 = MessageLoader_Init(1, 26, 695, param0);
v3 = Strbuf_Init(0x180, param0);
v2 = MessageLoader_Init(1, 26, 695, heapID);
v3 = Strbuf_Init(0x180, heapID);
Text_ResetAllPrinters();
Window_AddFromTemplate(v0, &v1, &Unk_020E5F48);

4
src/unk_02050568.c
View File

@ -83,7 +83,7 @@ static BOOL sub_020505A0(FieldTask *taskMan)
case 4:
sub_0205074C(fieldSystem->playerAvatar, 1);
sub_0205075C(fieldSystem);
sub_02056B30(taskMan, 3, 17, 0xffff, 0x0, 6, 1, 11);
sub_02056B30(taskMan, 3, 17, 0xffff, 0x0, 6, 1, HEAP_ID_FIELDMAP);
Sound_PlayEffect(1657);
v1->unk_08++;
break;
@ -93,7 +93,7 @@ static BOOL sub_020505A0(FieldTask *taskMan)
}
break;
case 6:
sub_02056B30(taskMan, 3, 16, 0xffff, 0x0, 6, 1, 11);
sub_02056B30(taskMan, 3, 16, 0xffff, 0x0, 6, 1, HEAP_ID_FIELDMAP);
Sound_PlayEffect(1657);
v1->unk_08++;
break;

10
src/unk_02055C50.c
View File

@ -83,15 +83,13 @@ static int sub_02055C80(int param0)
return param0 - 95 + 1;
}
UnkStruct_02055CBC *sub_02055C8C(FieldSystem *fieldSystem, int param1)
UnkStruct_02055CBC *sub_02055C8C(FieldSystem *fieldSystem, int heapID)
{
UnkStruct_02055CBC *v0;
v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02055CBC));
UnkStruct_02055CBC *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02055CBC));
MI_CpuClear8(v0, sizeof(UnkStruct_02055CBC));
v0->unk_00 = param1;
v0->unk_04 = BerryGrowthData_Init(param1);
v0->unk_00 = heapID;
v0->unk_04 = BerryGrowthData_Init(heapID);
sub_02055D14(fieldSystem, v0);
return v0;

10
src/unk_02056B30.c
View File

@ -49,7 +49,7 @@ typedef struct {
u16 unk_10;
int unk_14;
int unk_18;
int unk_1C;
int heapID;
} UnkStruct_02056B30;
static BOOL sub_02056B70(FieldTask *taskMan);
@ -98,9 +98,9 @@ static const UnkFuncPtr_020EC57C Unk_020EC57C[7] = {
NULL
};
void sub_02056B30(FieldTask *taskMan, int param1, int param2, int param3, u16 param4, int param5, int param6, int param7)
void sub_02056B30(FieldTask *taskMan, int param1, int param2, int param3, u16 param4, int param5, int param6, int heapID)
{
UnkStruct_02056B30 *v0 = Heap_AllocFromHeap(param7, sizeof(UnkStruct_02056B30));
UnkStruct_02056B30 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02056B30));
v0->unk_04 = param1;
v0->unk_08 = param2;
@ -108,7 +108,7 @@ void sub_02056B30(FieldTask *taskMan, int param1, int param2, int param3, u16 pa
v0->unk_10 = param4;
v0->unk_14 = param5;
v0->unk_18 = param6;
v0->unk_1C = param7;
v0->heapID = heapID;
v0->unk_00 = 0;
FieldTask_InitCall(taskMan, sub_02056B70, v0);
@ -122,7 +122,7 @@ static BOOL sub_02056B70(FieldTask *taskMan)
switch (v1->unk_00) {
case 0:
HBlankSystem_Stop(fieldSystem->unk_04->hBlankSystem);
StartScreenTransition(v1->unk_04, v1->unk_08, v1->unk_0C, v1->unk_10, v1->unk_14, v1->unk_18, v1->unk_1C);
StartScreenTransition(v1->unk_04, v1->unk_08, v1->unk_0C, v1->unk_10, v1->unk_14, v1->unk_18, v1->heapID);
v1->unk_00++;
break;
case 1:

6
src/unk_0205B33C.c
View File

@ -1371,9 +1371,9 @@ static void sub_0205C160(UnkStruct_0205B43C *param0)
void *sub_0205C17C(UnkStruct_0205B43C *param0)
{
param0->unk_184 = sub_02071F04(0);
param0->unk_188[0] = sub_02071F04(0);
param0->unk_188[1] = sub_02071F04(0);
param0->unk_184 = sub_02071F04(HEAP_ID_SYSTEM);
param0->unk_188[0] = sub_02071F04(HEAP_ID_SYSTEM);
param0->unk_188[1] = sub_02071F04(HEAP_ID_SYSTEM);
sub_02071D40(0, 0, 0, sub_0205CA14(TrainerInfo_Gender(param0->unk_08), TrainerInfo_Appearance(param0->unk_08), 0), param0->fieldSystem, param0->unk_184);

4
src/unk_02071D40.c
View File

@ -107,9 +107,9 @@ void sub_02071D40(const u8 param0, const u8 param1, const u8 param2, const u8 pa
param5->unk_66A = 0;
}
TrainerCard *sub_02071F04(const u16 param0)
TrainerCard *sub_02071F04(const u16 heapID)
{
TrainerCard *v0 = Heap_AllocFromHeap(param0, sizeof(TrainerCard));
TrainerCard *v0 = Heap_AllocFromHeap(heapID, sizeof(TrainerCard));
memset(v0, 0, sizeof(TrainerCard));
return v0;

2
src/unk_0207A6DC.c
View File

@ -675,7 +675,7 @@ void sub_0207AE34(int param0, int param1, void *param2, void *param3)
UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3;
if (CommSys_CurNetId() != param0) {
sub_02027FEC(v0->unk_00->unk_124, (UnkStruct_02027F8C *)param2, 1, 5);
sub_02027FEC(v0->unk_00->unk_124, (UnkStruct_02027F8C *)param2, 1, HEAP_ID_BATTLE);
}
v0->unk_1020++;

2
src/unk_02089604.c
View File

@ -846,7 +846,7 @@ void sub_0208A0B8(UnkStruct_02089688 *param0)
}
}
param0->unk_2C0.unk_14 = sub_02023FCC(param0->unk_2C0.unk_18, 0x1c, sub_0208A180, param0, 101);
param0->unk_2C0.unk_14 = sub_02023FCC(param0->unk_2C0.unk_18, 0x1c, sub_0208A180, param0, HEAP_ID_101);
}
void sub_0208A180(u32 param0, u32 param1, void *param2)

2
src/unk_02095CD4.c
View File

@ -156,7 +156,7 @@ void sub_02095DFC(int param0, int param1, void *param2, void *param3)
UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88;
if (CommSys_CurNetId() != param0) {
sub_02027FEC(v0->unk_227C, (UnkStruct_02027F8C *)param2, 1, 26);
sub_02027FEC(v0->unk_227C, (UnkStruct_02027F8C *)param2, 1, HEAP_ID_26);
v0->unk_54 = 3;
}
}

2
src/unk_02097B18.c
View File

@ -154,7 +154,7 @@ static int sub_02097B18(OverlayManager *param0, int *param1)
ov76_0223BF10();
v0->unk_D4.unk_D0 = sub_0200762C(53);
v0->unk_D4.unk_188 = sub_02015F84(53, 1, 0);
v0->unk_D4.unk_188 = sub_02015F84(HEAP_ID_53, 1, 0);
{
int v7;

2
src/unk_02098218.c
View File

@ -81,7 +81,7 @@ static int sub_02098218(OverlayManager *param0, int *param1)
VramTransfer_New(64, 71);
v1->unk_04.unk_54 = sub_02015F84(71, 1, 0);
v1->unk_04.unk_54 = sub_02015F84(HEAP_ID_71, 1, 0);
v1->unk_04.unk_04 = PaletteData_New(71);
PaletteData_SetAutoTransparent(v1->unk_04.unk_04, 1);

8
src/unk_02098FFC.c
View File

@ -20,14 +20,12 @@ static void sub_02099118(UnkStruct_0209903C *param0);
static void sub_020993A8(UnkStruct_0209903C *param0);
static s16 sub_020994B8(UnkStruct_0209903C *param0, u8 param1);
UnkStruct_0209903C *sub_02098FFC(int param0, u16 param1, u16 param2, u16 param3, int param4)
UnkStruct_0209903C *sub_02098FFC(int heapID, u16 param1, u16 param2, u16 param3, int param4)
{
UnkStruct_0209903C *v0;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0209903C));
UnkStruct_0209903C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0209903C));
MI_CpuClear8(v0, sizeof(UnkStruct_0209903C));
v0->unk_00 = param0;
v0->unk_00 = heapID;
if (param1 > 16) {
v0->unk_0A = 16;

6
src/unk_020998EC.c
View File

@ -3160,14 +3160,14 @@ static u32 sub_02099B28(UnkStruct_020998EC *param0, const u16 *param1, u32 param
static void sub_02099BAC(UnkStruct_020998EC *param0);
static u32 sub_02099BF4(UnkStruct_020998EC *param0, const u16 *param1, u16 *param2, u32 param3);
UnkStruct_020998EC *sub_020998EC(u32 param0, const UnkStruct_0209747C *param1)
UnkStruct_020998EC *sub_020998EC(u32 heapID, const UnkStruct_0209747C *param1)
{
UnkStruct_020998EC *v0;
int v1;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_020998EC));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_020998EC));
v0->unk_00 = param1;
v0->unk_04 = sub_02014D38(param0);
v0->unk_04 = sub_02014D38(heapID);
for (v1 = 0; v1 < ((1495 >> 3) + 1); v1++) {
v0->unk_189E[v1] = 0;

4
src/unk_0209C370.c
View File

@ -2,11 +2,11 @@
#include "heap.h"
u8 *sub_0209C370(int param0)
u8 *sub_0209C370(int heapID)
{
u8 *v0;
v0 = Heap_AllocFromHeap(param0, sizeof(void *));
v0 = Heap_AllocFromHeap(heapID, sizeof(void *));
MI_CpuClear8(v0, sizeof(void *));
return v0;
}