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

Document params used with Heap_AllocFromHeap - Part 4

Browse Source
This commit is contained in:
Eduardo Quezada 2025-03-04 17:44:32 -03:00
parent 6596c34172
commit dc9096d85f
99 changed files with 629 additions and 715 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle/ov16_0226DB7C.h
View File

@ -8,7 +8,7 @@
void ov16_0226DB7C(SpriteSystem *param0, SpriteManager *param1, PaletteData *param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7);
void ov16_0226DBFC(SpriteManager *param0, u32 param1, u32 param2, u32 param3, u32 param4);
UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteSystem *param0, SpriteManager *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteSystem *param0, SpriteManager *param1, int heapID, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
void ov16_0226DCA8(UnkStruct_ov16_0226DC24 *param0);
void ov16_0226DCCC(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9);
void ov16_0226DD54(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8);

2
include/battle/ov16_0226DE44.h
View File

@ -8,7 +8,7 @@
void ov16_0226DE44(SpriteSystem *param0, SpriteManager *param1, u32 param2, PaletteData *param3, u32 param4, u32 param5, u32 param6, u32 param7);
void ov16_0226DEC4(SpriteManager *param0, u32 param1, u32 param2, u32 param3, u32 param4);
UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteSystem *param0, SpriteManager *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteSystem *param0, SpriteManager *param1, int heapID, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
void ov16_0226DF68(UnkStruct_ov16_0226DEEC *param0);
void ov16_0226DF80(UnkStruct_ov16_0226DEEC *param0, int param1, int param2, fx32 param3);
void ov16_0226DFB0(UnkStruct_ov16_0226DEEC *param0, int param1, int param2);

2
include/overlay010/struct_ov10_0221F800.h
View File

@ -9,7 +9,7 @@ typedef struct {
FieldBattleDTO *unk_00;
Party *unk_04[4];
Strbuf *unk_14[4];
u32 unk_24;
u32 heapId;
u8 unk_28;
u8 unk_29;
u8 unk_2A;

4
include/overlay011/ov11_0221F840.h
View File

@ -3,8 +3,8 @@
#include "struct_decls/struct_02014014_decl.h"
UnkStruct_02014014 *ov11_0221F840(int param0);
UnkStruct_02014014 *ov11_0221F888(int param0);
UnkStruct_02014014 *ov11_0221F840(int heapID);
UnkStruct_02014014 *ov11_0221F888(int heapID);
void ov11_0221F8D8(UnkStruct_02014014 *param0);
void ov11_0221F8F0(void);

6
include/overlay012/ov12_022237EC.h
View File

@ -6,10 +6,10 @@
#include "narc.h"
#include "spl.h"
UnkStruct_02014014 *ov12_022237F0(int param0, int param1, int param2);
UnkStruct_02014014 *ov12_02223818(int param0, int param1, int param2, int param3);
UnkStruct_02014014 *ov12_022237F0(int heapID, int param1, int param2);
UnkStruct_02014014 *ov12_02223818(int heapID, int param1, int param2, int param3);
void *ov12_02223844(NARC *param0, int param1, int param2);
UnkStruct_02014014 *ov12_0222384C(NARC *param0, int param1, int param2, int param3);
UnkStruct_02014014 *ov12_0222384C(NARC *param0, int heapID, int param2, int param3);
SPLEmitter *ov12_02223880(UnkStruct_02014014 *param0, int param1, int param2, void *param3);
void ov12_02223894(UnkStruct_02014014 *param0);

4
include/overlay012/ov12_02235E94.h
View File

@ -9,8 +9,8 @@
#include "overlay012/struct_ov12_02236690.h"
#include "overlay012/struct_ov12_02237728.h"
UnkStruct_ov12_02235FE0 *ov12_02235FE0(int param0);
UnkStruct_ov12_02235FE0 *ov12_02236004(int param0, const UnkStruct_ov12_02236030 *param1);
UnkStruct_ov12_02235FE0 *ov12_02235FE0(int heapID);
UnkStruct_ov12_02235FE0 *ov12_02236004(int heapID, const UnkStruct_ov12_02236030 *param1);
void ov12_02236030(UnkStruct_ov12_02235FE0 *param0, const UnkStruct_ov12_02236030 *param1);
void ov12_02236320(UnkStruct_ov12_02235FE0 *param0);
BOOL ov12_02236374(UnkStruct_ov12_02235FE0 *param0);

4
include/overlay012/ov12_02237EFC.h
View File

@ -6,11 +6,11 @@
#include "overlay012/struct_ov12_02237F98_decl.h"
#include "overlay012/struct_ov12_02238004_decl.h"
UnkStruct_ov12_02237F98 *ov12_02237EFC(int param0, UnkStruct_ov12_02237EFC *param1);
UnkStruct_ov12_02237F98 *ov12_02237EFC(int heapId, UnkStruct_ov12_02237EFC *param1);
UnkStruct_ov12_02238004 *ov12_02237F38(UnkStruct_ov12_02237F98 *param0, UnkStruct_ov12_02237F38 *param1);
void ov12_02237F74(UnkStruct_ov12_02237F98 *param0);
void ov12_02237F98(UnkStruct_ov12_02237F98 *param0);
UnkStruct_ov12_02238004 *ov12_02237FC8(int param0, UnkStruct_ov12_02237F38 *param1);
UnkStruct_ov12_02238004 *ov12_02237FC8(int heapID, UnkStruct_ov12_02237F38 *param1);
void ov12_02238004(UnkStruct_ov12_02238004 *param0);
BOOL ov12_0223802C(UnkStruct_ov12_02238004 *param0);

2
include/overlay012/struct_ov12_02236690.h
View File

@ -5,7 +5,7 @@ typedef struct {
s16 unk_00;
s16 unk_02;
int unk_04;
int unk_08;
int heapID;
int unk_0C;
int unk_10;
} UnkStruct_ov12_02236690;

2
include/overlay017/ov17_0223F118.h
View File

@ -15,7 +15,7 @@
#include "strbuf.h"
#include "text.h"
GenericPointerData *ov17_0223F140(int param0);
GenericPointerData *ov17_0223F140(int heapID);
void ov17_0223F1E0(GenericPointerData *param0);
void ov17_0223F1E8(int param0, BgConfig *param1, SpriteManager *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const Strbuf *param5, enum Font param6, TextColor param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14);
void ov17_0223F2E4(UnkStruct_ov17_0223F2E4 *param0);

2
include/overlay021/struct_ov21_021D1FA4.h
View File

@ -8,7 +8,7 @@ typedef struct {
SpriteList *unk_00;
BgConfig *unk_04;
int unk_08;
int unk_0C;
int heapId;
} UnkStruct_ov21_021D1FA4;
#endif // POKEPLATINUM_STRUCT_OV21_021D1FA4_H

2
include/overlay021/struct_ov21_021E8E0C.h
View File

@ -11,7 +11,7 @@ typedef struct {
BgConfig *unk_00;
PaletteData *unk_04;
UnkStruct_02007768 *unk_08;
int unk_0C;
int heapId;
Pokemon *unk_10;
int unk_14;
} UnkStruct_ov21_021E8E0C;

2
include/overlay022/struct_ov22_022550D4.h
View File

@ -5,7 +5,7 @@ typedef struct {
int unk_00;
int unk_04;
int unk_08;
int unk_0C;
int heapID;
} UnkStruct_ov22_022550D4;
#endif // POKEPLATINUM_STRUCT_OV22_022550D4_H

2
include/overlay083/ov83_0223D6A8.h
View File

@ -114,7 +114,7 @@ void ov83_0223F544(UnkStruct_ov83_0223F4AC *param0, int param1, int param2);
void ov83_0223F730(UnkStruct_ov83_0223F770 *param0, int param1, int param2, int param3, int param4);
void ov83_0223F770(UnkStruct_ov83_0223F770 *param0);
void ov83_0223F784(UnkStruct_ov83_0223F770 *param0);
void ov83_0223F790(UnkStruct_ov83_0223F7A4 *param0, int param1, BgConfig *param2);
void ov83_0223F790(UnkStruct_ov83_0223F7A4 *param0, int heapID, BgConfig *param2);
void ov83_0223F7A4(UnkStruct_ov83_0223F7A4 *param0);
void ov83_0223F7B0(UnkStruct_ov83_0223F7A4 *param0);
u32 ov83_0223F7DC(UnkStruct_ov83_0223F7A4 *param0);

2
include/overlay083/struct_ov83_0223B784.h
View File

@ -25,7 +25,7 @@
#include "bg_window.h"
typedef struct {
int unk_00;
int heapID;
BOOL unk_04;
int unk_08;
int unk_0C;

2
include/overlay104/ov104_0223D5D0.h
View File

@ -5,7 +5,7 @@
#include "overlay104/struct_ov104_0223D5F0_decl.h"
UnkStruct_ov104_0223D5F0 *ov104_0223D5D0(int param0);
UnkStruct_ov104_0223D5F0 *ov104_0223D5D0(int heapID);
void ov104_0223D5F0(UnkStruct_ov104_0223D5F0 *param0);
UnkStruct_02014014 *ov104_0223D614(UnkStruct_ov104_0223D5F0 *param0, int param1, int param2, int param3);
void ov104_0223D68C(UnkStruct_ov104_0223D5F0 *param0, int param1);

6
include/overlay114/ov114_0225C700.h
View File

@ -23,9 +23,9 @@ UnkStruct_ov114_0225D678 *ov114_0225C82C(const UnkStruct_ov114_0225C76C *param0,
void ov114_0225C838(UnkStruct_ov114_0225D678 *param0);
BOOL ov114_0225C8BC(const UnkStruct_ov114_0225D678 *param0);
int ov114_0225C8CC(const UnkStruct_ov114_0225D678 *param0);
UnkStruct_ov114_0225E854 *ov114_0225C8E0(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2);
UnkStruct_ov114_0225E854 *ov114_0225C8EC(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2);
UnkStruct_ov114_0225E854 *ov114_0225C8F8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2);
UnkStruct_ov114_0225E854 *ov114_0225C8E0(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 heapID);
UnkStruct_ov114_0225E854 *ov114_0225C8EC(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 heapID);
UnkStruct_ov114_0225E854 *ov114_0225C8F8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 heapID);
void ov114_0225C904(UnkStruct_ov114_0225E854 *param0);
BOOL ov114_0225C9A0(const UnkStruct_ov114_0225E854 *param0);
BOOL ov114_0225C9A4(const UnkStruct_ov114_0225E854 *param0);

2
include/overlay115/ov115_02260CEC.h
View File

@ -7,7 +7,7 @@
#include "overlay115/struct_ov115_02265AD0.h"
#include "overlay115/struct_ov115_02265AD4.h"
UnkStruct_ov115_02260D78 *ov115_02260CEC(u32 param0, u32 param1, u32 param2, u32 param3, UnkStruct_ov115_02262F50 *param4);
UnkStruct_ov115_02260D78 *ov115_02260CEC(u32 heapID, u32 param1, u32 param2, u32 param3, UnkStruct_ov115_02262F50 *param4);
void ov115_02260D78(UnkStruct_ov115_02260D78 *param0);
BOOL ov115_02260DAC(UnkStruct_ov115_02260D78 *param0, u32 param1);
BOOL ov115_02260F70(UnkStruct_ov115_02260D78 *param0, u32 param1);

2
include/overlay119/struct_ov119_021D1930.h
View File

@ -2,7 +2,7 @@
#define POKEPLATINUM_STRUCT_OV119_021D1930_H
typedef struct {
int unk_00;
int heapId;
int unk_04;
} UnkStruct_ov119_021D1930;

4
include/unk_02012744.h
View File

@ -11,7 +11,7 @@
#include "bg_window.h"
#include "sprite.h"
UnkStruct_02012744 *sub_02012744(int param0, int param1);
UnkStruct_02012744 *sub_02012744(int param0, int heapID);
void sub_020127BC(UnkStruct_02012744 *param0);
FontOAM *sub_020127E8(const UnkStruct_020127E8 *param0);
void sub_02012870(FontOAM *param0);
@ -26,7 +26,7 @@ void sub_02012A60(FontOAM *param0, u32 param1);
void sub_02012A90(FontOAM *param0, u32 param1);
void sub_02012AC0(FontOAM *param0, u32 param1);
void sub_02012AF0(FontOAM *param0, GXOamMode param1);
UnkStruct_02012B20 *sub_02012B20(const Window *param0, int param1);
UnkStruct_02012B20 *sub_02012B20(const Window *param0, int heapID);
void sub_02012B48(UnkStruct_02012B20 *param0);
int sub_02012B58(const UnkStruct_02012B20 *param0, int param1);
FontOAM *sub_02012B60(const UnkStruct_020127E8 *param0, const UnkStruct_02012B20 *param1);

2
include/unk_02014000.h
View File

@ -13,7 +13,7 @@
#include "spl.h"
void sub_02014000(void);
UnkStruct_02014014 *sub_02014014(UnkFuncPtr_02014014 param0, UnkFuncPtr_02014014 param1, void *param2, int param3, int param4, int param5);
UnkStruct_02014014 *sub_02014014(UnkFuncPtr_02014014 param0, UnkFuncPtr_02014014 param1, void *param2, int param3, int param4, int heapID);
void sub_0201411C(UnkStruct_02014014 *param0);
void sub_020141E4(void);
void *sub_020144C4(int param0, int param1, int param2);

2
include/unk_02015920.h
View File

@ -4,7 +4,7 @@
#include "struct_decls/struct_02015920_decl.h"
#include "struct_defs/struct_02015958.h"
UnkStruct_02015920 *sub_02015920(u32 param0);
UnkStruct_02015920 *sub_02015920(u32 heapID);
void sub_02015938(UnkStruct_02015920 *param0);
void sub_02015958(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1);
u32 sub_020159C0(UnkStruct_02015920 *param0);

2
include/unk_02024220.h
View File

@ -5,7 +5,7 @@
#include "functypes/funcptr_02024220.h"
GenericPointerData *sub_02024220(u32 param0, int param1, int param2, int param3, int param4, UnkFuncPtr_02024220 param5);
GenericPointerData *sub_02024220(u32 heapID, int param1, int param2, int param3, int param4, UnkFuncPtr_02024220 param5);
void sub_020242C4(GenericPointerData *param0);
#endif // POKEPLATINUM_UNK_02024220_H

2
include/unk_0207C63C.h
View File

@ -7,7 +7,7 @@
void sub_0207C63C(void);
void sub_0207C664(void);
GenericPointerData *sub_0207C690(int param0);
GenericPointerData *sub_0207C690(int heapID);
void sub_0207C6AC(void);
void sub_0207C730(void);
void sub_0207C770(void);

2
include/unk_02092494.h
View File

@ -6,7 +6,7 @@
#include "pokemon.h"
#include "trainer_info.h"
PokemonInfoDisplayStruct *sub_02092494(Pokemon *param0, BOOL param1, int param2);
PokemonInfoDisplayStruct *sub_02092494(Pokemon *param0, BOOL param1, int heapID);
void sub_0209282C(PokemonInfoDisplayStruct *param0);
void sub_0209304C(Pokemon *param0, TrainerInfo *param1, int param2, int param3, int param4);
void UpdateBoxMonStatusAndTrainerInfo(BoxPokemon *boxMon, TrainerInfo *trainerInfo, int sel, int metLocation, int heapID);

5
include/unk_02099604.h
View File

@ -6,8 +6,7 @@
#include "savedata.h"
UnkStruct_ov82_0223B164 *sub_02099604(int param0, SaveData *param1, int param2);
UnkStruct_ov82_0223B164 *sub_02099674(FieldSystem *fieldSystem, int param1, int param2);
UnkStruct_ov82_0223B164 *sub_020996A0(FieldSystem *fieldSystem, int param1, BOOL param2);
UnkStruct_ov82_0223B164 *sub_02099674(FieldSystem *fieldSystem, int param1, int heapID);
UnkStruct_ov82_0223B164 *sub_020996A0(FieldSystem *fieldSystem, int heapID, BOOL param2);
#endif // POKEPLATINUM_UNK_02099604_H

6
src/battle/battle_display.c
View File

@ -1761,7 +1761,7 @@ static void ov16_0225EA80(SysTask *param0, void *param1)
v1.unk_00 = v0->unk_82;
v1.unk_08 = BattleSystem_PartyPokemon(v0->unk_00, v0->unk_81, v0->unk_8C);
v0->unk_08 = ov12_02236004(5, &v1);
v0->unk_08 = ov12_02236004(HEAP_ID_BATTLE, &v1);
ov12_02236320(v0->unk_08);
}
@ -1981,7 +1981,7 @@ static void ov16_0225F0C0(SysTask *param0, void *param1)
v5.unk_08 = BattleSystem_PartyPokemon(v0->unk_00, v0->unk_81, v0->unk_8C);
v5.unk_04 = v0->unk_8E;
v0->unk_08 = ov12_02236004(5, &v5);
v0->unk_08 = ov12_02236004(HEAP_ID_BATTLE, &v5);
ov12_02236320(v0->unk_08);
}
v0->unk_83++;
@ -5115,7 +5115,7 @@ static void ov16_02263014(SysTask *param0, void *param1)
case 0: {
UnkStruct_ov12_02237F38 v5;
v0->unk_04 = ov12_02237EFC(5, NULL);
v0->unk_04 = ov12_02237EFC(HEAP_ID_BATTLE, NULL);
v5.unk_00 = Unk_ov16_0226F31C[v3];
v5.unk_04 = 1;

4
src/battle/battle_script.c
View File

@ -10767,7 +10767,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1)
v12.unk_00 = BattleSystem_BGL(v2->battleSys);
v12.unk_04 = BattleSystem_PaletteSys(v2->battleSys);
v12.unk_08 = v5;
v12.unk_0C = 5;
v12.heapId = HEAP_ID_BATTLE;
v12.unk_10 = BattleSystem_PartyPokemon(v2->battleSys, v1, v2->battleCtx->selectedPartySlot[v1]);
v12.unk_14 = sub_0207A280(BattleSystem_GetPokedex(v2->battleSys));
v2->tmpPtr[1] = CharTransfer_PopTaskManager();
@ -12231,7 +12231,7 @@ static void BattleScript_LoadPartyLevelUpIcon(BattleSystem *battleSys, BattleScr
Sprite_SetExplicitPaletteOffsetAutoAdjust(param1->sprites[1]->sprite, Pokemon_IconPaletteIndex(param2));
ManagedSprite_TickFrame(param1->sprites[1]);
param1->tmpPtr[0] = sub_02012744(1, 5);
param1->tmpPtr[0] = sub_02012744(1, HEAP_ID_BATTLE);
if (Pokemon_GetValue(param2, MON_DATA_NIDORAN_HAS_NICKNAME, NULL) == 0) {
v13 = 2;

15
src/battle/ov16_0223B140.c
View File

@ -1424,10 +1424,7 @@ static BOOL ov16_0223CD3C(u16 param0)
static GenericPointerData *ov16_0223CD7C(void)
{
GenericPointerData *v0;
v0 = sub_02024220(5, 0, 2, 0, 2, ov16_0223CD9C);
return v0;
return sub_02024220(HEAP_ID_BATTLE, 0, 2, 0, 2, ov16_0223CD9C);
}
static void ov16_0223CD9C(void)
@ -2033,7 +2030,7 @@ static BOOL ov16_0223D800(OverlayManager *param0)
break;
}
battleSys->unk_1C0->unk_24 = 5;
battleSys->unk_1C0->heapId = HEAP_ID_BATTLE;
battleSys->unk_1C0->unk_28 = 0;
switch (sub_020362F4(v2)) {
@ -2094,7 +2091,7 @@ static BOOL ov16_0223D98C(OverlayManager *param0)
battleSys->unk_1C0->unk_14[sub_020362F4(v3)] = TrainerInfo_NameNewStrbuf(battleSys->trainerInfo[v3], 5);
}
battleSys->unk_1C0->unk_24 = 5;
battleSys->unk_1C0->heapId = HEAP_ID_BATTLE;
battleSys->unk_1C0->unk_28 = 1;
battleSys->unk_1C0->unk_29 = 1;
} else {
@ -2102,7 +2099,7 @@ static BOOL ov16_0223D98C(OverlayManager *param0)
battleSys->unk_1C0->unk_04[sub_020362F4(v2 ^ 1)] = battleSys->parties[v2 ^ 1];
battleSys->unk_1C0->unk_14[sub_020362F4(v2)] = TrainerInfo_NameNewStrbuf(battleSys->trainerInfo[v2], 5);
battleSys->unk_1C0->unk_14[sub_020362F4(v2 ^ 1)] = TrainerInfo_NameNewStrbuf(battleSys->trainerInfo[v2 ^ 1], 5);
battleSys->unk_1C0->unk_24 = 5;
battleSys->unk_1C0->heapId = HEAP_ID_BATTLE;
battleSys->unk_1C0->unk_28 = 1;
battleSys->unk_1C0->unk_29 = 0;
}
@ -2183,7 +2180,7 @@ static BOOL ov16_0223DB1C(OverlayManager *param0)
v1->unk_14[sub_020362F4(v3)] = TrainerInfo_NameNewStrbuf(v0->trainerInfo[v3], 5);
}
v1->unk_24 = 5;
v1->heapId = HEAP_ID_BATTLE;
v1->unk_28 = 2;
v1->unk_29 = 1;
@ -2197,7 +2194,7 @@ static BOOL ov16_0223DB1C(OverlayManager *param0)
v1->unk_04[sub_020362F4(v2 ^ 1)] = v0->parties[v2 ^ 1];
v1->unk_14[sub_020362F4(v2)] = TrainerInfo_NameNewStrbuf(v0->trainerInfo[v2], 5);
v1->unk_14[sub_020362F4(v2 ^ 1)] = TrainerInfo_NameNewStrbuf(v0->trainerInfo[v2 ^ 1], 5);
v1->unk_24 = 5;
v1->heapId = HEAP_ID_BATTLE;
v1->unk_28 = 2;
v1->unk_29 = 0;

6
src/battle/ov16_0226871C.c
View File

@ -1068,7 +1068,7 @@ void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *battleSys, int par
GF_ASSERT(0);
}
v0->unk_4C8 = sub_02012744(13, 5);
v0->unk_4C8 = sub_02012744(13, HEAP_ID_BATTLE);
v0->unk_678 = SysTask_Start(ov16_0226BCE4, v0, 1310);
{
@ -1226,7 +1226,7 @@ void ov16_02268A88(UnkStruct_ov16_02268A14 *param0)
if (BattleSystem_BattleType(param0->unk_00) & BATTLE_TYPE_CATCH_TUTORIAL) {
ov16_0226DE44(v1, v2, 5, v3, 20412, 20036, 20406, 20395);
param0->unk_6C4.unk_00 = ov16_0226DEEC(v1, v2, 5, 20412, 20036, 20406, 20395, 10, 0);
param0->unk_6C4.unk_00 = ov16_0226DEEC(v1, v2, HEAP_ID_BATTLE, 20412, 20036, 20406, 20395, 10, 0);
}
}
@ -1359,7 +1359,7 @@ void ov16_02268D40(NARC *param0, UnkStruct_ov16_02268A14 *param1)
v3 = BattleSystem_PaletteSys(param1->unk_00);
ov16_0226DB7C(v1, v2, v3, 5, 20411, 20035, 20405, 20394);
param1->unk_6B8 = ov16_0226DC24(v1, v2, 5, 20411, 20035, 20405, 20394, 5, 0);
param1->unk_6B8 = ov16_0226DC24(v1, v2, HEAP_ID_BATTLE, 20411, 20035, 20405, 20394, 5, 0);
}
}

5
src/battle/ov16_0226DB7C.c
View File

@ -18,7 +18,6 @@ typedef struct UnkStruct_ov16_0226DC24_t {
static void ov16_0226DE10(SysTask *param0, void *param1);
void ov16_0226DB7C(SpriteSystem *param0, SpriteManager *param1, PaletteData *param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7);
void ov16_0226DBFC(SpriteManager *param0, u32 param1, u32 param2, u32 param3, u32 param4);
UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteSystem *param0, SpriteManager *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
void ov16_0226DCA8(UnkStruct_ov16_0226DC24 *param0);
void ov16_0226DD7C(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4);
void ov16_0226DDE8(UnkStruct_ov16_0226DC24 *param0);
@ -57,7 +56,7 @@ void ov16_0226DBFC(SpriteManager *param0, u32 param1, u32 param2, u32 param3, u3
SpriteManager_UnloadAnimObjById(param0, param4);
}
UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteSystem *param0, SpriteManager *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8)
UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteSystem *param0, SpriteManager *param1, int heapID, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8)
{
UnkStruct_ov16_0226DC24 *v0;
SpriteTemplate v1;
@ -71,7 +70,7 @@ UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteSystem *param0, SpriteManager *para
v1.priority = param7;
v1.bgPriority = param8;
v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov16_0226DC24));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov16_0226DC24));
MI_CpuClear8(v0, sizeof(UnkStruct_ov16_0226DC24));
for (v2 = 0; v2 < 5; v2++) {

5
src/battle/ov16_0226DE44.c
View File

@ -28,7 +28,6 @@ typedef struct UnkStruct_ov16_0226DEEC_t {
void ov16_0226DE44(SpriteSystem *param0, SpriteManager *param1, u32 param2, PaletteData *param3, u32 param4, u32 param5, u32 param6, u32 param7);
void ov16_0226DEC4(SpriteManager *param0, u32 param1, u32 param2, u32 param3, u32 param4);
UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteSystem *param0, SpriteManager *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
void ov16_0226DF68(UnkStruct_ov16_0226DEEC *param0);
void ov16_0226DFB0(UnkStruct_ov16_0226DEEC *param0, int param1, int param2);
void ov16_0226DFBC(UnkStruct_ov16_0226DEEC *param0);
@ -67,7 +66,7 @@ void ov16_0226DEC4(SpriteManager *param0, u32 param1, u32 param2, u32 param3, u3
SpriteManager_UnloadAnimObjById(param0, param4);
}
UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteSystem *param0, SpriteManager *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8)
UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteSystem *param0, SpriteManager *param1, int heapID, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8)
{
UnkStruct_ov16_0226DEEC *v0;
SpriteTemplate v1;
@ -81,7 +80,7 @@ UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteSystem *param0, SpriteManager *para
v1.priority = param7;
v1.bgPriority = param8;
v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov16_0226DEEC));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov16_0226DEEC));
MI_CpuClear8(v0, sizeof(UnkStruct_ov16_0226DEEC));
v0->unk_00 = SpriteSystem_NewSprite(param0, param1, &v1);

9
src/choose_starter/choose_starter_app.c
View File

@ -723,13 +723,16 @@ static void ov78_021D14BC(ChooseStarterApp *param0)
sub_02007B6C(param0->spriteManager);
}
static void MakeSpriteDisplay(ChooseStarterApp *param0, enum HeapId param1)
static void MakeSpriteDisplay(ChooseStarterApp *param0, enum HeapId heapID)
{
UnkStruct_ov22_022550D4 v0 = {
1, 1, 1, 0
.unk_00 = 1,
.unk_04 = 1,
.unk_08 = 1,
.heapID = HEAP_ID_SYSTEM
};
v0.unk_0C = param1;
v0.heapID = heapID;
param0->spriteDisplay = sub_02015064(&v0);
}

4
src/dw_warp/dw_warp.c
View File

@ -317,9 +317,9 @@ static void Model3D_Update(DistortionWorldWarp *warp)
NNS_G3dGePopMtx(1);
}
static GenericPointerData *DWWarp_Init3D(int param0)
static GenericPointerData *DWWarp_Init3D(int heapID)
{
return sub_02024220(param0, 0, 2, 0, 2, DWWarp_Setup3D);
return sub_02024220(heapID, 0, 2, 0, 2, DWWarp_Setup3D);
}
static void DWWarp_Setup3D(void)

2
src/overlay005/encounter_effect.c
View File

@ -1435,7 +1435,7 @@ void ov5_021DF0CC(NARC *param0, u32 param1)
GF_ASSERT(Unk_ov5_02202120->unk_08 == NULL);
Unk_ov5_02202120->unk_0C = Heap_AllocFromHeap(HEAP_ID_FIELD, 0x4800);
Unk_ov5_02202120->unk_08 = sub_02014014(ov5_021DF3E8, ov5_021DF414, Unk_ov5_02202120->unk_0C, 0x4800, 1, 4);
Unk_ov5_02202120->unk_08 = sub_02014014(ov5_021DF3E8, ov5_021DF414, Unk_ov5_02202120->unk_0C, 0x4800, 1, HEAP_ID_FIELD);
GF_ASSERT(Unk_ov5_02202120->unk_08);
sub_02014788(Unk_ov5_02202120->unk_08, 1);

136
src/overlay010/ov10_0221F800.c
View File

@ -380,7 +380,7 @@ void ov10_0221F800(UnkStruct_ov10_0221F800 *param0)
{
UnkStruct_ov10_0221FB28 *v0;
v0 = SysTask_GetParam(SysTask_StartAndAllocateParam(ov10_0221F870, sizeof(UnkStruct_ov10_0221FB28), 100, param0->unk_24));
v0 = SysTask_GetParam(SysTask_StartAndAllocateParam(ov10_0221F870, sizeof(UnkStruct_ov10_0221FB28), 100, param0->heapId));
memset(v0, 0, sizeof(UnkStruct_ov10_0221FB28));
v0->unk_00 = param0;
@ -389,7 +389,7 @@ void ov10_0221F800(UnkStruct_ov10_0221F800 *param0)
if (v0->unk_BBC == 1) {
if ((v0->unk_00->unk_00 != NULL) && (v0->unk_00->unk_00->saveData != NULL)) {
v0->unk_BBC = Bag_CanRemoveItem(SaveData_GetBag(v0->unk_00->unk_00->saveData), 465, 1, param0->unk_24);
v0->unk_BBC = Bag_CanRemoveItem(SaveData_GetBag(v0->unk_00->unk_00->saveData), 465, 1, param0->heapId);
}
}
}
@ -488,13 +488,13 @@ static void ov10_0221F930(UnkStruct_ov10_0221FB28 *param0)
Window_DrawMessageBoxWithScrollCursor(&param0->unk_B8C, 0, 1, 15);
param0->unk_BAC = Text_AddPrinterWithParams(&param0->unk_B8C, FONT_MESSAGE, param0->unk_BA8, 0, 0, TEXT_SPEED_INSTANT, NULL);
param0->unk_BB4 = Menu_MakeYesNoChoiceWithCursorAt(param0->unk_0C, &Unk_ov10_02222A68, (1 + (18 + 12)), 14, 1, param0->unk_00->unk_24);
param0->unk_BB4 = Menu_MakeYesNoChoiceWithCursorAt(param0->unk_0C, &Unk_ov10_02222A68, (1 + (18 + 12)), 14, 1, param0->unk_00->heapId);
Bg_ScheduleTilemapTransfer(param0->unk_0C, 0);
param0->unk_BB0 = 4;
break;
case 4: {
u32 v0 = Menu_ProcessInputAndHandleExit(param0->unk_BB4, param0->unk_00->unk_24);
u32 v0 = Menu_ProcessInputAndHandleExit(param0->unk_BB4, param0->unk_00->heapId);
switch (v0) {
case 0:
@ -518,7 +518,7 @@ static void ov10_0221F930(UnkStruct_ov10_0221FB28 *param0)
break;
case 7:
if (param0->unk_BB4 != NULL) {
Menu_DestroyForExit(param0->unk_BB4, param0->unk_00->unk_24);
Menu_DestroyForExit(param0->unk_BB4, param0->unk_00->heapId);
param0->unk_BB4 = NULL;
}
@ -547,10 +547,10 @@ static u8 ov10_0221FB28(UnkStruct_ov10_0221FB28 *param0)
ov10_0221F900();
param0->unk_0C = BgConfig_New(param0->unk_00->unk_24);
param0->unk_08 = PaletteData_New(param0->unk_00->unk_24);
param0->unk_0C = BgConfig_New(param0->unk_00->heapId);
param0->unk_08 = PaletteData_New(param0->unk_00->heapId);
PaletteData_AllocBuffer(param0->unk_08, 0, 32 * 16, param0->unk_00->unk_24);
PaletteData_AllocBuffer(param0->unk_08, 0, 32 * 16, param0->unk_00->heapId);
Bg_MaskPalette(4, 0x0);
param0->unk_B76 = 0;
@ -597,7 +597,7 @@ static u8 ov10_0221FBFC(UnkStruct_ov10_0221FB28 *param0)
ov10_02222720(param0);
ov10_02221C14(param0);
sub_02039734();
sub_0208C120(0, param0->unk_00->unk_24);
sub_0208C120(0, param0->unk_00->heapId);
SetVBlankCallback(ov10_02220C64, param0);
return 1;
}
@ -621,7 +621,7 @@ static u8 ov10_0221FC78(UnkStruct_ov10_0221FB28 *param0)
ov10_022217CC(param0);
break;
case 2:
sub_0208C120(0, param0->unk_00->unk_24);
sub_0208C120(0, param0->unk_00->heapId);
SetVBlankCallback(ov10_02220C64, param0);
param0->unk_B76 = 0;
param0->unk_B70 = 8;
@ -646,7 +646,7 @@ static u8 ov10_0221FD00(UnkStruct_ov10_0221FB28 *param0)
BOOL v0;
int v1;
v0 = sub_0202F330(param0->unk_00->unk_00->saveData, param0->unk_00->unk_24, &v1, 0);
v0 = sub_0202F330(param0->unk_00->unk_00->saveData, param0->unk_00->heapId, &v1, 0);
param0->unk_BC0 = v1;
}
{
@ -673,15 +673,15 @@ static u8 ov10_0221FD00(UnkStruct_ov10_0221FB28 *param0)
sub_02039734();
break;
case 2:
sub_0208C120(0, param0->unk_00->unk_24);
sub_0208C120(0, param0->unk_00->heapId);
SetVBlankCallback(ov10_02220C64, param0);
param0->unk_B76 = 0;
param0->unk_B70 = 4;
param0->unk_B71 = 2;
param0->unk_B68 = 12;
param0->unk_BA0 = MessageLoader_Init(0, 26, 605, param0->unk_00->unk_24);
param0->unk_BA4 = StringTemplate_Default(param0->unk_00->unk_24);
param0->unk_BA8 = Strbuf_Init((2 * 160), param0->unk_00->unk_24);
param0->unk_BA0 = MessageLoader_Init(0, 26, 605, param0->unk_00->heapId);
param0->unk_BA4 = StringTemplate_Default(param0->unk_00->heapId);
param0->unk_BA8 = Strbuf_Init((2 * 160), param0->unk_00->heapId);
param0->unk_BB0 = 1;
return 1;
@ -816,7 +816,7 @@ static u8 ov10_02220014(UnkStruct_ov10_0221FB28 *param0)
static u8 ov10_02220228(UnkStruct_ov10_0221FB28 *param0)
{
if (param0->unk_B76 == 8) {
StartScreenTransition(0, 0, 0, 0x7fff, 6, 1, param0->unk_00->unk_24);
StartScreenTransition(0, 0, 0, 0x7fff, 6, 1, param0->unk_00->heapId);
}
if ((param0->unk_B76 >= 8) && (IsScreenTransitionDone() == 1)) {
@ -1127,7 +1127,7 @@ static u8 ov10_022209E0(UnkStruct_ov10_0221FB28 *param0)
static u8 ov10_02220A34(UnkStruct_ov10_0221FB28 *param0)
{
sub_0208C120(1, param0->unk_00->unk_24);
sub_0208C120(1, param0->unk_00->heapId);
param0->unk_B73 = 2;
return 1;
}
@ -1180,9 +1180,9 @@ static BOOL ov10_02220AD0(void)
static void ov10_02220B00(UnkStruct_ov10_0221FB28 *param0, SpriteResourceCapacities *param1, int param2)
{
VramTransfer_New(64, param0->unk_00->unk_24);
VramTransfer_New(64, param0->unk_00->heapId);
param0->unk_190 = SpriteSystem_Alloc(param0->unk_00->unk_24);
param0->unk_190 = SpriteSystem_Alloc(param0->unk_00->heapId);
param0->unk_194 = SpriteManager_New(param0->unk_190);
{
RenderOamTemplate v0 = {
@ -1418,15 +1418,13 @@ static void ov10_02220E30(UnkStruct_ov10_0221FB28 *param0)
static void ov10_02220E70(UnkStruct_ov10_0221FB28 *param0)
{
NARC *v0;
NARC *v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__VS_DEMO_GRA, param0->unk_00->heapId);
v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__VS_DEMO_GRA, param0->unk_00->unk_24);
Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 0, param0->unk_0C, 1, 0, 0, 0, param0->unk_00->unk_24);
Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 4, param0->unk_0C, 1, 0, 0, 0, param0->unk_00->unk_24);
Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 2, param0->unk_0C, 2, 0, 0, 0, param0->unk_00->unk_24);
Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 3, param0->unk_0C, 3, 0, 0, 0, param0->unk_00->unk_24);
Graphics_LoadPaletteFromOpenNARC(v0, 1, 0, 0, 0, param0->unk_00->unk_24);
Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 0, param0->unk_0C, 1, 0, 0, 0, param0->unk_00->heapId);
Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 4, param0->unk_0C, 1, 0, 0, 0, param0->unk_00->heapId);
Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 2, param0->unk_0C, 2, 0, 0, 0, param0->unk_00->heapId);
Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 3, param0->unk_0C, 3, 0, 0, 0, param0->unk_00->heapId);
Graphics_LoadPaletteFromOpenNARC(v0, 1, 0, 0, 0, param0->unk_00->heapId);
PaletteData_LoadBufferFromHardware(param0->unk_08, 0, 0, 0x20 * 5);
Bg_MaskPalette(1, 0x18c6);
NARC_dtor(v0);
@ -1439,11 +1437,11 @@ static void ov10_02220F1C(UnkStruct_ov10_0221FB28 *param0)
GF_ASSERT(param0->unk_B9C == GX_BG0_AS_2D && param0->unk_00 != NULL && param0->unk_00->unk_00 != NULL && param0->unk_00->unk_00->options != NULL);
v0 = Options_Frame(param0->unk_00->unk_00->options);
LoadMessageBoxGraphics(param0->unk_0C, 0, 1, 15, v0, param0->unk_00->unk_24);
LoadMessageBoxGraphics(param0->unk_0C, 0, 1, 15, v0, param0->unk_00->heapId);
PaletteData_LoadBufferFromHardware(param0->unk_08, 0, 15 * 16, 0x20 * 1);
LoadStandardWindowGraphics(param0->unk_0C, 0, (1 + (18 + 12)), 14, 0, param0->unk_00->unk_24);
LoadStandardWindowGraphics(param0->unk_0C, 0, (1 + (18 + 12)), 14, 0, param0->unk_00->heapId);
PaletteData_LoadBufferFromHardware(param0->unk_08, 0, 14 * 16, 0x20 * 1);
Font_LoadTextPalette(0, 13 * 0x20, param0->unk_00->unk_24);
Font_LoadTextPalette(0, 13 * 0x20, param0->unk_00->heapId);
PaletteData_LoadBufferFromHardware(param0->unk_08, 0, 13 * 16, 0x20 * 1);
Window_Add(param0->unk_0C, &param0->unk_B7C, 0, 0x2, 0x13, 27, 4, 13, ((1 + (18 + 12)) + 9));
Window_Add(param0->unk_0C, &param0->unk_B8C, 0, 0x2, 0x13, 27, 4, 13, ((1 + (18 + 12)) + 9));
@ -1485,9 +1483,7 @@ static void ov10_0222101C(UnkStruct_ov10_0221FB28 *param0)
static void ov10_022210F4(UnkStruct_ov10_0221FB28 *param0)
{
NARC *v0;
v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, param0->unk_00->unk_24);
NARC *v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, param0->unk_00->heapId);
SpriteSystem_LoadCharResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 208, TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, 47111);
SpriteSystem_LoadPlttResObj(param0->unk_190, param0->unk_194, NARC_INDEX_BATTLE__GRAPHIC__VS_DEMO_GRA, 8, FALSE, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 47111);
@ -1574,7 +1570,7 @@ static void ov10_0222130C(UnkStruct_ov10_0221FB28 *param0, u32 param1, Strbuf *p
v1.unk_20 = 2;
v1.unk_24 = 0;
v1.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
v1.unk_2C = param0->unk_00->unk_24;
v1.unk_2C = param0->unk_00->heapId;
param0->unk_B3C[param1] = sub_020127E8(&v1);
@ -1584,7 +1580,7 @@ static void ov10_0222130C(UnkStruct_ov10_0221FB28 *param0, u32 param1, Strbuf *p
static void ov10_022213B8(UnkStruct_ov10_0221FB28 *param0)
{
param0->unk_B38 = sub_02012744(8, param0->unk_00->unk_24);
param0->unk_B38 = sub_02012744(8, param0->unk_00->heapId);
ov10_0222130C(param0, 0, param0->unk_00->unk_14[0]);
ov10_0222130C(param0, 2, param0->unk_00->unk_14[1]);
@ -1688,9 +1684,7 @@ static void ov10_02221588(UnkStruct_ov10_0221FB28 *param0)
static void ov10_0222166C(UnkStruct_ov10_0221FB28 *param0)
{
NARC *v0;
v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__VS_DEMO_GRA, param0->unk_00->unk_24);
NARC *v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__VS_DEMO_GRA, param0->unk_00->heapId);
SpriteSystem_LoadCharResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 5, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, 47112);
SpriteSystem_LoadCellResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 6, FALSE, 47112);
@ -1736,18 +1730,18 @@ static void ov10_022217CC(UnkStruct_ov10_0221FB28 *param0)
Camera *camera;
void *v1;
param0->unk_B4C = sub_02024220(param0->unk_00->unk_24, 0, 4, 0, 2, NULL);
param0->unk_B4C = sub_02024220(param0->unk_00->heapId, 0, 4, 0, 2, NULL);
G3X_AlphaBlend(1);
sub_02014000();
param0->unk_B54 = Heap_AllocFromHeap(param0->unk_00->unk_24, 0x4800);
param0->unk_B50 = sub_02014014(ov10_02221928, ov10_0222194C, param0->unk_B54, 0x4800, 1, param0->unk_00->unk_24);
param0->unk_B54 = Heap_AllocFromHeap(param0->unk_00->heapId, 0x4800);
param0->unk_B50 = sub_02014014(ov10_02221928, ov10_0222194C, param0->unk_B54, 0x4800, 1, param0->unk_00->heapId);
camera = sub_02014784(param0->unk_B50);
Camera_SetClipping((FX32_ONE), (FX32_ONE * 900), camera);
v1 = sub_020144C4(61, 2, param0->unk_00->unk_24);
v1 = sub_020144C4(61, 2, param0->unk_00->heapId);
sub_020144CC(param0->unk_B50, v1, (1 << 1) | (1 << 3), 1);
sub_020146F4(param0->unk_B50, 0, NULL, NULL);
@ -1907,19 +1901,17 @@ static void ov10_02221A10(UnkStruct_ov10_0221FB28 *param0)
static void ov10_02221A3C(UnkStruct_ov10_0221FB28 *param0)
{
NARC *v0;
NARC *v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, param0->unk_00->heapId);
v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, param0->unk_00->unk_24);
Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 15, param0->unk_0C, 3, 0, 0, 0, param0->unk_00->unk_24);
Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 17, param0->unk_0C, 3, 0, 0, 0, param0->unk_00->unk_24);
Graphics_LoadTilesToBgLayerFromOpenNARC(v0, 15, param0->unk_0C, 3, 0, 0, 0, param0->unk_00->heapId);
Graphics_LoadTilemapToBgLayerFromOpenNARC(v0, 17, param0->unk_0C, 3, 0, 0, 0, param0->unk_00->heapId);
{
NNSG2dPaletteData *v1;
void *v2;
u16 *v3;
v2 = NARC_AllocAndReadWholeMember(v0, 16, param0->unk_00->unk_24);
v2 = NARC_AllocAndReadWholeMember(v0, 16, param0->unk_00->heapId);
NNS_G2dGetUnpackedPaletteData(v2, &v1);
Bg_LoadPalette(3, (void *)v1->pRawData, v1->szByte, 0);
@ -1928,7 +1920,7 @@ static void ov10_02221A3C(UnkStruct_ov10_0221FB28 *param0)
Heap_FreeToHeap(v2);
}
LoadScreenDataFromNARC(param0->unk_00->unk_24, param0->unk_298, param0->unk_358, param0->unk_418);
LoadScreenDataFromNARC(param0->unk_00->heapId, param0->unk_298, param0->unk_358, param0->unk_418);
NARC_dtor(v0);
}
@ -2145,9 +2137,7 @@ static void ov10_02222050(UnkStruct_ov10_0221FB28 *param0)
static void ov10_022220B4(UnkStruct_ov10_0221FB28 *param0)
{
u32 v0;
NARC *v1;
v1 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, param0->unk_00->unk_24);
NARC *v1 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, param0->unk_00->heapId);
SpriteSystem_LoadPlttResObjFromOpenNarc(param0->unk_190, param0->unk_194, v1, PokeIconPalettesFileIndex(), FALSE, 3, NNS_G2D_VRAM_TYPE_2DMAIN, 47112);
SpriteSystem_LoadCellResObjFromOpenNarc(param0->unk_190, param0->unk_194, v1, PokeIcon32KCellsFileIndex(), FALSE, 47113);
@ -2162,9 +2152,7 @@ static void ov10_022220B4(UnkStruct_ov10_0221FB28 *param0)
static void ov10_0222216C(UnkStruct_ov10_0221FB28 *param0)
{
NARC *v0;
v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, param0->unk_00->unk_24);
NARC *v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, param0->unk_00->heapId);
SpriteSystem_LoadCharResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 20, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, 47119);
SpriteSystem_LoadPlttResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 21, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 47113);
@ -2175,9 +2163,7 @@ static void ov10_0222216C(UnkStruct_ov10_0221FB28 *param0)
static void ov10_02222208(UnkStruct_ov10_0221FB28 *param0)
{
NARC *v0;
v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PST_GRA, param0->unk_00->unk_24);
NARC *v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PST_GRA, param0->unk_00->heapId);
SpriteSystem_LoadCharResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 64, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, 47120);
SpriteSystem_LoadPlttResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 65, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 47114);
@ -2188,9 +2174,7 @@ static void ov10_02222208(UnkStruct_ov10_0221FB28 *param0)
static void ov10_022222A4(UnkStruct_ov10_0221FB28 *param0)
{
NARC *v0;
v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, param0->unk_00->unk_24);
NARC *v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, param0->unk_00->heapId);
SpriteSystem_LoadCharResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 2, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, 47121);
SpriteSystem_LoadPlttResObjFromOpenNarc(param0->unk_190, param0->unk_194, v0, 8, FALSE, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 47115);
@ -2361,10 +2345,10 @@ static void ov10_02222720(UnkStruct_ov10_0221FB28 *param0)
Strbuf *v3;
u32 v4;
v0 = MessageLoader_Init(0, 26, 453, param0->unk_00->unk_24);
v1 = sub_0200C440(15, 14, 0, param0->unk_00->unk_24);
v2 = StringTemplate_Default(param0->unk_00->unk_24);
v3 = Strbuf_Init(32, param0->unk_00->unk_24);
v0 = MessageLoader_Init(0, 26, 453, param0->unk_00->heapId);
v1 = sub_0200C440(15, 14, 0, param0->unk_00->heapId);
v2 = StringTemplate_Default(param0->unk_00->heapId);
v3 = Strbuf_Init(32, param0->unk_00->heapId);
for (v4 = 0; v4 < 6; v4++) {
if (param0->unk_214[v4].unk_04 == 0) {
@ -2399,43 +2383,43 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0)
if (MapHeader_IsUnionRoom(param0->unk_00->mapHeaderID) == 1) {
opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].header.trainerType);
opponentName1 = Heap_AllocFromHeap(param0->unk_24, sizeof(u16) * (TRAINER_NAME_LEN + 1));
opponentName1 = Heap_AllocFromHeap(param0->heapId, sizeof(u16) * (TRAINER_NAME_LEN + 1));
Strbuf_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1);
journalEntryOnlineEvent = JournalEntry_CreateEventUnionBattle(opponentName1, opponentGender1, battleResult, param0->unk_24);
journalEntryOnlineEvent = JournalEntry_CreateEventUnionBattle(opponentName1, opponentGender1, battleResult, param0->heapId);
Heap_FreeToHeap(opponentName1);
} else {
switch (sub_0203895C()) {
case 1:
opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].header.trainerType);
opponentName1 = Heap_AllocFromHeap(param0->unk_24, sizeof(u16) * (TRAINER_NAME_LEN + 1));
opponentName1 = Heap_AllocFromHeap(param0->heapId, sizeof(u16) * (TRAINER_NAME_LEN + 1));
Strbuf_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1);
journalEntryOnlineEvent = JournalEntry_CreateEventSingleBattle(opponentName1, opponentGender1, battleResult, param0->unk_24);
journalEntryOnlineEvent = JournalEntry_CreateEventSingleBattle(opponentName1, opponentGender1, battleResult, param0->heapId);
Heap_FreeToHeap(opponentName1);
break;
case 2:
opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].header.trainerType);
opponentName1 = Heap_AllocFromHeap(param0->unk_24, sizeof(u16) * (TRAINER_NAME_LEN + 1));
opponentName1 = Heap_AllocFromHeap(param0->heapId, sizeof(u16) * (TRAINER_NAME_LEN + 1));
Strbuf_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1);
journalEntryOnlineEvent = JournalEntry_CreateEventDoubleBattle(opponentName1, opponentGender1, battleResult, param0->unk_24);
journalEntryOnlineEvent = JournalEntry_CreateEventDoubleBattle(opponentName1, opponentGender1, battleResult, param0->heapId);
Heap_FreeToHeap(opponentName1);
break;
case 3:
opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].header.trainerType);
opponentName1 = Heap_AllocFromHeap(param0->unk_24, sizeof(u16) * (TRAINER_NAME_LEN + 1));
opponentName1 = Heap_AllocFromHeap(param0->heapId, sizeof(u16) * (TRAINER_NAME_LEN + 1));
Strbuf_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1);
journalEntryOnlineEvent = JournalEntry_CreateEventMixSingleBattle(opponentName1, opponentGender1, battleResult, param0->unk_24);
journalEntryOnlineEvent = JournalEntry_CreateEventMixSingleBattle(opponentName1, opponentGender1, battleResult, param0->heapId);
Heap_FreeToHeap(opponentName1);
break;
case 4:
opponentName1 = Heap_AllocFromHeap(param0->unk_24, sizeof(u16) * (TRAINER_NAME_LEN + 1));
opponentName2 = Heap_AllocFromHeap(param0->unk_24, sizeof(u16) * (TRAINER_NAME_LEN + 1));
opponentName1 = Heap_AllocFromHeap(param0->heapId, sizeof(u16) * (TRAINER_NAME_LEN + 1));
opponentName2 = Heap_AllocFromHeap(param0->heapId, sizeof(u16) * (TRAINER_NAME_LEN + 1));
if (ov10_02220AD0() == 1) {
opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[1].header.trainerType);
@ -2451,7 +2435,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0)
Strbuf_ToChars(param0->unk_14[2], opponentName2, TRAINER_NAME_LEN + 1);
}
journalEntryOnlineEvent = JournalEntry_CreateEventMultiBattle(opponentName1, opponentName2, opponentGender1, opponentGender2, battleResult, param0->unk_24);
journalEntryOnlineEvent = JournalEntry_CreateEventMultiBattle(opponentName1, opponentName2, opponentGender1, opponentGender2, battleResult, param0->heapId);
Heap_FreeToHeap(opponentName1);
Heap_FreeToHeap(opponentName2);

12
src/overlay011/ov11_0221F840.c
View File

@ -13,14 +13,14 @@
static u32 ov11_0221F914(u32 param0, BOOL param1);
static u32 ov11_0221F930(u32 param0, BOOL param1);
UnkStruct_02014014 *ov11_0221F840(int param0)
UnkStruct_02014014 *ov11_0221F840(int heapID)
{
UnkStruct_02014014 *v0;
void *v1;
Camera *camera;
v1 = Heap_AllocFromHeap(param0, 0x4800);
v0 = sub_02014014(ov11_0221F914, ov11_0221F930, v1, 0x4800, 1, param0);
v1 = Heap_AllocFromHeap(heapID, 0x4800);
v0 = sub_02014014(ov11_0221F914, ov11_0221F930, v1, 0x4800, 1, heapID);
camera = sub_02014784(v0);
if (camera != NULL) {
@ -30,19 +30,19 @@ UnkStruct_02014014 *ov11_0221F840(int param0)
return v0;
}
UnkStruct_02014014 *ov11_0221F888(int param0)
UnkStruct_02014014 *ov11_0221F888(int heapID)
{
UnkStruct_02014014 *v0;
void *v1;
Camera *camera;
v1 = Heap_AllocFromHeap(param0, 0x4200);
v1 = Heap_AllocFromHeap(heapID, 0x4200);
if (v1 == NULL) {
return NULL;
}
v0 = sub_02014014(ov11_0221F914, ov11_0221F930, v1, 0x4200, 1, param0);
v0 = sub_02014014(ov11_0221F914, ov11_0221F930, v1, 0x4200, 1, heapID);
camera = sub_02014784(v0);
if (camera != NULL) {

24
src/overlay012/ov12_022237EC.c
View File

@ -47,25 +47,19 @@ static void ov12_022237EC(SPLEmitter *param0)
return;
}
UnkStruct_02014014 *ov12_022237F0(int param0, int param1, int param2)
UnkStruct_02014014 *ov12_022237F0(int heapID, int param1, int param2)
{
UnkStruct_02014014 *v0;
void *v1;
v0 = ov11_0221F840(param0);
v1 = sub_020144C4(29, param1, param0);
UnkStruct_02014014 *v0 = ov11_0221F840(heapID);
void *v1 = sub_020144C4(29, param1, heapID);
sub_020144CC(v0, v1, (1 << 1) | (1 << 3), param2);
return v0;
}
UnkStruct_02014014 *ov12_02223818(int param0, int param1, int param2, int param3)
UnkStruct_02014014 *ov12_02223818(int heapID, int param1, int param2, int param3)
{
UnkStruct_02014014 *v0;
void *v1;
v0 = ov11_0221F840(param0);
v1 = sub_020144C4(param1, param2, param0);
UnkStruct_02014014 *v0 = ov11_0221F840(heapID);
void *v1 = sub_020144C4(param1, param2, heapID);
sub_020144CC(v0, v1, (1 << 1) | (1 << 3), param3);
return v0;
@ -76,18 +70,18 @@ void *ov12_02223844(NARC *param0, int param1, int param2)
return NARC_AllocAndReadWholeMember(param0, param1, param2);
}
UnkStruct_02014014 *ov12_0222384C(NARC *param0, int param1, int param2, int param3)
UnkStruct_02014014 *ov12_0222384C(NARC *param0, int heapID, int param2, int param3)
{
UnkStruct_02014014 *v0;
void *v1;
v0 = ov11_0221F888(param1);
v0 = ov11_0221F888(heapID);
if (v0 == NULL) {
return NULL;
}
v1 = ov12_02223844(param0, param2, param1);
v1 = ov12_02223844(param0, param2, heapID);
sub_020144CC(v0, v1, (1 << 1) | (1 << 3), param3);
return v0;

36
src/overlay012/ov12_02235E94.c
View File

@ -48,7 +48,7 @@ typedef struct {
} UnkStruct_02236430;
typedef struct UnkStruct_ov12_02235FE0_t {
int unk_00;
int heapId;
UnkStruct_ov12_02236030 unk_04;
int unk_10;
UnkStruct_02014014 *unk_14[9];
@ -340,28 +340,28 @@ static int ov12_02235FC8(int param0, int param1)
return Unk_ov12_0223AF00[v0][param1];
}
UnkStruct_ov12_02235FE0 *ov12_02235FE0(int param0)
UnkStruct_ov12_02235FE0 *ov12_02235FE0(int heapID)
{
UnkStruct_ov12_02235FE0 *v0 = NULL;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov12_02235FE0));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov12_02235FE0));
if (v0 == NULL) {
GF_ASSERT(0);
return NULL;
}
v0->unk_00 = param0;
v0->heapId = heapID;
v0->unk_88 = 0;
return v0;
}
UnkStruct_ov12_02235FE0 *ov12_02236004(int param0, const UnkStruct_ov12_02236030 *param1)
UnkStruct_ov12_02235FE0 *ov12_02236004(int heapID, const UnkStruct_ov12_02236030 *param1)
{
UnkStruct_ov12_02235FE0 *v0 = NULL;
v0 = ov12_02235FE0(param0);
v0 = ov12_02235FE0(heapID);
ov12_02236030(v0, param1);
{
@ -411,7 +411,7 @@ static void ov12_022360A0(SysTask *param0, void *param1)
switch (v0->unk_90) {
case 0:
v0->unk_8C = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTDATA__BALL_PARTICLE, v0->unk_00);
v0->unk_8C = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTDATA__BALL_PARTICLE, v0->heapId);
for (v1 = 0; v1 < 2; v1++) {
v5 = sub_0202CA64(&v0->unk_A0, v1);
@ -434,7 +434,7 @@ static void ov12_022360A0(SysTask *param0, void *param1)
v0->unk_38[v0->unk_10] = v5;
GF_ASSERT(v0->unk_14[v0->unk_10] == NULL);
v0->unk_14[v0->unk_10] = ov12_0222384C(v0->unk_8C, v0->unk_00, v3, 0);
v0->unk_14[v0->unk_10] = ov12_0222384C(v0->unk_8C, v0->heapId, v3, 0);
if (v0->unk_14[v0->unk_10] == NULL) {
GF_ASSERT(v0->unk_14[v0->unk_10] != NULL);
@ -468,7 +468,7 @@ static void ov12_022360A0(SysTask *param0, void *param1)
v0->unk_38[v0->unk_10] = v5;
GF_ASSERT(v0->unk_14[v0->unk_10] == NULL);
v0->unk_14[v0->unk_10] = ov12_0222384C(v0->unk_8C, v0->unk_00, v3, 0);
v0->unk_14[v0->unk_10] = ov12_0222384C(v0->unk_8C, v0->heapId, v3, 0);
if (v0->unk_14[v0->unk_10] == NULL) {
GF_ASSERT(v0->unk_14[v0->unk_10] != NULL);
@ -502,7 +502,7 @@ static void ov12_022360A0(SysTask *param0, void *param1)
v0->unk_38[v0->unk_10] = v5;
GF_ASSERT(v0->unk_14[v0->unk_10] == NULL);
v0->unk_14[v0->unk_10] = ov12_0222384C(v0->unk_8C, v0->unk_00, v3, 0);
v0->unk_14[v0->unk_10] = ov12_0222384C(v0->unk_8C, v0->heapId, v3, 0);
if (v0->unk_14[v0->unk_10] == NULL) {
GF_ASSERT(v0->unk_14[v0->unk_10] != NULL);
@ -536,7 +536,7 @@ static void ov12_022360A0(SysTask *param0, void *param1)
v0->unk_38[v0->unk_10] = v5;
GF_ASSERT(v0->unk_14[v0->unk_10] == NULL);
v0->unk_14[v0->unk_10] = ov12_0222384C(v0->unk_8C, v0->unk_00, v3, 0);
v0->unk_14[v0->unk_10] = ov12_0222384C(v0->unk_8C, v0->heapId, v3, 0);
if (v0->unk_14[v0->unk_10] == NULL) {
GF_ASSERT(v0->unk_14[v0->unk_10] != NULL);
@ -568,7 +568,7 @@ void ov12_02236320(UnkStruct_ov12_02235FE0 *param0)
v3 = ov12_02235F64(param0->unk_98);
param0->unk_10 = 1;
param0->unk_14[0] = ov12_02223818(param0->unk_00, 99, v3, 0);
param0->unk_14[0] = ov12_02223818(param0->heapId, 99, v3, 0);
param0->unk_90 = 0xFF;
} else {
param0->unk_10 = 0;
@ -680,7 +680,7 @@ static void ov12_0223646C(UnkStruct_ov12_02235FE0 *param0, UnkFuncPtr_020146F4 p
sub_02014788(param0->unk_14[0], 1);
} else {
for (v0 = 0; v0 < param0->unk_10; v0++) {
UnkStruct_02236430 *v4 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_02236430));
UnkStruct_02236430 *v4 = Heap_AllocFromHeap(param0->heapId, sizeof(UnkStruct_02236430));
GF_ASSERT(v4 != NULL);
@ -843,7 +843,7 @@ UnkStruct_ov12_02236648 *ov12_02236690(UnkStruct_ov12_02236690 *param0)
{
UnkStruct_ov12_02236648 *v0;
v0 = Heap_AllocFromHeap(param0->unk_08, sizeof(UnkStruct_ov12_02236648));
v0 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov12_02236648));
GF_ASSERT(v0 != NULL);
v0->unk_00 = *param0;
@ -856,7 +856,7 @@ UnkStruct_ov12_02236648 *ov12_02236690(UnkStruct_ov12_02236690 *param0)
v0->unk_1C = ov12_02235FA0(v0->unk_00.unk_04);
}
v0->unk_18 = ov12_02223818(v0->unk_00.unk_08, 99, v0->unk_20, 0);
v0->unk_18 = ov12_02223818(v0->unk_00.heapID, 99, v0->unk_20, 0);
return v0;
}
@ -1125,7 +1125,7 @@ static BOOL ov12_02236918(BallRotation *param0)
UnkStruct_ov12_02236690 v0;
v0.unk_04 = param0->unk_90.ballID;
v0.unk_08 = param0->unk_90.heapID;
v0.heapID = param0->unk_90.heapID;
v0.unk_0C = 0xFF;
v0.unk_10 = 0;
@ -1470,7 +1470,7 @@ static BOOL ov12_02236D18(BallRotation *param0)
UnkStruct_ov12_02236690 v1;
v1.unk_04 = param0->unk_90.ballID;
v1.unk_08 = param0->unk_90.heapID;
v1.heapID = param0->unk_90.heapID;
v1.unk_0C = ov12_02235FB4(v1.unk_04);
v1.unk_10 = 0;
@ -1869,7 +1869,7 @@ static BOOL ov12_02237474(BallRotation *param0)
UnkStruct_ov12_02236690 v0;
v0.unk_04 = param0->unk_90.ballID;
v0.unk_08 = param0->unk_90.heapID;
v0.heapID = param0->unk_90.heapID;
v0.unk_0C = 0xFF;
v0.unk_10 = 1;

20
src/overlay012/ov12_02237EFC.c
View File

@ -19,7 +19,7 @@
typedef struct UnkStruct_ov12_02238004_t {
int unk_00;
int unk_04;
int heapId;
UnkStruct_ov12_02237F38 unk_08;
UnkStruct_02014014 *unk_10;
SPLEmitter *unk_14;
@ -29,7 +29,7 @@ typedef struct UnkStruct_ov12_02238004_t {
} UnkStruct_ov12_02238004;
typedef struct UnkStruct_ov12_02237F98_t {
int unk_00;
int heapId;
UnkStruct_ov12_02237EFC unk_04;
UnkStruct_ov12_02238004 *unk_08[16];
} UnkStruct_ov12_02237F98;
@ -39,12 +39,12 @@ static void ov12_02238054(UnkStruct_ov12_02238004 *param0, UnkFuncPtr_020146F4 p
static void ov12_02238080(SPLEmitter *param0);
static int ov12_02238088(int param0);
UnkStruct_ov12_02237F98 *ov12_02237EFC(int param0, UnkStruct_ov12_02237EFC *param1)
UnkStruct_ov12_02237F98 *ov12_02237EFC(int heapId, UnkStruct_ov12_02237EFC *param1)
{
UnkStruct_ov12_02237F98 *v0;
v0 = NULL;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov12_02237F98));
v0 = Heap_AllocFromHeap(heapId, sizeof(UnkStruct_ov12_02237F98));
if (v0 == NULL) {
GF_ASSERT(0);
@ -53,7 +53,7 @@ UnkStruct_ov12_02237F98 *ov12_02237EFC(int param0, UnkStruct_ov12_02237EFC *para
ov12_02220474();
v0->unk_00 = param0;
v0->heapId = heapId;
if (param1 != NULL) {
v0->unk_04 = *param1;
@ -80,7 +80,7 @@ UnkStruct_ov12_02238004 *ov12_02237F38(UnkStruct_ov12_02237F98 *param0, UnkStruc
continue;
}
param0->unk_08[v0] = ov12_02237FC8(param0->unk_00, param1);
param0->unk_08[v0] = ov12_02237FC8(param0->heapId, param1);
param0->unk_08[v0]->unk_18 = NULL;
v1 = param0->unk_08[v0];
@ -134,23 +134,23 @@ void ov12_02237F98(UnkStruct_ov12_02237F98 *param0)
}
}
UnkStruct_ov12_02238004 *ov12_02237FC8(int param0, UnkStruct_ov12_02237F38 *param1)
UnkStruct_ov12_02238004 *ov12_02237FC8(int heapID, UnkStruct_ov12_02237F38 *param1)
{
UnkStruct_ov12_02238004 *v0;
v0 == NULL;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov12_02238004));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov12_02238004));
if (v0 == NULL) {
GF_ASSERT(0);
return NULL;
}
v0->unk_04 = param0;
v0->heapId = heapID;
v0->unk_08 = *param1;
v0->unk_1C = ov12_02238088(v0->unk_08.unk_00);
v0->unk_10 = ov12_022237F0(v0->unk_04, v0->unk_08.unk_00, 1);
v0->unk_10 = ov12_022237F0(v0->heapId, v0->unk_08.unk_00, 1);
return v0;
}

8
src/overlay017/ov17_0223B140.c
View File

@ -157,7 +157,7 @@ int ov17_0223B140(OverlayManager *param0, int *param1)
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov17_02246F24), 21);
MI_CpuClear8(v0, sizeof(UnkStruct_ov17_02246F24));
v0->unk_08 = ov17_0223F140(21);
v0->unk_08 = ov17_0223F140(HEAP_ID_21);
v0->unk_00 = OverlayManager_Args(param0);
v0->unk_00->unk_150 = v0;
v0->unk_00->unk_154 = 2;
@ -207,7 +207,7 @@ int ov17_0223B140(OverlayManager *param0, int *param1)
v0->unk_0C.unk_3C = MessageLoader_Init(0, 26, 205, HEAP_ID_21);
v0->unk_0C.unk_40 = MessageLoader_Init(0, 26, 210, HEAP_ID_21);
v0->unk_0C.unk_44 = MessageLoader_Init(0, 26, 211, HEAP_ID_21);
v0->unk_0C.unk_54 = sub_02012744((2 * 4), 21);
v0->unk_0C.unk_54 = sub_02012744((2 * 4), HEAP_ID_21);
v0->unk_0C.unk_48 = StringTemplate_Default(HEAP_ID_21);
v0->unk_0C.unk_4C = Strbuf_Init((3 * 160), HEAP_ID_21);
@ -215,8 +215,8 @@ int ov17_0223B140(OverlayManager *param0, int *param1)
NARC *v1;
NARC *v2;
v1 = NARC_ctor(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_BG, 21);
v2 = NARC_ctor(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_OBJ, 21);
v1 = NARC_ctor(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_BG, HEAP_ID_21);
v2 = NARC_ctor(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_OBJ, HEAP_ID_21);
ov17_0223BBA8(v0, v1);
ov17_0223BCE0(v0, v1);

2
src/overlay017/ov17_0223CB1C.c
View File

@ -138,7 +138,7 @@ int ov17_0223CB1C(OverlayManager *param0, int *param1)
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov17_02247A48), 22);
MI_CpuClear8(v0, sizeof(UnkStruct_ov17_02247A48));
v0->unk_08 = ov17_0223F140(22);
v0->unk_08 = ov17_0223F140(HEAP_ID_22);
v0->unk_00 = OverlayManager_Args(param0);
v0->unk_00->unk_150 = v0;
v0->unk_00->unk_154 = 0;

6
src/overlay017/ov17_0223DAD0.c
View File

@ -236,7 +236,7 @@ int ov17_0223DAD0(OverlayManager *param0, int *param1)
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov17_0224DF54), 23);
MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0224DF54));
v0->unk_10 = ov17_0223F140(23);
v0->unk_10 = ov17_0223F140(HEAP_ID_23);
v0->unk_00 = OverlayManager_Args(param0);
v0->unk_00->unk_150 = v0;
v0->unk_00->unk_154 = 1;
@ -284,7 +284,7 @@ int ov17_0223DAD0(OverlayManager *param0, int *param1)
v0->unk_14.unk_84 = MessageLoader_Init(0, 26, 206, HEAP_ID_23);
v0->unk_14.unk_88 = StringTemplate_Default(HEAP_ID_23);
v0->unk_14.unk_8C = Strbuf_Init((2 * 160), HEAP_ID_23);
v0->unk_14.unk_94 = sub_02012744((3 * 3), 23);
v0->unk_14.unk_94 = sub_02012744((3 * 3), HEAP_ID_23);
{
NARC *v1;
@ -831,7 +831,7 @@ static void ov17_0223E778(UnkStruct_ov17_0224DF54 *param0)
GF_ASSERT(param0->unk_0C == NULL);
v0 = Heap_AllocFromHeap(HEAP_ID_23, 0x4800);
param0->unk_0C = sub_02014014(ov17_0223E800, ov17_0223E81C, v0, 0x4800, 1, 23);
param0->unk_0C = sub_02014014(ov17_0223E800, ov17_0223E81C, v0, 0x4800, 1, HEAP_ID_23);
camera = sub_02014784(param0->unk_0C);
Camera_SetClipping((FX32_ONE), (FX32_ONE * 900), camera);

7
src/overlay017/ov17_0223F118.c
View File

@ -78,12 +78,9 @@ static void NitroStaticInit(void)
Overlay_LoadByID(FS_OVERLAY_ID(overlay22), 2);
}
GenericPointerData *ov17_0223F140(int param0)
GenericPointerData *ov17_0223F140(int heapID)
{
GenericPointerData *v0;
v0 = sub_02024220(param0, 0, 2, 0, 2, ov17_0223F15C);
return v0;
return sub_02024220(heapID, 0, 2, 0, 2, ov17_0223F15C);
}
static void ov17_0223F15C(void)

2
src/overlay017/ov17_0223F7E4.c
View File

@ -565,7 +565,7 @@ void *ov17_0223F88C(UnkStruct_02095C48 *param0, UnkStruct_ov17_0223F88C *param1,
v0->unk_00 = param0;
v0->unk_04 = param1;
v0->unk_08 = param2;
v0->unk_3C = sub_02012744(12, 21);
v0->unk_3C = sub_02012744(12, HEAP_ID_21);
v1 = NARC_ctor(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_BG, 21);

2
src/overlay017/ov17_02247A48.c
View File

@ -992,7 +992,7 @@ static void ov17_022489C8(SysTask *param0, void *param1)
case 0:
v0->unk_00.unk_00 = 0;
v0->unk_00.unk_08 = v0->unk_10;
v0->unk_0C = ov12_02236004(22, &v0->unk_00);
v0->unk_0C = ov12_02236004(HEAP_ID_22, &v0->unk_00);
ov12_02236320(v0->unk_0C);
ov12_02236384(v0->unk_0C, ov17_02248990);
v0->unk_14++;

2
src/overlay017/ov17_022492DC.c
View File

@ -310,7 +310,7 @@ void *ov17_02249380(UnkStruct_02095C48 *param0, UnkStruct_ov17_0224A1EC *param1)
v0->unk_00 = param0;
v0->unk_04 = param1;
v0->unk_18 = sub_02012744(6, 23);
v0->unk_18 = sub_02012744(6, HEAP_ID_23);
ov17_022493DC(v0);

26
src/overlay017/ov17_0224F4D4.c
View File

@ -143,12 +143,12 @@ int ov17_0224F4D4(OverlayManager *param0, int *param1)
G2_BlendNone();
G2S_BlendNone();
Heap_Create(3, 24, 0x70000);
Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_24, 0x70000);
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov17_0224FCA0), 24);
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov17_0224FCA0), HEAP_ID_24);
MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0224FCA0));
v0->unk_0C = ov17_0223F140(24);
v0->unk_0C = ov17_0223F140(HEAP_ID_24);
v0->unk_00 = OverlayManager_Args(param0);
v0->unk_00->unk_150 = v0;
v0->unk_00->unk_154 = 3;
@ -157,26 +157,26 @@ int ov17_0224F4D4(OverlayManager *param0, int *param1)
ov17_0224FE1C(v0);
v0->unk_127B = 0;
v0->unk_10.unk_C0 = PaletteData_New(24);
v0->unk_10.unk_C0 = PaletteData_New(HEAP_ID_24);
PaletteData_SetAutoTransparent(v0->unk_10.unk_C0, 1);
PaletteData_AllocBuffer(v0->unk_10.unk_C0, 0, 0x200, 24);
PaletteData_AllocBuffer(v0->unk_10.unk_C0, 1, 0x200, 24);
PaletteData_AllocBuffer(v0->unk_10.unk_C0, 2, (((16 - 2) * 16) * sizeof(u16)), 24);
PaletteData_AllocBuffer(v0->unk_10.unk_C0, 3, 0x200, 24);
PaletteData_AllocBuffer(v0->unk_10.unk_C0, 0, 0x200, HEAP_ID_24);
PaletteData_AllocBuffer(v0->unk_10.unk_C0, 1, 0x200, HEAP_ID_24);
PaletteData_AllocBuffer(v0->unk_10.unk_C0, 2, (((16 - 2) * 16) * sizeof(u16)), HEAP_ID_24);
PaletteData_AllocBuffer(v0->unk_10.unk_C0, 3, 0x200, HEAP_ID_24);
v0->unk_10.unk_20 = BgConfig_New(HEAP_ID_24);
VramTransfer_New(64, 24);
VramTransfer_New(64, HEAP_ID_24);
SetAutorepeat(4, 8);
ov17_0224FB34(v0->unk_10.unk_20);
sub_0201E3D8();
sub_0201E450(4);
Font_InitManager(FONT_SUBSCREEN, 24);
Font_InitManager(FONT_SUBSCREEN, HEAP_ID_24);
v0->unk_10.unk_18 = SpriteSystem_Alloc(24);
v0->unk_10.unk_18 = SpriteSystem_Alloc(HEAP_ID_24);
SpriteSystem_Init(v0->unk_10.unk_18, &Unk_ov17_02254B0C, &Unk_ov17_02254AC4, (16 + 16));
ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_64K);
@ -190,9 +190,9 @@ int ov17_0224F4D4(OverlayManager *param0, int *param1)
ov17_0224FDDC();
v0->unk_10.unk_B4 = MessageLoader_Init(0, 26, 218, HEAP_ID_24);
v0->unk_10.unk_B8 = StringTemplate_Default(24);
v0->unk_10.unk_B8 = StringTemplate_Default(HEAP_ID_24);
v0->unk_10.unk_BC = Strbuf_Init((2 * 160), HEAP_ID_24);
v0->unk_10.unk_C4 = sub_02012744(10, 24);
v0->unk_10.unk_C4 = sub_02012744(10, HEAP_ID_24);
ov17_0224FE60(v0);
ov17_0224FE70(v0);

9
src/overlay021/ov21_021D1FA4.c
View File

@ -88,7 +88,7 @@ void ov21_021D1FA4(PokedexGraphicData *param0, int heapID)
v1.unk_00 = param0->spriteList;
v1.unk_04 = param0->bgConfig;
v1.unk_08 = 16;
v1.unk_0C = heapID;
v1.heapId = heapID;
param0->unk_14C = ov21_021D4C0C(&v1);
@ -766,10 +766,13 @@ static void ov21_021D2A0C(PokedexGraphicData *param0, int heapID)
{
UnkStruct_ov22_022550D4 v3 = {
8, 8, 8, 0
.unk_00 = 8,
.unk_04 = 8,
.unk_08 = 8,
.heapID = HEAP_ID_SYSTEM
};
v3.unk_0C = heapID;
v3.heapID = heapID;
param0->unk_164 = sub_02015064(&v3);
}
}

20
src/overlay021/ov21_021D4C0C.c
View File

@ -26,7 +26,7 @@ typedef struct UnkStruct_ov21_021D4C0C_t {
BgConfig *unk_08;
UnkStruct_ov21_021D4CA0 *unk_0C;
int unk_10;
int unk_14;
int heapId;
} UnkStruct_ov21_021D4C0C;
static BOOL ov21_021D4EA4(UnkStruct_ov21_021D4CA0 *param0);
@ -34,15 +34,13 @@ static UnkStruct_ov21_021D4CA0 *ov21_021D4EB4(UnkStruct_ov21_021D4C0C *param0);
UnkStruct_ov21_021D4C0C *ov21_021D4C0C(const UnkStruct_ov21_021D1FA4 *param0)
{
UnkStruct_ov21_021D4C0C *v0;
v0 = Heap_AllocFromHeap(param0->unk_0C, sizeof(UnkStruct_ov21_021D4C0C));
UnkStruct_ov21_021D4C0C *v0 = Heap_AllocFromHeap(param0->heapId, sizeof(UnkStruct_ov21_021D4C0C));
GF_ASSERT(v0);
memset(v0, 0, sizeof(UnkStruct_ov21_021D4C0C));
v0->unk_00 = sub_02012744(param0->unk_08, param0->unk_0C);
v0->unk_0C = Heap_AllocFromHeap(param0->unk_0C, sizeof(UnkStruct_ov21_021D4CA0) * param0->unk_08);
v0->unk_00 = sub_02012744(param0->unk_08, param0->heapId);
v0->unk_0C = Heap_AllocFromHeap(param0->heapId, sizeof(UnkStruct_ov21_021D4CA0) * param0->unk_08);
GF_ASSERT(v0->unk_0C);
memset(v0->unk_0C, 0, sizeof(UnkStruct_ov21_021D4CA0) * param0->unk_08);
@ -50,7 +48,7 @@ UnkStruct_ov21_021D4C0C *ov21_021D4C0C(const UnkStruct_ov21_021D1FA4 *param0)
v0->unk_10 = param0->unk_08;
v0->unk_04 = param0->unk_00;
v0->unk_08 = param0->unk_04;
v0->unk_14 = param0->unk_0C;
v0->heapId = param0->heapId;
return v0;
}
@ -125,9 +123,7 @@ void ov21_021D4D3C(UnkStruct_ov21_021D4C0C *param0)
Window *ov21_021D4D6C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2)
{
Window *v0;
v0 = Window_New(param0->unk_14, 1);
Window *v0 = Window_New(param0->heapId, 1);
Window_Init(v0);
Window_AddToTopLeftCorner(param0->unk_08, v0, param1, param2, 0, 0);
@ -146,7 +142,7 @@ u32 Pokedex_DisplayMessage(UnkStruct_ov21_021D4C0C *param0, Window *window, u32
Strbuf *strbuf;
u32 strWidth;
messageLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, bankID, param0->unk_14);
messageLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, bankID, param0->heapId);
GF_ASSERT(messageLoader);
strbuf = MessageLoader_GetNewStrbuf(messageLoader, entryID);
@ -166,7 +162,7 @@ void ov21_021D4E10(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2,
int v2;
int v3;
v0 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, param2, param0->unk_14);
v0 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, param2, param0->heapId);
GF_ASSERT(v0);
v1 = MessageLoader_GetNewStrbuf(v0, param3);

46
src/overlay021/ov21_021E8D48.c
View File

@ -134,7 +134,7 @@ static void ov21_021E9B08(UnkStruct_ov21_021E9A9C *param0, int param1);
UnkStruct_ov21_021E8D48 *ov21_021E8D48(const UnkStruct_ov21_021E8E0C *param0)
{
UnkStruct_ov21_021E8D48 *v0 = Heap_AllocFromHeap(param0->unk_0C, sizeof(UnkStruct_ov21_021E8D48));
UnkStruct_ov21_021E8D48 *v0 = Heap_AllocFromHeap(param0->heapId, sizeof(UnkStruct_ov21_021E8D48));
memset(v0, 0, sizeof(UnkStruct_ov21_021E8D48));
@ -191,37 +191,37 @@ void ov21_021E8E04(UnkStruct_ov21_021E8D48 *param0, BOOL param1)
static void ov21_021E8E0C(UnkStruct_ov21_021E8D48 *param0, const UnkStruct_ov21_021E8E0C *param1)
{
UnkStruct_ov21_021D1FA4 v0;
NARC *v1 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__ZUKAN__ZUKAN, param1->unk_0C);
NARC *v1 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__ZUKAN__ZUKAN, param1->heapId);
int v2;
param0->unk_220 = Pokemon_GetValue(param1->unk_10, MON_DATA_SPECIES, NULL);
v2 = Pokemon_GetValue(param1->unk_10, MON_DATA_FORM, NULL);
param0->unk_00 = param1->unk_00;
param0->unk_19C = SpriteList_InitRendering(32, &param0->unk_10, param1->unk_0C);
param0->unk_19C = SpriteList_InitRendering(32, &param0->unk_10, param1->heapId);
Utility_Clear2DMainOAM(param1->unk_0C);
ov21_021E9A0C(param1->unk_0C);
Utility_Clear2DMainOAM(param1->heapId);
ov21_021E9A0C(param1->heapId);
param0->unk_0C = ov21_021E99E0(param1->unk_08, param1->unk_10, 48, 72, param1->unk_0C);
param0->unk_0C = ov21_021E99E0(param1->unk_08, param1->unk_10, 48, 72, param1->heapId);
param0->unk_08 = param1->unk_04;
v0.unk_00 = param0->unk_19C;
v0.unk_04 = param0->unk_00;
v0.unk_08 = 3;
v0.unk_0C = param1->unk_0C;
v0.heapId = param1->heapId;
param0->unk_1B0 = ov21_021D4C0C(&v0);
ov21_021E90B0(param0->unk_00, param1->unk_0C);
ov21_021E90B0(param0->unk_00, param1->heapId);
G2_SetBlendBrightness((GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD), -16);
param0->unk_04 = ov21_021E91B0(param0->unk_00, param1->unk_0C);
param0->unk_04 = ov21_021E91B0(param0->unk_00, param1->heapId);
ov21_021E9208(param0->unk_1A0, param1->unk_0C);
ov21_021D2B88(&param0->unk_1B4, param0->unk_1A0, param1->unk_0C, v1);
ov21_021D2D88(&param0->unk_1B4, param0->unk_19C, param0->unk_1A0, param1->unk_0C, 2);
ov21_021E9240(&param0->unk_1B4, param0->unk_1B0, param1->unk_0C, param0->unk_220, param1->unk_14);
ov21_021E9208(param0->unk_1A0, param1->heapId);
ov21_021D2B88(&param0->unk_1B4, param0->unk_1A0, param1->heapId, v1);
ov21_021D2D88(&param0->unk_1B4, param0->unk_19C, param0->unk_1A0, param1->heapId, 2);
ov21_021E9240(&param0->unk_1B4, param0->unk_1B0, param1->heapId, param0->unk_220, param1->unk_14);
ov21_021D1858(&param0->unk_1B4, 172, 32);
ov21_021D2E44(&param0->unk_1B4, 1);
@ -234,18 +234,18 @@ static void ov21_021E8E0C(UnkStruct_ov21_021E8D48 *param0, const UnkStruct_ov21_
v3 = param0->unk_220;
}
ov21_021E9458(&param0->unk_1E4, param0->unk_1A0, v3, param1->unk_0C);
ov21_021E94B0(&param0->unk_1E4, param0->unk_19C, param0->unk_1A0, param1->unk_0C);
ov21_021E9458(&param0->unk_1E4, param0->unk_1A0, v3, param1->heapId);
ov21_021E94B0(&param0->unk_1E4, param0->unk_19C, param0->unk_1A0, param1->heapId);
}
ov21_021E95BC(&param0->unk_200, param0->unk_1A0, param0->unk_220, param1->unk_0C, v1);
ov21_021E95F8(&param0->unk_200, param0->unk_19C, param0->unk_1A0, param1->unk_0C, param0->unk_220);
ov21_021E9504(&param0->unk_1F8, param0->unk_19C, param0->unk_1A0, param1->unk_0C, param0->unk_200.unk_08);
ov21_021E9560(&param0->unk_1F8, param0->unk_1B0, param1->unk_0C, param0->unk_220, param0->unk_1B4.unk_0C[1]);
ov21_021E96A8(param0->unk_00, param1->unk_0C, v1);
ov21_021E97C4(param0->unk_00, param1->unk_0C, v1);
ov21_021E9968(param0->unk_04, param1->unk_0C, param0->unk_220);
ov21_021E9A40(&param0->unk_228, param1->unk_0C, param1->unk_14, v1);
ov21_021E95BC(&param0->unk_200, param0->unk_1A0, param0->unk_220, param1->heapId, v1);
ov21_021E95F8(&param0->unk_200, param0->unk_19C, param0->unk_1A0, param1->heapId, param0->unk_220);
ov21_021E9504(&param0->unk_1F8, param0->unk_19C, param0->unk_1A0, param1->heapId, param0->unk_200.unk_08);
ov21_021E9560(&param0->unk_1F8, param0->unk_1B0, param1->heapId, param0->unk_220, param0->unk_1B4.unk_0C[1]);
ov21_021E96A8(param0->unk_00, param1->heapId, v1);
ov21_021E97C4(param0->unk_00, param1->heapId, v1);
ov21_021E9968(param0->unk_04, param1->heapId, param0->unk_220);
ov21_021E9A40(&param0->unk_228, param1->heapId, param1->unk_14, v1);
param0->unk_248 = 1;

9
src/overlay022/ov22_02255094.c
View File

@ -84,7 +84,10 @@ void ov22_022550B4(void)
void ov22_022550D4(UnkStruct_ov22_0225A0E4 *param0)
{
UnkStruct_ov22_022550D4 v0 = {
718, 118, 19, 14
.unk_00 = 718,
.unk_04 = 118,
.unk_08 = 19,
.heapID = HEAP_ID_14
};
param0->unk_5C = NARC_ctor(NARC_INDEX_GRAPHIC__IMAGECLIP, 14);
@ -497,10 +500,10 @@ static void ov22_02255738(void)
static void ov22_02255748(UnkStruct_ov22_0225A0E4 *param0, const UnkStruct_ov22_022550D4 *param1)
{
param0->unk_00 = sub_02015064(param1);
param0->unk_04 = Heap_AllocFromHeap(param1->unk_0C, sizeof(UnkStruct_02015128 *) * (100 + 18));
param0->unk_04 = Heap_AllocFromHeap(param1->heapID, sizeof(UnkStruct_02015128 *) * (100 + 18));
param0->unk_08 = (100 + 18);
param0->unk_0C = 0;
param0->unk_10 = Heap_AllocFromHeap(param1->unk_0C, sizeof(UnkStruct_020151A4 *) * (1 + 18));
param0->unk_10 = Heap_AllocFromHeap(param1->heapID, sizeof(UnkStruct_020151A4 *) * (1 + 18));
param0->unk_14 = (1 + 18);
param0->unk_18 = 0;
param0->unk_1C = 1;

8
src/overlay022/ov22_02255D44.c
View File

@ -226,8 +226,8 @@ int ov22_02255D44(OverlayManager *param0, int *param1)
ov22_02256BAC(v0, v2->unk_0C);
ov22_022589E0(&v0->unk_4FC, &v0->unk_458, &v0->unk_3CC, &v0->unk_00, &v0->unk_5C4, 1);
v0->unk_714 = sub_02015920(13);
v0->unk_718 = Window_New(13, 1);
v0->unk_714 = sub_02015920(HEAP_ID_13);
v0->unk_718 = Window_New(HEAP_ID_13, 1);
v0->unk_70C = 0;
sub_02004550(53, 0, 0);
@ -462,8 +462,8 @@ int ov22_02256174(OverlayManager *param0, int *param1)
ov22_02256BF4(v0, v0->unk_720, v2->unk_08, v2->unk_1C, v2->unk_20);
ov22_022589E0(&v0->unk_4FC, &v0->unk_458, &v0->unk_3CC, &v0->unk_00, &v0->unk_5C4, 0);
v0->unk_714 = sub_02015920(13);
v0->unk_718 = Window_New(13, 1);
v0->unk_714 = sub_02015920(HEAP_ID_13);
v0->unk_718 = Window_New(HEAP_ID_13, 1);
v0->unk_70C = 0;
sub_020959F4(v0->unk_734->unk_16);

2
src/overlay022/ov22_02259C58.c
View File

@ -164,7 +164,7 @@ void ov22_02259DBC(UnkStruct_ov22_02259D2C *param0, UnkStruct_ov22_0225A0E4 *par
{
Window *v0;
param0->unk_64 = sub_02012744(1, 13);
param0->unk_64 = sub_02012744(1, HEAP_ID_13);
ov22_0225A218(param1);

2
src/overlay022/ov22_0225AF8C.c
View File

@ -301,7 +301,7 @@ static void ov22_0225B2D4(UnkStruct_ov22_0225B1BC *param0, const UnkStruct_ov22_
v1.unk_00 = (700 + 18);
v1.unk_04 = (100 + 18);
v1.unk_08 = (1 + 18);
v1.unk_0C = param1->heapId;
v1.heapID = param1->heapId;
ov22_0225547C(&param0->unk_00, &v1, param1->heapId);
ov22_0225B588(&param0->unk_00, &v0, param1, param1->heapId);

2
src/overlay058/ov58_021D0D80.c
View File

@ -550,7 +550,7 @@ static void ov58_021D12C4(UnkStruct_02095EAC *param0)
MessageLoader_GetStrbuf(param0->unk_10, 7, param0->unk_28);
param0->unk_442C = Heap_AllocFromHeap(HEAP_ID_39, 30 * 16 * 32);
param0->unk_9454 = sub_02015920(39);
param0->unk_9454 = sub_02015920(HEAP_ID_39);
param0->unk_378 = 0;
}

4
src/overlay062/ov62_0222F2C0.c
View File

@ -55,7 +55,7 @@ void ov62_0222F2C0(UnkStruct_0208C06C *param0)
param0->unk_14.unk_00 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__BATT_REC__BATT_REC_GRA, HEAP_ID_102);
param0->unk_14.unk_10 = BgConfig_New(HEAP_ID_102);
param0->unk_14.unk_14 = PaletteData_New(HEAP_ID_102);
param0->unk_14.unk_4C = sub_02024220(102, 0, 1, 0, 4, NULL);
param0->unk_14.unk_4C = sub_02024220(HEAP_ID_102, 0, 1, 0, 4, NULL);
param0->unk_14.unk_50 = sub_0200762C(HEAP_ID_102);
NNS_G2dSetupSoftwareSpriteCamera();
@ -124,7 +124,7 @@ void ov62_0222F2C0(UnkStruct_0208C06C *param0)
}
{
param0->unk_14.unk_3C = sub_02012744((5 * 2) + 10, 102);
param0->unk_14.unk_3C = sub_02012744((5 * 2) + 10, HEAP_ID_102);
param0->unk_14.unk_34 = MessageLoader_Init(0, 26, 10, HEAP_ID_102);
param0->unk_14.unk_38 = MessageLoader_Init(0, 26, 20, HEAP_ID_102);
}

4
src/overlay062/ov62_022300D8.c
View File

@ -659,7 +659,7 @@ void ov62_02230E80(UnkStruct_0208C06C *param0)
Window_Init(&v6);
Window_AddToTopLeftCorner(param0->unk_14.unk_10, &v6, 20, 2, 0, 0);
v7[v11]->unk_18 = sub_02012B20(&v6, 102);
v7[v11]->unk_18 = sub_02012B20(&v6, HEAP_ID_102);
v4 = sub_02012898(&v6, v8[v11], 102);
CharTransfer_AllocRange(v4, 1, v8[v11], &v7[v11]->unk_1C);
@ -775,7 +775,7 @@ void ov62_0223118C(UnkStruct_ov62_022312B0 *param0, UnkStruct_ov62_0223118C *par
Window_Init(&v6);
Window_AddToTopLeftCorner(param1->unk_10, &v6, 20, 2, 0, 0);
param0->unk_10 = sub_02012B20(&v6, 102);
param0->unk_10 = sub_02012B20(&v6, HEAP_ID_102);
v4 = sub_02012898(&v6, param2, 102);
CharTransfer_AllocRange(v4, 1, param2, &param0->unk_14);

62
src/overlay065/ov65_0222DCE0.c
View File

@ -130,7 +130,7 @@ static int ov65_0222EBB8(void);
static void ov65_02232F90(UnkStruct_ov65_0222EBE0 *param0, u32 param1);
static void ov65_02232FB0(UnkStruct_ov65_0222EBE0 *param0, u32 param1, u32 param2);
static BOOL ov65_02232FCC(const UnkStruct_ov65_0222EBE0 *param0);
static void ov65_02232FE0(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 param2);
static void ov65_02232FE0(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID);
static void ov65_02233068(UnkStruct_ov65_0222EBE0 *param0);
static u32 ov65_022330C0(UnkStruct_ov65_0222EBE0 *param0, u32 param1);
static void ov65_022331E0(UnkStruct_ov65_0222EBE0 *param0);
@ -145,7 +145,7 @@ static void ov65_022336A4(UnkStruct_ov65_0222EBE0 *param0, u32 param1);
static void ov65_022336C4(UnkStruct_ov65_0222EBE0 *param0);
static void ov65_022332C4(u32 param0, u32 param1, void *param2);
static void ov65_02234A10(UnkStruct_ov65_0222EBE0 *param0);
static void ov65_022332FC(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 param2);
static void ov65_022332FC(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID);
static void ov65_02233570(UnkStruct_ov65_0222EBE0 *param0);
static void ov65_022335F8(NNSG2dScreenData *param0, u8 param1);
static void ov65_022336D4(UnkStruct_ov65_0222EBE0 *param0);
@ -166,7 +166,7 @@ static void ov65_02234788(UnkStruct_ov65_0222EBE0 *param0, u8 param1, u8 param2,
static u32 ov65_0223484C(u32 param0, TextColor *param1);
static void ov65_02234900(UnkStruct_ov65_0222EBE0 *param0, Window *param1, u32 param2, u32 param3, u32 param4);
static void ov65_0223498C(UnkStruct_ov65_0222EBE0 *param0, Window *param1, u32 param2, u32 param3, u32 param4);
static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 param2);
static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID);
static void ov65_02234CFC(UnkStruct_ov65_0222EBE0 *param0);
static void ov65_02234D6C(UnkStruct_ov65_0222EBE0 *param0);
static void ov65_02234DA0(UnkStruct_ov65_0222EBE0 *param0);
@ -1503,7 +1503,7 @@ static void ov65_0222EE18(UnkStruct_ov65_0222EBE0 *param0, NARC *param1)
param0->unk_31C[v0] = SpriteResourceCollection_New(1, v0, 54);
}
param0->unk_32C = sub_02012744(1, 54);
param0->unk_32C = sub_02012744(1, HEAP_ID_54);
}
static void ov65_0222EE8C(UnkStruct_ov65_0222EBE0 *param0)
@ -2428,7 +2428,7 @@ static int ov65_0222FFAC(UnkStruct_ov65_0222EBE0 *param0, int param1)
}
if (ov65_02232FCC(param0) == 0) {
ov65_02232FE0(param0, v3, 54);
ov65_02232FE0(param0, v3, HEAP_ID_54);
}
ov65_022336A4(param0, 54);
@ -4925,7 +4925,7 @@ static BOOL ov65_02232FCC(const UnkStruct_ov65_0222EBE0 *param0)
return 1;
}
static void ov65_02232FE0(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 param2)
static void ov65_02232FE0(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID)
{
static const TouchScreenHitTable v0[8] = {
{ 0, 47, 0, 119 },
@ -4945,10 +4945,10 @@ static void ov65_02232FE0(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 par
GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 1);
GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0);
param0->unk_BE0.unk_4C = sub_02023FCC(v0, 8, ov65_022332C4, param0, param2);
param0->unk_BE0.unk_00 = StringTemplate_Default(param2);
param0->unk_BE0.unk_4C = sub_02023FCC(v0, 8, ov65_022332C4, param0, heapID);
param0->unk_BE0.unk_00 = StringTemplate_Default(heapID);
ov65_022332FC(param0, param1, param2);
ov65_022332FC(param0, param1, heapID);
param0->unk_BE0.unk_78 = 1;
@ -5133,31 +5133,31 @@ static void ov65_022332C4(u32 param0, u32 param1, void *param2)
}
}
static void ov65_022332FC(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 param2)
static void ov65_022332FC(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID)
{
int v0, v1;
int v2, v3;
Bg_ClearTilemap(param0->unk_15C, 4);
Graphics_LoadPaletteFromOpenNARC(param1, 16, 4, 0 * 32, 4 * 32, param2);
Graphics_LoadPaletteFromOpenNARC(param1, 19, 4, 4 * 32, 5 * 32, param2);
Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 15, param0->unk_15C, 4, 0, 0, 0, param2);
Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 18, param0->unk_15C, 6, (0 + 48), 0, 0, param2);
Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 17, param0->unk_15C, 4, 0, 0, 0, param2);
Graphics_LoadPaletteFromOpenNARC(param1, 16, 4, 0 * 32, 4 * 32, heapID);
Graphics_LoadPaletteFromOpenNARC(param1, 19, 4, 4 * 32, 5 * 32, heapID);
Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 15, param0->unk_15C, 4, 0, 0, 0, heapID);
Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 18, param0->unk_15C, 6, (0 + 48), 0, 0, heapID);
Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 17, param0->unk_15C, 4, 0, 0, 0, heapID);
param0->unk_BE0.unk_04 = Graphics_GetScrnDataFromOpenNARC(param1, 20, 0, &param0->unk_BE0.unk_08, param2);
param0->unk_BE0.unk_04 = Graphics_GetScrnDataFromOpenNARC(param1, 20, 0, &param0->unk_BE0.unk_08, heapID);
ov65_022335F8(param0->unk_BE0.unk_08, (0 + 48));
for (v0 = 0; v0 < 7; v0++) {
param0->unk_BE0.unk_0C[v0] = Graphics_GetScrnDataFromOpenNARC(param1, 21 + v0, 0, &param0->unk_BE0.unk_28[v0], param2);
param0->unk_BE0.unk_0C[v0] = Graphics_GetScrnDataFromOpenNARC(param1, 21 + v0, 0, &param0->unk_BE0.unk_28[v0], heapID);
ov65_022335F8(param0->unk_BE0.unk_28[v0], (0 + 48));
}
param0->unk_BE0.unk_44 = Graphics_GetScrnDataFromOpenNARC(param1, 28, 0, &param0->unk_BE0.unk_48, param2);
param0->unk_BE0.unk_44 = Graphics_GetScrnDataFromOpenNARC(param1, 28, 0, &param0->unk_BE0.unk_48, heapID);
ov65_022335F8(param0->unk_BE0.unk_48, (0 + 48));
Font_LoadScreenIndicatorsPalette(4, 15 * 32, param2);
Font_LoadScreenIndicatorsPalette(4, 15 * 32, heapID);
for (v0 = 0; v0 < 8; v0++) {
v2 = v0 / 4;
@ -5180,7 +5180,7 @@ static void ov65_022332FC(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 par
Window_FillTilemap(&param0->unk_BE0.unk_1FC, 0);
Window_ScheduleCopyToVRAM(&param0->unk_BE0.unk_1FC);
ov65_02234A68(param0, param1, param2);
ov65_02234A68(param0, param1, heapID);
}
static void ov65_02233570(UnkStruct_ov65_0222EBE0 *param0)
@ -6636,7 +6636,7 @@ static void ov65_02234A10(UnkStruct_ov65_0222EBE0 *param0)
}
}
static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 param2)
static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID)
{
BOOL v0;
int v1;
@ -6676,10 +6676,10 @@ static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 par
GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 0);
param0->unk_BE0.unk_20C[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_31C[0], param1, 42, 0, 30, NNS_G2D_VRAM_TYPE_2DSUB, param2);
param0->unk_BE0.unk_20C[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_31C[1], param1, 43, 0, 30, NNS_G2D_VRAM_TYPE_2DSUB, 8, param2);
param0->unk_BE0.unk_20C[2] = SpriteResourceCollection_AddFrom(param0->unk_31C[2], param1, 40, 0, 30, 2, param2);
param0->unk_BE0.unk_20C[3] = SpriteResourceCollection_AddFrom(param0->unk_31C[3], param1, 41, 0, 30, 3, param2);
param0->unk_BE0.unk_20C[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_31C[0], param1, 42, 0, 30, NNS_G2D_VRAM_TYPE_2DSUB, heapID);
param0->unk_BE0.unk_20C[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_31C[1], param1, 43, 0, 30, NNS_G2D_VRAM_TYPE_2DSUB, 8, heapID);
param0->unk_BE0.unk_20C[2] = SpriteResourceCollection_AddFrom(param0->unk_31C[2], param1, 40, 0, 30, 2, heapID);
param0->unk_BE0.unk_20C[3] = SpriteResourceCollection_AddFrom(param0->unk_31C[3], param1, 41, 0, 30, 3, heapID);
v0 = SpriteTransfer_RequestCharAtEndWithHardwareMappingType(param0->unk_BE0.unk_20C[0]);
GF_ASSERT(v0);
@ -6694,18 +6694,18 @@ static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 par
for (v1 = 0; v1 < 3; v1++) {
v9[v1].list = param0->unk_18C;
v9[v1].resourceData = &v2;
v9[v1].heapID = param2;
v9[v1].heapID = heapID;
param0->unk_BE0.unk_21C[v1] = SpriteList_AddAffine(&v9[v1]);
Sprite_SetAnim(param0->unk_BE0.unk_21C[v1], Unk_ov65_02238930[v1]);
}
Font_InitManager(FONT_SUBSCREEN, param2);
Font_InitManager(FONT_SUBSCREEN, heapID);
Window_Init(&v3);
Window_AddToTopLeftCorner(param0->unk_15C, &v3, 8, 2, 0, 0);
v4 = Strbuf_Init(64, param2);
v4 = Strbuf_Init(64, heapID);
MessageLoader_GetStrbuf(param0->unk_168, 73, v4);
{
@ -6715,7 +6715,7 @@ static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 par
Strbuf_Free(v4);
v5 = sub_02012B20(&v3, param2);
v5 = sub_02012B20(&v3, heapID);
v6 = sub_02012B58(v5, NNS_G2D_VRAM_TYPE_2DSUB);
v0 = CharTransfer_AllocRange(v6, 1, NNS_G2D_VRAM_TYPE_2DSUB, &param0->unk_BE0.unk_228);
@ -6732,7 +6732,7 @@ static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 par
v7.unk_20 = 0;
v7.unk_24 = 0;
v7.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
v7.unk_2C = param2;
v7.unk_2C = heapID;
param0->unk_BE0.unk_234 = sub_02012B60(&v7, v5);
@ -6740,7 +6740,7 @@ static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 par
Window_Remove(&v3);
Font_Free(FONT_SUBSCREEN);
param0->unk_BE0.unk_244 = sub_02023FCC(Unk_ov65_0223895C, 3, ov65_02234E40, param0, param2);
param0->unk_BE0.unk_244 = sub_02023FCC(Unk_ov65_0223895C, 3, ov65_02234E40, param0, heapID);
}
static void ov65_02234CFC(UnkStruct_ov65_0222EBE0 *param0)

36
src/overlay069/ov69_0225C700.c
View File

@ -281,7 +281,7 @@ static u32 ov69_0225D194(const VecFx32 *param0, const VecFx32 *param1);
static u32 ov69_0225D1E0(const UnkStruct_ov69_0225CE64 *param0, u32 param1, UnkStruct_ov66_02231428 param2);
static BOOL ov69_0225D268(UnkStruct_ov69_0225CE64 *param0, u8 param1, u8 param2);
static void ov69_0225D2A8(UnkStruct_ov69_0225CE64 *param0, const UnkStruct_ov66_02230F50 *param1);
static void ov69_0225D318(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 param2);
static void ov69_0225D318(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 heapID);
static void ov69_0225D35C(UnkStruct_ov69_0225D35C *param0);
static void ov69_0225D384(UnkStruct_ov69_0225D35C *param0);
static void ov69_0225D390(UnkStruct_ov69_0225D35C *param0);
@ -289,7 +289,7 @@ static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *param1, u32
static void ov69_0225D504(UnkStruct_ov69_0225D35C *param0);
static void ov69_0225D53C(UnkStruct_ov69_0225D35C *param0, u32 param1);
static void ov69_0225D5D8(UnkStruct_ov69_0225D35C *param0);
static void ov69_0225D604(UnkStruct_ov69_0225D35C *param0, u32 param1);
static void ov69_0225D604(UnkStruct_ov69_0225D35C *param0, u32 heapID);
static void ov69_0225D63C(UnkStruct_ov69_0225D35C *param0);
static void ov69_0225D64C(void);
static void ov69_0225D6D8(UnkStruct_ov69_0225D71C *param0, UnkStruct_ov69_0225D35C *param1, u32 param2);
@ -322,7 +322,7 @@ static void ov69_0225DC54(UnkStruct_ov69_0225DC48 *param0);
static int ov69_0225DD10(const UnkStruct_ov69_0225DC48 *param0, u32 param1);
static void ov69_0225DD2C(UnkStruct_ov69_0225DC48 *param0);
static void ov69_0225DD44(UnkStruct_ov69_0225DC48 *param0);
static void ov69_0225DD60(UnkStruct_ov69_0225DDC8 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, SaveData *param3, u32 param4);
static void ov69_0225DD60(UnkStruct_ov69_0225DDC8 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, SaveData *param3, u32 heapID);
static void ov69_0225DDC8(UnkStruct_ov69_0225DDC8 *param0);
static void ov69_0225DDFC(UnkStruct_ov69_0225DDC8 *param0);
static u32 ov69_0225DE40(UnkStruct_ov69_0225DDC8 *param0);
@ -682,9 +682,9 @@ int ov69_0225C700(OverlayManager *param0, int *param1)
UnkStruct_ov66_02230F50 *v1;
v1 = OverlayManager_Args(param0);
Heap_Create(3, 105, 0x50000);
Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_105, 0x50000);
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov69_0225CE64), 105);
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov69_0225CE64), HEAP_ID_105);
memset(v0, 0, sizeof(UnkStruct_ov69_0225CE64));
v0->unk_0C = sub_0202C878(v1->unk_04);
@ -694,13 +694,13 @@ int ov69_0225C700(OverlayManager *param0, int *param1)
v0->unk_1C = v1->unk_08;
ov69_0225D2A8(v0, v1);
ov69_0225D318(&v0->unk_20, v0->unk_10, 105);
ov69_0225D318(&v0->unk_20, v0->unk_10, HEAP_ID_105);
ov69_0225D6D8(&v0->unk_1DC, &v0->unk_20, 105);
ov69_0225EF1C(&v0->unk_1CC, 105);
ov69_0225D7A0(&v0->unk_288, v1->unk_00, &v0->unk_20, v0->unk_04, 105);
ov69_0225DA74(&v0->unk_BC30, v0->unk_04, 105);
ov69_0225DBB4(&v0->unk_BC44, &v0->unk_20, &v0->unk_1CC, 105);
ov69_0225DD60(&v0->unk_BF64, &v0->unk_20, &v0->unk_1CC, v1->unk_04, 105);
ov69_0225DD60(&v0->unk_BF64, &v0->unk_20, &v0->unk_1CC, v1->unk_04, HEAP_ID_105);
ov69_0225DEC0(&v0->unk_BC70, &v0->unk_20, &v0->unk_1CC, 105);
ov69_0225D030(v0, v1);
@ -1369,16 +1369,16 @@ static void ov69_0225D2A8(UnkStruct_ov69_0225CE64 *param0, const UnkStruct_ov66_
}
}
static void ov69_0225D318(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 param2)
static void ov69_0225D318(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 heapID)
{
param0->unk_1A8 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTIMER, param2);
param0->unk_1A8 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTIMER, heapID);
VramTransfer_New(64, param2);
VramTransfer_New(64, heapID);
GXLayers_SetBanks(&Unk_ov69_0225F0C0);
ov69_0225D3A4(param0, param1, param2);
ov69_0225D53C(param0, param2);
ov69_0225D604(param0, param2);
ov69_0225D3A4(param0, param1, heapID);
ov69_0225D53C(param0, heapID);
ov69_0225D604(param0, heapID);
}
static void ov69_0225D35C(UnkStruct_ov69_0225D35C *param0)
@ -1506,9 +1506,9 @@ static void ov69_0225D5D8(UnkStruct_ov69_0225D35C *param0)
RenderOam_Free();
}
static void ov69_0225D604(UnkStruct_ov69_0225D35C *param0, u32 param1)
static void ov69_0225D604(UnkStruct_ov69_0225D35C *param0, u32 heapID)
{
param0->unk_1A4 = sub_02024220(param1, 0, 2, 0, 4, ov69_0225D64C);
param0->unk_1A4 = sub_02024220(heapID, 0, 2, 0, 4, ov69_0225D64C);
NNS_G3dGlbLightVector(0, 0, 0, (-(FX32_ONE - 1)));
}
@ -1935,7 +1935,7 @@ static void ov69_0225DD44(UnkStruct_ov69_0225DC48 *param0)
Window_DrawStandardFrame(&param0->unk_1C, 0, (1 + (18 + 12)), 0);
}
static void ov69_0225DD60(UnkStruct_ov69_0225DDC8 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, SaveData *param3, u32 param4)
static void ov69_0225DD60(UnkStruct_ov69_0225DDC8 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, SaveData *param3, u32 heapID)
{
memset(param0, 0, sizeof(UnkStruct_ov69_0225DC48));
@ -1946,14 +1946,14 @@ static void ov69_0225DD60(UnkStruct_ov69_0225DDC8 *param0, UnkStruct_ov69_0225D3
param0->unk_08 = Options_TextFrameDelay(v0);
}
param0->unk_0C = Strbuf_Init(128, param4);
param0->unk_0C = Strbuf_Init(128, heapID);
Window_Add(param1->unk_00, &param0->unk_10, 1, 2, 1, 27, 4, 1, (((1 + (18 + 12)) + 9) + (6 * 2)));
Window_FillTilemap(&param0->unk_10, 15);
ov69_0225EF84(param2, 5, param0->unk_0C);
param0->unk_20 = sub_02015920(param4);
param0->unk_20 = sub_02015920(heapID);
}
static void ov69_0225DDC8(UnkStruct_ov69_0225DDC8 *param0)

42
src/overlay070/ov70_0225D9A4.c
View File

@ -229,7 +229,7 @@ typedef struct UnkStruct_ov70_0225DEE8_t {
} UnkStruct_ov70_0225DEE8;
static void ov70_0225E4C8(void *param0);
static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 param2);
static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 heapID);
static void ov70_0225E6C0(UnkStruct_ov70_0225E4EC *param0);
static void ov70_0225E6D0(UnkStruct_ov70_0225E4EC *param0);
static void ov70_0225E740(UnkStruct_ov70_0225E4EC *param0);
@ -591,10 +591,10 @@ int ov70_0225D9A4(OverlayManager *param0, int *param1)
v1 = OverlayManager_Args(param0);
Heap_Create(3, 112, 0x3a000);
Heap_Create(3, 113, 0x3d000);
Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_112, 0x3a000);
Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_113, 0x3d000);
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov70_0225DEE8), 112);
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov70_0225DEE8), HEAP_ID_112);
memset(v0, 0, sizeof(UnkStruct_ov70_0225DEE8));
v0->unk_38 = &v1->unk_0C;
@ -608,7 +608,7 @@ int ov70_0225D9A4(OverlayManager *param0, int *param1)
RenderControlFlags_SetSpeedUpOnTouch(0);
v0->unk_458 = SaveData_GetTrainerInfo(v1->unk_00);
ov70_0225E4EC(&v0->unk_3C, v1->unk_00, 112);
ov70_0225E4EC(&v0->unk_3C, v1->unk_00, HEAP_ID_112);
v0->unk_44C = ov70_0225C858(112);
{
@ -1257,12 +1257,12 @@ static void ov70_0225E4C8(void *param0)
ov70_0225E740(&v0->unk_3C);
}
static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 param2)
static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 heapID)
{
G2_BlendNone();
G2S_BlendNone();
VramTransfer_New(32, param2);
VramTransfer_New(32, heapID);
GXLayers_SetBanks(&Unk_ov70_0226D664);
gSystem.whichScreenIs3D = DS_SCREEN_MAIN;
GXLayers_SwapDisplay();
@ -1275,11 +1275,11 @@ static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32
int v0;
SetAllGraphicsModes(&Unk_ov70_0226D5BC);
param0->unk_00 = BgConfig_New(param2);
param0->unk_00 = BgConfig_New(heapID);
for (v0 = 0; v0 < 4; v0++) {
Bg_InitFromTemplate(param0->unk_00, Unk_ov70_0226D5CC[v0], &Unk_ov70_0226D6B4[v0], 0);
Bg_ClearTilesRange(Unk_ov70_0226D5CC[v0], 32, 0, param2);
Bg_ClearTilesRange(Unk_ov70_0226D5CC[v0], 32, 0, heapID);
Bg_ClearTilemap(param0->unk_00, Unk_ov70_0226D5CC[v0]);
}
}
@ -1291,14 +1291,14 @@ static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32
v1 = SaveData_Options(param1);
v2 = Options_Frame(v1);
Font_LoadTextPalette(0, 5 * 32, param2);
Font_LoadScreenIndicatorsPalette(0, 4 * 32, param2);
Font_LoadTextPalette(0, 5 * 32, heapID);
Font_LoadScreenIndicatorsPalette(0, 4 * 32, heapID);
LoadStandardWindowGraphics(param0->unk_00, Unk_ov70_0226D5CC[0], ((1 + (18 + 12)) + ((18 + 12) + 24)), 3, 0, param2);
LoadMessageBoxGraphics(param0->unk_00, Unk_ov70_0226D5CC[0], 1, 1, v2, param2);
LoadSignpostContentGraphics(param0->unk_00, Unk_ov70_0226D5CC[0], (1 + (18 + 12)), 2, 3, 0, param2);
LoadStandardWindowGraphics(param0->unk_00, Unk_ov70_0226D5CC[0], ((1 + (18 + 12)) + ((18 + 12) + 24)), 3, 0, heapID);
LoadMessageBoxGraphics(param0->unk_00, Unk_ov70_0226D5CC[0], 1, 1, v2, heapID);
LoadSignpostContentGraphics(param0->unk_00, Unk_ov70_0226D5CC[0], (1 + (18 + 12)), 2, 3, 0, heapID);
Graphics_LoadPalette(186, 90, 0, 2 * 32, 32, param2);
Graphics_LoadPalette(186, 90, 0, 2 * 32, 32, heapID);
}
{
@ -1306,9 +1306,9 @@ static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32
NNS_G2dInitOamManagerModule();
RenderOam_Init(0, 126, 0, 31, 0, 126, 0, 31, param2);
RenderOam_Init(0, 126, 0, 31, 0, 126, 0, 31, heapID);
CharTransfer_InitWithVramModes(&Unk_ov70_0226D5DC, GX_OBJVRAMMODE_CHAR_1D_32K, GX_OBJVRAMMODE_CHAR_1D_64K);
PlttTransfer_Init(24, param2);
PlttTransfer_Init(24, heapID);
CharTransfer_ClearBuffers();
PlttTransfer_Clear();
@ -1317,21 +1317,21 @@ static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32
ReserveSlotsForWirelessIconPalette(NNS_G2D_VRAM_TYPE_2DMAIN);
sub_02039734();
param0->unk_04 = SpriteList_InitRendering(24, &param0->unk_08, param2);
param0->unk_04 = SpriteList_InitRendering(24, &param0->unk_08, heapID);
SetSubScreenViewRect(&param0->unk_08, 0, (256 * FX32_ONE));
for (v3 = 0; v3 < 4; v3++) {
param0->unk_194[v3] = SpriteResourceCollection_New(24, v3, param2);
param0->unk_194[v3] = SpriteResourceCollection_New(24, v3, heapID);
}
param0->unk_1A4 = CellTransfer_New(24, param2);
param0->unk_1A4 = CellTransfer_New(24, heapID);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1);
}
{
param0->unk_1A8 = sub_02024220(param2, 0, 2, 0, 4, ov70_0225E754);
param0->unk_1A8 = sub_02024220(heapID, 0, 2, 0, 4, ov70_0225E754);
}
}

2
src/overlay072/ov72_0223D7A0.c
View File

@ -406,7 +406,7 @@ static void ov72_0223DB98(UnkStruct_ov72_0223DB98 *param0)
MessageLoader_GetStrbuf(param0->unk_14, 12, param0->unk_2C);
MessageLoader_GetStrbuf(param0->unk_14, 9, param0->unk_30);
param0->unk_5D00 = sub_02015920(39);
param0->unk_5D00 = sub_02015920(HEAP_ID_39);
MI_CpuClearFast(&param0->unk_5D04, sizeof(UnkStruct_ov72_0223EAD8));
}

9
src/overlay076/ov76_0223B870.c
View File

@ -102,8 +102,8 @@ static void ov76_0223B870(TouchScreenRect *rect, ManagedSprite *param1, int para
void ov76_0223B8A8(UnkStruct_ov76_0223DE00 *param0)
{
param0->unk_D4.unk_160 = sub_02012744(2, 53);
Font_InitManager(FONT_SUBSCREEN, 53);
param0->unk_D4.unk_160 = sub_02012744(2, HEAP_ID_53);
Font_InitManager(FONT_SUBSCREEN, HEAP_ID_53);
}
void ov76_0223B8C4(UnkStruct_ov76_0223DE00 *param0)
@ -379,10 +379,7 @@ void ov76_0223BD30(UnkStruct_ov76_0223DE00 *param0, s8 param1, int param2)
GenericPointerData *ov76_0223BE6C(void)
{
GenericPointerData *v0;
v0 = sub_02024220(53, 0, 2, 0, 2, ov76_0223BE8C);
return v0;
return sub_02024220(HEAP_ID_53, 0, 2, 0, 2, ov76_0223BE8C);
}
void ov76_0223BE8C(void)

4
src/overlay076/ov76_0223D338.c
View File

@ -866,7 +866,7 @@ static BOOL ov76_0223DF94(UnkStruct_ov76_0223DE00 *param0)
Pokemon_SetValue(param0->unk_428, MON_DATA_MAIL_ID, (u8 *)&v1);
Pokemon_SetValue(param0->unk_428, MON_DATA_171, &v2);
param0->unk_D4.unk_154 = ov12_02236004(53, &v3);
param0->unk_D4.unk_154 = ov12_02236004(HEAP_ID_53, &v3);
ov12_02236320(param0->unk_D4.unk_154);
}
param0->unk_3DC++;
@ -1028,7 +1028,7 @@ static BOOL ov76_0223DF94(UnkStruct_ov76_0223DE00 *param0)
v9.unk_10 = 25;
v9.unk_11 = 6;
param0->unk_D4.unk_150 = sub_02015920(53);
param0->unk_D4.unk_150 = sub_02015920(HEAP_ID_53);
sub_02015958(param0->unk_D4.unk_150, &v9);
}

2
src/overlay077/ov77_021D6C70.c
View File

@ -153,7 +153,7 @@ void ov77_021D6CFC(UnkStruct_ov77_021D6CFC *param0)
sub_02014000();
param0->unk_14 = Heap_AllocFromHeap(HEAP_ID_76, 0x4800);
param0->unk_18 = sub_02014014(ov77_021D6C70, ov77_021D6C94, param0->unk_14, 0x4800, 1, 76);
param0->unk_18 = sub_02014014(ov77_021D6C70, ov77_021D6C94, param0->unk_14, 0x4800, 1, HEAP_ID_76);
camera = sub_02014784(param0->unk_18);
Camera_SetClipping((FX32_ONE), (FX32_ONE * 900), camera);

34
src/overlay083/ov83_0223B5A0.c
View File

@ -107,14 +107,14 @@ int ov83_0223B5B0(OverlayManager *param0, int *param1)
UnkStruct_ov83_0223C344 *v0 = OverlayManager_Args(param0);
UnkStruct_ov83_0223B784 *v1;
Heap_Create(3, 56, 0x20000);
Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_56, 0x20000);
v1 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov83_0223B784), 56);
memset(v1, 0, sizeof(UnkStruct_ov83_0223B784));
v0->unk_18 = v1;
v1->unk_00 = 56;
v1->heapID = HEAP_ID_56;
VramTransfer_New(16, v1->unk_00);
VramTransfer_New(16, v1->heapID);
if (v0->unk_06_0 == 1) {
v1->unk_1490 = 1;
@ -195,7 +195,7 @@ int ov83_0223B65C(OverlayManager *param0, int *param1)
}
ov83_0223CBA4(v3);
sub_02038A1C(v3->unk_00, v3->unk_20);
sub_02038A1C(v3->heapID, v3->unk_20);
if (v3->unk_04) {
return 1;
@ -210,7 +210,7 @@ int ov83_0223B710(OverlayManager *param0, int *param1)
UnkStruct_ov83_0223C344 *v1 = OverlayManager_Args(param0);
UnkStruct_ov83_0223B784 *v2 = (UnkStruct_ov83_0223B784 *)OverlayManager_Data(param0);
v0 = v2->unk_00;
v0 = v2->heapID;
if (v1->unk_26) {
if (CommSys_CurNetId() == 0) {
@ -260,9 +260,9 @@ static int ov83_0223B78C(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
ov83_0223FDB0(&param1->unk_34C);
}
ov83_0223DEA0(&param1->unk_5B0, param1->unk_1488, &param1->unk_15E0, &param1->unk_1494, param1->unk_24, param1->unk_00);
ov83_0223DEA0(&param1->unk_5B0, param1->unk_1488, &param1->unk_15E0, &param1->unk_1494, param1->unk_24, param1->heapID);
ov83_0223E340(&param1->unk_608);
ov83_0223E6D4(&param1->unk_6A0, param1->unk_1488, &param1->unk_15E0, &param1->unk_1494, param1->unk_24, param1->unk_00);
ov83_0223E6D4(&param1->unk_6A0, param1->unk_1488, &param1->unk_15E0, &param1->unk_1494, param1->unk_24, param1->heapID);
ov83_0223E244(&param1->unk_5E4);
ov83_0223E244(&param1->unk_5F0);
ov83_0223E244(&param1->unk_5FC);
@ -287,7 +287,7 @@ static int ov83_0223B78C(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
(*param2)++;
break;
case 1:
StartScreenTransition(0, 1, 1, 0xffff, 6, 1, param1->unk_00);
StartScreenTransition(0, 1, 1, 0xffff, 6, 1, param1->heapID);
(*param2)++;
break;
case 2:
@ -371,7 +371,7 @@ static int ov83_0223B9EC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
switch (*param2) {
case 0:
ov83_0223F790(&param1->unk_1480, param1->unk_00, param1->unk_20);
ov83_0223F790(&param1->unk_1480, param1->heapID, param1->unk_20);
(*param2)++;
break;
case 1:
@ -547,7 +547,7 @@ static int ov83_0223BCEC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
break;
}
StartScreenTransition(3, 0, 0, 0x0, 6, 1, param1->unk_00);
StartScreenTransition(3, 0, 0, 0x0, 6, 1, param1->heapID);
(*param2)++;
break;
case 2:
@ -597,8 +597,8 @@ static int ov83_0223BCEC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
break;
case 4:
if (ov83_0223D570(param1->unk_148C) == 0) {
v0 = Poffin_New(param1->unk_00);
ov83_0223FFD4(&param1->unk_34C, v0, &param1->unk_1494, param1->unk_1488, param1->unk_00);
v0 = Poffin_New(param1->heapID);
ov83_0223FFD4(&param1->unk_34C, v0, &param1->unk_1494, param1->unk_1488, param1->heapID);
v1 = ov83_0223D508(28, v0, Poffin_SizeOf(), param1->unk_148C);
Heap_FreeToHeap(v0);
@ -646,8 +646,8 @@ static int ov83_0223BF74(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
param1->unk_31C = 0;
ov83_0223F730(&param1->unk_1478, 128, 144, param1->unk_1494.unk_58.unk_0C, param1->unk_00);
StartScreenTransition(3, 1, 0, 0x0, 6, 1, param1->unk_00);
ov83_0223F730(&param1->unk_1478, 128, 144, param1->unk_1494.unk_58.unk_0C, param1->heapID);
StartScreenTransition(3, 1, 0, 0x0, 6, 1, param1->heapID);
(*param2)++;
break;
case 1:
@ -797,7 +797,7 @@ static int ov83_0223C258(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
void *journalEntryOnlineEvent;
if (param1->unk_1490 == 1) {
journalEntryOnlineEvent = JournalEntry_CreateEventMadePoffins(param1->unk_00);
journalEntryOnlineEvent = JournalEntry_CreateEventMadePoffins(param1->heapID);
JournalEntry_SaveData(param0->unk_10->unk_1C, journalEntryOnlineEvent, JOURNAL_ONLINE_EVENT);
}
}
@ -813,7 +813,7 @@ static int ov83_0223C258(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
}
break;
case 2:
StartScreenTransition(0, 0, 0, 0x0, 6, 1, param1->unk_00);
StartScreenTransition(0, 0, 0, 0x0, 6, 1, param1->heapID);
(*param2)++;
break;
case 3:
@ -1057,7 +1057,7 @@ static void ov83_0223C82C(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B7
{
int v0;
param1->unk_1494.unk_100 = Poffin_New(param1->unk_00);
param1->unk_1494.unk_100 = Poffin_New(param1->heapID);
param1->unk_1494.unk_144 = ov83_0223D570(param1->unk_148C);
for (v0 = 0; v0 < 4; v0++) {

53
src/overlay083/ov83_0223C958.c
View File

@ -43,28 +43,26 @@ static void ov83_0223D068(UnkStruct_ov83_0223B784 *param0);
void ov83_0223C958(UnkStruct_ov83_0223B784 *param0)
{
NARC *v0;
v0 = NARC_ctor(NARC_INDEX_GRAPHIC__NUTMIXER, param0->unk_00);
NARC *v0 = NARC_ctor(NARC_INDEX_GRAPHIC__NUTMIXER, param0->heapID);
ov83_0223CE9C(param0);
ov83_0223CC30(&(param0->unk_20), param0->unk_00);
ov83_0223CC30(&(param0->unk_20), param0->heapID);
ov83_0223CD64(param0);
ov83_0223CCF8(param0);
ov83_0223CD28(param0);
ov83_0223CDD0(param0, v0);
ov83_0223DEE0(&param0->unk_5B0, param0->unk_20, param0->unk_00, v0);
ov83_0223E720(&param0->unk_6A0, param0->unk_20, param0->unk_00, v0);
ov83_0223E368(&param0->unk_608, param0->unk_320, param0->unk_00, v0);
ov83_0223E28C(&param0->unk_5E4, &param0->unk_2C, param0->unk_1CC, param0->unk_00, 0, 0);
ov83_0223DEE0(&param0->unk_5B0, param0->unk_20, param0->heapID, v0);
ov83_0223E720(&param0->unk_6A0, param0->unk_20, param0->heapID, v0);
ov83_0223E368(&param0->unk_608, param0->unk_320, param0->heapID, v0);
ov83_0223E28C(&param0->unk_5E4, &param0->unk_2C, param0->unk_1CC, param0->heapID, 0, 0);
ov83_0223E28C(&param0->unk_5FC, &param0->unk_2C, param0->unk_1CC, param0->unk_00, 0, 2);
ov83_0223E28C(&param0->unk_5F0, &param0->unk_2C, param0->unk_1CC, param0->unk_00, 5, 0);
ov83_0223E5DC(&param0->unk_680, &param0->unk_2C, param0->unk_1CC, param0->unk_00);
ov83_0223ED6C(&param0->unk_6D8, &param0->unk_2C, param0->unk_1CC, param0->unk_00);
ov83_0223F2C4(&param0->unk_AEC, &param0->unk_2C, param0->unk_00, v0);
ov83_0223F4CC(&param0->unk_B6C, &param0->unk_2C, param0->unk_1CC, param0->unk_00);
ov83_0223E28C(&param0->unk_5FC, &param0->unk_2C, param0->unk_1CC, param0->heapID, 0, 2);
ov83_0223E28C(&param0->unk_5F0, &param0->unk_2C, param0->unk_1CC, param0->heapID, 5, 0);
ov83_0223E5DC(&param0->unk_680, &param0->unk_2C, param0->unk_1CC, param0->heapID);
ov83_0223ED6C(&param0->unk_6D8, &param0->unk_2C, param0->unk_1CC, param0->heapID);
ov83_0223F2C4(&param0->unk_AEC, &param0->unk_2C, param0->heapID, v0);
ov83_0223F4CC(&param0->unk_B6C, &param0->unk_2C, param0->unk_1CC, param0->heapID);
ov83_0223CF2C(param0);
@ -101,7 +99,7 @@ void ov83_0223CAA4(UnkStruct_ov83_0223B784 *param0)
int ov83_0223CB5C(UnkStruct_ov83_0223B784 *param0, int *param1)
{
ov83_0223DB4C(&param0->unk_3C0, &param0->unk_1494.unk_6C, &param0->unk_2C, param0->unk_1CC, param0->unk_00);
ov83_0223DB4C(&param0->unk_3C0, &param0->unk_1494.unk_6C, &param0->unk_2C, param0->unk_1CC, param0->heapID);
return param0->unk_0C + 1;
}
@ -270,7 +268,7 @@ static void ov83_0223CCCC(BgConfig **param0)
static void ov83_0223CCF8(UnkStruct_ov83_0223B784 *param0)
{
ov83_0223D754(&param0->unk_2C, 72, 16, param0->unk_00);
ov83_0223D754(&param0->unk_2C, 72, 16, param0->heapID);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1);
}
@ -283,10 +281,13 @@ static void ov83_0223CD1C(UnkStruct_ov83_0223B784 *param0)
static void ov83_0223CD28(UnkStruct_ov83_0223B784 *param0)
{
UnkStruct_ov22_022550D4 v0 = {
48, 32, 32, 0
.unk_00 = 48,
.unk_04 = 32,
.unk_08 = 32,
.heapID = HEAP_ID_SYSTEM
};
v0.unk_0C = param0->unk_00;
v0.heapID = param0->heapID;
param0->unk_320 = sub_02015064(&v0);
}
@ -298,7 +299,7 @@ static void ov83_0223CD54(UnkStruct_ov83_0223B784 *param0)
static void ov83_0223CD64(UnkStruct_ov83_0223B784 *param0)
{
NNS_G2dInitOamManagerModule();
RenderOam_Init(0, 128, 0, 32, 0, 128, 0, 32, param0->unk_00);
RenderOam_Init(0, 128, 0, 32, 0, 128, 0, 32, param0->heapID);
{
CharTransferTemplate v0 = {
@ -307,12 +308,12 @@ static void ov83_0223CD64(UnkStruct_ov83_0223B784 *param0)
0x0,
};
v0.heapID = param0->unk_00;
v0.heapID = param0->heapID;
CharTransfer_InitWithVramModes(&v0, GX_OBJVRAMMODE_CHAR_1D_128K, GX_OBJVRAMMODE_CHAR_1D_32K);
}
PlttTransfer_Init(32, param0->unk_00);
PlttTransfer_Init(32, param0->heapID);
CharTransfer_ClearBuffers();
PlttTransfer_Clear();
}
@ -338,9 +339,9 @@ static void ov83_0223CDD0(UnkStruct_ov83_0223B784 *param0, NARC *param1)
for (v0 = 0; v0 < 6; v0++) {
if ((v0 > 0) && (v1[v0] == 8)) {
ov83_0223D894(&param0->unk_2C, &param0->unk_1CC[v0], param1, param0->unk_1CC[0].unk_00[1], 14 + (3 * v0), 13 + (3 * v0), 12 + (3 * v0), 2000 + v0, param0->unk_00);
ov83_0223D894(&param0->unk_2C, &param0->unk_1CC[v0], param1, param0->unk_1CC[0].unk_00[1], 14 + (3 * v0), 13 + (3 * v0), 12 + (3 * v0), 2000 + v0, param0->heapID);
} else {
ov83_0223D7A8(&param0->unk_2C, &param0->unk_1CC[v0], param1, v1[v0], 2, 14 + (3 * v0), 13 + (3 * v0), 12 + (3 * v0), 2000 + v0, param0->unk_00);
ov83_0223D7A8(&param0->unk_2C, &param0->unk_1CC[v0], param1, v1[v0], 2, 14 + (3 * v0), 13 + (3 * v0), 12 + (3 * v0), 2000 + v0, param0->heapID);
}
}
}
@ -382,9 +383,9 @@ static void ov83_0223CF2C(UnkStruct_ov83_0223B784 *param0)
{
int v0;
param0->unk_15E0.unk_00 = MessageLoader_Init(0, 26, 464, param0->unk_00);
param0->unk_15E0.unk_04 = StringTemplate_New(4, 64, param0->unk_00);
param0->unk_15E0.unk_08 = Strbuf_Init(64, param0->unk_00);
param0->unk_15E0.unk_00 = MessageLoader_Init(0, 26, 464, param0->heapID);
param0->unk_15E0.unk_04 = StringTemplate_New(4, 64, param0->heapID);
param0->unk_15E0.unk_08 = Strbuf_Init(64, param0->heapID);
param0->unk_15E0.unk_0C = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 0);
param0->unk_15E0.unk_10 = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 1);
param0->unk_15E0.unk_14 = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 2);

2
src/overlay083/ov83_0223D150.c
View File

@ -30,7 +30,7 @@ void ov83_0223D150(UnkStruct_ov83_0223B784 *param0, TrainerInfo *param1)
param0->unk_1488 = 1;
}
param0->unk_148C = ov83_0223D4CC(ov83_0223D144(), ov83_0223D14C(), param0, param0->unk_1490, param0->unk_00);
param0->unk_148C = ov83_0223D4CC(ov83_0223D144(), ov83_0223D14C(), param0, param0->unk_1490, param0->heapID);
memset(param0->unk_1494.unk_130, 4, sizeof(u8) * 4);
if (param0->unk_1490 == 1) {

4
src/overlay083/ov83_0223D6A8.c
View File

@ -1840,9 +1840,9 @@ void ov83_0223F784(UnkStruct_ov83_0223F770 *param0)
sub_02099160(param0->unk_00);
}
void ov83_0223F790(UnkStruct_ov83_0223F7A4 *param0, int param1, BgConfig *param2)
void ov83_0223F790(UnkStruct_ov83_0223F7A4 *param0, int heapID, BgConfig *param2)
{
param0->unk_00 = sub_02015920(param1);
param0->unk_00 = sub_02015920(heapID);
param0->unk_04 = param2;
}

2
src/overlay097/ov97_02233B18.c
View File

@ -1788,7 +1788,7 @@ static int ov97_02235624(OverlayManager *param0, int *param1)
memset(v0, 0, sizeof(UnkStruct_ov97_02234A2C));
v0->unk_20 = BgConfig_New(HEAP_ID_78);
v0->unk_E8EC = sub_02015920(78);
v0->unk_E8EC = sub_02015920(HEAP_ID_78);
sub_0200F344(0, 0x0);
sub_0200F344(1, 0x0);

31
src/overlay099/ov99_021D0D80.c
View File

@ -77,7 +77,7 @@ static void ov99_021D1380(BgConfig *param0);
static void ov99_021D1720(UnkStruct_ov99_021D2CB0 *param0);
static void ov99_021D1918(UnkStruct_ov99_021D2CB0 *param0);
static void ov99_021D19A0(UnkStruct_ov99_021D2CB0 *param0);
static GenericPointerData *ov99_021D19AC(int param0);
static GenericPointerData *ov99_021D19AC(int heapID);
static void ov99_021D19C8(void);
static void ov99_021D1A4C(GenericPointerData *param0);
static void ov99_021D16E4(UnkStruct_ov99_021D2CB0 *param0);
@ -101,24 +101,24 @@ int ov99_021D0D80(OverlayManager *param0, int *param1)
G2_BlendNone();
G2S_BlendNone();
Heap_Create(3, 75, 0x80000);
Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_75, 0x80000);
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov99_021D2CB0), 75);
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov99_021D2CB0), HEAP_ID_75);
MI_CpuClear8(v0, sizeof(UnkStruct_ov99_021D2CB0));
v0->unk_00 = OverlayManager_Args(param0);
v0->unk_10 = ov99_021D19AC(75);
v0->unk_0C = PaletteData_New(75);
v0->unk_10 = ov99_021D19AC(HEAP_ID_75);
v0->unk_0C = PaletteData_New(HEAP_ID_75);
PaletteData_AllocBuffer(v0->unk_0C, 0, 0x200, 75);
PaletteData_AllocBuffer(v0->unk_0C, 1, 0x200, 75);
PaletteData_AllocBuffer(v0->unk_0C, 2, 0x200 - 0x40, 75);
PaletteData_AllocBuffer(v0->unk_0C, 3, 0x200, 75);
PaletteData_AllocBuffer(v0->unk_0C, 0, 0x200, HEAP_ID_75);
PaletteData_AllocBuffer(v0->unk_0C, 1, 0x200, HEAP_ID_75);
PaletteData_AllocBuffer(v0->unk_0C, 2, 0x200 - 0x40, HEAP_ID_75);
PaletteData_AllocBuffer(v0->unk_0C, 3, 0x200, HEAP_ID_75);
PaletteData_SetAutoTransparent(v0->unk_0C, 1);
v0->unk_08 = BgConfig_New(HEAP_ID_75);
VramTransfer_New(64, 75);
VramTransfer_New(64, HEAP_ID_75);
SetAutorepeat(4, 8);
ov99_021D1380(v0->unk_08);
@ -127,11 +127,11 @@ int ov99_021D0D80(OverlayManager *param0, int *param1)
sub_0201E450(4);
v0->unk_20 = MessageLoader_Init(0, 26, 548, HEAP_ID_75);
v0->unk_10F8 = NARC_ctor(NARC_INDEX_GRAPHIC__ENDING, 75);
v0->unk_10F8 = NARC_ctor(NARC_INDEX_GRAPHIC__ENDING, HEAP_ID_75);
ov99_021D1918(v0);
v0->unk_18 = SpriteSystem_Alloc(75);
v0->unk_18 = SpriteSystem_Alloc(HEAP_ID_75);
SpriteSystem_Init(v0->unk_18, &Unk_ov99_021D4760, &Unk_ov99_021D4718, (16 + 16));
ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_128K);
@ -768,12 +768,9 @@ static void ov99_021D19A0(UnkStruct_ov99_021D2CB0 *param0)
Camera_Delete(param0->camera);
}
static GenericPointerData *ov99_021D19AC(int param0)
static GenericPointerData *ov99_021D19AC(int heapID)
{
GenericPointerData *v0;
v0 = sub_02024220(param0, 0, 1, 0, 1, ov99_021D19C8);
return v0;
return sub_02024220(heapID, 0, 1, 0, 1, ov99_021D19C8);
}
static void ov99_021D19C8(void)

18
src/overlay100/ov100_021D0D80.c
View File

@ -214,24 +214,24 @@ static void ov100_021D1034(UnkStruct_ov100_021D46C8 *param0)
GX_SetVisiblePlane(0);
GXS_SetVisiblePlane(0);
param0->unk_00 = NARC_ctor(NARC_INDEX_ARC__DEMO_TENGAN_GRA, 111);
param0->unk_00 = NARC_ctor(NARC_INDEX_ARC__DEMO_TENGAN_GRA, HEAP_ID_111);
param0->unk_0C = BgConfig_New(HEAP_ID_111);
param0->unk_10 = PaletteData_New(111);
param0->unk_14 = sub_02024220(111, 0, 1, 0, 4, NULL);
param0->camera = Camera_Alloc(111);
param0->unk_10 = PaletteData_New(HEAP_ID_111);
param0->unk_14 = sub_02024220(HEAP_ID_111, 0, 1, 0, 4, NULL);
param0->camera = Camera_Alloc(HEAP_ID_111);
param0->unk_2C = MessageLoader_Init(0, 26, 234, HEAP_ID_111);
PaletteData_SetAutoTransparent(param0->unk_10, 1);
PaletteData_AllocBuffer(param0->unk_10, 0, 0x200, 111);
PaletteData_AllocBuffer(param0->unk_10, 1, 0x200, 111);
PaletteData_AllocBuffer(param0->unk_10, 2, 0x200, 111);
PaletteData_AllocBuffer(param0->unk_10, 3, 0x200, 111);
PaletteData_AllocBuffer(param0->unk_10, 0, 0x200, HEAP_ID_111);
PaletteData_AllocBuffer(param0->unk_10, 1, 0x200, HEAP_ID_111);
PaletteData_AllocBuffer(param0->unk_10, 2, 0x200, HEAP_ID_111);
PaletteData_AllocBuffer(param0->unk_10, 3, 0x200, HEAP_ID_111);
ov100_021D1208(param0->unk_0C);
ov100_021D0FA0(param0);
G3X_AlphaBlend(1);
Heap_FndInitAllocatorForExpHeap(&param0->unk_1C, 111, 32);
Heap_FndInitAllocatorForExpHeap(&param0->unk_1C, HEAP_ID_111, 32);
}
static void ov100_021D111C(UnkStruct_ov100_021D46C8 *param0)

25
src/overlay104/ov104_0223C2D4.c
View File

@ -72,7 +72,7 @@ UnkStruct_ov104_0223C4CC *ov104_0223C2D4(UnkStruct_0209B75C *param0);
void ov104_0223C4CC(UnkStruct_ov104_0223C4CC *param0);
static void ov104_0223C8E8(UnkStruct_ov104_0223C4CC *param0);
static void ov104_0223CC10(UnkStruct_ov104_0223C4CC *param0);
static GenericPointerData *ov104_0223CF4C(int param0);
static GenericPointerData *ov104_0223CF4C(int heapID);
static void ov104_0223CF68(void);
static void ov104_0223CFEC(GenericPointerData *param0);
static void ov104_0223D3B0(UnkStruct_ov104_0223C4CC *param0);
@ -148,18 +148,18 @@ UnkStruct_ov104_0223C4CC *ov104_0223C2D4(UnkStruct_0209B75C *param0)
v0->unk_3C.unk_34[v1] = 0xffff;
}
v0->unk_0C = ov104_0223CF4C(94);
v0->unk_04 = PaletteData_New(94);
v0->unk_0C = ov104_0223CF4C(HEAP_ID_94);
v0->unk_04 = PaletteData_New(HEAP_ID_94);
PaletteData_SetAutoTransparent(v0->unk_04, 1);
PaletteData_AllocBuffer(v0->unk_04, 0, 0x200, 94);
PaletteData_AllocBuffer(v0->unk_04, 1, 0x200, 94);
PaletteData_AllocBuffer(v0->unk_04, 2, 0x200 - 0x40, 94);
PaletteData_AllocBuffer(v0->unk_04, 3, 0x200, 94);
PaletteData_AllocBuffer(v0->unk_04, 0, 0x200, HEAP_ID_94);
PaletteData_AllocBuffer(v0->unk_04, 1, 0x200, HEAP_ID_94);
PaletteData_AllocBuffer(v0->unk_04, 2, 0x200 - 0x40, HEAP_ID_94);
PaletteData_AllocBuffer(v0->unk_04, 3, 0x200, HEAP_ID_94);
v0->unk_00 = BgConfig_New(HEAP_ID_94);
VramTransfer_New(64, 94);
VramTransfer_New(64, HEAP_ID_94);
SetAutorepeat(4, 8);
ov104_0223C948(v0->unk_00, v2);
@ -171,7 +171,7 @@ UnkStruct_ov104_0223C4CC *ov104_0223C2D4(UnkStruct_0209B75C *param0)
ov104_0223CFF4(v0);
v0->unk_10 = ov104_0223D5D0(94);
v0->unk_10 = ov104_0223D5D0(HEAP_ID_94);
ov104_0223CC74(v0, v2, v4);
@ -777,12 +777,9 @@ static void ov104_0223CEEC(UnkStruct_ov104_0223C4CC *param0)
ov63_0222D7B4(param0->unk_30);
}
static GenericPointerData *ov104_0223CF4C(int param0)
static GenericPointerData *ov104_0223CF4C(int heapID)
{
GenericPointerData *v0;
v0 = sub_02024220(param0, 0, 1, 0, 1, ov104_0223CF68);
return v0;
return sub_02024220(heapID, 0, 1, 0, 1, ov104_0223CF68);
}
static void ov104_0223CF68(void)

16
src/overlay104/ov104_0223D5D0.c
View File

@ -12,21 +12,19 @@
typedef struct UnkStruct_ov104_0223D5F0_t {
UnkStruct_02014014 *unk_00[8];
u16 unk_20;
u16 heapId;
} UnkStruct_ov104_0223D5F0;
static u32 ov104_0223D720(u32 param0, BOOL param1);
static u32 ov104_0223D744(u32 param0, BOOL param1);
static void ov104_0223D708(UnkStruct_02014014 *param0);
UnkStruct_ov104_0223D5F0 *ov104_0223D5D0(int param0)
UnkStruct_ov104_0223D5F0 *ov104_0223D5D0(int heapID)
{
UnkStruct_ov104_0223D5F0 *v0;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov104_0223D5F0));
UnkStruct_ov104_0223D5F0 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov104_0223D5F0));
MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0223D5F0));
v0->unk_20 = param0;
v0->heapId = heapID;
sub_02014000();
return v0;
@ -55,14 +53,14 @@ UnkStruct_02014014 *ov104_0223D614(UnkStruct_ov104_0223D5F0 *param0, int param1,
GF_ASSERT(param0->unk_00[param1] == NULL);
v1 = Heap_AllocFromHeap(param0->unk_20, 0x4800);
v0 = sub_02014014(ov104_0223D720, ov104_0223D744, v1, 0x4800, 1, param0->unk_20);
v1 = Heap_AllocFromHeap(param0->heapId, 0x4800);
v0 = sub_02014014(ov104_0223D720, ov104_0223D744, v1, 0x4800, 1, param0->heapId);
camera = sub_02014784(v0);
Camera_SetClipping((FX32_ONE), (FX32_ONE * 900), camera);
sub_02014788(v0, param3);
v3 = sub_020144C4(157, param2, param0->unk_20);
v3 = sub_020144C4(157, param2, param0->heapId);
sub_020144CC(v0, v3, (1 << 1) | (1 << 3), 1);
param0->unk_00[param1] = v0;

2
src/overlay104/ov104_0223DC7C.c
View File

@ -255,7 +255,7 @@ static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 param1, const U
v7 = SpriteSystem_LoadPaletteBufferFromOpenNarc(param0->unk_1C, 2, param0->unk_14, param0->unk_18, param0->unk_24, 11, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 2004);
param0->unk_164 |= 1 << v7;
param0->unk_30 = sub_02012744(4, 94);
param0->unk_30 = sub_02012744(4, HEAP_ID_94);
{
MessageLoader *v9;

4
src/overlay105/ov105_02241AE0.c
View File

@ -359,7 +359,7 @@ int ov105_02241AE0(OverlayManager *param0, int *param1)
v1 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov105_02241FF4), 93);
memset(v1, 0, sizeof(UnkStruct_ov105_02241FF4));
v1->unk_124 = sub_02024220(93, 0, 2, 0, 2, ov105_02245CD0);
v1->unk_124 = sub_02024220(HEAP_ID_93, 0, 2, 0, 2, ov105_02245CD0);
v1->unk_4C = BgConfig_New(HEAP_ID_93);
v1->unk_00 = param0;
@ -2807,7 +2807,7 @@ static void ov105_022452A0(UnkStruct_ov105_02241FF4 *param0)
ov105_022452E4();
param0->unk_124 = sub_02024220(93, 0, 2, 0, 2, ov105_02245CD0);
param0->unk_124 = sub_02024220(HEAP_ID_93, 0, 2, 0, 2, ov105_02245CD0);
param0->unk_4C = BgConfig_New(HEAP_ID_93);
ov105_0224531C(param0);

2
src/overlay111/ov111_021D0D80.c
View File

@ -1202,7 +1202,7 @@ static void ov111_021D1D68(UnkStruct_ov111_021D0F7C *param0)
static void ov111_021D1F70(UnkStruct_ov111_021D0F7C *param0)
{
param0->unk_3FC = sub_02015920(115);
param0->unk_3FC = sub_02015920(HEAP_ID_115);
return;
}

39
src/overlay113/ov113_0225C700.c
View File

@ -136,7 +136,7 @@ static void ov113_0225D12C(BgConfig *param0);
static void ov113_0225D160(UnkStruct_ov113_0225DBCC *param0, NARC *param1);
static void ov113_0225DBCC(UnkStruct_ov113_0225DBCC *param0);
static void ov113_0225DC4C(UnkStruct_ov113_0225DBCC *param0);
static GenericPointerData *ov113_0225DC6C(int param0);
static GenericPointerData *ov113_0225DC6C(int heapID);
static void ov113_0225DC88(void);
static void ov113_0225DD0C(GenericPointerData *param0);
static void ov113_0225D9FC(UnkStruct_ov113_0225DBCC *param0);
@ -345,9 +345,9 @@ int ov113_0225C700(OverlayManager *param0, int *param1)
G2_BlendNone();
G2S_BlendNone();
Heap_Create(3, 118, 0x50000);
Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_118, 0x50000);
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov113_0225DBCC), 118);
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov113_0225DBCC), HEAP_ID_118);
MI_CpuClear8(v0, sizeof(UnkStruct_ov113_0225DBCC));
v0->unk_00 = OverlayManager_Args(param0);
@ -359,32 +359,32 @@ int ov113_0225C700(OverlayManager *param0, int *param1)
v0->unk_19D4 = (32 << 8);
v0->unk_19D8 = v0->unk_19D4;
v0->unk_14 = ov113_0225DC6C(118);
v0->unk_0C = PaletteData_New(118);
v0->unk_14 = ov113_0225DC6C(HEAP_ID_118);
v0->unk_0C = PaletteData_New(HEAP_ID_118);
PaletteData_SetAutoTransparent(v0->unk_0C, 1);
PaletteData_AllocBuffer(v0->unk_0C, 0, 0x200, 118);
PaletteData_AllocBuffer(v0->unk_0C, 1, 0x200, 118);
PaletteData_AllocBuffer(v0->unk_0C, 2, 0x200 - 0x40, 118);
PaletteData_AllocBuffer(v0->unk_0C, 3, 0x200, 118);
PaletteData_AllocBuffer(v0->unk_0C, 0, 0x200, HEAP_ID_118);
PaletteData_AllocBuffer(v0->unk_0C, 1, 0x200, HEAP_ID_118);
PaletteData_AllocBuffer(v0->unk_0C, 2, 0x200 - 0x40, HEAP_ID_118);
PaletteData_AllocBuffer(v0->unk_0C, 3, 0x200, HEAP_ID_118);
PaletteData_SetAutoTransparent(v0->unk_0C, 1);
v0->unk_08 = BgConfig_New(HEAP_ID_118);
VramTransfer_New(64, 118);
VramTransfer_New(64, HEAP_ID_118);
SetAutorepeat(4, 8);
ov113_0225CF58(v0->unk_08);
sub_0201E3D8();
sub_0201E450(4);
Font_InitManager(FONT_SUBSCREEN, 118);
Font_InitManager(FONT_SUBSCREEN, HEAP_ID_118);
v0->unk_2C = StringTemplate_Default(118);
v0->unk_2C = StringTemplate_Default(HEAP_ID_118);
v0->unk_30 = MessageLoader_Init(0, 26, 650, HEAP_ID_118);
v0->unk_10 = sub_02012744(4, 118);
v0->unk_160 = NARC_ctor(NARC_INDEX_GRAPHIC__FOOTPRINT_BOARD, 118);
v0->unk_164 = NARC_ctor(NARC_INDEX_POKETOOL__POKEFOOT__POKEFOOT, 118);
v0->unk_10 = sub_02012744(4, HEAP_ID_118);
v0->unk_160 = NARC_ctor(NARC_INDEX_GRAPHIC__FOOTPRINT_BOARD, HEAP_ID_118);
v0->unk_164 = NARC_ctor(NARC_INDEX_POKETOOL__POKEFOOT__POKEFOOT, HEAP_ID_118);
ov113_0225D160(v0, v0->unk_160);
ov113_0225DAA8(v0, v0->unk_160);
@ -412,7 +412,7 @@ int ov113_0225C700(OverlayManager *param0, int *param1)
ov113_0225D6F8(v0);
ov113_0225D7CC(v0);
v0->unk_24 = sub_02015920(118);
v0->unk_24 = sub_02015920(HEAP_ID_118);
StartScreenTransition(0, 1, 1, 0x0, 6, 1, 118);
@ -1261,12 +1261,9 @@ static void ov113_0225DC4C(UnkStruct_ov113_0225DBCC *param0)
}
}
static GenericPointerData *ov113_0225DC6C(int param0)
static GenericPointerData *ov113_0225DC6C(int heapID)
{
GenericPointerData *v0;
v0 = sub_02024220(param0, 0, 2, 0, 2, ov113_0225DC88);
return v0;
return sub_02024220(heapID, 0, 2, 0, 2, ov113_0225DC88);
}
static void ov113_0225DC88(void)

44
src/overlay114/ov114_0225C700.c
View File

@ -338,7 +338,7 @@ static void ov114_0225D688(SysTask *param0, void *param1);
static void ov114_0225DA0C(SysTask *param0, void *param1);
static int ov114_0225DA2C(const u8 *param0, u32 param1);
static BOOL ov114_0225DA5C(UnkStruct_ov114_0225D678 *param0);
static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2, u32 param3);
static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2, u32 heapID);
static void ov114_0225E744(UnkStruct_ov114_0225E854 *param0, u32 param1);
static void ov114_0225E854(UnkStruct_ov114_0225E854 *param0);
static void ov114_0225E874(SysTask *param0, void *param1);
@ -348,7 +348,7 @@ static void ov114_0225F148(UnkStruct_ov114_0225E854 *param0, NARC *param1, u32 p
static void ov114_0225F168(UnkStruct_ov114_0225E854 *param0);
static void ov114_0225F19C(UnkStruct_ov114_0225E854 *param0);
static void ov114_0225F224(UnkStruct_ov114_0225E854 *param0);
static void ov114_0225F234(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_0225CEF0 *param1, u32 param2, u32 param3);
static void ov114_0225F234(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_0225CEF0 *param1, u32 param2, u32 heapID);
static void ov114_0225F270(UnkStruct_ov114_0225F270 *param0);
static BOOL ov114_0225F27C(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_0225D338 *param1, UnkStruct_ov114_0225D084 *param2, u32 param3, u32 param4);
static BOOL ov114_0225F420(const UnkStruct_ov114_0225F270 *param0);
@ -933,19 +933,19 @@ int ov114_0225C8CC(const UnkStruct_ov114_0225D678 *param0)
return param0->unk_06;
}
UnkStruct_ov114_0225E854 *ov114_0225C8E0(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2)
UnkStruct_ov114_0225E854 *ov114_0225C8E0(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 heapID)
{
return ov114_0225E5A8(param0, param1, UnkEnum_ov66_022324D0_00, param2);
return ov114_0225E5A8(param0, param1, UnkEnum_ov66_022324D0_00, heapID);
}
UnkStruct_ov114_0225E854 *ov114_0225C8EC(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2)
UnkStruct_ov114_0225E854 *ov114_0225C8EC(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 heapID)
{
return ov114_0225E5A8(param0, param1, UnkEnum_ov66_022324D0_01, param2);
return ov114_0225E5A8(param0, param1, UnkEnum_ov66_022324D0_01, heapID);
}
UnkStruct_ov114_0225E854 *ov114_0225C8F8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2)
UnkStruct_ov114_0225E854 *ov114_0225C8F8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 heapID)
{
return ov114_0225E5A8(param0, param1, UnkEnum_ov66_022324D0_02, param2);
return ov114_0225E5A8(param0, param1, UnkEnum_ov66_022324D0_02, heapID);
}
void ov114_0225C904(UnkStruct_ov114_0225E854 *param0)
@ -2468,12 +2468,12 @@ static void ov114_0225E550(NARC *param0, u32 param1, u32 param2)
Graphics_LoadPaletteWithSrcOffsetFromOpenNARC(param0, 5, 4, v0 * 32, 5 * 32, 32, param2);
}
static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2, u32 param3)
static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2, u32 heapID)
{
UnkStruct_ov114_0225E854 *v0;
int v1;
v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov114_0225E854));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov114_0225E854));
memset(v0, 0, sizeof(UnkStruct_ov114_0225E854));
memcpy(&v0->unk_1C, param1, sizeof(UnkStruct_ov114_0225C9A8));
memcpy(&v0->unk_0C, param0, sizeof(UnkStruct_ov114_0225C76C));
@ -2489,16 +2489,16 @@ static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C *
GXLayers_SetBanks(&Unk_ov114_022601DC);
v0->unk_02 = param3;
v0->unk_02 = heapID;
ov114_0225E0F8(&v0->unk_34, &v0->unk_0C);
VramTransfer_New(16, param3);
VramTransfer_New(16, heapID);
ov114_0225CEF0(&v0->unk_4C, &Unk_ov114_0226014C, Unk_ov114_02260324, 6, param3);
ov114_0225CFCC(&v0->unk_A0, 32, 2, 2, param3);
ov114_0225CCD0(&v0->unk_230, 2, param3);
ov114_0225D084(&v0->unk_58, param3);
ov114_0225E744(v0, param3);
ov114_0225CEF0(&v0->unk_4C, &Unk_ov114_0226014C, Unk_ov114_02260324, 6, heapID);
ov114_0225CFCC(&v0->unk_A0, 32, 2, 2, heapID);
ov114_0225CCD0(&v0->unk_230, 2, heapID);
ov114_0225D084(&v0->unk_58, heapID);
ov114_0225E744(v0, heapID);
{
BOOL v2;
@ -2506,10 +2506,10 @@ static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C *
v3 = ov114_0225C78C(&v0->unk_0C, v0->unk_0C.unk_09);
v2 = ov114_0225C7A4(&v0->unk_0C, v3);
ov114_0225D290(&v0->unk_68, &v0->unk_4C, v0->unk_0C.unk_00, v2, param3);
ov114_0225D290(&v0->unk_68, &v0->unk_4C, v0->unk_0C.unk_00, v2, heapID);
}
ov114_0225F234(&v0->unk_24C, &v0->unk_4C, v0->unk_0C.unk_0A, param3);
ov114_0225F234(&v0->unk_24C, &v0->unk_4C, v0->unk_0C.unk_0A, heapID);
{
int v4;
@ -2534,7 +2534,7 @@ static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C *
v0->unk_6AC = SysTask_ExecuteAfterVBlank(ov114_0225F124, v0, 0);
if (v0->unk_0C.unk_0A) {
ov4_021D1E74(param3);
ov4_021D1E74(heapID);
}
return v0;
@ -3197,7 +3197,7 @@ static void ov114_0225F224(UnkStruct_ov114_0225E854 *param0)
Heap_FreeToHeap(param0->unk_6B8);
}
static void ov114_0225F234(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_0225CEF0 *param1, u32 param2, u32 param3)
static void ov114_0225F234(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_0225CEF0 *param1, u32 param2, u32 heapID)
{
memset(param0, 0, sizeof(UnkStruct_ov114_0225F270));
@ -3207,7 +3207,7 @@ static void ov114_0225F234(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_022
param0->unk_08.unk_0C = 2;
param0->unk_08.unk_10 = 24;
param0->unk_08.unk_11 = 8;
param0->unk_04 = sub_02015920(param3);
param0->unk_04 = sub_02015920(heapID);
param0->unk_01 = param2;
param0->unk_1D = 1;
}

4
src/overlay115/ov115_02260440.c
View File

@ -158,7 +158,7 @@ int ov115_0226048C(OverlayManager *param0, int *param1)
v0->unk_7C = 1;
}
v0->unk_34 = ov115_02260CEC(99, (30 * 40), v0->unk_74, v0->unk_46, &v0->unk_48);
v0->unk_34 = ov115_02260CEC(HEAP_ID_99, (30 * 40), v0->unk_74, v0->unk_46, &v0->unk_48);
sub_02039734();
if (v1->unk_38) {
@ -341,7 +341,7 @@ int ov115_0226048C(OverlayManager *param0, int *param1)
ov114_0225C9A8(&v0->unk_18, v0->unk_08.unk_08);
v9 = v0->unk_18.unk_10[v0->unk_46];
}
v0->unk_04 = ov114_0225C8E0(&v0->unk_08, &v0->unk_18, 99);
v0->unk_04 = ov114_0225C8E0(&v0->unk_08, &v0->unk_18, HEAP_ID_99);
(*param1)++;
break;
case 15: {

96
src/overlay115/ov115_02260CEC.c
View File

@ -418,17 +418,17 @@ static void ov115_02263294(UnkStruct_ov115_022632C8 *param0, u32 param1, u32 par
static void ov115_022632C8(UnkStruct_ov115_022632C8 *param0);
static u32 ov115_022632D8(const UnkStruct_ov115_022632C8 *param0);
static BOOL ov115_022632DC(const UnkStruct_ov115_022632C8 *param0, u32 param1);
static void ov115_022633FC(UnkStruct_ov115_02260D78 *param0, u32 param1);
static void ov115_022633FC(UnkStruct_ov115_02260D78 *param0, u32 heapID);
static void ov115_02263560(UnkStruct_ov115_02260D78 *param0);
static void ov115_02263640(const UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_02261ADC *param1);
static void ov115_0226369C(const UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_02261ADC *param1);
static void ov115_02263308(void);
static void ov115_02263328(void);
static void ov115_022633B4(UnkStruct_ov115_02261ADC *param0, u32 param1, u32 param2, u32 param3);
static void ov115_022633B4(UnkStruct_ov115_02261ADC *param0, u32 param1, u32 param2, u32 heapID);
static void ov115_022633EC(UnkStruct_ov115_02261ADC *param0);
static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1);
static void ov115_02263954(UnkStruct_ov115_02261ADC *param0);
static void ov115_02263990(UnkStruct_ov115_02261ADC *param0, u32 param1);
static void ov115_02263990(UnkStruct_ov115_02261ADC *param0, u32 heapID);
static void ov115_02263A3C(UnkStruct_ov115_02261ADC *param0);
static void ov115_02263BCC(UnkStruct_ov115_02261ADC *param0, u32 param1);
static void ov115_02263C04(UnkStruct_ov115_02261ADC *param0);
@ -499,7 +499,7 @@ static void ov115_022652A4(UnkStruct_ov115_022653CC *param0, u8 param1);
static void ov115_022652C0(UnkStruct_ov115_022653CC *param0, UnkStruct_ov115_02261ADC *param1);
static void ov115_022653CC(UnkStruct_ov115_022653CC *param0);
static void ov115_022653F4(UnkStruct_ov115_02261ADC *param0, s16 param1, u16 param2);
static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1, NARC *param2, u32 param3);
static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1, NARC *param2, u32 heapID);
static void ov115_02265688(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1);
static void ov115_02265700(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1, u32 param2);
static void ov115_02265788(UnkStruct_ov115_02265788 *param0);
@ -709,12 +709,12 @@ static const s16 Unk_ov115_02265B7C[12] = {
0x4D
};
UnkStruct_ov115_02260D78 *ov115_02260CEC(u32 param0, u32 param1, u32 param2, u32 param3, UnkStruct_ov115_02262F50 *param4)
UnkStruct_ov115_02260D78 *ov115_02260CEC(u32 heapID, u32 param1, u32 param2, u32 param3, UnkStruct_ov115_02262F50 *param4)
{
UnkStruct_ov115_02260D78 *v0;
u32 v1;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov115_02260D78));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov115_02260D78));
memset(v0, 0, sizeof(UnkStruct_ov115_02260D78));
v0->unk_04 = 1;
@ -725,8 +725,8 @@ UnkStruct_ov115_02260D78 *ov115_02260CEC(u32 param0, u32 param1, u32 param2, u32
v0->unk_8720 = param4;
ov115_02261B34(v0, &v0->unk_19CC);
ov115_022633FC(v0, param0);
ov115_02262FB4(&v0->unk_8730, &v0->unk_1AB4, param0);
ov115_022633FC(v0, heapID);
ov115_02262FB4(&v0->unk_8730, &v0->unk_1AB4, heapID);
ov115_0226327C(&v0->unk_8770);
v1 = sub_0201E3F4(Unk_ov115_022666C0, 8, 4);
@ -2868,10 +2868,10 @@ static void ov115_02263328(void)
G3_ViewPort(0, 0, 255, 191);
}
static void ov115_022633B4(UnkStruct_ov115_02261ADC *param0, u32 param1, u32 param2, u32 param3)
static void ov115_022633B4(UnkStruct_ov115_02261ADC *param0, u32 param1, u32 param2, u32 heapID)
{
param0->unk_18 = sub_02024220(param3, 0, 1, 0, 4, ov115_02263328);
ov115_02263C24(param0, param1, param2, param3);
param0->unk_18 = sub_02024220(heapID, 0, 1, 0, 4, ov115_02263328);
ov115_02263C24(param0, param1, param2, heapID);
}
static void ov115_022633EC(UnkStruct_ov115_02261ADC *param0)
@ -2880,35 +2880,35 @@ static void ov115_022633EC(UnkStruct_ov115_02261ADC *param0)
sub_020242C4(param0->unk_18);
}
static void ov115_022633FC(UnkStruct_ov115_02260D78 *param0, u32 param1)
static void ov115_022633FC(UnkStruct_ov115_02260D78 *param0, u32 heapID)
{
NARC *v0;
Heap_FndInitAllocatorForExpHeap(&param0->unk_1AB4.unk_6BBC, param1, 32);
Heap_FndInitAllocatorForExpHeap(&param0->unk_1AB4.unk_6BBC, heapID, 32);
ov115_02263308();
ov115_022633B4(&param0->unk_1AB4, param0->unk_10, param0->unk_14, param1);
ov115_0226376C(&param0->unk_1AB4, param1);
ov115_02263990(&param0->unk_1AB4, param1);
ov115_02263BCC(&param0->unk_1AB4, param1);
ov115_022633B4(&param0->unk_1AB4, param0->unk_10, param0->unk_14, heapID);
ov115_0226376C(&param0->unk_1AB4, heapID);
ov115_02263990(&param0->unk_1AB4, heapID);
ov115_02263BCC(&param0->unk_1AB4, heapID);
v0 = NARC_ctor(NARC_INDEX_GRAPHIC__BUCKET, param1);
v0 = NARC_ctor(NARC_INDEX_GRAPHIC__BUCKET, heapID);
ov115_02263A74(&param0->unk_1AB4, v0, param1);
ov115_02264E48(&param0->unk_1AB4.unk_204, &param0->unk_1AB4, v0, param0->unk_10, param0->unk_14, param1, &param0->unk_1AB4.unk_6BBC);
ov115_02263DF8(&param0->unk_1AB4.unk_524, v0, param1, &param0->unk_1AB4.unk_6BBC);
ov115_022643EC(&param0->unk_1AB4, v0, param1);
ov115_02264B40(&param0->unk_1AB4, &param0->unk_1AB4.unk_6A34, param0->unk_14, param1);
ov115_02264C0C(&param0->unk_1AB4, &param0->unk_1AB4.unk_6A3C, param0->unk_14, param1);
ov115_02263CD8(&param0->unk_1AB4, v0, param0->unk_14, param1);
ov115_022617E8(&param0->unk_1AB4.unk_4E8, &param0->unk_1AB4, param0->unk_8720, param0->unk_10, param0->unk_14, v0, param1);
ov115_02261AC8(&param0->unk_1AB4, param0->unk_10, param0->unk_14, param1);
ov115_02261520(&param0->unk_1AB4.unk_3E8, &param0->unk_1AB4, param0->unk_10, param0->unk_14, param1);
ov115_02263A74(&param0->unk_1AB4, v0, heapID);
ov115_02264E48(&param0->unk_1AB4.unk_204, &param0->unk_1AB4, v0, param0->unk_10, param0->unk_14, heapID, &param0->unk_1AB4.unk_6BBC);
ov115_02263DF8(&param0->unk_1AB4.unk_524, v0, heapID, &param0->unk_1AB4.unk_6BBC);
ov115_022643EC(&param0->unk_1AB4, v0, heapID);
ov115_02264B40(&param0->unk_1AB4, &param0->unk_1AB4.unk_6A34, param0->unk_14, heapID);
ov115_02264C0C(&param0->unk_1AB4, &param0->unk_1AB4.unk_6A3C, param0->unk_14, heapID);
ov115_02263CD8(&param0->unk_1AB4, v0, param0->unk_14, heapID);
ov115_022617E8(&param0->unk_1AB4.unk_4E8, &param0->unk_1AB4, param0->unk_8720, param0->unk_10, param0->unk_14, v0, heapID);
ov115_02261AC8(&param0->unk_1AB4, param0->unk_10, param0->unk_14, heapID);
ov115_02261520(&param0->unk_1AB4.unk_3E8, &param0->unk_1AB4, param0->unk_10, param0->unk_14, heapID);
ov115_022652A4(&param0->unk_1AB4.unk_758, param0->unk_14);
ov115_02265478(&param0->unk_1AB4.unk_6B1C, &param0->unk_1AB4, v0, param1);
ov115_02265478(&param0->unk_1AB4.unk_6B1C, &param0->unk_1AB4, v0, heapID);
NARC_dtor(v0);
param0->unk_1AB4.unk_754 = ov114_0225CAD4(param0->unk_1AB4.unk_1C, param1);
param0->unk_1AB4.unk_754 = ov114_0225CAD4(param0->unk_1AB4.unk_1C, heapID);
}
static void ov115_02263560(UnkStruct_ov115_02260D78 *param0)
@ -3155,37 +3155,37 @@ static void ov115_02263954(UnkStruct_ov115_02261ADC *param0)
Heap_FreeToHeap(param0->unk_00);
}
static void ov115_02263990(UnkStruct_ov115_02261ADC *param0, u32 param1)
static void ov115_02263990(UnkStruct_ov115_02261ADC *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 = {
16, (128 * 1024), (16 * 1024), 0
};
v1.heapID = param1;
v1.heapID = heapID;
CharTransfer_InitWithVramModes(&v1, GX_OBJVRAMMODE_CHAR_1D_128K, GX_OBJVRAMMODE_CHAR_1D_128K);
}
PlttTransfer_Init(16, param1);
PlttTransfer_Init(16, heapID);
CharTransfer_ClearBuffers();
PlttTransfer_Clear();
ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_128K);
ReserveSlotsForWirelessIconPalette(NNS_G2D_VRAM_TYPE_2DMAIN);
param0->unk_1C = SpriteList_InitRendering(128, &param0->unk_20, param1);
param0->unk_1C = SpriteList_InitRendering(128, &param0->unk_20, heapID);
SetSubScreenViewRect(&param0->unk_20, 0, (512 << FX32_SHIFT));
for (v0 = 0; v0 < 4; v0++) {
param0->unk_1AC[v0] = SpriteResourceCollection_New(16, v0, param1);
param0->unk_1AC[v0] = SpriteResourceCollection_New(16, v0, heapID);
}
param0->unk_1F0 = sub_02012744(8, param1);
param0->unk_1F0 = sub_02012744(8, heapID);
}
static void ov115_02263A3C(UnkStruct_ov115_02261ADC *param0)
@ -4381,17 +4381,17 @@ static void ov115_022653F4(UnkStruct_ov115_02261ADC *param0, s16 param1, u16 par
}
}
static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1, NARC *param2, u32 param3)
static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1, NARC *param2, u32 heapID)
{
param0->unk_9C = param3;
param0->unk_9C = heapID;
{
BOOL v0;
param0->unk_00[0] = SpriteResourceCollection_AddTilesFrom(param1->unk_1AC[0], param2, 10, 0, 140, NNS_G2D_VRAM_TYPE_2DMAIN, param3);
param0->unk_00[1] = SpriteResourceCollection_AddPaletteFrom(param1->unk_1AC[1], param2, 11, 0, 140, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param3);
param0->unk_00[2] = SpriteResourceCollection_AddFrom(param1->unk_1AC[2], param2, 9, 0, 140, 2, param3);
param0->unk_00[3] = SpriteResourceCollection_AddFrom(param1->unk_1AC[3], param2, 8, 0, 140, 3, param3);
param0->unk_00[0] = SpriteResourceCollection_AddTilesFrom(param1->unk_1AC[0], param2, 10, 0, 140, NNS_G2D_VRAM_TYPE_2DMAIN, heapID);
param0->unk_00[1] = SpriteResourceCollection_AddPaletteFrom(param1->unk_1AC[1], param2, 11, 0, 140, NNS_G2D_VRAM_TYPE_2DMAIN, 1, heapID);
param0->unk_00[2] = SpriteResourceCollection_AddFrom(param1->unk_1AC[2], param2, 9, 0, 140, 2, heapID);
param0->unk_00[3] = SpriteResourceCollection_AddFrom(param1->unk_1AC[3], param2, 8, 0, 140, 3, heapID);
v0 = SpriteTransfer_RequestCharAtEndWithHardwareMappingType(param0->unk_00[0]);
GF_ASSERT(v0);
@ -4412,7 +4412,7 @@ static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022
v1.position.y = (FX32_CONST(48));
v1.priority = (0 + 1);
v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
v1.heapID = param3;
v1.heapID = heapID;
param0->unk_34 = SpriteList_Add(&v1);
Sprite_SetDrawFlag(param0->unk_34, 0);
@ -4423,15 +4423,15 @@ static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022
BOOL v3;
UnkStruct_020127E8 v4;
param0->unk_5C = Strbuf_Init(16, param3);
param0->unk_5C = Strbuf_Init(16, heapID);
Window_AddToTopLeftCorner(param1->unk_00, &param0->unk_38, 3, 2, 0, 0);
param0->unk_4C = sub_02012B20(&param0->unk_38, param3);
param0->unk_4C = sub_02012B20(&param0->unk_38, heapID);
v2 = sub_02012B58(param0->unk_4C, NNS_G2D_VRAM_TYPE_2DMAIN);
v3 = CharTransfer_AllocRange(v2, 1, NNS_G2D_VRAM_TYPE_2DMAIN, &param0->unk_50);
GF_ASSERT(v3 == 1);
param0->unk_60 = SpriteResourceCollection_AddPalette(param1->unk_1AC[1], 14, 6, 0, 150, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param3);
param0->unk_60 = SpriteResourceCollection_AddPalette(param1->unk_1AC[1], 14, 6, 0, 150, NNS_G2D_VRAM_TYPE_2DMAIN, 1, heapID);
v3 = SpriteTransfer_RequestPlttFreeSpace(param0->unk_60);
GF_ASSERT(v3);
@ -4448,7 +4448,7 @@ static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022
v4.unk_20 = 0;
v4.unk_24 = 0;
v4.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
v4.unk_2C = param3;
v4.unk_2C = heapID;
param0->unk_48 = sub_02012B60(&v4, param0->unk_4C);

22
src/overlay116/ov116_022604C4.c
View File

@ -613,7 +613,7 @@ int ov116_02260CF4(OverlayManager *param0, int *param1)
ov114_0225C9A8(&v0->unk_98, v0->unk_84.unk_08);
}
v0->unk_B0 = ov114_0225C8EC(&v0->unk_84, &v0->unk_98, 106);
v0->unk_B0 = ov114_0225C8EC(&v0->unk_84, &v0->unk_98, HEAP_ID_106);
ov116_0226178C(v0, v1, 18, param1);
break;
case 18:
@ -758,20 +758,20 @@ int ov116_0226126C(OverlayManager *param0, int *param1)
static void ov116_022612CC(UnkStruct_ov116_0226139C *param0)
{
param0->unk_48.unk_00 = NARC_ctor(NARC_INDEX_ARC__MANENE, 106);
param0->unk_48.unk_04 = NARC_ctor(NARC_INDEX_GRAPHIC__BUCKET, 106);
param0->unk_48.unk_00 = NARC_ctor(NARC_INDEX_ARC__MANENE, HEAP_ID_106);
param0->unk_48.unk_04 = NARC_ctor(NARC_INDEX_GRAPHIC__BUCKET, HEAP_ID_106);
param0->unk_48.unk_10 = BgConfig_New(HEAP_ID_106);
param0->unk_48.unk_14 = PaletteData_New(106);
param0->unk_48.unk_18 = sub_02024220(106, 0, 1, 0, 4, NULL);
param0->unk_48.camera = Camera_Alloc(106);
param0->unk_48.unk_14 = PaletteData_New(HEAP_ID_106);
param0->unk_48.unk_18 = sub_02024220(HEAP_ID_106, 0, 1, 0, 4, NULL);
param0->unk_48.camera = Camera_Alloc(HEAP_ID_106);
ov116_02261C88(param0);
PaletteData_SetAutoTransparent(param0->unk_48.unk_14, 1);
PaletteData_AllocBuffer(param0->unk_48.unk_14, 0, 0x200, 106);
PaletteData_AllocBuffer(param0->unk_48.unk_14, 1, 0x200, 106);
PaletteData_AllocBuffer(param0->unk_48.unk_14, 2, 0x200, 106);
PaletteData_AllocBuffer(param0->unk_48.unk_14, 3, 0x200, 106);
PaletteData_AllocBuffer(param0->unk_48.unk_14, 0, 0x200, HEAP_ID_106);
PaletteData_AllocBuffer(param0->unk_48.unk_14, 1, 0x200, HEAP_ID_106);
PaletteData_AllocBuffer(param0->unk_48.unk_14, 2, 0x200, HEAP_ID_106);
PaletteData_AllocBuffer(param0->unk_48.unk_14, 3, 0x200, HEAP_ID_106);
ov116_02261494(param0->unk_48.unk_10);
ov116_022616CC(param0);
@ -794,7 +794,7 @@ static void ov116_022612CC(UnkStruct_ov116_0226139C *param0)
G3X_SetEdgeColorTable(v0);
}
Heap_FndInitAllocatorForExpHeap(&param0->unk_48.unk_24, 106, 32);
Heap_FndInitAllocatorForExpHeap(&param0->unk_48.unk_24, HEAP_ID_106, 32);
}
void ov116_0226139C(UnkStruct_ov116_0226139C *param0)

35
src/overlay117/ov117_02260668.c
View File

@ -59,7 +59,7 @@
#include "vram_transfer.h"
static void ov117_02260DA0(void *param0);
static GenericPointerData *ov117_02260E14(int param0);
static GenericPointerData *ov117_02260E14(int heapID);
static void ov117_02260E34(void);
static void ov117_02260EB8(GenericPointerData *param0);
static void ov117_02260F7C(SysTask *param0, void *param1);
@ -191,31 +191,31 @@ int ov117_02260668(OverlayManager *param0, int *param1)
G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG0, GX_BLEND_ALL, 16, 16);
G2S_SetBlendAlpha((GX_BLEND_PLANEMASK_BG3), (GX_BLEND_BGALL | GX_BLEND_PLANEMASK_OBJ), 13, 3);
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov117_02261280), 110);
v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov117_02261280), HEAP_ID_110);
MI_CpuClear8(v0, sizeof(UnkStruct_ov117_02261280));
Heap_FndInitAllocatorForExpHeap(&v0->unk_A8, 110, 32);
Heap_FndInitAllocatorForExpHeap(&v0->unk_A8, HEAP_ID_110, 32);
v0->unk_98 = ov117_02260E14(110);
v0->unk_98 = ov117_02260E14(HEAP_ID_110);
v0->unk_00 = OverlayManager_Args(param0);
ov117_022665FC(v0);
v0->unk_8C = PaletteData_New(110);
v0->unk_8C = PaletteData_New(HEAP_ID_110);
PaletteData_SetAutoTransparent(v0->unk_8C, 1);
PaletteData_AllocBuffer(v0->unk_8C, 0, 0x200, 110);
PaletteData_AllocBuffer(v0->unk_8C, 1, 0x200, 110);
PaletteData_AllocBuffer(v0->unk_8C, 2, (((16 - 2) * 16) * sizeof(u16)), 110);
PaletteData_AllocBuffer(v0->unk_8C, 3, 0x200, 110);
PaletteData_AllocBuffer(v0->unk_8C, 0, 0x200, HEAP_ID_110);
PaletteData_AllocBuffer(v0->unk_8C, 1, 0x200, HEAP_ID_110);
PaletteData_AllocBuffer(v0->unk_8C, 2, (((16 - 2) * 16) * sizeof(u16)), HEAP_ID_110);
PaletteData_AllocBuffer(v0->unk_8C, 3, 0x200, HEAP_ID_110);
v0->unk_2C = BgConfig_New(HEAP_ID_110);
VramTransfer_New(64, 110);
VramTransfer_New(64, HEAP_ID_110);
SetAutorepeat(4, 8);
ov117_022610D8(v0->unk_2C);
sub_0201E3D8();
sub_0201E450(4);
ov117_02260EC0(v0);
v0->unk_24 = SpriteSystem_Alloc(110);
v0->unk_24 = SpriteSystem_Alloc(HEAP_ID_110);
SpriteSystem_Init(v0->unk_24, &Unk_ov117_022669A8, &Unk_ov117_0226697C, (16 + 16));
ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_64K);
@ -229,9 +229,9 @@ int ov117_02260668(OverlayManager *param0, int *param1)
ov117_02261574(v0);
v0->unk_80 = MessageLoader_Init(0, 26, 9, HEAP_ID_110);
v0->unk_84 = StringTemplate_Default(110);
v0->unk_84 = StringTemplate_Default(HEAP_ID_110);
v0->unk_88 = Strbuf_Init((2 * 160), HEAP_ID_110);
v0->unk_90 = sub_02012744((2 * 6 + 6 + 1), 110);
v0->unk_90 = sub_02012744((2 * 6 + 6 + 1), HEAP_ID_110);
ov117_02265210(v0, &v0->unk_1468);
@ -509,12 +509,9 @@ static void ov117_02260DA0(void *param0)
OS_SetIrqCheckFlag(OS_IE_V_BLANK);
}
static GenericPointerData *ov117_02260E14(int param0)
static GenericPointerData *ov117_02260E14(int heapID)
{
GenericPointerData *v0;
v0 = sub_02024220(param0, 0, 1, 0, 2, ov117_02260E34);
return v0;
return sub_02024220(heapID, 0, 1, 0, 2, ov117_02260E34);
}
static void ov117_02260E34(void)
@ -907,7 +904,7 @@ static void ov117_02261574(UnkStruct_ov117_02261280 *param0)
sub_02014000();
v0 = Heap_AllocFromHeap(HEAP_ID_110, 0x4800);
param0->unk_A4 = sub_02014014(ov117_02261644, ov117_02261668, v0, 0x4800, 1, 110);
param0->unk_A4 = sub_02014014(ov117_02261644, ov117_02261668, v0, 0x4800, 1, HEAP_ID_110);
camera = sub_02014784(param0->unk_A4);
Camera_SetClipping((FX32_ONE), (FX32_ONE * 900), camera);

2
src/overlay117/ov117_02266498.c
View File

@ -87,7 +87,7 @@ int ov117_022664BC(OverlayManager *param0, int *param1)
}
break;
case 3:
v0->unk_08 = ov114_0225C8F8(&v0->unk_00->unk_00, &v0->unk_00->unk_10, 110);
v0->unk_08 = ov114_0225C8F8(&v0->unk_00->unk_00, &v0->unk_00->unk_10, HEAP_ID_110);
(*param1)++;
break;
case 4:

2
src/overlay118/ov118_021D0D80.c
View File

@ -191,7 +191,7 @@ static void ov118_021D0FDC(OverlayMetadata *param0)
sub_02014000();
v0 = Heap_AllocFromHeap(HEAP_ID_12, 0x4800);
param0->unk_18 = sub_02014014(ov118_021D1128, ov118_021D114C, v0, 0x4800, 1, 12);
param0->unk_18 = sub_02014014(ov118_021D1128, ov118_021D114C, v0, 0x4800, 1, HEAP_ID_12);
camera = sub_02014784(param0->unk_18);
Camera_SetClipping((FX32_ONE), (FX32_ONE * 900), camera);

30
src/overlay119/ov119_021D0D80.c
View File

@ -47,8 +47,8 @@ void ov119_021D0DF4(void);
void ov119_021D0E78(void);
static u32 ov119_021D13B4(u32 param0, BOOL param1);
static u32 ov119_021D13D0(u32 param0, BOOL param1);
static UnkStruct_02014014 *ov119_021D13EC(int param0);
static UnkStruct_02014014 *ov119_021D1434(int param0, int param1, int param2);
static UnkStruct_02014014 *ov119_021D13EC(int heapID);
static UnkStruct_02014014 *ov119_021D1434(int heapID, int param1, int param2);
static void ov119_021D1474(SPLEmitter *param0);
void ov119_021D0D80(void)
@ -68,10 +68,7 @@ void ov119_021D0DA8(void)
GenericPointerData *ov119_021D0DD4(void)
{
GenericPointerData *v0;
v0 = sub_02024220(71, 0, 2, 0, 2, ov119_021D0DF4);
return v0;
return sub_02024220(HEAP_ID_71, 0, 2, 0, 2, ov119_021D0DF4);
}
void ov119_021D0DF4(void)
@ -425,14 +422,14 @@ static u32 ov119_021D13D0(u32 param0, BOOL param1)
return v1;
}
static UnkStruct_02014014 *ov119_021D13EC(int param0)
static UnkStruct_02014014 *ov119_021D13EC(int heapID)
{
UnkStruct_02014014 *v0;
void *v1;
Camera *camera;
v1 = Heap_AllocFromHeap(param0, 0x4800);
v0 = sub_02014014(ov119_021D13B4, ov119_021D13D0, v1, 0x4800, 1, param0);
v1 = Heap_AllocFromHeap(heapID, 0x4800);
v0 = sub_02014014(ov119_021D13B4, ov119_021D13D0, v1, 0x4800, 1, heapID);
camera = sub_02014784(v0);
if (camera != NULL) {
@ -442,13 +439,10 @@ static UnkStruct_02014014 *ov119_021D13EC(int param0)
return v0;
}
static UnkStruct_02014014 *ov119_021D1434(int param0, int param1, int param2)
static UnkStruct_02014014 *ov119_021D1434(int heapID, int param1, int param2)
{
UnkStruct_02014014 *v0;
void *v1;
v0 = ov119_021D13EC(param0);
v1 = sub_020144C4(param1, param2, param0);
UnkStruct_02014014 *v0 = ov119_021D13EC(heapID);
void *v1 = sub_020144C4(param1, param2, heapID);
sub_020144CC(v0, v1, (1 << 1) | (1 << 3), 1);
@ -477,14 +471,12 @@ UnkStruct_ov119_021D14DC *ov119_021D14AC(UnkStruct_ov119_021D1930 *param0)
int v1;
int v2;
int v3;
UnkStruct_ov119_021D14DC *v4;
v4 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_ov119_021D14DC));
UnkStruct_ov119_021D14DC *v4 = Heap_AllocFromHeap(param0->heapId, sizeof(UnkStruct_ov119_021D14DC));
GF_ASSERT(v4 != NULL);
v4->unk_00 = *param0;
v4->unk_0C = ov119_021D1434(v4->unk_00.unk_00, 119, v4->unk_00.unk_04);
v4->unk_0C = ov119_021D1434(v4->unk_00.heapId, 119, v4->unk_00.unk_04);
sub_02014788(v4->unk_0C, 1);

4
src/overlay119/ov119_021D191C.c
View File

@ -64,7 +64,7 @@ static BOOL ov119_021D1930(UnkStruct_ov119_021D0FD0 *param0)
{
UnkStruct_ov119_021D1930 v1;
v1.unk_00 = 71;
v1.heapId = HEAP_ID_71;
v1.unk_04 = 0;
param0->unk_04.unk_40 = ov119_021D14AC(&v1);
@ -248,7 +248,7 @@ static BOOL ov119_021D1BD0(UnkStruct_ov119_021D0FD0 *param0)
{
UnkStruct_ov119_021D1930 v1;
v1.unk_00 = 71;
v1.heapId = HEAP_ID_71;
v1.unk_04 = 1;
param0->unk_04.unk_40 = ov119_021D14AC(&v1);
}

2
src/scrcmd.c
View File

@ -4249,7 +4249,7 @@ static BOOL ScrCmd_1D7(ScriptContext *ctx)
void **v2 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19);
v0 = ScriptContext_ReadHalfWord(ctx);
*v2 = sub_02099674(ctx->fieldSystem, v0, 11);
*v2 = sub_02099674(ctx->fieldSystem, v0, HEAP_ID_FIELDMAP);
ScriptContext_Pause(ctx, sub_02041CC8);
return 1;

17
src/unk_02012744.c
View File

@ -91,22 +91,21 @@ static const u8 Unk_020E52E4[12][2] = {
{ 0x1, 0x1 }
};
UnkStruct_02012744 *sub_02012744(int param0, int param1)
UnkStruct_02012744 *sub_02012744(int param0, int heapID)
{
UnkStruct_02012744 *v0;
int v1;
v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02012744));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02012744));
GF_ASSERT(v0);
for (v1 = 0; v1 < 12; v1++) {
v0->unk_00[v1] = Graphics_GetCellBank(
35, v1, 0, &v0->unk_30[v1], param1);
v0->unk_00[v1] = Graphics_GetCellBank(35, v1, 0, &v0->unk_30[v1], heapID);
GF_ASSERT(v0->unk_00[v1]);
}
v0->unk_60 = Heap_AllocFromHeap(param1, sizeof(FontOAM) * param0);
v0->unk_60 = Heap_AllocFromHeap(heapID, sizeof(FontOAM) * param0);
GF_ASSERT(v0->unk_60);
v0->unk_64 = param0;
@ -333,15 +332,13 @@ void sub_02012AF0(FontOAM *param0, GXOamMode param1)
}
}
UnkStruct_02012B20 *sub_02012B20(const Window *param0, int param1)
UnkStruct_02012B20 *sub_02012B20(const Window *param0, int heapID)
{
UnkStruct_02012B20 *v0;
v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02012B20));
UnkStruct_02012B20 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02012B20));
v0->unk_00.unk_0C = &v0->unk_00;
v0->unk_00.unk_10 = &v0->unk_00;
v0->unk_14 = sub_02012DE4(param0->width, param0->height, param1, &v0->unk_00);
v0->unk_14 = sub_02012DE4(param0->width, param0->height, heapID, &v0->unk_00);
return v0;
}

6
src/unk_02014000.c
View File

@ -128,7 +128,7 @@ void sub_02014000(void)
}
}
UnkStruct_02014014 *sub_02014014(UnkFuncPtr_02014014 param0, UnkFuncPtr_02014014 param1, void *param2, int param3, int param4, int param5)
UnkStruct_02014014 *sub_02014014(UnkFuncPtr_02014014 param0, UnkFuncPtr_02014014 param1, void *param2, int param3, int param4, int heapID)
{
UnkStruct_02014014 *v0;
int v1;
@ -142,7 +142,7 @@ UnkStruct_02014014 *sub_02014014(UnkFuncPtr_02014014 param0, UnkFuncPtr_02014014
return NULL;
}
v0 = Heap_AllocFromHeap(param5, sizeof(UnkStruct_02014014));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02014014));
if (v0 == NULL) {
GF_ASSERT(FALSE);
}
@ -163,7 +163,7 @@ UnkStruct_02014014 *sub_02014014(UnkFuncPtr_02014014 param0, UnkFuncPtr_02014014
Unk_021BF618[v1] = v0;
if (param4 == 1) {
v0->camera = Camera_Alloc(param5);
v0->camera = Camera_Alloc(heapID);
{
VEC_Set(&v0->unk_24, 0, 0, 0);
v0->unk_30 = 8192;

71
src/unk_02015064.c
View File

@ -53,9 +53,9 @@ static void sub_020152C0(UnkStruct_02015214 *param0);
static void sub_020152E0(UnkStruct_02015128 *param0);
static void sub_020152EC(UnkStruct_020151A4 *param0);
static void sub_02015468(UnkStruct_02015214 *param0);
static UnkStruct_02015214 *sub_020152F8(int param0, int param1);
static UnkStruct_02015128 *sub_02015328(int param0, int param1);
static UnkStruct_020151A4 *sub_02015358(int param0, int param1);
static UnkStruct_02015214 *sub_020152F8(int param0, int heapID);
static UnkStruct_02015128 *sub_02015328(int param0, int heapID);
static UnkStruct_020151A4 *sub_02015358(int param0, int heapID);
static UnkStruct_02015214 *sub_02015388(UnkStruct_02015064 *param0);
static UnkStruct_02015128 *sub_020153B4(UnkStruct_02015064 *param0);
static UnkStruct_020151A4 *sub_020153E0(UnkStruct_02015064 *param0);
@ -70,14 +70,14 @@ UnkStruct_02015064 *sub_02015064(const UnkStruct_ov22_022550D4 *param0)
UnkStruct_02015064 *v0;
int v1;
v0 = Heap_AllocFromHeap(param0->unk_0C, sizeof(UnkStruct_02015064));
v0 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_02015064));
GF_ASSERT(v0);
v0->unk_00 = sub_020152F8(param0->unk_00, param0->unk_0C);
v0->unk_00 = sub_020152F8(param0->unk_00, param0->heapID);
v0->unk_04 = param0->unk_00;
v0->unk_08 = sub_02015328(param0->unk_04, param0->unk_0C);
v0->unk_08 = sub_02015328(param0->unk_04, param0->heapID);
v0->unk_0C = param0->unk_04;
v0->unk_10 = sub_02015358(param0->unk_08, param0->unk_0C);
v0->unk_10 = sub_02015358(param0->unk_08, param0->heapID);
v0->unk_14 = param0->unk_08;
return v0;
@ -313,46 +313,37 @@ static void sub_020152EC(UnkStruct_020151A4 *param0)
NNS_G2dInitImagePaletteProxy(&param0->unk_04);
}
static UnkStruct_02015214 *sub_020152F8(int param0, int param1)
static UnkStruct_02015214 *sub_020152F8(int param0, int heapID)
{
UnkStruct_02015214 *v0;
int v1;
v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02015214) * param0);
UnkStruct_02015214 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02015214) * param0);
GF_ASSERT(v0);
for (v1 = 0; v1 < param0; v1++) {
sub_020152C0(v0 + v1);
for (int i = 0; i < param0; i++) {
sub_020152C0(v0 + i);
}
return v0;
}
static UnkStruct_02015128 *sub_02015328(int param0, int param1)
static UnkStruct_02015128 *sub_02015328(int param0, int heapID)
{
UnkStruct_02015128 *v0;
int v1;
v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02015128) * param0);
UnkStruct_02015128 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02015128) * param0);
GF_ASSERT(v0);
for (v1 = 0; v1 < param0; v1++) {
sub_020152E0(v0 + v1);
for (int i = 0; i < param0; i++) {
sub_020152E0(v0 + i);
}
return v0;
}
static UnkStruct_020151A4 *sub_02015358(int param0, int param1)
static UnkStruct_020151A4 *sub_02015358(int param0, int heapID)
{
UnkStruct_020151A4 *v0;
int v1;
v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_020151A4) * param0);
UnkStruct_020151A4 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_020151A4) * param0);
GF_ASSERT(v0);
for (v1 = 0; v1 < param0; v1++) {
sub_020152EC(v0 + v1);
for (int i = 0; i < param0; i++) {
sub_020152EC(v0 + i);
}
return v0;
@ -360,11 +351,9 @@ static UnkStruct_020151A4 *sub_02015358(int param0, int param1)
static UnkStruct_02015214 *sub_02015388(UnkStruct_02015064 *param0)
{
int v0;
for (v0 = 0; v0 < param0->unk_04; v0++) {
if (param0->unk_00[v0].unk_1C == 0) {
return param0->unk_00 + v0;
for (int i = 0; i < param0->unk_04; i++) {
if (param0->unk_00[i].unk_1C == 0) {
return param0->unk_00 + i;
}
}
@ -373,11 +362,9 @@ static UnkStruct_02015214 *sub_02015388(UnkStruct_02015064 *param0)
static UnkStruct_02015128 *sub_020153B4(UnkStruct_02015064 *param0)
{
int v0;
for (v0 = 0; v0 < param0->unk_04; v0++) {
if (param0->unk_08[v0].unk_00 == 0) {
return param0->unk_08 + v0;
for (int i = 0; i < param0->unk_04; i++) {
if (param0->unk_08[i].unk_00 == 0) {
return param0->unk_08 + i;
}
}
@ -386,11 +373,9 @@ static UnkStruct_02015128 *sub_020153B4(UnkStruct_02015064 *param0)
static UnkStruct_020151A4 *sub_020153E0(UnkStruct_02015064 *param0)
{
int v0;
for (v0 = 0; v0 < param0->unk_04; v0++) {
if (param0->unk_10[v0].unk_00 == 0) {
return param0->unk_10 + v0;
for (int i = 0; i < param0->unk_04; i++) {
if (param0->unk_10[i].unk_00 == 0) {
return param0->unk_10 + i;
}
}

46
src/unk_02015920.c
View File

@ -68,7 +68,7 @@ typedef struct UnkStruct_02015920_t {
UnkStruct_02015C38 unk_0C[2];
BgConfig *unk_7C;
u32 unk_80;
u32 unk_84;
u32 heapID;
fx32 unk_88[4];
u8 unk_98;
u8 unk_99;
@ -77,7 +77,7 @@ typedef struct UnkStruct_02015920_t {
u8 unk_9B_4 : 4;
} UnkStruct_02015920;
static void sub_02015A80(UnkStruct_02015920 *param0, u32 param1);
static void sub_02015A80(UnkStruct_02015920 *param0, u32 heapID);
static void sub_02015AC0(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1);
static void sub_02015AE4(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1);
static void sub_02015B14(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1);
@ -90,20 +90,18 @@ static void sub_02015D60(UnkStruct_02015C38 *param0);
static void sub_02015D8C(UnkStruct_02015D8C *param0, const fx32 *param1, u32 param2);
static void sub_02015D98(UnkStruct_02015D8C *param0, fx32 param1);
static u32 sub_02015DA0(const UnkStruct_02015D8C *param0);
static void sub_02015DCC(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5);
static void sub_02015E1C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5);
static void sub_02015DCC(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 heapID);
static void sub_02015E1C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 heapID);
static void sub_02015E64(SysTask *param0, void *param1);
static void sub_02015EA0(SysTask *param0, void *param1);
static void sub_02015EE8(BgConfig *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4);
static void sub_02015F34(const NNSG2dScreenData *param0, int param1);
static void sub_02015F54(const NNSG2dScreenData *param0, int param1);
UnkStruct_02015920 *sub_02015920(u32 param0)
UnkStruct_02015920 *sub_02015920(u32 heapID)
{
UnkStruct_02015920 *v0;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02015920));
sub_02015A80(v0, param0);
UnkStruct_02015920 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02015920));
sub_02015A80(v0, heapID);
return v0;
}
@ -191,22 +189,22 @@ void sub_02015A54(UnkStruct_02015920 *param0)
sub_02015D00(&param0->unk_0C[v0]);
}
sub_02015A80(param0, param0->unk_84);
sub_02015A80(param0, param0->heapID);
}
static void sub_02015A80(UnkStruct_02015920 *param0, u32 param1)
static void sub_02015A80(UnkStruct_02015920 *param0, u32 heapID)
{
memset(param0, 0, sizeof(UnkStruct_02015920));
param0->unk_9B_0 = 0;
param0->unk_84 = param1;
param0->heapID = heapID;
param0->unk_9A = 3;
param0->unk_9B_4 = 0x8;
}
static void sub_02015AC0(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1)
{
sub_02015DCC(84, 1, param0->unk_7C, param0->unk_80, param1->unk_08, param0->unk_84);
sub_02015DCC(84, 1, param0->unk_7C, param0->unk_80, param1->unk_08, param0->heapID);
}
static void sub_02015AE4(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1)
@ -219,7 +217,7 @@ static void sub_02015AE4(UnkStruct_02015920 *param0, const UnkStruct_02015958 *p
v0 = 4;
}
sub_02015E1C(84, 0, v0, param1->unk_0C * 32, 2 * 32, param0->unk_84);
sub_02015E1C(84, 0, v0, param1->unk_0C * 32, 2 * 32, param0->heapID);
}
static void sub_02015B14(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1)
@ -248,7 +246,7 @@ static void sub_02015B14(UnkStruct_02015920 *param0, const UnkStruct_02015958 *p
v2.unk_2D = (v0 * (40 / 8)) + param0->unk_99;
v2.unk_20 += v0;
sub_02015C38(&param0->unk_0C[v0], &v2, param0->unk_84);
sub_02015C38(&param0->unk_0C[v0], &v2, param0->heapID);
}
}
@ -263,7 +261,7 @@ static void sub_02015BA4(UnkStruct_02015920 *param0, const UnkStruct_02015958 *p
param0->unk_04[v0].rect.right = (param0->unk_98 * 8) + (6 * 8);
}
param0->unk_00 = sub_02023FCC(param0->unk_04, 2, sub_02015C08, param0, param0->unk_84);
param0->unk_00 = sub_02023FCC(param0->unk_04, 2, sub_02015C08, param0, param0->heapID);
}
static void sub_02015C08(u32 param0, u32 param1, void *param2)
@ -364,14 +362,12 @@ static u32 sub_02015DA0(const UnkStruct_02015D8C *param0)
return param0->unk_04 - 1;
}
static void sub_02015DCC(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5)
static void sub_02015DCC(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 heapID)
{
UnkStruct_02015DCC *v0;
v0 = Heap_AllocFromHeap(param5, sizeof(UnkStruct_02015DCC));
UnkStruct_02015DCC *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02015DCC));
memset(v0, 0, sizeof(UnkStruct_02015DCC));
v0->unk_08 = Graphics_GetCharData(param0, param1, 1, &v0->unk_04, param5);
v0->unk_08 = Graphics_GetCharData(param0, param1, 1, &v0->unk_04, heapID);
v0->unk_00 = param2;
v0->unk_0C = param3;
v0->unk_10 = param4;
@ -379,14 +375,12 @@ static void sub_02015DCC(u32 param0, u32 param1, BgConfig *param2, u32 param3, u
SysTask_ExecuteAfterVBlank(sub_02015E64, v0, 128);
}
static void sub_02015E1C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5)
static void sub_02015E1C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 heapID)
{
UnkStruct_02015E1C *v0;
v0 = Heap_AllocFromHeap(param5, sizeof(UnkStruct_02015E1C));
UnkStruct_02015E1C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02015E1C));
memset(v0, 0, sizeof(UnkStruct_02015E1C));
v0->unk_04 = Graphics_GetPlttData(param0, param1, &v0->unk_00, param5);
v0->unk_04 = Graphics_GetPlttData(param0, param1, &v0->unk_00, heapID);
v0->unk_08 = param2;
v0->unk_0C = param3;
v0->unk_10 = param4;

6
src/unk_02024220.c
View File

@ -12,12 +12,12 @@
static void sub_020242DC(void);
GenericPointerData *sub_02024220(u32 param0, int param1, int param2, int param3, int param4, UnkFuncPtr_02024220 param5)
GenericPointerData *sub_02024220(u32 heapID, int param1, int param2, int param3, int param4, UnkFuncPtr_02024220 param5)
{
int v0, v1;
GenericPointerData *v2 = Heap_AllocFromHeap(param0, sizeof(GenericPointerData));
GenericPointerData *v2 = Heap_AllocFromHeap(heapID, sizeof(GenericPointerData));
v2->unk_00 = param0;
v2->unk_00 = heapID;
NNS_G3dInit();

8
src/unk_0207C63C.c
View File

@ -17,7 +17,6 @@
void sub_0207C63C(void);
void sub_0207C664(void);
GenericPointerData *sub_0207C690(int param0);
void sub_0207C6AC(void);
void sub_0207C730(void);
void sub_0207C770(void);
@ -46,12 +45,9 @@ void sub_0207C664(void)
G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, 7, 8);
}
GenericPointerData *sub_0207C690(int param0)
GenericPointerData *sub_0207C690(int heapID)
{
GenericPointerData *v0;
v0 = sub_02024220(param0, 0, 2, 0, 2, sub_0207C6AC);
return v0;
return sub_02024220(heapID, 0, 2, 0, 2, sub_0207C6AC);
}
void sub_0207C6AC(void)

2
src/unk_0207DA28.c
View File

@ -210,7 +210,7 @@ static BOOL sub_0207DA28(FieldTask *param0)
}
break;
case 14:
v2->unk_10 = (void *)sub_020996A0(fieldSystem, 11, v2->unk_14);
v2->unk_10 = (void *)sub_020996A0(fieldSystem, HEAP_ID_FIELDMAP, v2->unk_14);
v2->unk_04++;
break;
case 15:

11
src/unk_0207E0B8.c
View File

@ -124,7 +124,7 @@ static u8 CheckDuplicateValues(GameWindowLayout *param0);
static u8 CheckUniqueValues(GameWindowLayout *param0);
static u8 CheckEqualityInArray(GameWindowLayout *param0);
static BOOL ValidateGameWindowState(GameWindowLayout *param0);
static GenericPointerData *sub_0207EAD4(int param0);
static GenericPointerData *sub_0207EAD4(int heapID);
static void sub_0207EAF4(void);
static void sub_0207EB64(GenericPointerData *param0);
static int ProcessMessageResult(GameWindowLayout *param0);
@ -870,7 +870,7 @@ void sub_0207EA74(GameWindowLayout *param0, int param1)
Bg_FreeTilemapBuffer(param0->unk_00, 0);
GX_SetGraphicsMode(GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_3D);
param0->unk_B28 = sub_0207EAD4(12);
param0->unk_B28 = sub_0207EAD4(HEAP_ID_12);
} else {
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0);
sub_0207EB64(param0->unk_B28);
@ -882,12 +882,9 @@ void sub_0207EA74(GameWindowLayout *param0, int param1)
}
}
static GenericPointerData *sub_0207EAD4(int param0)
static GenericPointerData *sub_0207EAD4(int heapID)
{
GenericPointerData *v0;
v0 = sub_02024220(param0, 0, 1, 0, 2, sub_0207EAF4);
return v0;
return sub_02024220(heapID, 0, 1, 0, 2, sub_0207EAF4);
}
static void sub_0207EAF4(void)

4
src/unk_0208A3F4.c
View File

@ -674,8 +674,8 @@ void sub_0208AF44(UnkStruct_02089688 *param0)
void sub_0208AFCC(UnkStruct_02089688 *param0)
{
param0->unk_2C0.unk_8C = sub_02012744(2, 101);
Font_InitManager(FONT_SUBSCREEN, 101);
param0->unk_2C0.unk_8C = sub_02012744(2, HEAP_ID_101);
Font_InitManager(FONT_SUBSCREEN, HEAP_ID_101);
}
void sub_0208AFE8(UnkStruct_02089688 *param0)

6
src/unk_02092494.c
View File

@ -30,12 +30,12 @@ static void BoxPokemon_ResetMetLocationAndDate(BoxPokemon *boxMon, int isHatch);
static void BoxPokemon_SetMetLevelToCurrentLevel(BoxPokemon *boxMon);
static void BoxPokemon_SetFatefulEncounterFlag(BoxPokemon *boxMon);
PokemonInfoDisplayStruct *sub_02092494(Pokemon *param0, BOOL param1, int param2)
PokemonInfoDisplayStruct *sub_02092494(Pokemon *param0, BOOL param1, int heapID)
{
PokemonInfoDisplayStruct *v0;
v0 = Heap_AllocFromHeap(param2, sizeof(PokemonInfoDisplayStruct));
v0->unk_00 = param2;
v0 = Heap_AllocFromHeap(heapID, sizeof(PokemonInfoDisplayStruct));
v0->unk_00 = heapID;
v0->unk_04 = MessageLoader_Init(1, 26, 455, v0->unk_00);
v0->unk_08 = StringTemplate_New(9, 32, v0->unk_00);
v0->unk_0C = param0;

7
src/unk_02097624.c
View File

@ -51,7 +51,6 @@ int sub_02097750(UnkStruct_02097728 *param0, Pokemon *param1);
void sub_02097770(UnkStruct_02097728 *param0);
int sub_02097788(UnkStruct_02028430 *param0, Pokemon *param1, int param2);
int sub_020977E4(UnkStruct_02028430 *param0, u16 param1, Pokemon *param2, int param3);
UnkStruct_020978D8 *sub_02097834(const UnkStruct_0202818C *param0, int param1);
void sub_020978D8(UnkStruct_020978D8 *param0);
void sub_020978F0(UnkStruct_0202818C *param0, UnkStruct_020978D8 *param1);
@ -218,17 +217,17 @@ int sub_020977E4(UnkStruct_02028430 *param0, u16 param1, Pokemon *param2, int pa
return param1;
}
UnkStruct_020978D8 *sub_02097834(const UnkStruct_0202818C *param0, int param1)
UnkStruct_020978D8 *sub_02097834(const UnkStruct_0202818C *param0, int heapID)
{
u16 v0;
UnkStruct_020978D8 *v1;
v1 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_020978D8));
v1 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_020978D8));
MI_CpuClear8(v1, sizeof(UnkStruct_020978D8));
v1->unk_00 = 0;
v1->unk_08 = sub_02028308(param0);
v1->unk_10 = Strbuf_Init(8, param1);
v1->unk_10 = Strbuf_Init(8, heapID);
Strbuf_CopyChars(v1->unk_10, sub_0202830C((UnkStruct_0202818C *)param0));

16
src/unk_02099604.c
View File

@ -15,15 +15,11 @@
FS_EXTERN_OVERLAY(overlay82);
UnkStruct_ov82_0223B164 *sub_02099604(int param0, SaveData *param1, int param2, JournalEntry *param3);
UnkStruct_ov82_0223B164 *sub_02099674(FieldSystem *fieldSystem, int param1, int param2);
UnkStruct_ov82_0223B164 *sub_020996A0(FieldSystem *fieldSystem, int param1, BOOL param2);
UnkStruct_ov82_0223B164 *sub_02099604(int param0, SaveData *param1, int param2, JournalEntry *param3)
static UnkStruct_ov82_0223B164 *sub_02099604(int param0, SaveData *param1, int heapID, JournalEntry *param3)
{
UnkStruct_ov82_0223B164 *v0;
v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov82_0223B164));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov82_0223B164));
MI_CpuClear8(v0, sizeof(UnkStruct_ov82_0223B164));
v0->unk_0C = param1;
@ -54,21 +50,21 @@ static void sub_0209964C(FieldSystem *fieldSystem, UnkStruct_ov82_0223B164 *para
}
}
UnkStruct_ov82_0223B164 *sub_02099674(FieldSystem *fieldSystem, int param1, int param2)
UnkStruct_ov82_0223B164 *sub_02099674(FieldSystem *fieldSystem, int param1, int heapID)
{
UnkStruct_ov82_0223B164 *v0;
v0 = sub_02099604(param1, FieldSystem_GetSaveData(fieldSystem), param2, fieldSystem->journalEntry);
v0 = sub_02099604(param1, FieldSystem_GetSaveData(fieldSystem), heapID, fieldSystem->journalEntry);
sub_0209964C(fieldSystem, v0);
return v0;
}
UnkStruct_ov82_0223B164 *sub_020996A0(FieldSystem *fieldSystem, int param1, BOOL param2)
UnkStruct_ov82_0223B164 *sub_020996A0(FieldSystem *fieldSystem, int heapID, BOOL param2)
{
UnkStruct_ov82_0223B164 *v0;
v0 = sub_02099604(1, FieldSystem_GetSaveData(fieldSystem), param1, fieldSystem->journalEntry);
v0 = sub_02099604(1, FieldSystem_GetSaveData(fieldSystem), heapID, fieldSystem->journalEntry);
v0->unk_20 = 1;
v0->unk_24 = param2;