mirror of
https://github.com/pret/pokeplatinum.git
synced 2026-04-25 07:29:01 -05:00
Breadcrum params used with Heap_AllocFromHeap - Part 9
This commit is contained in:
Eduardo Quezada
parent
a193d086ae
commit
6fc0f2d994
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
#include "overlay083/struct_ov83_0223D4CC_decl.h"
|
||||
|
||||
UnkStruct_ov83_0223D4CC *ov83_0223D4CC(const CommCmdTable *param0, int param1, void *param2, int param3, int param4);
|
||||
UnkStruct_ov83_0223D4CC *ov83_0223D4CC(const CommCmdTable *param0, int param1, void *param2, int param3, int heapID);
|
||||
BOOL ov83_0223D508(int param0, const void *param1, int param2, UnkStruct_ov83_0223D4CC *param3);
|
||||
void ov83_0223D558(UnkStruct_ov83_0223D4CC *param0);
|
||||
int ov83_0223D570(UnkStruct_ov83_0223D4CC *param0);
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@ Sprite *ov97_02237D14(int param0, Sprite *param1, int param2, int param3, int pa
|
|||
void ov97_02237DA0(void);
|
||||
u32 ov97_02237E4C(int param0);
|
||||
void ov97_02238194(BgConfig *param0, UnkStruct_0202DF40 *param1);
|
||||
void ov97_0223829C(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *param1, int param2);
|
||||
void ov97_02238324(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *param1, int param2);
|
||||
void ov97_0223829C(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *param1, int heapID);
|
||||
void ov97_02238324(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *param1, int heapID);
|
||||
void ov97_022383C4(ListMenu *param0, u32 param1, u8 param2);
|
||||
void ov97_02238400(BOOL param0);
|
||||
void ov97_02238440(void);
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
#include "strbuf.h"
|
||||
|
||||
void ov98_022499C8(Strbuf *param0, char *param1, int param2);
|
||||
int ov98_02249A80(Strbuf *param0, int param1);
|
||||
void ov98_022499C8(Strbuf *param0, char *param1, int heapID);
|
||||
int ov98_02249A80(Strbuf *param0, int heapID);
|
||||
void ov98_02249ACC(const char *param0, u32 *param1, int param2);
|
||||
|
||||
#endif // POKEPLATINUM_OV98_022499C8_H
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#include "narc.h"
|
||||
#include "sprite.h"
|
||||
|
||||
UnkStruct_ov101_021D7E48 *ov101_021D7E48(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9, u32 param10);
|
||||
UnkStruct_ov101_021D7E48 *ov101_021D7E48(u32 heapID, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9, u32 param10);
|
||||
void ov101_021D7FB4(UnkStruct_ov101_021D7E48 *param0);
|
||||
void ov101_021D80D4(UnkStruct_ov101_021D7E48 *param0);
|
||||
void ov101_021D80E4(UnkStruct_ov101_021D7E48 *param0, u32 param1, NARC *param2, u32 param3, u32 param4);
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ BOOL ov104_0222E6A8(UnkStruct_ov104_022320B4 *param0);
|
|||
void ov104_0222E710(UnkStruct_ov104_022320B4 *param0);
|
||||
void ov104_0222E748(UnkStruct_ov104_022320B4 *param0, int param1, int param2);
|
||||
void ov104_0222E86C(UnkStruct_ov104_022320B4 *param0, int param1, int param2);
|
||||
UnkStruct_ov104_0222E8C8 *ov104_0222E8C8(UnkStruct_ov104_022320B4 *param0, int param1);
|
||||
UnkStruct_ov104_0222E8C8 *ov104_0222E8C8(UnkStruct_ov104_022320B4 *param0, int heapID);
|
||||
void ov104_0222E8E8(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0222E8C8 *param1);
|
||||
u16 *ov104_0222E91C(UnkStruct_ov104_022320B4 *param0, int param1);
|
||||
UnkStruct_ov104_0223C4CC *ov104_0222E924(UnkStruct_ov104_022320B4 *param0);
|
||||
|
|
|
|||
|
|
@ -17,18 +17,18 @@ void ov104_0223E9EC(UnkStruct_ov104_0223E9EC *param0, int param1, int param2, in
|
|||
BOOL ov104_0223E9F8(UnkStruct_ov104_0223E9EC *param0);
|
||||
void ov104_0223EA28(UnkStruct_ov104_0223EA38 *param0, int param1, int param2, int param3);
|
||||
BOOL ov104_0223EA38(UnkStruct_ov104_0223EA38 *param0);
|
||||
UnkStruct_ov104_0223EA84 *ov104_0223EA64(u32 param0);
|
||||
UnkStruct_ov104_0223EA84 *ov104_0223EA64(u32 heapID);
|
||||
void ov104_0223EA7C(UnkStruct_ov104_0223EA84 *param0);
|
||||
void ov104_0223EA84(UnkStruct_ov104_0223EA84 *param0, int param1, int param2, int param3, int param4, int param5, Window *param6, u32 param7, u32 param8, u8 param9);
|
||||
BOOL ov104_0223EADC(UnkStruct_ov104_0223EA84 *param0);
|
||||
UnkStruct_ov104_0223EBD0 *ov104_0223EBA0(u32 param0);
|
||||
UnkStruct_ov104_0223EBD0 *ov104_0223EBA0(u32 heapID);
|
||||
void ov104_0223EBD0(UnkStruct_ov104_0223EBD0 *param0);
|
||||
void ov104_0223EBF0(UnkStruct_ov104_0223EBD0 *param0, u8 param1, u8 param2, Window *param3, u8 param4);
|
||||
BOOL ov104_0223EC34(UnkStruct_ov104_0223EBD0 *param0);
|
||||
BOOL ov104_0223EE44(UnkStruct_ov104_0223EBD0 *param0);
|
||||
void ov104_0223F094(UnkStruct_ov104_0223F094 *param0, u32 param1);
|
||||
void ov104_0223F0B0(UnkStruct_ov104_0223F094 *param0, u8 param1, u8 param2, u16 param3, fx32 param4, s16 param5, u32 param6, u32 param7, u32 param8);
|
||||
UnkStruct_ov104_0223F174 *ov104_0223F1B4(u32 param0, UnkStruct_ov104_0223F1B4 *param1, int param2);
|
||||
UnkStruct_ov104_0223F174 *ov104_0223F1B4(u32 param0, UnkStruct_ov104_0223F1B4 *param1, int heapID);
|
||||
void ov104_0223F258(UnkStruct_ov104_0223F174 *param0);
|
||||
void *ov104_0223F27C(const UnkStruct_ov104_0223F174 *param0);
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ struct UnkStruct_ov104_022320B4_t {
|
|||
UnkStruct_0209B75C *unk_00;
|
||||
UnkStruct_ov104_0222E930 *unk_04[8];
|
||||
UnkStruct_ov104_0222E8C8 unk_24;
|
||||
int unk_34;
|
||||
int heapID;
|
||||
u8 unk_38;
|
||||
MessageLoader *unk_3C;
|
||||
u8 *unk_40;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#include "overlay105/struct_ov105_02245AAC.h"
|
||||
#include "overlay105/struct_ov105_02245E1C_decl.h"
|
||||
|
||||
UnkStruct_ov105_02245E1C *ov105_02245DC4(UnkStruct_ov105_02245AAC *param0, u32 param1, int param2, int param3, u32 param4);
|
||||
UnkStruct_ov105_02245E1C *ov105_02245DC4(UnkStruct_ov105_02245AAC *param0, u32 param1, int param2, int param3, u32 heapID);
|
||||
void *ov105_02245E1C(UnkStruct_ov105_02245E1C *param0);
|
||||
void ov105_02245E30(UnkStruct_ov105_02245E1C *param0, int param1, int param2);
|
||||
BOOL ov105_02245E48(UnkStruct_ov105_02245E1C *param0);
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#include "overlay105/struct_ov105_02245AAC.h"
|
||||
#include "overlay105/struct_ov105_02245EA8_decl.h"
|
||||
|
||||
UnkStruct_ov105_02245EA8 *ov105_02245E54(UnkStruct_ov105_02245AAC *param0, int param1, int param2, u32 param3);
|
||||
UnkStruct_ov105_02245EA8 *ov105_02245E54(UnkStruct_ov105_02245AAC *param0, int param1, int param2, u32 heapID);
|
||||
void *ov105_02245EA8(UnkStruct_ov105_02245EA8 *param0);
|
||||
void ov105_02245EBC(UnkStruct_ov105_02245EA8 *param0, int param1);
|
||||
VecFx32 ov105_02245EC8(UnkStruct_ov105_02245EA8 *param0, int param1, int param2);
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ void ov114_0225CA2C(UnkStruct_ov114_0225E854 *param0, u32 param1, BOOL param2);
|
|||
void ov114_0225CA44(UnkStruct_ov114_0225E854 *param0, BOOL param1);
|
||||
BOOL ov114_0225CA54(UnkStruct_ov114_0225C76C *param0);
|
||||
BOOL ov114_0225CA98(const UnkStruct_ov114_0225C76C *param0);
|
||||
UnkStruct_ov114_0225CAD4 *ov114_0225CAD4(SpriteList *param0, u32 param1);
|
||||
UnkStruct_ov114_0225CAD4 *ov114_0225CAD4(SpriteList *param0, u32 heapID);
|
||||
void ov114_0225CB38(UnkStruct_ov114_0225CAD4 *param0);
|
||||
int ov114_0225CB74(UnkStruct_ov114_0225CAD4 *param0);
|
||||
void ov114_0225CB8C(UnkStruct_ov114_0225CAD4 *param0);
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#include "overlay115/struct_ov115_02265AD0.h"
|
||||
#include "overlay115/struct_ov115_02265AD4.h"
|
||||
|
||||
UnkStruct_ov115_02260BE4 *ov115_02260BBC(u32 param0, u32 param1, u32 param2, const UnkStruct_ov115_02262F50 *param3);
|
||||
UnkStruct_ov115_02260BE4 *ov115_02260BBC(u32 heapID, u32 param1, u32 param2, const UnkStruct_ov115_02262F50 *param3);
|
||||
void ov115_02260BE4(UnkStruct_ov115_02260BE4 *param0);
|
||||
BOOL ov115_02260BEC(UnkStruct_ov115_02260BE4 *param0);
|
||||
BOOL ov115_02260C54(const UnkStruct_ov115_02260BE4 *param0);
|
||||
|
|
|
|||
|
|
@ -34,21 +34,21 @@ typedef struct UnkStruct_ov83_0223D4CC_t {
|
|||
void *unk_04;
|
||||
} UnkStruct_ov83_0223D4CC;
|
||||
|
||||
static UnkStruct_ov83_0223D584 *ov83_0223D584(const CommCmdTable *param0, int param1, void *param2, int param3);
|
||||
static UnkStruct_ov83_0223D584 *ov83_0223D584(const CommCmdTable *param0, int param1, void *param2, int heapID);
|
||||
static void ov83_0223D5CC(SysTask *param0, void *param1);
|
||||
static void ov83_0223D620(UnkStruct_ov83_0223D584 *param0);
|
||||
static BOOL ov83_0223D638(UnkStruct_ov83_0223D584 *param0, int param1, const void *param2, int param3);
|
||||
|
||||
UnkStruct_ov83_0223D4CC *ov83_0223D4CC(const CommCmdTable *param0, int param1, void *param2, int param3, int param4)
|
||||
UnkStruct_ov83_0223D4CC *ov83_0223D4CC(const CommCmdTable *param0, int param1, void *param2, int param3, int heapID)
|
||||
{
|
||||
UnkStruct_ov83_0223D4CC *v0 = Heap_AllocFromHeap(param4, sizeof(UnkStruct_ov83_0223D4CC));
|
||||
UnkStruct_ov83_0223D4CC *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov83_0223D4CC));
|
||||
v0->unk_00 = param3;
|
||||
v0->unk_04 = NULL;
|
||||
|
||||
if (param3 == 1) {
|
||||
CommCmd_Init(param0, param1, param2);
|
||||
} else {
|
||||
v0->unk_04 = ov83_0223D584(param0, param1, param2, param4);
|
||||
v0->unk_04 = ov83_0223D584(param0, param1, param2, heapID);
|
||||
}
|
||||
|
||||
return v0;
|
||||
|
|
@ -97,9 +97,9 @@ int ov83_0223D570(UnkStruct_ov83_0223D4CC *param0)
|
|||
}
|
||||
}
|
||||
|
||||
static UnkStruct_ov83_0223D584 *ov83_0223D584(const CommCmdTable *param0, int param1, void *param2, int param3)
|
||||
static UnkStruct_ov83_0223D584 *ov83_0223D584(const CommCmdTable *param0, int param1, void *param2, int heapID)
|
||||
{
|
||||
UnkStruct_ov83_0223D584 *v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov83_0223D584));
|
||||
UnkStruct_ov83_0223D584 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov83_0223D584));
|
||||
memset(v0, 0, sizeof(UnkStruct_ov83_0223D584));
|
||||
|
||||
v0->unk_190 = param0;
|
||||
|
|
|
|||
|
|
@ -434,7 +434,7 @@ enum {
|
|||
static void ov97_0222C388(UnkStruct_ov97_0222C388 *param0);
|
||||
int ov97_0222CB10(UnkStruct_ov97_0222C388 *param0);
|
||||
MysteryGift *SaveData_MysteryGift(SaveData *param0);
|
||||
void ov97_02231FFC(BgConfig *param0, void *, int param2);
|
||||
void ov97_02231FFC(BgConfig *param0, void *, int heapID);
|
||||
|
||||
static u16 ov97_0222C174(u16 param0)
|
||||
{
|
||||
|
|
@ -748,7 +748,7 @@ static int ov97_0222C78C(OverlayManager *param0, int *param1)
|
|||
GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 1);
|
||||
GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0);
|
||||
|
||||
ov97_02231FFC(v0->unk_04, &v0->unk_3180, 85);
|
||||
ov97_02231FFC(v0->unk_04, &v0->unk_3180, HEAP_ID_85);
|
||||
ov97_02237790(1, UnkEnum_ov97_0222C78C_06, param1, UnkEnum_ov97_0222C78C_13);
|
||||
v0->unk_3180.unk_104.unk_4E_2 = 0;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ typedef struct {
|
|||
void Strbuf_ToChars(const Strbuf *param0, u16 *param1, u32 param2);
|
||||
void Strbuf_CopyNumChars(Strbuf *param0, const u16 *param1, u32 param2);
|
||||
MysteryGift *SaveData_MysteryGift(SaveData *param0);
|
||||
void ov97_02231FFC(BgConfig *param0, void *, int param2);
|
||||
void ov97_02231FFC(BgConfig *param0, void *, int heapID);
|
||||
static int ov97_0222D474(OverlayManager *param0);
|
||||
static int ov97_0222D4D8(OverlayManager *param0);
|
||||
static int ov97_0222DA18(OverlayManager *param0);
|
||||
|
|
@ -360,7 +360,7 @@ static UnkStruct_0202DF40 *ov97_0222D55C(OverlayManager *param0)
|
|||
switch (v0->unk_1638) {
|
||||
case 1:
|
||||
memcpy(v1, ov97_0222D2B8(0, NULL, 0), sizeof(UnkUnion_ov97_0222D2B0));
|
||||
ov97_02238324(&v0->unk_8C, &v0->unk_8C.unk_50, 86);
|
||||
ov97_02238324(&v0->unk_8C, &v0->unk_8C.unk_50, HEAP_ID_86);
|
||||
break;
|
||||
case 3:
|
||||
v3 = (UnkStruct_ov97_0223829C *)v0->unk_638;
|
||||
|
|
@ -2397,7 +2397,7 @@ static int ov97_0222F75C(OverlayManager *param0, int *param1)
|
|||
ov97_0222DC20(v3->unk_00);
|
||||
GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0);
|
||||
GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 1);
|
||||
ov97_02231FFC(v3->unk_00, &v3->unk_8C.unk_50.val2, 86);
|
||||
ov97_02231FFC(v3->unk_00, &v3->unk_8C.unk_50.val2, HEAP_ID_86);
|
||||
ov97_02237790(1, 55, v3->unk_163C, 2);
|
||||
v3->unk_8C.unk_00.unk_4E_2 = 0;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ typedef struct {
|
|||
} UnkStruct_ov97_02231318;
|
||||
|
||||
typedef struct {
|
||||
int unk_00;
|
||||
int heapID;
|
||||
UnkStruct_ov97_0222D04C unk_04;
|
||||
BgConfig *unk_2A5C;
|
||||
StringTemplate *unk_2A60;
|
||||
|
|
@ -133,7 +133,6 @@ typedef struct {
|
|||
|
||||
void Strbuf_CopyNumChars(Strbuf *param0, const u16 *param1, u32 param2);
|
||||
MysteryGift *SaveData_MysteryGift(SaveData *param0);
|
||||
void ov97_02231FFC(BgConfig *param0, void *, int param2);
|
||||
static int ov97_02230728(OverlayManager *param0);
|
||||
static int ov97_022306F4(OverlayManager *param0);
|
||||
static int ov97_02230834(OverlayManager *param0);
|
||||
|
|
@ -431,7 +430,7 @@ static BOOL ov97_022308B0(UnkStruct_ov97_02230868 *param0, Window *param1, TextC
|
|||
|
||||
static BOOL ov97_022308B4(UnkStruct_ov97_02230868 *param0, Window *param1, TextColor param2)
|
||||
{
|
||||
Strbuf *v0 = Strbuf_Init(36 + 1, param0->unk_00);
|
||||
Strbuf *v0 = Strbuf_Init(36 + 1, param0->heapID);
|
||||
|
||||
Strbuf_CopyNumChars(v0, param0->unk_2C14[param0->unk_2C20]->unk_104.unk_00, 36);
|
||||
Text_AddPrinterWithParamsAndColor(param1, FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, param2, NULL);
|
||||
|
|
@ -456,7 +455,7 @@ static BOOL ov97_02230904(UnkStruct_ov97_02230868 *param0, Window *param1, TextC
|
|||
}
|
||||
}
|
||||
|
||||
v0 = MessageUtil_ExpandedStrbuf(param0->unk_2A60, param0->unk_2A64, v2, param0->unk_00);
|
||||
v0 = MessageUtil_ExpandedStrbuf(param0->unk_2A60, param0->unk_2A64, v2, param0->heapID);
|
||||
|
||||
Text_AddPrinterWithParamsAndColor(param1, FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, param2, NULL);
|
||||
Strbuf_Free(v0);
|
||||
|
|
@ -574,8 +573,8 @@ static void ov97_02230C44(UnkStruct_ov97_02230868 *param0, int param1, int param
|
|||
TextColor v3;
|
||||
UnkStruct_ov97_0223E680 *v4 = Unk_ov97_0223E680;
|
||||
|
||||
param0->unk_2A64 = MessageLoader_Init(1, 26, 421, param0->unk_00);
|
||||
param0->unk_2A60 = StringTemplate_Default(param0->unk_00);
|
||||
param0->unk_2A64 = MessageLoader_Init(1, 26, 421, param0->heapID);
|
||||
param0->unk_2A60 = StringTemplate_Default(param0->heapID);
|
||||
param0->unk_2C24 = param2;
|
||||
|
||||
ov97_02230F98(param0, param2);
|
||||
|
|
@ -603,7 +602,7 @@ static void ov97_02230C44(UnkStruct_ov97_02230868 *param0, int param1, int param
|
|||
|
||||
if (v4[v0].unk_24(param0, ¶m0->unk_2A68[v0], v3) == 1) {
|
||||
if (v4[v0].unk_20) {
|
||||
v2 = MessageUtil_ExpandedStrbuf(param0->unk_2A60, param0->unk_2A64, v4[v0].unk_20, param0->unk_00);
|
||||
v2 = MessageUtil_ExpandedStrbuf(param0->unk_2A60, param0->unk_2A64, v4[v0].unk_20, param0->heapID);
|
||||
|
||||
{
|
||||
u32 v5 = (v4[v0].unk_28 == -1) ? Font_CalcCenterAlignment(v4[v0].unk_14, v2, 0, v4[v0].unk_0C * 8) : v4[v0].unk_28;
|
||||
|
|
@ -697,7 +696,7 @@ static int ov97_02230F20(UnkStruct_ov97_02230868 *param0, int param1, int param2
|
|||
static void ov97_02230F58(UnkStruct_ov97_02230868 *param0, u32 param1, u32 param2, u32 param3)
|
||||
{
|
||||
NNSG2dScreenData *v0;
|
||||
void *v1 = LoadMemberFromNARC(116, param1, 1, param0->unk_00, 1);
|
||||
void *v1 = LoadMemberFromNARC(116, param1, 1, param0->heapID, 1);
|
||||
|
||||
NNS_G2dGetUnpackedScreenData(v1, &v0);
|
||||
|
||||
|
|
@ -707,20 +706,20 @@ static void ov97_02230F58(UnkStruct_ov97_02230868 *param0, u32 param1, u32 param
|
|||
|
||||
static void ov97_02230F98(UnkStruct_ov97_02230868 *param0, int param1)
|
||||
{
|
||||
Graphics_LoadPalette(116, 3, 0, 0, 16 * 16, param0->unk_00);
|
||||
Graphics_LoadTilesToBgLayer(116, 6, param0->unk_2A5C, 1, 0, 24 * 16 * 0x20, 1, param0->unk_00);
|
||||
Graphics_LoadPalette(116, 3, 0, 0, 16 * 16, param0->heapID);
|
||||
Graphics_LoadTilesToBgLayer(116, 6, param0->unk_2A5C, 1, 0, 24 * 16 * 0x20, 1, param0->heapID);
|
||||
|
||||
switch (param1) {
|
||||
case 0:
|
||||
Graphics_LoadTilemapToBgLayer(116, 4, param0->unk_2A5C, 1, 0, 32 * 24 * 2, 1, param0->unk_00);
|
||||
Graphics_LoadTilemapToBgLayer(116, 4, param0->unk_2A5C, 1, 0, 32 * 24 * 2, 1, param0->heapID);
|
||||
break;
|
||||
case 1:
|
||||
Graphics_LoadTilemapToBgLayer(116, 5, param0->unk_2A5C, 1, 0, 32 * 24 * 2, 1, param0->unk_00);
|
||||
Graphics_LoadTilemapToBgLayer(116, 5, param0->unk_2A5C, 1, 0, 32 * 24 * 2, 1, param0->heapID);
|
||||
break;
|
||||
}
|
||||
|
||||
Graphics_LoadPalette(116, 0, 0, 16 * 2 * 11, 16 * 2, param0->unk_00);
|
||||
Graphics_LoadTilesToBgLayer(116, 1, param0->unk_2A5C, 3, 0 * 1, 1 * 16 * 0x20, 1, param0->unk_00);
|
||||
Graphics_LoadPalette(116, 0, 0, 16 * 2 * 11, 16 * 2, param0->heapID);
|
||||
Graphics_LoadTilesToBgLayer(116, 1, param0->unk_2A5C, 3, 0 * 1, 1 * 16 * 0x20, 1, param0->heapID);
|
||||
|
||||
ov97_02230F58(param0, 2, 3, 32 * 24 * 2);
|
||||
|
||||
|
|
@ -785,7 +784,7 @@ static void ov97_022310FC(UnkStruct_ov97_02230868 *param0)
|
|||
ov97_02237A74();
|
||||
ov97_02237B0C(116, 26, 23, 25, 24, 0);
|
||||
|
||||
Graphics_LoadPalette(19, PokeIconPalettesFileIndex(), 1, 3 * 0x20, 0, param0->unk_00);
|
||||
Graphics_LoadPalette(19, PokeIconPalettesFileIndex(), 1, 3 * 0x20, 0, param0->heapID);
|
||||
}
|
||||
|
||||
v2 = 1;
|
||||
|
|
@ -803,7 +802,7 @@ static void ov97_022310FC(UnkStruct_ov97_02230868 *param0)
|
|||
}
|
||||
|
||||
param0->unk_2E90[v1] = ov97_02237D14(0, param0->unk_2E90[v1], v0, 16, 10 + v1);
|
||||
v3 = Graphics_GetCharData(19, PokeIconSpriteIndex(v2, 0, 0), 0, &v4, param0->unk_00);
|
||||
v3 = Graphics_GetCharData(19, PokeIconSpriteIndex(v2, 0, 0), 0, &v4, param0->heapID);
|
||||
|
||||
DC_FlushRange(v4->pRawData, ((4 * 4) * 0x20));
|
||||
GX_LoadOBJ(v4->pRawData, (0x64 + v1 * (4 * 4)) * 0x20, ((4 * 4) * 0x20));
|
||||
|
|
@ -823,7 +822,7 @@ static int ov97_02231224(OverlayManager *param0, int *param1)
|
|||
memset(v0, 0, sizeof(UnkStruct_ov97_02230868));
|
||||
|
||||
v0->unk_2A5C = BgConfig_New(HEAP_ID_87);
|
||||
v0->unk_00 = 87;
|
||||
v0->heapID = HEAP_ID_87;
|
||||
|
||||
sub_0200F344(0, 0x0);
|
||||
sub_0200F344(1, 0x0);
|
||||
|
|
@ -1205,7 +1204,7 @@ static int ov97_0223161C(OverlayManager *param0, int *param1)
|
|||
break;
|
||||
case 21:
|
||||
if (--v4->unk_2C94 == 0) {
|
||||
ov97_0223829C(&v4->unk_04.unk_8C, &v4->unk_2E9C, v4->unk_00);
|
||||
ov97_0223829C(&v4->unk_04.unk_8C, &v4->unk_2E9C, v4->heapID);
|
||||
ov97_0222D1F0((const void *)&v4->unk_2E9C, sizeof(UnkUnion_ov97_0222D2B0));
|
||||
ov97_02231488(v4);
|
||||
*param1 = 23;
|
||||
|
|
@ -1472,19 +1471,19 @@ const OverlayManagerTemplate Unk_ov97_0223D7AC = {
|
|||
0xffffffff
|
||||
};
|
||||
|
||||
void ov97_02231FFC(BgConfig *param0, void *param1, int param2)
|
||||
void ov97_02231FFC(BgConfig *param0, void *param1, int heapID)
|
||||
{
|
||||
UnkStruct_ov97_02230868 *v0;
|
||||
|
||||
ov97_02232074(param0);
|
||||
|
||||
v0 = Heap_AllocFromHeapAtEnd(param2, sizeof(UnkStruct_ov97_02230868));
|
||||
v0 = Heap_AllocFromHeapAtEnd(heapID, sizeof(UnkStruct_ov97_02230868));
|
||||
memset(v0, 0, sizeof(UnkStruct_ov97_02230868));
|
||||
|
||||
v0->unk_2A5C = param0;
|
||||
v0->unk_00 = param2;
|
||||
v0->heapID = heapID;
|
||||
|
||||
Font_LoadTextPalette(0, 15 * 32, v0->unk_00);
|
||||
Font_LoadTextPalette(0, 15 * 32, v0->heapID);
|
||||
|
||||
v0->unk_2C14[0] = (UnkStruct_0202DBAC *)param1;
|
||||
v0->unk_2C20 = 0;
|
||||
|
|
|
|||
|
|
@ -713,7 +713,7 @@ void ov97_02238194(BgConfig *param0, UnkStruct_0202DF40 *param1)
|
|||
Sprite_SetDrawFlag(v2->unk_26C, 0);
|
||||
}
|
||||
|
||||
void ov97_0223829C(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *param1, int param2)
|
||||
void ov97_0223829C(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *param1, int heapID)
|
||||
{
|
||||
MATHCRC16Table *v0;
|
||||
CRYPTORC4Context *v1;
|
||||
|
|
@ -721,7 +721,7 @@ void ov97_0223829C(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *para
|
|||
u16 v3, v4;
|
||||
int v5;
|
||||
|
||||
v0 = Heap_AllocFromHeap(param2, sizeof(MATHCRC16Table));
|
||||
v0 = Heap_AllocFromHeap(heapID, sizeof(MATHCRC16Table));
|
||||
MATH_CRC16InitTable(v0);
|
||||
|
||||
v3 = MATH_CalcCRC16(v0, ¶m0->unk_00, sizeof(UnkStruct_ov97_0222D250));
|
||||
|
|
@ -738,7 +738,7 @@ void ov97_0223829C(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *para
|
|||
v4 = v2[v5];
|
||||
}
|
||||
|
||||
v1 = Heap_AllocFromHeap(param2, sizeof(CRYPTORC4Context));
|
||||
v1 = Heap_AllocFromHeap(heapID, sizeof(CRYPTORC4Context));
|
||||
|
||||
CRYPTO_RC4Init(v1, v2, 8);
|
||||
CRYPTO_RC4Encrypt(v1, ¶m0->unk_50, sizeof(UnkUnion_ov97_0222D2B0), param1);
|
||||
|
|
@ -746,7 +746,7 @@ void ov97_0223829C(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *para
|
|||
Heap_FreeToHeap(v1);
|
||||
}
|
||||
|
||||
void ov97_02238324(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *param1, int param2)
|
||||
void ov97_02238324(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *param1, int heapID)
|
||||
{
|
||||
MATHCRC16Table *v0;
|
||||
CRYPTORC4Context *v1;
|
||||
|
|
@ -755,7 +755,7 @@ void ov97_02238324(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *para
|
|||
u16 v4, v5;
|
||||
int v6;
|
||||
|
||||
v0 = Heap_AllocFromHeap(param2, sizeof(MATHCRC16Table));
|
||||
v0 = Heap_AllocFromHeap(heapID, sizeof(MATHCRC16Table));
|
||||
MATH_CRC16InitTable(v0);
|
||||
|
||||
v4 = MATH_CalcCRC16(v0, ¶m0->unk_00, sizeof(UnkStruct_ov97_0222D250));
|
||||
|
|
@ -773,7 +773,7 @@ void ov97_02238324(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *para
|
|||
v5 = v3[v6];
|
||||
}
|
||||
|
||||
v1 = Heap_AllocFromHeap(param2, sizeof(CRYPTORC4Context));
|
||||
v1 = Heap_AllocFromHeap(heapID, sizeof(CRYPTORC4Context));
|
||||
|
||||
CRYPTO_RC4Init(v1, v3, 8);
|
||||
CRYPTO_RC4Encrypt(v1, ¶m0->unk_50, sizeof(UnkUnion_ov97_0222D2B0), param1);
|
||||
|
|
|
|||
|
|
@ -272,7 +272,7 @@ void ov98_02246EF8(UnkStruct_ov98_02246E88 *param0)
|
|||
{
|
||||
char *v0 = Heap_AllocFromHeap(HEAP_ID_108, sizeof(char) * 100);
|
||||
|
||||
ov98_022499C8(param0->unk_114, v0, 108);
|
||||
ov98_022499C8(param0->unk_114, v0, HEAP_ID_108);
|
||||
sub_02030D38(param0->unk_04, v0);
|
||||
Heap_FreeToHeap(v0);
|
||||
}
|
||||
|
|
@ -296,7 +296,7 @@ void ov98_02246F5C(UnkStruct_ov98_02246E88 *param0)
|
|||
|
||||
void ov98_02246F74(UnkStruct_ov98_02246E88 *param0)
|
||||
{
|
||||
ov98_022499C8(param0->unk_114, param0->unk_9C.unk_1C, 108);
|
||||
ov98_022499C8(param0->unk_114, param0->unk_9C.unk_1C, HEAP_ID_108);
|
||||
}
|
||||
|
||||
void ov98_02246F88(UnkStruct_ov98_02246E88 *param0)
|
||||
|
|
@ -355,7 +355,7 @@ void *ov98_02246FC4(UnkStruct_ov98_02246E88 *param0)
|
|||
void ov98_02246FFC(UnkStruct_ov98_02246E88 *param0)
|
||||
{
|
||||
UnkStruct_02089438 *v0 = param0->unk_98;
|
||||
if (ov98_02249A80(v0->unk_1C, 108)) {
|
||||
if (ov98_02249A80(v0->unk_1C, HEAP_ID_108)) {
|
||||
ov98_02246FAC(param0, 1);
|
||||
} else if (ov98_02246FB4(param0) == 2) {
|
||||
if (Strbuf_Compare(param0->unk_114, v0->unk_1C) != 0) {
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ static const struct {
|
|||
{ 0x12a, '9' },
|
||||
};
|
||||
|
||||
void ov98_022499C8(Strbuf *param0, char *param1, int param2)
|
||||
void ov98_022499C8(Strbuf *param0, char *param1, int heapID)
|
||||
{
|
||||
static const char Unk_ov98_02249D1C[] = "w";
|
||||
static const char Unk_ov98_02249D20[] = "@wii.com";
|
||||
|
|
@ -38,7 +38,7 @@ void ov98_022499C8(Strbuf *param0, char *param1, int param2)
|
|||
param1[v2] = Unk_ov98_02249D1C[v0++];
|
||||
}
|
||||
|
||||
v1 = Heap_AllocFromHeap(param2, sizeof(charcode_t) * 100);
|
||||
v1 = Heap_AllocFromHeap(heapID, sizeof(charcode_t) * 100);
|
||||
Strbuf_ToChars(param0, v1, 100);
|
||||
|
||||
v0 = 0;
|
||||
|
|
@ -65,13 +65,13 @@ void ov98_022499C8(Strbuf *param0, char *param1, int param2)
|
|||
Heap_FreeToHeap(v1);
|
||||
}
|
||||
|
||||
int ov98_02249A80(Strbuf *param0, int param1)
|
||||
int ov98_02249A80(Strbuf *param0, int heapID)
|
||||
{
|
||||
charcode_t *v0;
|
||||
BOOL v1 = TRUE;
|
||||
int v2;
|
||||
|
||||
v0 = Heap_AllocFromHeap(param1, sizeof(charcode_t) * 100);
|
||||
v0 = Heap_AllocFromHeap(heapID, sizeof(charcode_t) * 100);
|
||||
Strbuf_ToChars(param0, v0, 100);
|
||||
|
||||
for (v2 = 0; v0[v2] != CHAR_EOS; v2++) {
|
||||
|
|
|
|||
|
|
@ -501,7 +501,7 @@ static void ov101_021D1550(UnkStruct_ov101_021D13C8 *param0)
|
|||
NNS_G2dInitOamManagerModule();
|
||||
|
||||
RenderOam_Init(0, 128, 0, 32, 0, 128, 0, 32, 79);
|
||||
param0->unk_450 = ov101_021D7E48(79, 64, 32, 64, 16, 64, 32, 11, 8, 11, 11);
|
||||
param0->unk_450 = ov101_021D7E48(HEAP_ID_79, 64, 32, 64, 16, 64, 32, 11, 8, 11, 11);
|
||||
ov101_021D15BC(param0);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ typedef struct {
|
|||
} UnkStruct_ov101_021D7E48_sub1;
|
||||
|
||||
typedef struct UnkStruct_ov101_021D7E48_t {
|
||||
u32 unk_00;
|
||||
u32 heapID;
|
||||
u8 unk_04;
|
||||
u8 unk_05;
|
||||
u8 unk_06;
|
||||
|
|
@ -43,13 +43,13 @@ typedef struct UnkStruct_ov101_021D7E48_t {
|
|||
UnkStruct_ov101_021D7E48_sub1 *unk_1BC;
|
||||
} UnkStruct_ov101_021D7E48;
|
||||
|
||||
UnkStruct_ov101_021D7E48 *ov101_021D7E48(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9, u32 param10)
|
||||
UnkStruct_ov101_021D7E48 *ov101_021D7E48(u32 heapID, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9, u32 param10)
|
||||
{
|
||||
UnkStruct_ov101_021D7E48 *v0 = Heap_AllocFromHeap(param0, (sizeof(UnkStruct_ov101_021D7E48)));
|
||||
UnkStruct_ov101_021D7E48 *v0 = Heap_AllocFromHeap(heapID, (sizeof(UnkStruct_ov101_021D7E48)));
|
||||
|
||||
GF_ASSERT(v0 != NULL);
|
||||
|
||||
v0->unk_00 = param0;
|
||||
v0->heapID = heapID;
|
||||
v0->unk_04 = param3;
|
||||
v0->unk_05 = param4;
|
||||
v0->unk_06 = param5;
|
||||
|
|
@ -58,19 +58,19 @@ UnkStruct_ov101_021D7E48 *ov101_021D7E48(u32 param0, u32 param1, u32 param2, u32
|
|||
v0->unk_09 = param8;
|
||||
v0->unk_0A = param9;
|
||||
v0->unk_0B = param10;
|
||||
v0->unk_0C = SpriteList_InitRendering(param1, &v0->unk_10, param0);
|
||||
v0->unk_19C = CellTransfer_New(param2, param0);
|
||||
v0->unk_0C = SpriteList_InitRendering(param1, &v0->unk_10, heapID);
|
||||
v0->unk_19C = CellTransfer_New(param2, heapID);
|
||||
|
||||
VramTransfer_New(param2, param0);
|
||||
VramTransfer_New(param2, heapID);
|
||||
|
||||
v0->unk_1A0 = SpriteResourceCollection_New(param3, 0, param0);
|
||||
v0->unk_1A4 = SpriteResourceCollection_New(param4, 1, param0);
|
||||
v0->unk_1A8 = SpriteResourceCollection_New(param5, 2, param0);
|
||||
v0->unk_1AC = SpriteResourceCollection_New(param6, 3, param0);
|
||||
v0->unk_1B0 = Heap_AllocFromHeap(param0, (sizeof(UnkStruct_ov101_021D7E48_sub1)) * param3);
|
||||
v0->unk_1B4 = Heap_AllocFromHeap(param0, (sizeof(UnkStruct_ov101_021D7E48_sub1)) * param4);
|
||||
v0->unk_1B8 = Heap_AllocFromHeap(param0, (sizeof(UnkStruct_ov101_021D7E48_sub1)) * param5);
|
||||
v0->unk_1BC = Heap_AllocFromHeap(param0, (sizeof(UnkStruct_ov101_021D7E48_sub1)) * param6);
|
||||
v0->unk_1A0 = SpriteResourceCollection_New(param3, 0, heapID);
|
||||
v0->unk_1A4 = SpriteResourceCollection_New(param4, 1, heapID);
|
||||
v0->unk_1A8 = SpriteResourceCollection_New(param5, 2, heapID);
|
||||
v0->unk_1AC = SpriteResourceCollection_New(param6, 3, heapID);
|
||||
v0->unk_1B0 = Heap_AllocFromHeap(heapID, (sizeof(UnkStruct_ov101_021D7E48_sub1)) * param3);
|
||||
v0->unk_1B4 = Heap_AllocFromHeap(heapID, (sizeof(UnkStruct_ov101_021D7E48_sub1)) * param4);
|
||||
v0->unk_1B8 = Heap_AllocFromHeap(heapID, (sizeof(UnkStruct_ov101_021D7E48_sub1)) * param5);
|
||||
v0->unk_1BC = Heap_AllocFromHeap(heapID, (sizeof(UnkStruct_ov101_021D7E48_sub1)) * param6);
|
||||
|
||||
{
|
||||
u32 v1;
|
||||
|
|
@ -152,8 +152,7 @@ void ov101_021D80E4(UnkStruct_ov101_021D7E48 *param0, u32 param1, NARC *param2,
|
|||
if (param0->unk_1B0[v0].unk_00 == param0->unk_08) {
|
||||
param0->unk_1B0[v0].unk_00 = param4;
|
||||
param0->unk_1B0[v0].unk_02 = 0;
|
||||
param0->unk_1B0[v0].unk_04 = SpriteResourceCollection_AddTilesFrom(
|
||||
param0->unk_1A0, param2, param3, 0, param4, param1, param0->unk_00);
|
||||
param0->unk_1B0[v0].unk_04 = SpriteResourceCollection_AddTilesFrom(param0->unk_1A0, param2, param3, 0, param4, param1, param0->heapID);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -197,7 +196,7 @@ void ov101_021D81B4(UnkStruct_ov101_021D7E48 *param0, u32 param1, NARC *param2,
|
|||
if (param0->unk_1B4[v0].unk_00 == param0->unk_09) {
|
||||
param0->unk_1B4[v0].unk_00 = param4;
|
||||
param0->unk_1B4[v0].unk_02 = 0;
|
||||
param0->unk_1B4[v0].unk_04 = SpriteResourceCollection_AddPaletteFrom(param0->unk_1A4, param2, param3, 0, param4, param1, 1, param0->unk_00);
|
||||
param0->unk_1B4[v0].unk_04 = SpriteResourceCollection_AddPaletteFrom(param0->unk_1A4, param2, param3, 0, param4, param1, 1, param0->heapID);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -241,7 +240,7 @@ void ov101_021D8288(UnkStruct_ov101_021D7E48 *param0, NARC *param1, u32 param2,
|
|||
if (param0->unk_1B8[v0].unk_00 == param0->unk_0A) {
|
||||
param0->unk_1B8[v0].unk_00 = param3;
|
||||
param0->unk_1B8[v0].unk_02 = 0;
|
||||
param0->unk_1B8[v0].unk_04 = SpriteResourceCollection_AddFrom(param0->unk_1A8, param1, param2, 0, param3, 2, param0->unk_00);
|
||||
param0->unk_1B8[v0].unk_04 = SpriteResourceCollection_AddFrom(param0->unk_1A8, param1, param2, 0, param3, 2, param0->heapID);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -257,8 +256,7 @@ void ov101_021D82F0(UnkStruct_ov101_021D7E48 *param0, NARC *param1, u32 param2,
|
|||
if (param0->unk_1BC[v0].unk_00 == param0->unk_0B) {
|
||||
param0->unk_1BC[v0].unk_00 = param3;
|
||||
param0->unk_1BC[v0].unk_02 = 0;
|
||||
param0->unk_1BC[v0].unk_04 = SpriteResourceCollection_AddFrom(
|
||||
param0->unk_1AC, param1, param2, 0, param3, 3, param0->unk_00);
|
||||
param0->unk_1BC[v0].unk_04 = SpriteResourceCollection_AddFrom(param0->unk_1AC, param1, param2, 0, param3, 3, param0->heapID);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -340,7 +338,7 @@ void ov101_021D84A4(UnkStruct_ov101_021D7E48 *param0, UnkStruct_ov101_021D8544 *
|
|||
v1.position = *param2;
|
||||
v1.priority = param10;
|
||||
v1.vramType = param3;
|
||||
v1.heapID = param0->unk_00;
|
||||
v1.heapID = param0->heapID;
|
||||
|
||||
param1->unk_04 = SpriteList_Add(&v1);
|
||||
GF_ASSERT(param1->unk_04 != NULL);
|
||||
|
|
|
|||
|
|
@ -30,20 +30,20 @@ static void ov104_0222E82C(UnkStruct_ov104_022320B4 *param0, u16 param1, u32 *pa
|
|||
static void ov104_0222E830(u8 **param0, MessageLoader **param1, int param2, int param3);
|
||||
static void ov104_0222E904(UnkStruct_ov104_0222E930 *param0, int param1);
|
||||
|
||||
UnkStruct_ov104_022320B4 *ov104_0222E63C(UnkStruct_0209B75C *param0, int param1, int param2)
|
||||
UnkStruct_ov104_022320B4 *ov104_0222E63C(UnkStruct_0209B75C *param0, int heapID, int param2)
|
||||
{
|
||||
UnkStruct_ov104_022320B4 *v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov104_022320B4));
|
||||
UnkStruct_ov104_022320B4 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov104_022320B4));
|
||||
MI_CpuClear8(v0, sizeof(UnkStruct_ov104_022320B4));
|
||||
|
||||
v0->unk_00 = param0;
|
||||
v0->unk_34 = param1;
|
||||
v0->heapID = heapID;
|
||||
v0->unk_52 = param2;
|
||||
|
||||
ov104_0222E830(&v0->unk_40, &v0->unk_3C, param2, param1);
|
||||
ov104_0222E830(&v0->unk_40, &v0->unk_3C, param2, heapID);
|
||||
|
||||
v0->unk_44 = StringTemplate_New(8, 64, param1);
|
||||
v0->unk_48 = Strbuf_Init(1024, param1);
|
||||
v0->unk_4C = Strbuf_Init(1024, param1);
|
||||
v0->unk_44 = StringTemplate_New(8, 64, heapID);
|
||||
v0->unk_48 = Strbuf_Init(1024, heapID);
|
||||
v0->unk_4C = Strbuf_Init(1024, heapID);
|
||||
|
||||
ov104_0222E82C(v0, param2, NULL, NULL);
|
||||
|
||||
|
|
@ -101,7 +101,7 @@ void ov104_0222E710(UnkStruct_ov104_022320B4 *param0)
|
|||
|
||||
void ov104_0222E748(UnkStruct_ov104_022320B4 *param0, int param1, int param2)
|
||||
{
|
||||
UnkStruct_ov104_0222E930 *v0 = Heap_AllocFromHeap(param0->unk_34, sizeof(UnkStruct_ov104_0222E930));
|
||||
UnkStruct_ov104_0222E930 *v0 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov104_0222E930));
|
||||
MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0222E930));
|
||||
|
||||
ov104_0222E930(v0, Unk_ov104_0223F674, Unk_ov104_0223F63C);
|
||||
|
|
@ -112,7 +112,7 @@ void ov104_0222E748(UnkStruct_ov104_022320B4 *param0, int param1, int param2)
|
|||
v0->unk_84 = param0->unk_40;
|
||||
v0->unk_80 = param0->unk_3C;
|
||||
} else {
|
||||
ov104_0222E830(&v0->unk_84, &v0->unk_80, param1, param0->unk_34);
|
||||
ov104_0222E830(&v0->unk_84, &v0->unk_80, param1, param0->heapID);
|
||||
}
|
||||
|
||||
ov104_0222E968(v0, v0->unk_84);
|
||||
|
|
@ -195,9 +195,9 @@ void ov104_0222E86C(UnkStruct_ov104_022320B4 *param0, int param1, int param2)
|
|||
param0->unk_3C = v4;
|
||||
}
|
||||
|
||||
UnkStruct_ov104_0222E8C8 *ov104_0222E8C8(UnkStruct_ov104_022320B4 *param0, int param1)
|
||||
UnkStruct_ov104_0222E8C8 *ov104_0222E8C8(UnkStruct_ov104_022320B4 *param0, int heapID)
|
||||
{
|
||||
UnkStruct_ov104_0222E8C8 *v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov104_0222E8C8));
|
||||
UnkStruct_ov104_0222E8C8 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov104_0222E8C8));
|
||||
*v0 = param0->unk_24;
|
||||
|
||||
return v0;
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ static BOOL ov104_022303A8(UnkStruct_ov104_0222E930 *param0);
|
|||
static BOOL ov104_022303C8(UnkStruct_ov104_0222E930 *param0);
|
||||
static BOOL ov104_022304A0(UnkStruct_ov104_0222E930 *param0);
|
||||
static BOOL ov104_0223050C(UnkStruct_ov104_0222E930 *param0);
|
||||
static void ov104_0223056C(u16 param0, UnkStruct_ov104_0223C634 *param1, const UnkStruct_ov104_02232B78_sub1 *param2, UnkStruct_ov63_0222D77C *param3, u8 *param4, int param5);
|
||||
static void ov104_0223056C(u16 param0, UnkStruct_ov104_0223C634 *param1, const UnkStruct_ov104_02232B78_sub1 *param2, UnkStruct_ov63_0222D77C *param3, u8 *param4, int heapID);
|
||||
static BOOL ov104_022305B8(UnkStruct_ov104_0222E930 *param0);
|
||||
static BOOL ov104_022305C8(UnkStruct_ov104_0222E930 *param0);
|
||||
static BOOL ov104_02230958(UnkStruct_ov104_0222E930 *param0);
|
||||
|
|
@ -994,7 +994,7 @@ static BOOL ov104_02230260(UnkStruct_ov104_0222E930 *param0)
|
|||
u16 v2 = ov104_0222EA48(param0);
|
||||
u8 v3 = (*((param0)->unk_1C++));
|
||||
|
||||
v0->unk_74 = Menu_MakeYesNoChoiceWithCursorAt(v1->unk_00, &Unk_ov104_0223F640, ((1024 - (18 + 12)) - 9), 12, v3, v0->unk_34);
|
||||
v0->unk_74 = Menu_MakeYesNoChoiceWithCursorAt(v1->unk_00, &Unk_ov104_0223F640, ((1024 - (18 + 12)) - 9), 12, v3, v0->heapID);
|
||||
param0->unk_78[0] = v2;
|
||||
|
||||
ov104_0222E974(param0, ov104_022302B4);
|
||||
|
|
@ -1008,7 +1008,7 @@ static BOOL ov104_022302B4(UnkStruct_ov104_0222E930 *param0)
|
|||
UnkStruct_ov104_022320B4 *v1 = param0->unk_00;
|
||||
u16 *v2 = ov104_0222FC14(param0, param0->unk_78[0]);
|
||||
|
||||
v0 = Menu_ProcessInputAndHandleExit(v1->unk_74, v1->unk_34);
|
||||
v0 = Menu_ProcessInputAndHandleExit(v1->unk_74, v1->heapID);
|
||||
|
||||
if (v0 == 0xffffffff) {
|
||||
return 0;
|
||||
|
|
@ -1189,15 +1189,15 @@ static BOOL ov104_0223050C(UnkStruct_ov104_0222E930 *param0)
|
|||
}
|
||||
|
||||
v2 = (u8 *)(param0->unk_1C + v4);
|
||||
ov104_0223056C(v3, v5, (UnkStruct_ov104_02232B78_sub1 *)v2, v1->unk_30, &v0->unk_59, v0->unk_34);
|
||||
ov104_0223056C(v3, v5, (UnkStruct_ov104_02232B78_sub1 *)v2, v1->unk_30, &v0->unk_59, v0->heapID);
|
||||
v0->unk_59++;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void ov104_0223056C(u16 param0, UnkStruct_ov104_0223C634 *param1, const UnkStruct_ov104_02232B78_sub1 *param2, UnkStruct_ov63_0222D77C *param3, u8 *param4, int param5)
|
||||
static void ov104_0223056C(u16 param0, UnkStruct_ov104_0223C634 *param1, const UnkStruct_ov104_02232B78_sub1 *param2, UnkStruct_ov63_0222D77C *param3, u8 *param4, int heapID)
|
||||
{
|
||||
UnkStruct_ov104_02232B78 *v0 = Heap_AllocFromHeap(param5, sizeof(UnkStruct_ov104_02232B78));
|
||||
UnkStruct_ov104_02232B78 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov104_02232B78));
|
||||
MI_CpuClear8(v0, sizeof(UnkStruct_ov104_02232B78));
|
||||
|
||||
v0->unk_14 = param1;
|
||||
|
|
@ -1239,7 +1239,7 @@ static BOOL ov104_022305DC(UnkStruct_ov104_0222E930 *param0)
|
|||
v3 = ov104_0222EA60(param0);
|
||||
v2 = param0->unk_1C;
|
||||
param0->unk_1C = (u8 *)(param0->unk_1C + v3);
|
||||
v5 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_OBJ, v0->unk_34);
|
||||
v5 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_OBJ, v0->heapID);
|
||||
|
||||
while (TRUE) {
|
||||
v4 = ov104_0222FC00(param0);
|
||||
|
|
@ -1424,7 +1424,7 @@ static void ov104_0223088C(UnkStruct_ov104_0222E930 *param0, int param1, int par
|
|||
|
||||
GF_ASSERT(param2 <= 7);
|
||||
|
||||
v1 = Heap_AllocFromHeap(v0->unk_34, sizeof(s16) * param2);
|
||||
v1 = Heap_AllocFromHeap(v0->heapID, sizeof(s16) * param2);
|
||||
v2 = ov104_0222FC00(param0);
|
||||
|
||||
for (v3 = 0; v3 < 3; v3++) {
|
||||
|
|
@ -1685,7 +1685,7 @@ static BOOL ov104_02230C04(UnkStruct_ov104_0222E930 *param0)
|
|||
u16 *v2 = ov104_0222FBE4(param0);
|
||||
|
||||
ResetLock(4);
|
||||
InitHeapCanary(v0->unk_34);
|
||||
InitHeapCanary(v0->heapID);
|
||||
SaveData_SaveStateInit(v1->unk_08, 2);
|
||||
|
||||
ov104_0222E974(param0, ov104_02230C3C);
|
||||
|
|
@ -2086,7 +2086,7 @@ static BOOL ov104_022311BC(UnkStruct_ov104_02231148 *param0)
|
|||
Window_FillTilemap(param0->unk_28, 0);
|
||||
Window_ScheduleCopyToVRAM(param0->unk_28);
|
||||
|
||||
param0->unk_2C = ov104_0223EBA0(11);
|
||||
param0->unk_2C = ov104_0223EBA0(HEAP_ID_FIELDMAP);
|
||||
param0->unk_04++;
|
||||
case 2:
|
||||
ov104_0223EBF0(param0->unk_2C, 1, 1, param0->unk_28, 15);
|
||||
|
|
@ -2140,7 +2140,7 @@ static BOOL ov104_022312D8(UnkStruct_ov104_02231148 *param0)
|
|||
Window_FillTilemap(param0->unk_28, 0);
|
||||
Window_ScheduleCopyToVRAM(param0->unk_28);
|
||||
|
||||
param0->unk_2C = ov104_0223EBA0(11);
|
||||
param0->unk_2C = ov104_0223EBA0(HEAP_ID_FIELDMAP);
|
||||
param0->unk_04++;
|
||||
case 2:
|
||||
ov104_0223EBF0(param0->unk_2C, 1, 1, param0->unk_28, 15);
|
||||
|
|
@ -2340,7 +2340,7 @@ static BOOL ov104_02231720(UnkStruct_ov104_02231148 *param0)
|
|||
param0->unk_10 = 0;
|
||||
param0->unk_24 = Heap_AllocFromHeap(HEAP_ID_94, sizeof(UnkStruct_ov104_022313FC));
|
||||
param0->unk_24->unk_604 = 1;
|
||||
param0->unk_24->unk_600 = ov104_0223F1B4(((u32)®_G2_BG2PA), &v0, 94);
|
||||
param0->unk_24->unk_600 = ov104_0223F1B4(((u32)®_G2_BG2PA), &v0, HEAP_ID_94);
|
||||
|
||||
{
|
||||
int v1;
|
||||
|
|
@ -2400,7 +2400,7 @@ static BOOL ov104_02231864(UnkStruct_ov104_02231148 *param0)
|
|||
param0->unk_10 = 0;
|
||||
param0->unk_24 = Heap_AllocFromHeap(HEAP_ID_94, sizeof(UnkStruct_ov104_022313FC));
|
||||
param0->unk_24->unk_604 = 2;
|
||||
param0->unk_24->unk_600 = ov104_0223F1B4(((u32)®_G2_BG2PA), &v0, 94);
|
||||
param0->unk_24->unk_600 = ov104_0223F1B4(((u32)®_G2_BG2PA), &v0, HEAP_ID_94);
|
||||
|
||||
{
|
||||
int v1;
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@ static void ov104_0223214C(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_022
|
|||
int v0;
|
||||
|
||||
if (param8 == NULL) {
|
||||
param1->unk_8C = MessageLoader_Init(1, 26, 361, param0->unk_34);
|
||||
param1->unk_8C = MessageLoader_Init(1, 26, 361, param0->heapID);
|
||||
param1->unk_97_1 = 1;
|
||||
} else {
|
||||
param1->unk_8C = param8;
|
||||
|
|
@ -267,7 +267,7 @@ static void ov104_0223214C(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_022
|
|||
}
|
||||
|
||||
for (v0 = 0; v0 < 28; v0++) {
|
||||
param1->unk_1C[v0] = Strbuf_Init((40 * 2), param0->unk_34);
|
||||
param1->unk_1C[v0] = Strbuf_Init((40 * 2), param0->heapID);
|
||||
}
|
||||
|
||||
*param1->unk_A0 = 0xeeee;
|
||||
|
|
@ -280,7 +280,7 @@ UnkStruct_ov104_02232B5C *ov104_02232258(UnkStruct_ov104_022320B4 *param0, u8 pa
|
|||
UnkStruct_ov104_02232B5C *v0;
|
||||
int v1;
|
||||
|
||||
v0 = Heap_AllocFromHeap(param0->unk_34, sizeof(UnkStruct_ov104_02232B5C));
|
||||
v0 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov104_02232B5C));
|
||||
|
||||
if (v0 == NULL) {
|
||||
return NULL;
|
||||
|
|
@ -321,7 +321,7 @@ void ov104_022322B0(UnkStruct_ov104_02232B5C *param0)
|
|||
Window_Add(v1->unk_00, ¶m0->unk_08, 1, param0->unk_98, param0->unk_99, v0, param0->unk_9B * 2, 14, 1);
|
||||
Window_DrawStandardFrame(¶m0->unk_08, 1, 985, 12);
|
||||
ov104_02232454(param0);
|
||||
param0->unk_B0 = Menu_NewSimple(¶m0->unk_A4, param0->unk_96, param0->unk_00->unk_34);
|
||||
param0->unk_B0 = Menu_NewSimple(¶m0->unk_A4, param0->unk_96, param0->unk_00->heapID);
|
||||
ov104_022325D8(param0);
|
||||
param0->unk_04 = SysTask_Start(ov104_022324C8, param0, 0);
|
||||
}
|
||||
|
|
@ -332,7 +332,7 @@ static void ov104_02232390(UnkStruct_ov104_02232B5C *param0, u32 param1, u32 par
|
|||
void *v1;
|
||||
|
||||
{
|
||||
Strbuf *v2 = Strbuf_Init((40 * 2), param0->unk_00->unk_34);
|
||||
Strbuf *v2 = Strbuf_Init((40 * 2), param0->unk_00->heapID);
|
||||
|
||||
MessageLoader_GetStrbuf(param0->unk_8C, param1, v2);
|
||||
StringTemplate_Format(param0->unk_90, param0->unk_1C[param0->unk_9B], v2);
|
||||
|
|
@ -503,7 +503,7 @@ void ov104_02232624(UnkStruct_ov104_02232B5C *param0)
|
|||
}
|
||||
Window_DrawStandardFrame(¶m0->unk_08, 1, 985, 12);
|
||||
ov104_02232830(param0);
|
||||
param0->unk_1B4 = ListMenu_New((const ListMenuTemplate *)¶m0->unk_194, 0, param0->unk_96, param0->unk_00->unk_34);
|
||||
param0->unk_1B4 = ListMenu_New((const ListMenuTemplate *)¶m0->unk_194, 0, param0->unk_96, param0->unk_00->heapID);
|
||||
ov104_02232B2C(param0);
|
||||
param0->unk_04 = SysTask_Start(ov104_0223296C, param0, 0);
|
||||
}
|
||||
|
|
@ -514,7 +514,7 @@ static void ov104_02232750(UnkStruct_ov104_02232B5C *param0, u32 param1, u32 par
|
|||
void *v1;
|
||||
|
||||
{
|
||||
Strbuf *v2 = Strbuf_Init((40 * 2), param0->unk_00->unk_34);
|
||||
Strbuf *v2 = Strbuf_Init((40 * 2), param0->unk_00->heapID);
|
||||
|
||||
MessageLoader_GetStrbuf(param0->unk_8C, param1, v2);
|
||||
StringTemplate_Format(param0->unk_90, param0->unk_1C[param0->unk_9B], v2);
|
||||
|
|
@ -688,8 +688,8 @@ static void ov104_02232A58(UnkStruct_ov104_02232B5C *param0, u8 param1)
|
|||
|
||||
static void ov104_02232AC4(UnkStruct_ov104_02232B5C *param0, u16 param1, u32 param2)
|
||||
{
|
||||
Strbuf *v0 = Strbuf_Init((40 * 2), param0->unk_00->unk_34);
|
||||
Strbuf *v1 = Strbuf_Init((40 * 2), param0->unk_00->unk_34);
|
||||
Strbuf *v0 = Strbuf_Init((40 * 2), param0->unk_00->heapID);
|
||||
Strbuf *v1 = Strbuf_Init((40 * 2), param0->unk_00->heapID);
|
||||
|
||||
Window_FillTilemap(param0->unk_18, 15);
|
||||
|
||||
|
|
|
|||
|
|
@ -794,8 +794,8 @@ void ov104_02237180(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 *
|
|||
static void ov104_02237284(UnkStruct_ov104_022320B4 *param0, Window *param1, TrainerInfo *param2, u16 param3)
|
||||
{
|
||||
MessageLoader *v0;
|
||||
Strbuf *v1 = Strbuf_Init((10 * 2), param0->unk_34);
|
||||
Strbuf *v2 = Strbuf_Init((10 * 2), param0->unk_34);
|
||||
Strbuf *v1 = Strbuf_Init((10 * 2), param0->heapID);
|
||||
Strbuf *v2 = Strbuf_Init((10 * 2), param0->heapID);
|
||||
|
||||
v0 = MessageLoader_Init(0, 26, 199, HEAP_ID_FIELDMAP);
|
||||
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ void ov104_0223DC7C(int param0, BgConfig *param1, SpriteSystem *param2, SpriteMa
|
|||
static void ov104_0223DD30(UnkStruct_ov104_0223DD30 *param0, SysTask *param1);
|
||||
static void ov104_0223DD5C(SysTask *param0, void *param1);
|
||||
static void ov104_0223DDB4(SysTask *param0, void *param1);
|
||||
static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 param1, const UnkStruct_ov104_0224191C *param2);
|
||||
static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 heapID, const UnkStruct_ov104_0224191C *param2);
|
||||
static void ov104_0223E29C(UnkStruct_ov104_0223DD30 *param0, UnkStruct_ov104_0223E3B8 *param1, const Strbuf *param2, enum Font param3, TextColor param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov104_0223E29C *param10);
|
||||
static void ov104_0223E3B8(UnkStruct_ov104_0223E3B8 *param0);
|
||||
static void ov104_0223E3FC(UnkStruct_ov104_0223DD30 *param0, UnkStruct_ov104_0223E48C *param1, fx32 param2, fx32 param3, u32 param4);
|
||||
|
|
@ -226,14 +226,14 @@ static void ov104_0223DD5C(SysTask *param0, void *param1)
|
|||
static void ov104_0223DDB4(SysTask *param0, void *param1)
|
||||
{
|
||||
UnkStruct_ov104_0223DD30 *v0 = param1;
|
||||
BOOL v1 = ov104_0223DDE4(v0, 94, &Unk_ov104_0224191C[v0->unk_2C]);
|
||||
BOOL v1 = ov104_0223DDE4(v0, HEAP_ID_94, &Unk_ov104_0224191C[v0->unk_2C]);
|
||||
|
||||
if (v1 == 1) {
|
||||
ov104_0223DD30(v0, param0);
|
||||
}
|
||||
}
|
||||
|
||||
static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 param1, const UnkStruct_ov104_0224191C *param2)
|
||||
static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 heapID, const UnkStruct_ov104_0224191C *param2)
|
||||
{
|
||||
UnkStruct_ov104_0223DDE4 *v0 = param0->unk_0C;
|
||||
BOOL v1;
|
||||
|
|
@ -246,7 +246,7 @@ static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 param1, const U
|
|||
|
||||
switch (param0->unk_00) {
|
||||
case 0:
|
||||
param0->unk_0C = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov104_0223DDE4));
|
||||
param0->unk_0C = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov104_0223DDE4));
|
||||
memset(param0->unk_0C, 0, sizeof(UnkStruct_ov104_0223DDE4));
|
||||
|
||||
v0 = param0->unk_0C;
|
||||
|
|
@ -259,7 +259,7 @@ static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 param1, const U
|
|||
MessageLoader *v9;
|
||||
Strbuf *v10;
|
||||
|
||||
v9 = MessageLoader_Init(1, 26, 618, param1);
|
||||
v9 = MessageLoader_Init(1, 26, 618, heapID);
|
||||
v10 = MessageLoader_GetNewStrbuf(v9, param2->unk_00);
|
||||
|
||||
ov104_0223E29C(param0, &v0->unk_7C, v10, FONT_SYSTEM, TEXT_COLOR(1, 2, 0), 0, 2004, 208 + -92 + param0->unk_28, 11 * 8 + param0->unk_2A, 0, NULL);
|
||||
|
|
@ -290,11 +290,11 @@ static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 param1, const U
|
|||
|
||||
ManagedSprite_SetDrawFlag(v0->unk_90, 0);
|
||||
Sprite_TickFrame(v0->unk_90->sprite);
|
||||
ov104_0223E3FC(param0, &v0->unk_14, (FX32_CONST(72)) + FX32_CONST(param0->unk_28), (FX32_CONST(82)) + FX32_CONST(param0->unk_2A), param1);
|
||||
ov104_0223E3FC(param0, &v0->unk_14, (FX32_CONST(72)) + FX32_CONST(param0->unk_28), (FX32_CONST(82)) + FX32_CONST(param0->unk_2A), heapID);
|
||||
param0->unk_00++;
|
||||
break;
|
||||
case 1:
|
||||
StartScreenTransition(0, 0, 0, 0x7fff, 3, 1, param1);
|
||||
StartScreenTransition(0, 0, 0, 0x7fff, 3, 1, heapID);
|
||||
param0->unk_00++;
|
||||
break;
|
||||
case 2:
|
||||
|
|
@ -303,7 +303,7 @@ static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 param1, const U
|
|||
}
|
||||
break;
|
||||
case 3:
|
||||
StartScreenTransition(3, 1, 1, 0x7fff, 3, 1, param1);
|
||||
StartScreenTransition(3, 1, 1, 0x7fff, 3, 1, heapID);
|
||||
param0->unk_00++;
|
||||
break;
|
||||
case 4:
|
||||
|
|
@ -355,7 +355,7 @@ static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 param1, const U
|
|||
break;
|
||||
}
|
||||
|
||||
StartScreenTransition(3, 0, 0, 0x7fff, 3, 1, param1);
|
||||
StartScreenTransition(3, 0, 0, 0x7fff, 3, 1, heapID);
|
||||
param0->unk_00++;
|
||||
break;
|
||||
case 12:
|
||||
|
|
@ -368,7 +368,7 @@ static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 param1, const U
|
|||
}
|
||||
break;
|
||||
case 13:
|
||||
StartScreenTransition(3, 1, 1, 0x7fff, 3, 1, param1);
|
||||
StartScreenTransition(3, 1, 1, 0x7fff, 3, 1, heapID);
|
||||
param0->unk_00++;
|
||||
break;
|
||||
case 14:
|
||||
|
|
|
|||
|
|
@ -212,9 +212,9 @@ BOOL ov104_0223EA38(UnkStruct_ov104_0223EA38 *param0)
|
|||
return 1;
|
||||
}
|
||||
|
||||
UnkStruct_ov104_0223EA84 *ov104_0223EA64(u32 param0)
|
||||
UnkStruct_ov104_0223EA84 *ov104_0223EA64(u32 heapID)
|
||||
{
|
||||
UnkStruct_ov104_0223EA84 *v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov104_0223EA84));
|
||||
UnkStruct_ov104_0223EA84 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov104_0223EA84));
|
||||
memset(v0, 0, sizeof(UnkStruct_ov104_0223EA84));
|
||||
|
||||
return v0;
|
||||
|
|
@ -295,16 +295,16 @@ static void ov104_0223EB44(Window *param0, s32 param1, s32 param2, s32 param3, s
|
|||
Window_FillRectWithColor(param0, param5, param3, param1, param4 - param3, param2 - param1);
|
||||
}
|
||||
|
||||
UnkStruct_ov104_0223EBD0 *ov104_0223EBA0(u32 param0)
|
||||
UnkStruct_ov104_0223EBD0 *ov104_0223EBA0(u32 heapID)
|
||||
{
|
||||
UnkStruct_ov104_0223EBD0 *v0;
|
||||
int v1;
|
||||
|
||||
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov104_0223EBD0));
|
||||
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov104_0223EBD0));
|
||||
memset(v0, 0, sizeof(UnkStruct_ov104_0223EBD0));
|
||||
|
||||
for (v1 = 0; v1 < ((256 / 16) * (192 / 32)); v1++) {
|
||||
v0->unk_04[v1] = ov104_0223EA64(param0);
|
||||
v0->unk_04[v1] = ov104_0223EA64(heapID);
|
||||
}
|
||||
|
||||
return v0;
|
||||
|
|
@ -592,16 +592,16 @@ static void ov104_0223F1AC(void *param0)
|
|||
ov104_0223F174(v0);
|
||||
}
|
||||
|
||||
UnkStruct_ov104_0223F174 *ov104_0223F1B4(u32 param0, UnkStruct_ov104_0223F1B4 *param1, int param2)
|
||||
UnkStruct_ov104_0223F174 *ov104_0223F1B4(u32 param0, UnkStruct_ov104_0223F1B4 *param1, int heapID)
|
||||
{
|
||||
UnkStruct_ov104_0223F174 *v0;
|
||||
int v1;
|
||||
|
||||
v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov104_0223F174));
|
||||
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov104_0223F174));
|
||||
memset(v0, 0, sizeof(UnkStruct_ov104_0223F174));
|
||||
|
||||
GF_ASSERT(v0);
|
||||
v0->bufferManager = BufferManager_New(param2, v0->unk_20, v0->unk_1820);
|
||||
v0->bufferManager = BufferManager_New(heapID, v0->unk_20, v0->unk_1820);
|
||||
|
||||
GF_ASSERT(v0->bufferManager);
|
||||
v0->unk_3020 = param0;
|
||||
|
|
|
|||
|
|
@ -3234,7 +3234,7 @@ static UnkStruct_ov105_02245EA8 *ov105_02245934(UnkStruct_ov105_02241FF4 *param0
|
|||
}
|
||||
}
|
||||
|
||||
return ov105_02245E54(¶m0->unk_144, v0, v1, 93);
|
||||
return ov105_02245E54(¶m0->unk_144, v0, v1, HEAP_ID_93);
|
||||
}
|
||||
|
||||
static UnkStruct_ov105_02245E1C *ov105_022459B0(UnkStruct_ov105_02241FF4 *param0, u32 param1)
|
||||
|
|
@ -3262,7 +3262,7 @@ static UnkStruct_ov105_02245E1C *ov105_022459B0(UnkStruct_ov105_02241FF4 *param0
|
|||
break;
|
||||
}
|
||||
|
||||
return ov105_02245DC4(¶m0->unk_144, param1, v0, v1, 93);
|
||||
return ov105_02245DC4(¶m0->unk_144, param1, v0, v1, HEAP_ID_93);
|
||||
}
|
||||
|
||||
static UnkStruct_ov105_02245E1C *ov105_02245A04(UnkStruct_ov105_02241FF4 *param0, u32 param1)
|
||||
|
|
@ -3282,7 +3282,7 @@ static UnkStruct_ov105_02245E1C *ov105_02245A04(UnkStruct_ov105_02241FF4 *param0
|
|||
break;
|
||||
}
|
||||
|
||||
return ov105_02245DC4(¶m0->unk_144, param1, v0, v1, 93);
|
||||
return ov105_02245DC4(¶m0->unk_144, param1, v0, v1, HEAP_ID_93);
|
||||
}
|
||||
|
||||
static void ov105_02245A30(UnkStruct_ov105_02241FF4 *param0)
|
||||
|
|
|
|||
|
|
@ -16,14 +16,13 @@ struct UnkStruct_ov105_02245E1C_t {
|
|||
Sprite *unk_08;
|
||||
};
|
||||
|
||||
UnkStruct_ov105_02245E1C *ov105_02245DC4(UnkStruct_ov105_02245AAC *param0, u32 param1, int param2, int param3, u32 param4);
|
||||
void *ov105_02245E1C(UnkStruct_ov105_02245E1C *param0);
|
||||
void ov105_02245E30(UnkStruct_ov105_02245E1C *param0, int param1, int param2);
|
||||
BOOL ov105_02245E48(UnkStruct_ov105_02245E1C *param0);
|
||||
|
||||
UnkStruct_ov105_02245E1C *ov105_02245DC4(UnkStruct_ov105_02245AAC *param0, u32 param1, int param2, int param3, u32 param4)
|
||||
UnkStruct_ov105_02245E1C *ov105_02245DC4(UnkStruct_ov105_02245AAC *param0, u32 param1, int param2, int param3, u32 heapID)
|
||||
{
|
||||
UnkStruct_ov105_02245E1C *v0 = Heap_AllocFromHeap(param4, sizeof(UnkStruct_ov105_02245E1C));
|
||||
UnkStruct_ov105_02245E1C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov105_02245E1C));
|
||||
memset(v0, 0, sizeof(UnkStruct_ov105_02245E1C));
|
||||
|
||||
v0->unk_00 = param2;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ struct UnkStruct_ov105_02245EA8_t {
|
|||
Sprite *unk_0C;
|
||||
};
|
||||
|
||||
UnkStruct_ov105_02245EA8 *ov105_02245E54(UnkStruct_ov105_02245AAC *param0, int param1, int param2, u32 param3);
|
||||
void *ov105_02245EA8(UnkStruct_ov105_02245EA8 *param0);
|
||||
void ov105_02245EBC(UnkStruct_ov105_02245EA8 *param0, int param1);
|
||||
VecFx32 ov105_02245EC8(UnkStruct_ov105_02245EA8 *param0, int param1, int param2);
|
||||
|
|
@ -34,9 +33,9 @@ int ov105_02245F8C(UnkStruct_ov105_02245EA8 *param0);
|
|||
void ov105_02245F90(UnkStruct_ov105_02245EA8 *param0, u32 param1);
|
||||
void ov105_02245FAC(UnkStruct_ov105_02245EA8 *param0, u32 param1);
|
||||
|
||||
UnkStruct_ov105_02245EA8 *ov105_02245E54(UnkStruct_ov105_02245AAC *param0, int param1, int param2, u32 param3)
|
||||
UnkStruct_ov105_02245EA8 *ov105_02245E54(UnkStruct_ov105_02245AAC *param0, int param1, int param2, u32 heapID)
|
||||
{
|
||||
UnkStruct_ov105_02245EA8 *v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov105_02245EA8));
|
||||
UnkStruct_ov105_02245EA8 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov105_02245EA8));
|
||||
memset(v0, 0, sizeof(UnkStruct_ov105_02245EA8));
|
||||
|
||||
v0->unk_00 = 0;
|
||||
|
|
|
|||
|
|
@ -266,7 +266,7 @@ typedef struct {
|
|||
static void ov114_0225CBF0(UnkStruct_ov114_0225CBF0 *param0, fx32 param1, fx32 param2, fx32 param3, int param4);
|
||||
static BOOL ov114_0225CC4C(UnkStruct_ov114_0225CBF0 *param0, s32 param1);
|
||||
static void ov114_0225CCB0(NNSG2dScreenData *param0, u32 param1);
|
||||
static void ov114_0225CCD0(UnkStruct_ov114_0225CCD0 *param0, u32 param1, u32 param2);
|
||||
static void ov114_0225CCD0(UnkStruct_ov114_0225CCD0 *param0, u32 param1, u32 heapID);
|
||||
static void ov114_0225CD10(UnkStruct_ov114_0225CCD0 *param0);
|
||||
static UnkStruct_ov114_0225CDB4 *ov114_0225CD54(UnkStruct_ov114_0225CCD0 *param0, NARC *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
|
||||
static Sprite *ov114_0225CDB4(UnkStruct_ov114_0225CDB4 *param0, SpriteList *param1, s16 param2, s16 param3, u16 param4, u32 param5);
|
||||
|
|
@ -1092,17 +1092,17 @@ BOOL ov114_0225CA98(const UnkStruct_ov114_0225C76C *param0)
|
|||
return 0;
|
||||
}
|
||||
|
||||
UnkStruct_ov114_0225CAD4 *ov114_0225CAD4(SpriteList *param0, u32 param1)
|
||||
UnkStruct_ov114_0225CAD4 *ov114_0225CAD4(SpriteList *param0, u32 heapID)
|
||||
{
|
||||
UnkStruct_ov114_0225CAD4 *v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov114_0225CAD4));
|
||||
UnkStruct_ov114_0225CAD4 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov114_0225CAD4));
|
||||
memset(v0, 0, sizeof(UnkStruct_ov114_0225CAD4));
|
||||
|
||||
v0->unk_08 = param0;
|
||||
v0->unk_0C = NARC_ctor(NARC_INDEX_RESOURCE__ENG__WIFI_LOBBY_MINIGAME__WLMNGM_TOOL, param1);
|
||||
v0->unk_0C = NARC_ctor(NARC_INDEX_RESOURCE__ENG__WIFI_LOBBY_MINIGAME__WLMNGM_TOOL, heapID);
|
||||
|
||||
ov114_0225CCD0(&v0->unk_10, 1, param1);
|
||||
ov114_0225CCD0(&v0->unk_10, 1, heapID);
|
||||
|
||||
v0->unk_28 = ov114_0225CD54(&v0->unk_10, v0->unk_0C, 3, 3, 2, 1, 0, 5000, param1);
|
||||
v0->unk_28 = ov114_0225CD54(&v0->unk_10, v0->unk_0C, 3, 3, 2, 1, 0, 5000, heapID);
|
||||
|
||||
return v0;
|
||||
}
|
||||
|
|
@ -1215,15 +1215,15 @@ static void ov114_0225CCB0(NNSG2dScreenData *param0, u32 param1)
|
|||
}
|
||||
}
|
||||
|
||||
static void ov114_0225CCD0(UnkStruct_ov114_0225CCD0 *param0, u32 param1, u32 param2)
|
||||
static void ov114_0225CCD0(UnkStruct_ov114_0225CCD0 *param0, u32 param1, u32 heapID)
|
||||
{
|
||||
int v0;
|
||||
|
||||
for (v0 = 0; v0 < 4; v0++) {
|
||||
param0->unk_00[v0] = SpriteResourceCollection_New(param1, v0, param2);
|
||||
param0->unk_00[v0] = SpriteResourceCollection_New(param1, v0, heapID);
|
||||
}
|
||||
|
||||
param0->unk_10 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov114_0225CDB4) * param1);
|
||||
param0->unk_10 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov114_0225CDB4) * param1);
|
||||
memset(param0->unk_10, 0, sizeof(UnkStruct_ov114_0225CDB4) * param1);
|
||||
param0->unk_14 = param1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ int ov115_0226048C(OverlayManager *param0, int *param1)
|
|||
v0->unk_46 = ov114_0225C76C(&v0->unk_08, v0->unk_44);
|
||||
|
||||
if (v0->unk_44 == 0) {
|
||||
v0->unk_30 = ov115_02260BBC(99, (30 * 40), v0->unk_74, &v0->unk_48);
|
||||
v0->unk_30 = ov115_02260BBC(HEAP_ID_99, (30 * 40), v0->unk_74, &v0->unk_48);
|
||||
v0->unk_7C = 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@ typedef struct UnkStruct_ov115_02260BE4_t {
|
|||
|
||||
static u32 ov115_02260CCC(const UnkStruct_ov115_02260BE4 *param0);
|
||||
|
||||
UnkStruct_ov115_02260BE4 *ov115_02260BBC(u32 param0, u32 param1, u32 param2, const UnkStruct_ov115_02262F50 *param3)
|
||||
UnkStruct_ov115_02260BE4 *ov115_02260BBC(u32 heapID, u32 param1, u32 param2, const UnkStruct_ov115_02262F50 *param3)
|
||||
{
|
||||
UnkStruct_ov115_02260BE4 *v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov115_02260BE4));
|
||||
UnkStruct_ov115_02260BE4 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov115_02260BE4));
|
||||
memset(v0, 0, sizeof(UnkStruct_ov115_02260BE4));
|
||||
|
||||
v0->unk_00 = param1;
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@ static void ov116_022604C4(UnkStruct_ov116_0226139C *param0)
|
|||
}
|
||||
}
|
||||
|
||||
param0->unk_7C = ov114_0225CAD4(SpriteManager_GetSpriteList(param0->unk_48.unk_0C), 106);
|
||||
param0->unk_7C = ov114_0225CAD4(SpriteManager_GetSpriteList(param0->unk_48.unk_0C), HEAP_ID_106);
|
||||
PaletteData_LoadBufferFromHardware(param0->unk_48.unk_14, 2, 0 * 16, 16 * 0x20);
|
||||
|
||||
if (param0->unk_80->unk_3C) {
|
||||
|
|
|
|||
|
|
@ -272,7 +272,7 @@ int ov117_02260668(OverlayManager *param0, int *param1)
|
|||
RenderControlFlags_SetSpeedUpOnTouch(0);
|
||||
}
|
||||
|
||||
v0->unk_1C = ov114_0225CAD4(SpriteManager_GetSpriteList(v0->unk_28), 110);
|
||||
v0->unk_1C = ov114_0225CAD4(SpriteManager_GetSpriteList(v0->unk_28), HEAP_ID_110);
|
||||
|
||||
{
|
||||
int v2;
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ int sub_0209B6F8(OverlayManager *param0, int *param1)
|
|||
v0->unk_00 = OverlayManager_Args(param0);
|
||||
GF_ASSERT(v0->unk_00 != NULL);
|
||||
|
||||
v0->unk_14 = ov104_0222E63C(v0, 11, v0->unk_00->unk_24);
|
||||
v0->unk_14 = ov104_0222E63C(v0, HEAP_ID_FIELDMAP, v0->unk_00->unk_24);
|
||||
ov104_0222E748(v0->unk_14, v0->unk_00->unk_24, 0);
|
||||
|
||||
sub_0209B8C8(v0);
|
||||
|
|
@ -164,10 +164,10 @@ int sub_0209B75C(OverlayManager *param0, int *param1)
|
|||
} else {
|
||||
UnkStruct_ov104_0222E8C8 *v2;
|
||||
|
||||
v2 = ov104_0222E8C8(v0->unk_14, 11);
|
||||
v2 = ov104_0222E8C8(v0->unk_14, HEAP_ID_FIELDMAP);
|
||||
ov104_0222E710(v0->unk_14);
|
||||
|
||||
v0->unk_14 = ov104_0222E63C(v0, 11, v0->unk_00->unk_24);
|
||||
v0->unk_14 = ov104_0222E63C(v0, HEAP_ID_FIELDMAP, v0->unk_00->unk_24);
|
||||
ov104_0222E748(v0->unk_14, v0->unk_00->unk_24, v0->unk_20);
|
||||
ov104_0222E8E8(v0->unk_14, v2);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user