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

Breadcrum params used with Heap_AllocFromHeap - Part 7

Browse Source
This commit is contained in:
Eduardo Quezada 2025-03-06 15:00:52 -03:00
parent 0495a9b133
commit b579de84af
24 changed files with 159 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/overlay063/ov63_0222AE60.h
View File

@ -8,7 +8,7 @@
#include "palette.h"
#include "sprite.h"
UnkStruct_ov63_0222AE60 *ov63_0222AE60(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3);
UnkStruct_ov63_0222AE60 *ov63_0222AE60(SpriteList *param0, PaletteData *param1, u32 param2, u32 heapID);
void ov63_0222AF14(UnkStruct_ov63_0222AE60 *param0);
void ov63_0222AF94(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 param4);
void ov63_0222AFD0(UnkStruct_ov63_0222AE60 *param0, u32 param1);

2
include/overlay063/ov63_0222BCE8.h
View File

@ -4,7 +4,7 @@
#include "overlay063/struct_ov63_0222BCE8_decl.h"
#include "overlay063/union_ov63_0222BDAC.h"
UnkStruct_ov63_0222BCE8 *ov63_0222BCE8(u16 param0, u16 param1, u32 param2);
UnkStruct_ov63_0222BCE8 *ov63_0222BCE8(u16 param0, u16 param1, u32 heapID);
void ov63_0222BD30(UnkStruct_ov63_0222BCE8 *param0);
u16 ov63_0222BD48(const UnkStruct_ov63_0222BCE8 *param0);
u16 ov63_0222BD4C(const UnkStruct_ov63_0222BCE8 *param0);

2
include/overlay063/ov63_0222BE18.h
View File

@ -7,7 +7,7 @@
#include "overlay063/struct_ov63_0222CCB8.h"
#include "overlay065/struct_ov65_022376D0.h"
UnkStruct_ov63_0222BE18 *ov63_0222BE18(u32 param0, u32 param1);
UnkStruct_ov63_0222BE18 *ov63_0222BE18(u32 param0, u32 heapID);
void ov63_0222BE58(UnkStruct_ov63_0222BE18 *param0);
void ov63_0222BE70(UnkStruct_ov63_0222BE18 *param0, const UnkStruct_ov63_0222CCB8 *param1);
void ov63_0222BE84(UnkStruct_ov63_0222BE18 *param0);

4
include/overlay063/ov63_0222CCE4.h
View File

@ -9,8 +9,8 @@
#include "palette.h"
#include "sprite.h"
UnkStruct_ov63_0222CD2C *ov63_0222CCE4(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3, u32 param4);
UnkStruct_ov63_0222CD2C *ov63_0222CD2C(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6);
UnkStruct_ov63_0222CD2C *ov63_0222CCE4(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3, u32 heapID);
UnkStruct_ov63_0222CD2C *ov63_0222CD2C(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3, int param4, u32 param5, u32 heapID);
void ov63_0222CD9C(UnkStruct_ov63_0222CD2C *param0);
void ov63_0222CDE8(UnkStruct_ov63_0222CD2C *param0, u32 param1, int param2, u32 param3);
void ov63_0222CE0C(UnkStruct_ov63_0222CD2C *param0, u32 param1);

2
include/overlay063/ov63_0222D1C0.h
View File

@ -8,7 +8,7 @@
#include "bg_window.h"
#include "sprite_util.h"
UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(G2dRenderer *param0, BgConfig *param1, const UnkStruct_ov65_0223582C *param2, u32 param3);
UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(G2dRenderer *param0, BgConfig *param1, const UnkStruct_ov65_0223582C *param2, u32 heapID);
void ov63_0222D214(UnkStruct_ov63_0222D1C0 *param0);
void ov63_0222D228(UnkStruct_ov63_0222D1C0 *param0, const UnkStruct_ov63_0222D160 *param1);

4
include/overlay063/ov63_0222D77C.h
View File

@ -6,11 +6,11 @@
#include "overlay063/struct_ov63_0222D848_decl.h"
#include "overlay063/struct_ov63_0222D894.h"
UnkStruct_ov63_0222D77C *ov63_0222D77C(u32 param0, u32 param1);
UnkStruct_ov63_0222D77C *ov63_0222D77C(u32 param0, u32 heapID);
void ov63_0222D7B4(UnkStruct_ov63_0222D77C *param0);
void ov63_0222D7C8(UnkStruct_ov63_0222D77C *param0, const UnkStruct_ov63_0222CCB8 *param1);
BOOL ov63_0222D810(UnkStruct_ov63_0222D77C *param0, UnkStruct_ov63_0222CCB8 *param1);
UnkStruct_ov63_0222D848 *ov63_0222D848(u32 param0, u32 param1);
UnkStruct_ov63_0222D848 *ov63_0222D848(u32 param0, u32 heapID);
void ov63_0222D880(UnkStruct_ov63_0222D848 *param0);
void ov63_0222D894(UnkStruct_ov63_0222D848 *param0, const UnkStruct_ov63_0222D894 *param1);
BOOL ov63_0222D8D0(UnkStruct_ov63_0222D848 *param0, UnkStruct_ov63_0222D894 *param1);

2
include/overlay065/struct_ov65_02235130.h
View File

@ -15,7 +15,7 @@
typedef struct UnkStruct_ov65_02235130_t {
BOOL unk_00;
u32 unk_04;
u32 heapID;
u32 unk_08;
BOOL unk_0C;
BgConfig *unk_10;

2
include/overlay066/ov66_0222DDF0.h
View File

@ -18,7 +18,7 @@
#include "savedata.h"
#include "trainer_info.h"
UnkStruct_ov66_0222DFF8 *ov66_0222DDF0(SaveData *param0, u32 param1);
UnkStruct_ov66_0222DFF8 *ov66_0222DDF0(SaveData *param0, u32 heapID);
void ov66_0222DEEC(UnkStruct_ov66_0222DFF8 *param0);
void ov66_0222DF58(UnkStruct_ov66_0222DFF8 *param0);
void ov66_0222DFF4(UnkStruct_ov66_0222DFF8 *param0);

2
include/overlay066/ov66_02230C44.h
View File

@ -7,7 +7,7 @@
#include "savedata.h"
UnkStruct_ov66_02230C90 *ov66_02230C44(BOOL param0, SaveData *param1, UnkStruct_ov66_0222DCE0_sub1 *param2, UnkStruct_ov66_0222DFF8 *param3, u32 param4);
UnkStruct_ov66_02230C90 *ov66_02230C44(BOOL param0, SaveData *param1, UnkStruct_ov66_0222DCE0_sub1 *param2, UnkStruct_ov66_0222DFF8 *param3, u32 heapID);
void ov66_02230C90(UnkStruct_ov66_02230C90 *param0);
void ov66_02230CAC(UnkStruct_ov66_02230C90 *param0);
int ov66_02230CB8(UnkStruct_ov66_02230C90 *param0);

2
include/overlay070/ov70_0225C858.h
View File

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

16
src/overlay063/ov63_0222AE60.c
View File

@ -294,33 +294,33 @@ static const u8 Unk_ov63_0222D904[10] = {
0x0
};
UnkStruct_ov63_0222AE60 *ov63_0222AE60(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3)
UnkStruct_ov63_0222AE60 *ov63_0222AE60(SpriteList *param0, PaletteData *param1, u32 param2, u32 heapID)
{
UnkStruct_ov63_0222AE60 *v0;
int v1;
v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov63_0222AE60));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222AE60));
memset(v0, 0, sizeof(UnkStruct_ov63_0222AE60));
v0->unk_00 = param0;
v0->unk_04 = param1;
v0->unk_2294[0] = NARC_ctor(NARC_INDEX_GRAPHIC__WIFI2DCHAR, param3);
v0->unk_2294[1] = NARC_ctor(NARC_INDEX_GRAPHIC__WIFI_UNIONOBJ, param3);
v0->unk_2294[0] = NARC_ctor(NARC_INDEX_GRAPHIC__WIFI2DCHAR, heapID);
v0->unk_2294[1] = NARC_ctor(NARC_INDEX_GRAPHIC__WIFI_UNIONOBJ, heapID);
for (v1 = 0; v1 < 2; v1++) {
v0->unk_2280[v1] = SpriteResourceCollection_New((151 + 1), v1, param3);
v0->unk_2280[v1] = SpriteResourceCollection_New((151 + 1), v1, heapID);
}
for (v1 = 0; v1 < 2; v1++) {
v0->unk_2280[v1 + 2] = SpriteResourceCollection_New(((3 * 2) + 16 + 1), v1 + 2, param3);
v0->unk_2280[v1 + 2] = SpriteResourceCollection_New(((3 * 2) + 16 + 1), v1 + 2, heapID);
}
for (v1 = 0; v1 < 3; v1++) {
ov63_0222B374(v0, v1, param3);
ov63_0222B374(v0, v1, heapID);
}
v0->unk_0C = param2;
v0->unk_08 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov63_0222BB38) * v0->unk_0C);
v0->unk_08 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222BB38) * v0->unk_0C);
memset(v0->unk_08, 0, sizeof(UnkStruct_ov63_0222BB38) * v0->unk_0C);
return v0;

6
src/overlay063/ov63_0222BCE8.c
View File

@ -13,15 +13,15 @@ typedef struct UnkStruct_ov63_0222BCE8_t {
UnkUnion_ov63_0222BDAC *unk_04;
} UnkStruct_ov63_0222BCE8;
UnkStruct_ov63_0222BCE8 *ov63_0222BCE8(u16 param0, u16 param1, u32 param2)
UnkStruct_ov63_0222BCE8 *ov63_0222BCE8(u16 param0, u16 param1, u32 heapID)
{
UnkStruct_ov63_0222BCE8 *v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov63_0222BCE8));
UnkStruct_ov63_0222BCE8 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222BCE8));
GF_ASSERT(v0);
v0->unk_00 = param0;
v0->unk_02 = param1;
v0->unk_04 = Heap_AllocFromHeap(param2, sizeof(UnkUnion_ov63_0222BDAC) * (v0->unk_00 * v0->unk_02));
v0->unk_04 = Heap_AllocFromHeap(heapID, sizeof(UnkUnion_ov63_0222BDAC) * (v0->unk_00 * v0->unk_02));
GF_ASSERT(v0->unk_04);
memset(v0->unk_04, 0, sizeof(UnkUnion_ov63_0222BDAC) * (v0->unk_00 * v0->unk_02));

6
src/overlay063/ov63_0222BE18.c
View File

@ -53,13 +53,13 @@ static void ov63_0222CA48(UnkStruct_ov63_0222BEC0 *param0);
static UnkStruct_ov63_0222CC3C ov63_0222C9E4(UnkStruct_ov63_0222CC3C param0, int param1);
static BOOL ov63_0222CA14(UnkStruct_ov63_0222BEC0 *param0);
UnkStruct_ov63_0222BE18 *ov63_0222BE18(u32 param0, u32 param1)
UnkStruct_ov63_0222BE18 *ov63_0222BE18(u32 param0, u32 heapID)
{
UnkStruct_ov63_0222BE18 *v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov63_0222BE18));
UnkStruct_ov63_0222BE18 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222BE18));
GF_ASSERT(v0);
v0->unk_04 = param0;
v0->unk_00 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov63_0222BEC0) * v0->unk_04);
v0->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222BEC0) * v0->unk_04);
GF_ASSERT(v0->unk_00);
memset(v0->unk_00, 0, sizeof(UnkStruct_ov63_0222BEC0) * v0->unk_04);

20
src/overlay063/ov63_0222CCE4.c
View File

@ -22,12 +22,12 @@ static int ov63_0222D0C4(const UnkStruct_ov63_0222BB38 *param0, int param1);
static void ov63_0222D0E0(const UnkStruct_ov63_0222CE44 *param0, s16 *param1, s16 *param2);
static void ov63_0222D110(UnkStruct_ov63_0222CE44 *param0, int param1, int param2);
UnkStruct_ov63_0222CD2C *ov63_0222CCE4(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3, u32 param4)
UnkStruct_ov63_0222CD2C *ov63_0222CCE4(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3, u32 heapID)
{
UnkStruct_ov63_0222CD2C *v0 = Heap_AllocFromHeap(param4, sizeof(UnkStruct_ov63_0222CD2C));
v0->unk_00 = ov63_0222AE60(param0, param1, param2, param4);
UnkStruct_ov63_0222CD2C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222CD2C));
v0->unk_00 = ov63_0222AE60(param0, param1, param2, heapID);
v0->unk_08 = param2;
v0->unk_04 = Heap_AllocFromHeap(param4, sizeof(UnkStruct_ov63_0222CE44) * v0->unk_08);
v0->unk_04 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222CE44) * v0->unk_08);
memset(v0->unk_04, 0, sizeof(UnkStruct_ov63_0222CE44) * v0->unk_08);
@ -37,20 +37,20 @@ UnkStruct_ov63_0222CD2C *ov63_0222CCE4(SpriteList *param0, PaletteData *param1,
return v0;
}
UnkStruct_ov63_0222CD2C *ov63_0222CD2C(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6)
UnkStruct_ov63_0222CD2C *ov63_0222CD2C(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3, int param4, u32 param5, u32 heapID)
{
UnkStruct_ov63_0222CD2C *v0 = Heap_AllocFromHeap(param6, sizeof(UnkStruct_ov63_0222CD2C));
v0->unk_00 = ov63_0222AE60(param0, param1, param2, param6);
UnkStruct_ov63_0222CD2C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222CD2C));
v0->unk_00 = ov63_0222AE60(param0, param1, param2, heapID);
v0->unk_08 = param2;
v0->unk_04 = Heap_AllocFromHeap(param6, sizeof(UnkStruct_ov63_0222CE44) * v0->unk_08);
v0->unk_04 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222CE44) * v0->unk_08);
memset(v0->unk_04, 0, sizeof(UnkStruct_ov63_0222CE44) * v0->unk_08);
v0->unk_0A = 2;
v0->unk_0B = param5;
ov63_0222AF94(v0->unk_00, param3, v0->unk_0B, param4, param6);
ov63_0222B0A0(v0->unk_00, v0->unk_0B, 40001, param6);
ov63_0222AF94(v0->unk_00, param3, v0->unk_0B, param4, heapID);
ov63_0222B0A0(v0->unk_00, v0->unk_0B, 40001, heapID);
return v0;
}

6
src/overlay063/ov63_0222D1C0.c
View File

@ -31,9 +31,9 @@ static void ov63_0222D4F8(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8
static u8 ov63_0222D688(u8 param0, u8 param1);
static const void *ov63_0222D6BC(const u8 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, UnkStruct_ov63_0222CC3C *param6);
UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(G2dRenderer *param0, BgConfig *param1, const UnkStruct_ov65_0223582C *param2, u32 param3)
UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(G2dRenderer *param0, BgConfig *param1, const UnkStruct_ov65_0223582C *param2, u32 heapID)
{
UnkStruct_ov63_0222D1C0 *v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov63_0222D1C0));
UnkStruct_ov63_0222D1C0 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222D1C0));
memset(v0, 0, sizeof(UnkStruct_ov63_0222D1C0));
v0->unk_00 = param0;
@ -43,7 +43,7 @@ UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(G2dRenderer *param0, BgConfig *param1, co
ov63_0222D31C(v0->unk_04, v0->unk_14, param2);
v0->unk_08 = Graphics_GetScrnData(param2->unk_08, param2->unk_09, param2->unk_0A, &v0->unk_0C, param3);
v0->unk_08 = Graphics_GetScrnData(param2->unk_08, param2->unk_09, param2->unk_0A, &v0->unk_0C, heapID);
return v0;
}

12
src/overlay063/ov63_0222D77C.c
View File

@ -22,13 +22,13 @@ typedef struct UnkStruct_ov63_0222D848_t {
u16 unk_0A;
} UnkStruct_ov63_0222D848;
UnkStruct_ov63_0222D77C *ov63_0222D77C(u32 param0, u32 param1)
UnkStruct_ov63_0222D77C *ov63_0222D77C(u32 param0, u32 heapID)
{
UnkStruct_ov63_0222D77C *v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov63_0222D77C));
UnkStruct_ov63_0222D77C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222D77C));
GF_ASSERT(v0);
v0->unk_04 = param0 + 1;
v0->unk_00 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov63_0222CCB8) * v0->unk_04);
v0->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222CCB8) * v0->unk_04);
memset(v0->unk_00, 0, sizeof(UnkStruct_ov63_0222CCB8) * v0->unk_04);
@ -67,13 +67,13 @@ BOOL ov63_0222D810(UnkStruct_ov63_0222D77C *param0, UnkStruct_ov63_0222CCB8 *par
return 1;
}
UnkStruct_ov63_0222D848 *ov63_0222D848(u32 param0, u32 param1)
UnkStruct_ov63_0222D848 *ov63_0222D848(u32 param0, u32 heapID)
{
UnkStruct_ov63_0222D848 *v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov63_0222D848));
UnkStruct_ov63_0222D848 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222D848));
GF_ASSERT(v0);
v0->unk_04 = param0 + 1;
v0->unk_00 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov63_0222D894) * v0->unk_04);
v0->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222D894) * v0->unk_04);
memset(v0->unk_00, 0, sizeof(UnkStruct_ov63_0222D894) * v0->unk_04);

38
src/overlay065/ov65_02235060.c
View File

@ -55,9 +55,9 @@ static void ov65_022356E8(UnkStruct_ov65_02235130 *param0);
static void ov65_0223573C(UnkStruct_ov65_02235130 *param0);
static void ov65_02235778(UnkStruct_ov65_02235130 *param0);
static const UnkStruct_ov65_022354D8 *ov65_022357A8(const UnkStruct_ov65_02235130 *param0, const UnkStruct_ov65_022354D8 *param1, int param2);
static void ov65_022357E8(UnkStruct_ov65_02235130 *param0, u32 param1, u32 param2);
static void ov65_022357E8(UnkStruct_ov65_02235130 *param0, u32 param1, u32 heapID);
static void ov65_0223581C(UnkStruct_ov65_02235130 *param0);
static void ov65_0223582C(UnkStruct_ov65_02235130 *param0, u32 param1, NARC *param2, u32 param3);
static void ov65_0223582C(UnkStruct_ov65_02235130 *param0, u32 heapID, NARC *param2, u32 param3);
static void ov65_0223586C(UnkStruct_ov65_02235130 *param0);
static void ov65_0223587C(UnkStruct_ov65_022358CC *param0, u32 param1, NARC *param2);
static void ov65_022358CC(UnkStruct_ov65_022358CC *param0);
@ -127,7 +127,7 @@ static const u16 Unk_ov65_02238BC8[2] = {
0x2
};
void ov65_02235060(UnkStruct_ov65_02235130 *param0, u32 param1, NARC *param2, BgConfig *param3, u32 param4, u32 param5)
void ov65_02235060(UnkStruct_ov65_02235130 *param0, u32 heapID, NARC *param2, BgConfig *param3, u32 param4, u32 param5)
{
UnkStruct_ov63_0222CC3C v0;
u32 v1;
@ -136,24 +136,24 @@ void ov65_02235060(UnkStruct_ov65_02235130 *param0, u32 param1, NARC *param2, Bg
v1 = (param5 - 1) / 8;
param0->unk_04 = param1;
param0->heapID = heapID;
param0->unk_10 = param3;
ov65_0223587C(&param0->unk_14, param0->unk_04, param2);
ov65_02235918(param0->unk_10, param1);
ov65_0223587C(&param0->unk_14, param0->heapID, param2);
ov65_02235918(param0->unk_10, heapID);
v0 = ov65_02236474(v1);
param0->unk_748 = ov63_0222BCE8(v0.unk_00, v0.unk_02, param1);
param0->unk_748 = ov63_0222BCE8(v0.unk_00, v0.unk_02, heapID);
ov63_0222BD50(param0->unk_748, ov65_02236480(v1));
param0->unk_74C = ov63_0222BE18(48, param1);
param0->unk_74C = ov63_0222BE18(48, heapID);
ov65_022357E8(param0, param4, param1);
ov65_022357E8(param0, param4, heapID);
ov63_0222D19C(&param0->unk_754);
ov65_0223582C(param0, param1, param2, v1);
ov65_02235920(param0->unk_10, param1, param2);
ov65_0223582C(param0, heapID, param2, v1);
ov65_02235920(param0->unk_10, heapID, param2);
ov65_022362B0(param0, &param0->unk_734, param2);
param0->unk_75C = ov63_0222D848(128, param1);
param0->unk_75C = ov63_0222D848(128, heapID);
param0->unk_00 = 1;
}
@ -529,13 +529,13 @@ static const UnkStruct_ov65_022354D8 *ov65_022357A8(const UnkStruct_ov65_0223513
return NULL;
}
static void ov65_022357E8(UnkStruct_ov65_02235130 *param0, u32 param1, u32 param2)
static void ov65_022357E8(UnkStruct_ov65_02235130 *param0, u32 param1, u32 heapID)
{
int v0;
param0->unk_750 = ov63_0222CD2C(param0->unk_14.unk_00, NULL, 48, param1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, param2);
param0->unk_750 = ov63_0222CD2C(param0->unk_14.unk_00, NULL, 48, param1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, heapID);
ov63_0222CE30(param0->unk_750, 2, param2);
ov63_0222CE30(param0->unk_750, 2, heapID);
}
static void ov65_0223581C(UnkStruct_ov65_02235130 *param0)
@ -543,7 +543,7 @@ static void ov65_0223581C(UnkStruct_ov65_02235130 *param0)
ov63_0222CD9C(param0->unk_750);
}
static void ov65_0223582C(UnkStruct_ov65_02235130 *param0, u32 param1, NARC *param2, u32 param3)
static void ov65_0223582C(UnkStruct_ov65_02235130 *param0, u32 heapID, NARC *param2, u32 param3)
{
UnkStruct_ov65_0223582C v0 = {
0,
@ -560,7 +560,7 @@ static void ov65_0223582C(UnkStruct_ov65_02235130 *param0, u32 param1, NARC *par
};
v0.unk_09 += param3;
param0->unk_758 = ov63_0222D1C0(&param0->unk_14.unk_04, param0->unk_10, &v0, param1);
param0->unk_758 = ov63_0222D1C0(&param0->unk_14.unk_04, param0->unk_10, &v0, heapID);
}
static void ov65_0223586C(UnkStruct_ov65_02235130 *param0)
@ -832,7 +832,7 @@ static UnkStruct_ov65_022354D8 *ov65_02235D7C(UnkStruct_ov65_02235130 *param0)
static void ov65_02235DAC(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1, BOOL param2)
{
param1->unk_04 = ov63_0222CE44(param0->unk_750, param1->unk_00, param2, param0->unk_04);
param1->unk_04 = ov63_0222CE44(param0->unk_750, param1->unk_00, param2, param0->heapID);
if (param2 == 0) {
ov63_0222CFA4(param1->unk_04, 0);
@ -1151,7 +1151,7 @@ static void ov65_022362B0(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022363
{
memset(param1, 0, sizeof(UnkStruct_ov65_02236318));
param1->unk_00 = Graphics_GetPlttDataFromOpenNARC(param2, 31, &param1->unk_04, param0->unk_04);
param1->unk_00 = Graphics_GetPlttDataFromOpenNARC(param2, 31, &param1->unk_04, param0->heapID);
param1->unk_08 = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3);
param1->unk_09 = 0;
param1->unk_0A = Unk_ov65_02238BC8[param1->unk_09];

46
src/overlay065/ov65_0223648C.c
View File

@ -130,7 +130,7 @@ typedef struct UnkStruct_ov65_02236744_t {
static void ov65_02236780(void *param0);
static BOOL ov65_02236794(const UnkStruct_ov65_02236794 *param0);
static void ov65_022367A8(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 param2);
static void ov65_022367A8(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 heapID);
static void ov65_022367F8(UnkStruct_ov65_022367A8 *param0, u32 param1);
static void ov65_02236820(void);
static void ov65_02236840(UnkStruct_ov65_02236840 *param0, u32 param1);
@ -140,7 +140,7 @@ static void ov65_02236B90(UnkStruct_ov65_02236840 *param0, u32 param1);
static void ov65_02236C10(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2);
static void ov65_02236C5C(UnkStruct_ov65_02236840 *param0);
static void ov65_02236C7C(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2);
static void ov65_02236D50(UnkStruct_ov65_02236840 *param0, u32 param1);
static void ov65_02236D50(UnkStruct_ov65_02236840 *param0, u32 heapID);
static void ov65_02236E04(UnkStruct_ov65_02236840 *param0);
static void ov65_02236E44(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2, u32 param3);
static void ov65_02236E50(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2, u8 param3, u32 param4);
@ -253,7 +253,7 @@ static BOOL ov65_0223875C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
static BOOL ov65_0223878C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2);
static BOOL ov65_022387AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2);
static BOOL ov65_022387E8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2);
static BOOL ov65_02238838(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2);
static BOOL ov65_02238838(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID);
static BOOL ov65_022388FC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2);
static BOOL ov65_02238910(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2);
@ -415,7 +415,7 @@ int ov65_0223648C(OverlayManager *param0, int *param1)
sub_0209C390(v0);
ov65_0223760C(v0);
ov65_022367A8(v0, v1, 96);
ov65_022367A8(v0, v1, HEAP_ID_96);
SetVBlankCallback(ov65_02236780, v0);
sub_02039734();
@ -579,15 +579,15 @@ static BOOL ov65_02236794(const UnkStruct_ov65_02236794 *param0)
return 0;
}
static void ov65_022367A8(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 param2)
static void ov65_022367A8(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 heapID)
{
ov65_02236820();
ov65_02236840(&param0->unk_30, param2);
ov65_02236A28(&param0->unk_30, param1, param2);
ov65_02236C10(&param0->unk_30, param1, param2);
ov65_02236C7C(&param0->unk_30, param1, param2);
ov65_02237034(param0, param1, param2);
ov65_02236D50(&param0->unk_30, param2);
ov65_02236840(&param0->unk_30, heapID);
ov65_02236A28(&param0->unk_30, param1, heapID);
ov65_02236C10(&param0->unk_30, param1, heapID);
ov65_02236C7C(&param0->unk_30, param1, heapID);
ov65_02237034(param0, param1, heapID);
ov65_02236D50(&param0->unk_30, heapID);
}
static void ov65_022367F8(UnkStruct_ov65_022367A8 *param0, u32 param1)
@ -828,36 +828,36 @@ static void ov65_02236C7C(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207D
Window_ScheduleCopyToVRAM(&param0->unk_1F0);
}
static void ov65_02236D50(UnkStruct_ov65_02236840 *param0, u32 param1)
static void ov65_02236D50(UnkStruct_ov65_02236840 *param0, u32 heapID)
{
int v0;
NNS_G2dInitOamManagerModule();
RenderOam_Init(0, 126, 0, 31, 0, 126, 0, 31, param1);
RenderOam_Init(0, 126, 0, 31, 0, 126, 0, 31, heapID);
{
CharTransferTemplate v1 = {
4, (128 * 1024), (16 * 1024), 0
};
v1.heapID = param1;
v1.heapID = heapID;
CharTransfer_InitWithVramModes(&v1, GX_OBJVRAMMODE_CHAR_1D_128K, GX_OBJVRAMMODE_CHAR_1D_32K);
}
PlttTransfer_Init(4, param1);
PlttTransfer_Init(4, heapID);
CharTransfer_ClearBuffers();
PlttTransfer_Clear();
ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_128K);
ReserveSlotsForWirelessIconPalette(NNS_G2D_VRAM_TYPE_2DMAIN);
param0->unk_18 = SpriteList_InitRendering(4, &param0->unk_1C, param1);
param0->unk_18 = SpriteList_InitRendering(4, &param0->unk_1C, heapID);
for (v0 = 0; v0 < 4; v0++) {
param0->unk_1A8[v0] = SpriteResourceCollection_New(4, v0, param1);
param0->unk_1A8[v0] = SpriteResourceCollection_New(4, v0, heapID);
}
param0->unk_1B8 = ov63_0222BE18(4, param1);
param0->unk_1BC = ov63_0222CCE4(param0->unk_18, NULL, 4, NNS_G2D_VRAM_TYPE_2DMAIN, param1);
param0->unk_1B8 = ov63_0222BE18(4, heapID);
param0->unk_1BC = ov63_0222CCE4(param0->unk_18, NULL, 4, NNS_G2D_VRAM_TYPE_2DMAIN, heapID);
}
static void ov65_02236E04(UnkStruct_ov65_02236840 *param0)
@ -2697,7 +2697,7 @@ static BOOL ov65_022387E8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
return 0;
}
static BOOL ov65_02238838(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2)
static BOOL ov65_02238838(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID)
{
if (IsScreenTransitionDone()) {
CommInfo_Init(param1->unk_08, NULL);
@ -2706,12 +2706,12 @@ static BOOL ov65_02238838(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
{
ov65_022377E8(param0);
ov65_022367F8(param0, param2);
ov65_022367F8(param0, heapID);
memset(&param0->unk_30, 0, sizeof(UnkStruct_ov65_02236840));
ov65_0223760C(param0);
ov65_022367A8(param0, param1, param2);
ov65_022367A8(param0, param1, heapID);
sub_02039734();
}
@ -2731,7 +2731,7 @@ static BOOL ov65_02238838(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
memset(param0->unk_00.unk_28, 0, sizeof(u8) * 4);
}
StartScreenTransition(3, 1, 1, 0x0, 6, 1, param2);
StartScreenTransition(3, 1, 1, 0x0, 6, 1, heapID);
param0->unk_00.unk_05 = 28;
}

6
src/overlay066/ov66_0222DCE0.c
View File

@ -44,14 +44,14 @@ int ov66_0222DCE0(OverlayManager *param0, int *param1)
Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_104, 0x5000);
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov66_0222DD90), 104);
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov66_0222DD90), HEAP_ID_104);
memset(v0, 0, sizeof(UnkStruct_ov66_0222DD90));
v1 = OverlayManager_Args(param0);
v0->unk_00 = v1->unk_04;
v0->unk_04 = ov66_0222DDF0(v0->unk_00, 104);
v0->unk_08 = ov66_02230C44(v1->unk_08, v1->unk_04, v1->unk_00, v0->unk_04, 104);
v0->unk_04 = ov66_0222DDF0(v0->unk_00, HEAP_ID_104);
v0->unk_08 = ov66_02230C44(v1->unk_08, v1->unk_04, v1->unk_00, v0->unk_04, HEAP_ID_104);
SetVBlankCallback(NULL, NULL);
DisableHBlank();

50
src/overlay066/ov66_0222DDF0.c
View File

@ -244,7 +244,7 @@ typedef struct UnkStruct_ov66_0222DFF8_t {
UnkStruct_ov66_02230A6C unk_4BC;
UnkStruct_ov66_0222FBF0 unk_508;
UnkStruct_ov66_0222DFF8_sub3 unk_510;
u32 unk_528;
u32 heapID;
u32 unk_52C;
} UnkStruct_ov66_0222DFF8;
@ -280,7 +280,7 @@ static BOOL ov66_0222FBD0(const UnkStruct_ov66_0222FBC8 *param0);
static void ov66_0222FBE0(UnkStruct_ov66_0222FBC8 *param0);
static void ov66_0222FBF0(UnkStruct_ov66_0222FBF0 *param0, u32 param1);
static void ov66_0222FC00(UnkStruct_ov66_0222FBF0 *param0);
static void ov66_0222FC0C(UnkStruct_ov66_0222FBF0 *param0, const UnkStruct_ov66_0222F6C4 *param1, u32 param2);
static void ov66_0222FC0C(UnkStruct_ov66_0222FBF0 *param0, const UnkStruct_ov66_0222F6C4 *param1, u32 heapID);
static void ov66_0222FC4C(UnkStruct_ov66_0222FBC8 *param0);
static BOOL ov66_0222FC54(const UnkStruct_ov66_0222FBC8 *param0);
static void ov66_0222FC58(UnkStruct_ov66_0222FC58 *param0);
@ -411,13 +411,13 @@ static const UnkStruct_ov66_022589B4 Unk_ov66_022589B4[8] = {
{ ov66_022307B4, sizeof(u32) }
};
UnkStruct_ov66_0222DFF8 *ov66_0222DDF0(SaveData *param0, u32 param1)
UnkStruct_ov66_0222DFF8 *ov66_0222DDF0(SaveData *param0, u32 heapID)
{
UnkStruct_ov66_0222DFF8 *v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov66_0222DFF8));
UnkStruct_ov66_0222DFF8 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_0222DFF8));
memset(v0, 0, sizeof(UnkStruct_ov66_0222DFF8));
v0->unk_00 = param0;
v0->unk_528 = param1;
v0->heapID = heapID;
{
UnkStruct_ov66_022324F0 v1;
@ -428,29 +428,29 @@ UnkStruct_ov66_0222DFF8 *ov66_0222DDF0(SaveData *param0, u32 param1)
v1.unk_0C = ov66_0222F4C8;
v1.unk_10 = ov66_0222F684;
ov66_022324F0(param1, v0->unk_00, sizeof(UnkStruct_ov66_0222E71C), &v1, v0);
ov66_022324F0(heapID, v0->unk_00, sizeof(UnkStruct_ov66_0222E71C), &v1, v0);
}
{
int v2;
v0->unk_04.unk_00 = ov66_0223177C(param1);
v0->unk_04.unk_00 = ov66_0223177C(heapID);
for (v2 = 0; v2 < 4; v2++) {
v0->unk_04.unk_E4[v2] = TrainerInfo_New(param1);
v0->unk_04.unk_E4[v2] = TrainerInfo_New(heapID);
}
}
ov66_0222F7C8(&v0->unk_108, v0->unk_00, param1);
ov66_0222F7C8(&v0->unk_108, v0->unk_00, heapID);
ov66_0222FC68(&v0->unk_1C0);
ov66_0222FC58(&v0->unk_1E8);
ov66_02232D30(Unk_ov66_022589B4, 8, v0);
ov66_0222FB64(&v0->unk_1FC);
ov66_022302B0(&v0->unk_20C);
ov66_022307D4(&v0->unk_3AB);
ov66_022308A0(&v0->unk_3E4, param1);
ov66_022308A0(&v0->unk_3E4, heapID);
ov66_02230A6C(&v0->unk_4BC, v0->unk_00);
ov66_0222FBF0(&v0->unk_508, param1);
ov66_0222FBF0(&v0->unk_508, heapID);
return v0;
}
@ -1900,7 +1900,7 @@ void ov66_0222F16C(UnkStruct_ov66_0222DFF8 *param0)
GF_ASSERT(param0->unk_4B8 == NULL);
info = SaveData_GetTrainerInfo(param0->unk_00);
param0->unk_4B8 = sub_0207E060(info, param0->unk_528);
param0->unk_4B8 = sub_0207E060(info, param0->heapID);
}
void ov66_0222F198(UnkStruct_ov66_0222DFF8 *param0)
@ -1935,7 +1935,7 @@ static void ov66_0222F1DC(s32 param0, const void *param1, void *param2, BOOL par
v0 = param2;
if (param3) {
ov66_0222FC0C(&v0->unk_508, &v0->unk_108, v0->unk_528);
ov66_0222FC0C(&v0->unk_508, &v0->unk_108, v0->heapID);
if (ov66_0222FA04(&v0->unk_108, v0->unk_00) == 0) {
v0->unk_52C = 1;
@ -1961,7 +1961,7 @@ static void ov66_0222F1DC(s32 param0, const void *param1, void *param2, BOOL par
v8 = ov66_0222E824(&v0->unk_108.unk_20);
if ((v6 != 0) && (v8 == 1)) {
v0->unk_108.unk_20.unk_1C = ov66_02234EA8(v6, v7, v0->unk_108.unk_20.unk_18, v0->unk_528);
v0->unk_108.unk_20.unk_1C = ov66_02234EA8(v6, v7, v0->unk_108.unk_20.unk_18, v0->heapID);
} else {
v0->unk_108.unk_20.unk_1C.unk_00_val2_unk_00 = 12;
v0->unk_108.unk_20.unk_1C.unk_00_val2_unk_01 = 0;
@ -2519,14 +2519,14 @@ static void ov66_0222FC00(UnkStruct_ov66_0222FBF0 *param0)
Heap_FreeToHeap(param0->unk_00);
}
static void ov66_0222FC0C(UnkStruct_ov66_0222FBF0 *param0, const UnkStruct_ov66_0222F6C4 *param1, u32 param2)
static void ov66_0222FC0C(UnkStruct_ov66_0222FBF0 *param0, const UnkStruct_ov66_0222F6C4 *param1, u32 heapID)
{
UnkStruct_ov66_0222E71C *v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_0222E71C));
UnkStruct_ov66_0222E71C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_0222E71C));
MI_CpuCopyFast(&param1->unk_20, v0, sizeof(UnkStruct_ov66_0222E71C));
MI_CpuCopy8(param1->unk_10, v0->unk_08, sizeof(u16) * (7 + 1));
ov66_0222E640(v0, param0->unk_00, param2);
ov66_0222E640(v0, param0->unk_00, heapID);
Heap_FreeToHeap(v0);
}
@ -2684,7 +2684,7 @@ static void ov66_0222FDC4(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_
if (v2 != 0xffffffff) {
v0 = ov66_0222E374(param0, v2);
ov66_0222E640(v0, param0->unk_04.unk_E4[v1], param0->unk_528);
ov66_0222E640(v0, param0->unk_04.unk_E4[v1], param0->heapID);
} else {
return;
}
@ -2714,7 +2714,7 @@ static void ov66_0222FE40(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_
if (v2 != 0xffffffff) {
v0 = ov66_0222E374(param0, v2);
ov66_0222E640(v0, param0->unk_04.unk_E4[v1], param0->unk_528);
ov66_0222E640(v0, param0->unk_04.unk_E4[v1], param0->heapID);
} else {
return;
}
@ -2748,7 +2748,7 @@ static void ov66_0222FEC0(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_
if (v3 != 0xffffffff) {
v0 = ov66_0222E374(param0, v3);
ov66_0222E640(v0, param0->unk_04.unk_E4[v1], param0->unk_528);
ov66_0222E640(v0, param0->unk_04.unk_E4[v1], param0->heapID);
v2[v1] = param0->unk_04.unk_E4[v1];
} else {
return;
@ -2764,7 +2764,7 @@ static void ov66_0222FEC0(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_
if (v5 != 0xffffffff) {
v0 = ov66_0222E374(param0, v5);
ov66_0222E640(v0, param0->unk_04.unk_E4[v1], param0->unk_528);
ov66_0222E640(v0, param0->unk_04.unk_E4[v1], param0->heapID);
v2[v1] = param0->unk_04.unk_E4[v1];
} else {
return;
@ -2805,7 +2805,7 @@ static void ov66_0222FFF4(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_
if (v2 != 0xffffffff) {
v0 = ov66_0222E374(param0, v2);
ov66_0222E640(v0, param0->unk_04.unk_E4[0], param0->unk_528);
ov66_0222E640(v0, param0->unk_04.unk_E4[0], param0->heapID);
} else {
return;
}
@ -2836,7 +2836,7 @@ static void ov66_02230058(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_
if (v3 != 0xffffffff) {
v0 = ov66_0222E374(param0, v3);
ov66_0222E640(v0, param0->unk_04.unk_E4[v1], param0->unk_528);
ov66_0222E640(v0, param0->unk_04.unk_E4[v1], param0->heapID);
v2[v1] = param0->unk_04.unk_E4[v1];
} else {
return;
@ -2877,7 +2877,7 @@ static void ov66_02230114(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_
if (v3 != 0xffffffff) {
v0 = ov66_0222E374(param0, v3);
ov66_0222E640(v0, param0->unk_04.unk_E4[v1], param0->unk_528);
ov66_0222E640(v0, param0->unk_04.unk_E4[v1], param0->heapID);
v2[v1] = param0->unk_04.unk_E4[v1];
} else {
return;
@ -2918,7 +2918,7 @@ static void ov66_022301D0(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_
if (v3 != 0xffffffff) {
v0 = ov66_0222E374(param0, v3);
ov66_0222E640(v0, param0->unk_04.unk_E4[v1], param0->unk_528);
ov66_0222E640(v0, param0->unk_04.unk_E4[v1], param0->heapID);
v2[v1] = param0->unk_04.unk_E4[v1];
} else {
return;

64
src/overlay066/ov66_02230C44.c
View File

@ -54,41 +54,41 @@ typedef struct UnkStruct_ov66_02230C90_t {
UnkStruct_ov66_02230E4C unk_04[13];
u8 unk_38;
u8 unk_39;
u16 unk_3A;
u16 heapID;
UnkStruct_ov66_0222DFF8 *unk_3C;
SaveData *unk_40;
UnkStruct_ov66_0222DCE0_sub1 *unk_44;
} UnkStruct_ov66_02230C90;
static void ov66_02230CEC(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, const OverlayManagerTemplate *param2);
static void ov66_02230D0C(UnkStruct_ov66_02230C90 *param0, u32 param1, u32 param2);
static void ov66_02230D0C(UnkStruct_ov66_02230C90 *param0, u32 param1, u32 heapID);
static void ov66_02230D34(UnkStruct_ov66_02230C90 *param0, u32 param1);
static void ov66_02230D54(UnkStruct_ov66_02230C90 *param0, u32 param1);
static int ov66_02230D7C(UnkStruct_ov66_02230C90 *param0, u32 param1);
static void ov66_02230DA0(UnkStruct_ov66_02230DBC *param0, u32 param1);
static void ov66_02230DBC(UnkStruct_ov66_02230DBC *param0);
static void ov66_02230DD8(UnkStruct_ov66_02230DBC *param0, UnkStruct_ov66_0222DFF8 *param1, u32 param2);
static void ov66_02230E28(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2);
static void ov66_02230E28(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 heapID);
static void ov66_02230E4C(UnkStruct_ov66_02230E4C *param0);
static void ov66_02230E68(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1);
static int ov66_02230E90(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1);
static void ov66_02230F1C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2);
static void ov66_02230F1C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 heapID);
static void ov66_02230F44(UnkStruct_ov66_02230E4C *param0);
static void ov66_02230F50(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1);
static int ov66_02230F7C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1);
static void ov66_02230FA0(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2);
static void ov66_02230FA0(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 heapID);
static void ov66_02230FE4(UnkStruct_ov66_02230E4C *param0);
static void ov66_02230FF0(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1);
static int ov66_02231000(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1);
static void ov66_02231024(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2);
static void ov66_02231024(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 heapID);
static void ov66_02231058(UnkStruct_ov66_02230E4C *param0);
static void ov66_02231064(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1);
static int ov66_02231074(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1);
static void ov66_0223108C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2);
static void ov66_0223108C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 heapID);
static void ov66_022310C4(UnkStruct_ov66_02230E4C *param0);
static void ov66_022310D8(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1);
static int ov66_02231104(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1);
static void ov66_02231134(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2);
static void ov66_02231134(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 heapID);
static void ov66_02231164(UnkStruct_ov66_02230E4C *param0);
static void ov66_02231178(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1);
static int ov66_022311A4(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1);
@ -113,22 +113,22 @@ static void ov66_022313E8(UnkStruct_ov66_02230E4C *param0);
static void ov66_022313F4(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1);
static int ov66_02231404(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1);
UnkStruct_ov66_02230C90 *ov66_02230C44(BOOL param0, SaveData *param1, UnkStruct_ov66_0222DCE0_sub1 *param2, UnkStruct_ov66_0222DFF8 *param3, u32 param4)
UnkStruct_ov66_02230C90 *ov66_02230C44(BOOL param0, SaveData *param1, UnkStruct_ov66_0222DCE0_sub1 *param2, UnkStruct_ov66_0222DFF8 *param3, u32 heapID)
{
UnkStruct_ov66_02230C90 *v0 = Heap_AllocFromHeap(param4, sizeof(UnkStruct_ov66_02230C90));
UnkStruct_ov66_02230C90 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02230C90));
memset(v0, 0, sizeof(UnkStruct_ov66_02230C90));
v0->unk_3C = param3;
v0->unk_40 = param1;
v0->unk_44 = param2;
v0->unk_39 = param0;
v0->unk_3A = param4;
v0->heapID = heapID;
{
int v1;
for (v1 = 0; v1 < 13; v1++) {
ov66_02230D0C(v0, v1, param4);
ov66_02230D0C(v0, v1, heapID);
}
}
@ -179,10 +179,10 @@ void ov66_02230CE8(UnkStruct_ov66_02230C90 *param0)
static void ov66_02230CEC(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, const OverlayManagerTemplate *param2)
{
GF_ASSERT(param0->unk_00 == NULL);
param0->unk_00 = OverlayManager_New(param2, param1->unk_00, param0->unk_3A);
param0->unk_00 = OverlayManager_New(param2, param1->unk_00, param0->heapID);
}
static void ov66_02230D0C(UnkStruct_ov66_02230C90 *param0, u32 param1, u32 param2)
static void ov66_02230D0C(UnkStruct_ov66_02230C90 *param0, u32 param1, u32 heapID)
{
static void (*v0[])(UnkStruct_ov66_02230C90 *, UnkStruct_ov66_02230E4C *, u32) = {
ov66_02230E28,
@ -201,7 +201,7 @@ static void ov66_02230D0C(UnkStruct_ov66_02230C90 *param0, u32 param1, u32 param
};
GF_ASSERT(param1 < 13);
v0[param1](param0, &param0->unk_04[param1], param2);
v0[param1](param0, &param0->unk_04[param1], heapID);
}
static void ov66_02230D34(UnkStruct_ov66_02230C90 *param0, u32 param1)
@ -315,11 +315,11 @@ static void ov66_02230DD8(UnkStruct_ov66_02230DBC *param0, UnkStruct_ov66_0222DF
}
}
static void ov66_02230E28(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2)
static void ov66_02230E28(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 heapID)
{
UnkStruct_ov66_02230E68 *v0;
param1->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_02230E68));
param1->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02230E68));
memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02230E68));
v0 = param1->unk_00;
@ -397,11 +397,11 @@ static int ov66_02230E90(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4
return 0;
}
static void ov66_02230F1C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2)
static void ov66_02230F1C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 heapID)
{
UnkStruct_ov66_02230F50 *v0;
param1->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_02230F50));
param1->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02230F50));
memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02230F50));
v0 = param1->unk_00;
@ -444,11 +444,11 @@ static int ov66_02230F7C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4
return 0;
}
static void ov66_02230FA0(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2)
static void ov66_02230FA0(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 heapID)
{
UnkStruct_ov66_02230FA0 *v0;
param1->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_02230FA0));
param1->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02230FA0));
memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02230FA0));
v0 = param1->unk_00;
@ -485,11 +485,11 @@ static int ov66_02231000(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4
return 0;
}
static void ov66_02231024(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2)
static void ov66_02231024(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 heapID)
{
UnkStruct_ov66_02231024 *v0;
param1->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_02231024));
param1->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02231024));
memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02231024));
v0 = param1->unk_00;
@ -529,11 +529,11 @@ static int ov66_02231074(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4
return 0;
}
static void ov66_0223108C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2)
static void ov66_0223108C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 heapID)
{
UnkStruct_ov115_02260440 *v0;
param1->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov115_02260440));
param1->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov115_02260440));
memset(param1->unk_00, 0, sizeof(UnkStruct_ov115_02260440));
v0 = param1->unk_00;
@ -542,7 +542,7 @@ static void ov66_0223108C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E
v0->unk_39 = 1;
v0->unk_34 = param0->unk_40;
ov66_02230DA0(&v0->unk_00, param2);
ov66_02230DA0(&v0->unk_00, heapID);
}
static void ov66_022310C4(UnkStruct_ov66_02230E4C *param0)
@ -571,7 +571,7 @@ static void ov66_022310D8(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E
UnkStruct_ov115_02260440 *v1;
v1 = param1->unk_00;
ov66_02230DD8(&v1->unk_00, param0->unk_3C, param0->unk_3A);
ov66_02230DD8(&v1->unk_00, param0->unk_3C, param0->heapID);
}
ov66_02230CEC(param0, param1, &v0);
@ -596,11 +596,11 @@ static int ov66_02231104(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4
return 0;
}
static void ov66_02231134(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2)
static void ov66_02231134(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 heapID)
{
UnkStruct_ov66_02231134 *v0;
param1->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_02231134));
param1->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02231134));
memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02231134));
v0 = param1->unk_00;
@ -609,7 +609,7 @@ static void ov66_02231134(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E
v0->unk_38 = 1;
v0->unk_34 = param0->unk_40;
ov66_02230DA0(&v0->unk_00, param2);
ov66_02230DA0(&v0->unk_00, heapID);
}
static void ov66_02231164(UnkStruct_ov66_02230E4C *param0)
@ -638,7 +638,7 @@ static void ov66_02231178(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E
UnkStruct_ov66_02231134 *v1;
v1 = param1->unk_00;
ov66_02230DD8(&v1->unk_00, param0->unk_3C, param0->unk_3A);
ov66_02230DD8(&v1->unk_00, param0->unk_3C, param0->heapID);
}
ov66_02230CEC(param0, param1, &v0);
@ -704,7 +704,7 @@ static void ov66_02231220(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E
UnkStruct_ov117_02260440 *v1;
v1 = param1->unk_00;
ov66_02230DD8(&v1->unk_00, param0->unk_3C, param0->unk_3A);
ov66_02230DD8(&v1->unk_00, param0->unk_3C, param0->heapID);
}
ov66_02230CEC(param0, param1, &v0);

8
src/overlay070/ov70_0225C858.c
View File

@ -13,15 +13,15 @@ typedef struct UnkStruct_ov70_0225C894_t {
UnkStruct_ov63_0222BCE8 *unk_00;
} UnkStruct_ov70_0225C894;
UnkStruct_ov70_0225C894 *ov70_0225C858(u32 param0)
UnkStruct_ov70_0225C894 *ov70_0225C858(u32 heapID)
{
UnkStruct_ov70_0225C894 *v0;
void *v1;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov70_0225C894));
v0->unk_00 = ov63_0222BCE8(35, 42, param0);
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_0225C894));
v0->unk_00 = ov63_0222BCE8(35, 42, heapID);
v1 = LoadMemberFromNARC(174, 0, 0, param0, 1);
v1 = LoadMemberFromNARC(174, 0, 0, heapID, 1);
ov63_0222BD50(v0->unk_00, v1);
Heap_FreeToHeap(v1);

2
src/overlay070/ov70_0225D9A4.c
View File

@ -607,7 +607,7 @@ int ov70_0225D9A4(OverlayManager *param0, int *param1)
v0->unk_458 = SaveData_GetTrainerInfo(v1->unk_00);
ov70_0225E4EC(&v0->unk_3C, v1->unk_00, HEAP_ID_112);
v0->unk_44C = ov70_0225C858(112);
v0->unk_44C = ov70_0225C858(HEAP_ID_112);
{
u32 v2;

15
src/overlay104/ov104_0223C2D4.c
View File

@ -633,12 +633,12 @@ static void ov104_0223CC10(UnkStruct_ov104_0223C4CC *param0)
static void ov104_0223CC74(UnkStruct_ov104_0223C4CC *param0, int param1, const TrainerInfo *param2)
{
param0->unk_14 = ov63_0222BE18(32, 94);
param0->unk_18 = ov63_0222BCE8((256 / 16), (256 / 16), 94);
param0->unk_14 = ov63_0222BE18(32, HEAP_ID_94);
param0->unk_18 = ov63_0222BCE8((256 / 16), (256 / 16), HEAP_ID_94);
ov63_0222D19C(&param0->unk_1C);
param0->unk_20 = ov63_0222CD2C(SpriteManager_GetSpriteList(param0->unk_34.unk_04), param0->unk_04, 32, ov104_0222E5F0(param2), 0, NNS_G2D_VRAM_TYPE_2DMAIN, 94);
param0->unk_20 = ov63_0222CD2C(SpriteManager_GetSpriteList(param0->unk_34.unk_04), param0->unk_04, 32, ov104_0222E5F0(param2), 0, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_94);
{
UnkStruct_ov65_0223582C v0 = {
@ -661,7 +661,7 @@ static void ov104_0223CC74(UnkStruct_ov104_0223C4CC *param0, int param1, const T
v1 = ov104_0222EA90(param1, 12);
if (v1 == 0) {
param0->unk_24 = ov63_0222D1C0(SpriteSystem_GetRenderer(param0->unk_34.unk_00), param0->unk_00, &v0, 94);
param0->unk_24 = ov63_0222D1C0(SpriteSystem_GetRenderer(param0->unk_34.unk_00), param0->unk_00, &v0, HEAP_ID_94);
}
if (ov104_0222EA90(param1, 9) != 0xffff) {
@ -672,14 +672,13 @@ static void ov104_0223CC74(UnkStruct_ov104_0223C4CC *param0, int param1, const T
v0.unk_06 = 1;
if (v1 == 0) {
param0->unk_28 = ov63_0222D1C0(
SpriteSystem_GetRenderer(param0->unk_34.unk_00), param0->unk_00, &v0, 94);
param0->unk_28 = ov63_0222D1C0(SpriteSystem_GetRenderer(param0->unk_34.unk_00), param0->unk_00, &v0, HEAP_ID_94);
}
}
}
param0->unk_2C = ov63_0222D848(128, 94);
param0->unk_30 = ov63_0222D77C(128, 94);
param0->unk_2C = ov63_0222D848(128, HEAP_ID_94);
param0->unk_30 = ov63_0222D77C(128, HEAP_ID_94);
ov63_0222BD50(param0->unk_18, Unk_ov104_022413D8);