Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-10-01 14:00:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #414 from AsparagusEduardo/document7

Browse Source 
Heap ID documentation - Part 2
This commit is contained in:
Rachel
2025-03-05 11:50:31 -08:00
committed by GitHub
parent b7863ca6f5 5cdbbdbae5
commit 033a2f58e2
196 changed files with 1217 additions and 1340 deletions
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);

6
include/overlay004/ov4_021D0D80.h
View File

@@ -10,7 +10,7 @@
#include "savedata.h"
int ov4_021D0D80(SaveData *param0, int param1, int param2, int param3);
int ov4_021D0D80(SaveData *param0, int heapID, int param2, int param3);
void ov4_021D0F68();
int ov4_021D0FEC();
void ov4_021D1104(UnkFuncPtr_ov4_021D1104 param0, UnkFuncPtr_ov4_021D1104 param1);
@@ -27,7 +27,7 @@ void *ov4_021D1AA0(DWCAllocType param0, u32 param1, int param2);
void ov4_021D1B04(DWCAllocType param0, void *param1, u32 param2);
int ov4_021D1B5C(void);
int ov4_021D1E30();
void ov4_021D1E74(int param0);
void ov4_021D1E74(int heapID);
void ov4_021D1F18(void);
int ov4_021D1F3C(int param0, int param1);
int ov4_021D20B0(int param0);
@@ -48,7 +48,7 @@ void ov4_021D2598(BOOL param0);
int ov4_021D25C0(void);
void ov4_021D25FC(void);
int ov4_021D2610(void);
void ov4_021D2618(BOOL param0, int param1);
void ov4_021D2618(BOOL param0, int heapID);
void ov4_021D26EC(BOOL param0);
u8 ov4_021D27E0(void);
void ov4_021D27F4(void);

2
include/overlay004/ov4_021D2808.h
View File

@@ -3,7 +3,7 @@
void ov4_021D2B28();
BOOL ov4_021D2C70(int param0, void *param1, int param2);
void ov4_021D2CC0(int param0, int param1, int param2);
void ov4_021D2CC0(int heapID, int param1, int param2);
void ov4_021D2EA4();
void ov4_021D2EF4(void (*func)());
void ov4_021D2F08(void);

10
include/overlay005/encounter_effect.h
View File

@@ -140,26 +140,24 @@ void ov5_021DE47C(UnkStruct_ov5_021DE47C *param0, int param1, int param2);
void ov5_021DE4AC(UnkStruct_ov5_021DE47C *param0);
void ov5_021DE4CC(NARC *param0, UnkStruct_ov5_021DE47C *param1, UnkStruct_ov5_021DE5A4 *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
void ov5_021DE5A4(UnkStruct_ov5_021DE47C *param0, UnkStruct_ov5_021DE5A4 *param1);
void ov5_021DE5D0(Sprite *param0, u32 param1, u32 param2, u8 param3, u16 param4);
void ov5_021DE5D0(Sprite *param0, u32 heapID, u32 param2, u8 param3, u16 param4);
Sprite *ov5_021DE62C(UnkStruct_ov5_021DE47C *param0, UnkStruct_ov5_021DE5A4 *param1, fx32 param2, fx32 param3, fx32 param4, int param5);
VecFx32 VecFx32_FromXYZ(fx32 param0, fx32 param1, fx32 param2);
UnkStruct_ov5_021DE6BC *ov5_021DE6A4(u32 param0);
UnkStruct_ov5_021DE6BC *ov5_021DE6A4(u32 heapID);
void ov5_021DE6BC(UnkStruct_ov5_021DE6BC *param0);
void ov5_021DE6C4(UnkStruct_ov5_021DE6BC *param0, int param1, int param2, int param3, int param4, int param5, Window *param6, u32 param7, u32 param8, u8 param9);
BOOL ov5_021DE71C(UnkStruct_ov5_021DE6BC *param0);
UnkStruct_ov5_021DE79C *ov5_021DE784(u32 param0);
void ov5_021DE79C(UnkStruct_ov5_021DE79C *param0);
void ov5_021DE7A4(UnkStruct_ov5_021DE79C *param0, int param1, int param2, int param3, int param4, int param5, Window *param6, u32 param7, u32 param8, u8 param9);
BOOL ov5_021DE7FC(UnkStruct_ov5_021DE79C *param0);
UnkStruct_ov5_021DE928 *ov5_021DE8F8(u32 param0);
UnkStruct_ov5_021DE928 *ov5_021DE8F8(u32 heapID);
void ov5_021DE928(UnkStruct_ov5_021DE928 *param0);
void ov5_021DE948(UnkStruct_ov5_021DE928 *param0, u8 param1, u8 param2, Window *param3, u8 param4);
BOOL ov5_021DE988(UnkStruct_ov5_021DE928 *param0);
UnkStruct_ov5_021DEA98 *ov5_021DEA80(u32 param0);
void ov5_021DEA98(UnkStruct_ov5_021DEA98 *param0);
void ov5_021DEAA0(UnkStruct_ov5_021DEA98 *param0, u8 param1, u16 param2, u16 param3, Window *param4, u8 param5);
BOOL ov5_021DEAC8(UnkStruct_ov5_021DEA98 *param0);
UnkStruct_ov5_021DEC18 *ov5_021DEBEC(u32 param0);
UnkStruct_ov5_021DEC18 *ov5_021DEBEC(u32 heapID);
void ov5_021DEC18(UnkStruct_ov5_021DEC18 *param0);
void ov5_021DEC38(UnkStruct_ov5_021DEC18 *param0, u8 param1, Window *param2, u8 param3);
BOOL ov5_021DECB8(UnkStruct_ov5_021DEC18 *param0);

2
include/overlay005/ov5_021D1A94.h
View File

@@ -6,7 +6,7 @@
#include "overlay005/struct_ov5_021D1BEC_decl.h"
#include "overlay006/struct_ov6_0223E6EC.h"
UnkStruct_ov5_021D1A94 *ov5_021D1A94(FieldSystem *fieldSystem, int param1, int param2);
UnkStruct_ov5_021D1A94 *ov5_021D1A94(FieldSystem *fieldSystem, int heapID, int param2);
void ov5_021D1AE4(UnkStruct_ov5_021D1A94 *param0);
void ov5_021D1B18(UnkStruct_ov5_021D1A94 *param0);
UnkStruct_ov5_021D1BEC *ov5_021D1B6C(UnkStruct_ov5_021D1A94 *param0, const UnkStruct_ov6_0223E6EC *param1);

2
include/overlay005/ov5_021D2F14.h
View File

@@ -7,7 +7,7 @@
#include "sprite.h"
#include "sprite_system.h"
void ov5_021D2F14(UnkStruct_ov5_021D30A8 *param0, const SpriteResourceDataPaths *param1, u32 param2, u32 param3);
void ov5_021D2F14(UnkStruct_ov5_021D30A8 *param0, const SpriteResourceDataPaths *param1, u32 param2, u32 heapID);
void ov5_021D30A8(UnkStruct_ov5_021D30A8 *param0);
Sprite *ov5_021D3104(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplateFromResourceHeader *param1);
void ov5_021D3190(UnkStruct_ov5_021D30A8 *param0, SpriteResourceCapacities *param1, u32 param2, u32 param3);

4
include/overlay005/ov5_021DF440.h
View File

@@ -15,9 +15,9 @@
#include "overlay101/struct_ov101_021D5D90_decl.h"
#include "overlay101/struct_ov101_021D86B0.h"
UnkStruct_ov5_021DF47C *ov5_021DF440(FieldSystem *fieldSystem, u32 param1, u32 param2);
UnkStruct_ov5_021DF47C *ov5_021DF440(FieldSystem *fieldSystem, u32 param1, u32 heapID);
void ov5_021DF47C(UnkStruct_ov5_021DF47C *param0, u32 param1);
void ov5_021DF488(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
void ov5_021DF488(UnkStruct_ov5_021DF47C *param0, u32 heapID, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
void ov5_021DF4A8(UnkStruct_ov5_021DF47C *param0, u32 param1);
void ov5_021DF4C8(UnkStruct_ov5_021DF47C *param0, const u32 *param1);
int ov5_021DF4E4(UnkStruct_ov5_021DF47C *param0, u32 param1);

2
include/overlay005/ov5_021EF250.h
View File

@@ -3,7 +3,7 @@
#include "overlay005/struct_ov5_021EF300_decl.h"
UnkStruct_ov5_021EF300 *ov5_021EF28C(const u8 param0, const u8 param1);
UnkStruct_ov5_021EF300 *ov5_021EF28C(const u8 param0, const u8 heapID);
void ov5_021EF2CC(const u8 param0, const int param1, const int param2, const int param3, const int param4, const fx32 param5, UnkStruct_ov5_021EF300 *param6);
void ov5_021EF300(UnkStruct_ov5_021EF300 *param0);
BOOL ov5_021EF314(const int param0, const int param1, const UnkStruct_ov5_021EF300 *param2, u8 *param3);

2
include/overlay005/ov5_021EF4BC.h
View File

@@ -5,7 +5,7 @@
#include "hblank_system.h"
UnkStruct_ov5_021EF4F8 *ov5_021EF4BC(u32 param0, HBlankSystem *param1);
UnkStruct_ov5_021EF4F8 *ov5_021EF4BC(u32 heapID, HBlankSystem *param1);
void ov5_021EF4F8(UnkStruct_ov5_021EF4F8 *param0);
void Field_DoPoisonEffect(UnkStruct_ov5_021EF4F8 *param0);

2
include/overlay005/ov5_021F067C.h
View File

@@ -5,7 +5,7 @@
#include "narc.h"
UnkStruct_ov5_021F06D8 *ov5_021F067C(u32 param0, u32 param1, u32 param2, u32 param3);
UnkStruct_ov5_021F06D8 *ov5_021F067C(u32 parentHeapID, u32 childHeapID, u32 param2, u32 param3);
void ov5_021F06D8(UnkStruct_ov5_021F06D8 *param0);
void *ov5_021F070C(UnkStruct_ov5_021F06D8 *param0, u32 param1, u32 param2, int param3);
void ov5_021F0740(UnkStruct_ov5_021F06D8 *param0, u32 param1);

2
include/overlay005/struct_ov5_021D30A8.h
View File

@@ -12,7 +12,7 @@ typedef struct {
SpriteResourceCollection *unk_194[6];
SpriteResourceList *unk_1AC[6];
u16 unk_1C4;
u16 unk_1C6;
u16 heapId;
} UnkStruct_ov5_021D30A8;
#endif // POKEPLATINUM_STRUCT_OV5_021D30A8_H

11
include/overlay006/ov6_0223E140.h
View File

@@ -26,7 +26,6 @@ UnkStruct_ov5_021D1BEC *ov6_0223FCCC(FieldSystem *fieldSystem);
void ov6_0223FCE0(UnkStruct_ov5_021D1BEC *param0);
void ov6_0223FCE8(UnkStruct_ov5_021D1BEC *param0);
u32 ov6_0223FCF4(UnkStruct_ov5_021D1BEC *param0);
UnkStruct_ov6_0223FDE4 *ov6_0223FDE4(u32 param0);
void ov6_0223FE08(UnkStruct_ov6_0223FDE4 *param0);
void ov6_0223FE1C(UnkStruct_ov6_0223FDE4 *param0, fx32 param1, fx32 param2, u32 param3, u32 param4, Camera *camera);
void ov6_0223FE9C(UnkStruct_ov6_0223FDE4 *param0);
@@ -39,31 +38,31 @@ int ov6_02240060(const UnkStruct_ov6_02240000 *param0);
UnkStruct_ov6_022400A8 *ov6_02240074(FieldSystem *fieldSystem);
void ov6_022400A8(UnkStruct_ov6_022400A8 *param0);
void ov6_022400C4(UnkStruct_ov6_022400A8 *param0);
UnkStruct_ov6_022401B8 *ov6_02240104(u32 param0, FieldSystem *fieldSystem);
UnkStruct_ov6_022401B8 *ov6_02240104(u32 heapID, FieldSystem *fieldSystem);
void ov6_022401B8(UnkStruct_ov6_022401B8 *param0);
void ov6_022401D0(UnkStruct_ov6_022401B8 *param0, u32 param1);
BOOL ov6_02240214(UnkStruct_ov6_022401B8 *param0);
void ov6_02240228(UnkStruct_ov6_022401B8 *param0);
UnkStruct_ov6_02240774 *ov6_02240768(u32 param0);
UnkStruct_ov6_02240774 *ov6_02240768(u32 heapID);
void ov6_02240774(UnkStruct_ov6_02240774 *param0);
void ov6_0224077C(UnkStruct_ov6_02240774 *param0, u16 param1, u16 param2, u16 param3);
void ov6_022407A8(UnkStruct_ov6_02240774 *param0);
void ov6_022407B0(UnkStruct_ov6_02240774 *param0);
UnkStruct_ov6_02240A00 *ov6_022409F4(u32 param0);
UnkStruct_ov6_02240A00 *ov6_022409F4(u32 heapID);
void ov6_02240A00(UnkStruct_ov6_02240A00 *param0);
void ov6_02240A08(UnkStruct_ov6_02240A00 *param0);
void ov6_02240A10(UnkStruct_ov6_02240A00 *param0);
void ov6_02240A18(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32 param3);
void ov6_02240A50(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32 param3);
void ov6_02240A8C(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32 param3);
UnkStruct_ov6_02240774 *ov6_02240AC8(u32 param0);
UnkStruct_ov6_02240774 *ov6_02240AC8(u32 heapID);
void ov6_02240AD4(UnkStruct_ov6_02240774 *param0);
void ov6_02240ADC(UnkStruct_ov6_02240774 *param0);
void ov6_02240AE4(UnkStruct_ov6_02240774 *param0);
void ov6_02240AEC(UnkStruct_ov6_02240774 *param0, fx32 param1, fx32 param2, fx32 param3);
void ov6_02240B24(UnkStruct_ov6_02240774 *param0, fx32 param1, fx32 param2, fx32 param3);
void ov6_02240B60(UnkStruct_ov6_02240774 *param0, fx32 param1, fx32 param2, fx32 param3);
UnkStruct_ov6_02240C44 *ov6_02240B9C(u32 param0, FieldSystem *fieldSystem);
UnkStruct_ov6_02240C44 *ov6_02240B9C(u32 heapID, FieldSystem *fieldSystem);
void ov6_02240C44(UnkStruct_ov6_02240C44 *param0, u32 param1);
BOOL ov6_02240C7C(UnkStruct_ov6_02240C44 *param0);
void ov6_02240C94(UnkStruct_ov6_02240C44 *param0);

2
include/overlay006/ov6_02248948.h
View File

@@ -3,6 +3,6 @@
#include "field/field_system_decl.h"
void ov6_0224899C(FieldSystem *fieldSystem, u16 *param1, u32 param2, u32 param3);
void ov6_0224899C(FieldSystem *fieldSystem, u16 *param1, u32 param2, u32 heapID);
#endif // POKEPLATINUM_OV6_02248948_H

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);

4
include/overlay012/ov12_0221FC20.h
View File

@@ -80,8 +80,8 @@ void ov12_02223460(UnkStruct_ov12_0221FCDC *param0, int param1);
void ov12_02223488(UnkStruct_ov12_0221FCDC *param0);
BOOL ov12_022234A8(UnkStruct_ov12_0221FCDC *param0, int param1);
int ov12_022234E4(int param0, int param1);
UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *battleSys, int param1, int param2);
UnkStruct_ov12_02223764 *ov12_02223764(BattleSystem *battleSys, int param1);
UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *battleSys, int heapID, int param2);
UnkStruct_ov12_02223764 *ov12_02223764(BattleSystem *battleSys, int heapID);
void ov12_02223770(UnkStruct_ov12_02223764 *param0);
void ov12_022237A4(UnkStruct_ov12_02223764 *param0, int param1);
int ov12_022237D8(UnkStruct_ov12_02223764 *param0);

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/ov12_022380BC.h
View File

@@ -6,7 +6,7 @@
void ov12_022380BC(UnkStruct_ov12_022380DC *param0, int heapID);
void ov12_022380CC(UnkStruct_ov12_022380DC *param0, int heapID);
void ov12_022382BC(UnkStruct_ov12_022380DC *param0, int heapID);
void ov12_02238390(UnkStruct_ov12_022380DC *param0, int param1);
void ov12_02238390(UnkStruct_ov12_022380DC *param0, int heapID);
s16 ov12_022384CC(int param0, int param1);
#endif // POKEPLATINUM_OV12_022380BC_H

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/ov21_021D1FA4.h
View File

@@ -19,7 +19,7 @@
#include "sprite.h"
#include "sprite_resource.h"
void ov21_021D1FA4(PokedexGraphicData *param0, int param1);
void ov21_021D1FA4(PokedexGraphicData *param0, int heapID);
void ov21_021D2098(PokedexGraphicData *param0);
void ov21_021D2124(PokedexGraphicData *param0);
void ov21_021D214C(PokedexGraphicData *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/ov22_02255094.h
View File

@@ -36,7 +36,7 @@ void ov22_02255390(void);
void ov22_022553F8(UnkStruct_ov22_0225A0E4 *param0);
void ov22_02255410(UnkStruct_ov22_02255CB8 *param0, int param1);
int ov22_02255420(NNSG2dCharacterData *param0, int param1, int param2, int param3);
void ov22_0225547C(UnkStruct_ov22_0225A0E4 *param0, const UnkStruct_ov22_022550D4 *param1, int param2);
void ov22_0225547C(UnkStruct_ov22_0225A0E4 *param0, const UnkStruct_ov22_022550D4 *param1, int heapID);
void ov22_022554A8(UnkStruct_ov22_0225A0E4 *param0, BgConfig *param1, int param2);
void ov22_022554F8(UnkStruct_ov22_0225A0E4 *param0);
void ov22_02255524(UnkStruct_ov22_0225A0E4 *param0);

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/overlay022/struct_ov22_0225AF8C.h
View File

@@ -7,7 +7,7 @@ typedef struct {
BgConfig *unk_00;
int unk_04;
int unk_08;
int unk_0C;
int heapId;
} UnkStruct_ov22_0225AF8C;
#endif // POKEPLATINUM_STRUCT_OV22_0225AF8C_H

2
include/overlay079/ov79_021D3768.h
View File

@@ -4,7 +4,7 @@
#include "overlay079/struct_ov79_021D3820.h"
#include "overlay079/struct_ov79_021D38D0.h"
void ov79_021D3768(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *param1, int param2);
void ov79_021D3768(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *param1, int heapID);
void ov79_021D3820(UnkStruct_ov79_021D3820 *param0);
void ov79_021D385C(UnkStruct_ov79_021D3820 *param0);

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);

12
include/overlay114/ov114_0225C700.h
View File

@@ -17,15 +17,15 @@ u32 ov114_0225C76C(const UnkStruct_ov114_0225C76C *param0, u32 param1);
u32 ov114_0225C78C(const UnkStruct_ov114_0225C76C *param0, u32 param1);
BOOL ov114_0225C7A4(const UnkStruct_ov114_0225C76C *param0, u32 param1);
TrainerInfo *ov114_0225C7CC(const UnkStruct_ov114_0225C76C *param0, u32 param1);
UnkStruct_ov114_0225D678 *ov114_0225C814(const UnkStruct_ov114_0225C76C *param0, u32 param1);
UnkStruct_ov114_0225D678 *ov114_0225C820(const UnkStruct_ov114_0225C76C *param0, u32 param1);
UnkStruct_ov114_0225D678 *ov114_0225C82C(const UnkStruct_ov114_0225C76C *param0, u32 param1);
UnkStruct_ov114_0225D678 *ov114_0225C814(const UnkStruct_ov114_0225C76C *param0, u32 heapID);
UnkStruct_ov114_0225D678 *ov114_0225C820(const UnkStruct_ov114_0225C76C *param0, u32 heapID);
UnkStruct_ov114_0225D678 *ov114_0225C82C(const UnkStruct_ov114_0225C76C *param0, u32 heapID);
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;

2
include/unk_0200762C.h
View File

@@ -7,7 +7,7 @@
#include "struct_defs/sprite_animation_frame.h"
#include "struct_defs/struct_02008900.h"
void *sub_0200762C(int param0);
void *sub_0200762C(int heapID);
void sub_02007768(UnkStruct_02007768 *param0);
void sub_02007B6C(UnkStruct_02007768 *param0);
void sub_02007B98(PokemonSprite *param0, int param1);

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);

10
include/unk_020131EC.h
View File

@@ -4,14 +4,12 @@
#include "struct_defs/struct_02013610.h"
void sub_020133D4(int param0, int param1, int param2, int param3, int param4, int param5, int param6, void *param7);
void *sub_020134A8(int param0, int param1, int param2, int param3, int param4, int param5, int param6);
void sub_020134E4(int param0, int param1, int param2, int param3, int param4, int param5, int *param6, const void *param7, void *param8);
void sub_02013560(int param0, int param1, const UnkStruct_02013610 *param2, int *param3, const void *param4, void *param5);
void sub_02013584(int param0, int param1, int param2, int param3, int param4, int param5, int param6, void *param7);
void sub_020135F0(int param0, int param1, int param2, const UnkStruct_02013610 *param3, void *param4);
void sub_02013610(int param0, int param1, int param2, void *param3);
void *sub_0201363C(int param0, int param1, int param2);
void *sub_02013660(int param0, int param1, int param2);
void sub_020135F0(int param0, int param1, int heapID, const UnkStruct_02013610 *param3, void *param4);
void sub_02013610(int param0, int param1, int heapID, void *param3);
void *sub_0201363C(int param0, int param1, int heapID);
void *sub_02013660(int param0, int param1, int heapID);
void sub_020136A4(int param0, int param1, int heapID, int param3, int param4, int param5, int param6, void *param7, u32 param8, BOOL param9, int param10, int param11);
void sub_02013720(int param0, int param1, int heapID, const UnkStruct_02013610 *param3, void *param4, u32 param5, BOOL param6, int param7, int param8);
void sub_02013750(int param0, int param1, int heapID, void *param3, u32 param4, BOOL param5, int param6, int param7);

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_020158A8.h
View File

@@ -5,7 +5,7 @@
#include "strbuf.h"
UnkStruct_020158A8 *sub_020158A8(int param0);
UnkStruct_020158A8 *sub_020158A8(int heapID);
void sub_020158F4(UnkStruct_020158A8 *param0);
const Strbuf *sub_02015918(UnkStruct_020158A8 *param0, int param1);

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_0202854C.h
View File

@@ -11,7 +11,7 @@
int Underground_SaveSize(void);
int sub_02028554(void);
int sub_02028558(void);
SecretBaseRecord *sub_0202855C(u32 param0);
SecretBaseRecord *sub_0202855C(u32 heapID);
void Underground_Init(UndergroundData *param0);
void sub_02028658(SaveData *param0, int param1);
void sub_02028758(SaveData *param0, s32 param1, BOOL param2);

4
include/unk_020298BC.h
View File

@@ -20,8 +20,8 @@ void ImageClip_Init(UnkStruct_0202A750 *param0);
int ImageClip_SaveSize(void);
int sub_02029C60(void);
int sub_02029C64(void);
UnkStruct_02029C68 *sub_02029C68(u32 param0);
UnkStruct_02029C88 *sub_02029C88(u32 param0);
UnkStruct_02029C68 *sub_02029C68(u32 heapID);
UnkStruct_02029C88 *sub_02029C88(u32 heapID);
UnkStruct_02029C68 *sub_02029CA8(UnkStruct_0202A750 *param0, int param1);
UnkStruct_02029C88 *sub_02029CD0(UnkStruct_0202A750 *param0, int param1);
UnkStruct_02029D04 *sub_02029D04(UnkStruct_0202A750 *param0);

2
include/unk_0202F1D4.h
View File

@@ -34,7 +34,7 @@ UnkStruct_02030A80 *sub_0202FDE8(void);
UnkStruct_0202F41C *sub_0202FE04(void);
void sub_0202FE20(UnkStruct_02030A80 *param0, UnkStruct_0202F41C *param1, UnkStruct_0202F298 *param2, FieldBattleDTO *param3, SaveData *param4);
u64 sub_0202FE98(UnkStruct_0202F41C *param0, int param1, int param2);
UnkStruct_0202F41C *sub_0202FF2C(int param0);
UnkStruct_0202F41C *sub_0202FF2C(int heapID);
void sub_0202FF44(UnkStruct_0202F41C *param0);
#endif // POKEPLATINUM_UNK_0202F1D4_H

4
include/unk_0203D1B8.h
View File

@@ -56,7 +56,7 @@ void *FieldSystem_OpenOptionsMenu(FieldSystem *fieldSystem);
UnkStruct_02097728 *sub_0203D920(FieldSystem *fieldSystem, int param1, u8 param2, u8 param3, int param4);
UnkStruct_02097728 *sub_0203D94C(FieldSystem *fieldSystem, int param1, u8 param2, int param3);
UnkStruct_02097728 *sub_0203D984(FieldSystem *fieldSystem, Pokemon *param1, int param2);
UnkStruct_0203D9B8 *sub_0203D9B8(FieldSystem *fieldSystem, int param1);
UnkStruct_0203D9B8 *sub_0203D9B8(FieldSystem *fieldSystem, int heapID);
void sub_0203D9D8(FieldSystem *fieldSystem, UnkStruct_ov90_021D0D80 *param1);
void sub_0203DAC0(FieldTask *param0, u16 *param1, SaveData *param2, u16 param3, u16 param4);
BOOL sub_0203DB10(FieldSystem *fieldSystem, void *param1);
@@ -86,7 +86,7 @@ BOOL sub_0203E348(FieldSystem *fieldSystem, UnkStruct_0203E348 *param1);
void sub_0203E414(FieldTask *param0, int param1);
void AccessoryShop_Init(FieldTask *task);
void *sub_0203E53C(FieldSystem *fieldSystem, int heapID, int param2);
void *sub_0203E564(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 param3, int param4);
void *sub_0203E564(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 param3, int heapID);
PartyManagementData *sub_0203E598(FieldSystem *fieldSystem, int heapID, int param2);
void *sub_0203E608(FieldSystem *fieldSystem, int heapID);
void *sub_0203E63C(int param0, FieldSystem *fieldSystem, u16 param2, u16 param3);

2
include/unk_02056B30.h
View File

@@ -5,7 +5,7 @@
#include "field_task.h"
void sub_02056B30(FieldTask *param0, int param1, int param2, int param3, u16 param4, int param5, int param6, int param7);
void sub_02056B30(FieldTask *param0, int param1, int param2, int param3, u16 param4, int param5, int param6, int heapID);
void sub_02056BDC(FieldSystem *fieldSystem, const int param1, const int param2, const int param3, const int param4, const int param5, const int param6);
void sub_02056C18(FieldSystem *fieldSystem, const int param1, const int param2, const int param3, const int param4, const int param5);

2
include/unk_020711EC.h
View File

@@ -15,7 +15,7 @@
#include "overlay101/struct_ov101_021D5D90_decl.h"
#include "overlay101/struct_ov101_021D86B0.h"
UnkStruct_020711EC *sub_020711EC(int param0, int param1);
UnkStruct_020711EC *sub_020711EC(int heapID, int param1);
void sub_0207120C(UnkStruct_020711EC *param0);
void sub_0207121C(UnkStruct_020711EC *param0);
UnkStruct_ov101_021D5D90 *sub_0207122C(UnkStruct_020711EC *param0, const UnkStruct_02071330 *param1, const VecFx32 *param2, int param3, const void *param4, int param5);

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_0208694C.h
View File

@@ -5,7 +5,7 @@
#include "game_options.h"
UnkStruct_0208737C *sub_0208712C(int param0, int param1, int param2, int param3, Options *param4);
UnkStruct_0208737C *sub_0208712C(int heapID, int param1, int param2, int param3, Options *param4);
void sub_0208716C(UnkStruct_0208737C *param0);
#endif // POKEPLATINUM_UNK_0208694C_H

6
include/unk_020890F4.h
View File

@@ -5,9 +5,9 @@
#include "game_options.h"
UnkStruct_02089438 *sub_020893B4(int param0, int param1, int param2[], Options *param3, u32 param4, u32 param5);
UnkStruct_02089438 *sub_02089400(int param0, int param1, int param2[], Options *param3, u32 param4, u32 param5);
UnkStruct_02089438 *sub_0208941C(int param0, int param1, int param2[], Options *param3, u32 param4, u32 param5, u32 param6, u32 param7);
UnkStruct_02089438 *sub_020893B4(int heapID, int param1, int param2[], Options *param3, u32 param4, u32 param5);
UnkStruct_02089438 *sub_02089400(int heapID, int param1, int param2[], Options *param3, u32 param4, u32 param5);
UnkStruct_02089438 *sub_0208941C(int heapID, int param1, int param2[], Options *param3, u32 param4, u32 param5, u32 param6, u32 param7);
void sub_02089438(UnkStruct_02089438 *param0);
#endif // POKEPLATINUM_UNK_020890F4_H

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);

2
include/unk_02094EDC.h
View File

@@ -15,7 +15,7 @@ void sub_02094F04(UnkStruct_02095C48 *param0, int param1, int param2, int param3
void sub_020951B0(UnkStruct_02095C48 *param0, int param1);
void sub_02095338(UnkStruct_02095C48 *param0);
void sub_02095380(const UnkStruct_ov6_02248BE8 *param0, Pokemon *param1, int param2);
PokemonSprite *sub_02095484(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, UnkStruct_ov16_0223E0C8 *param4, int param5, int param6, int param7, int param8);
PokemonSprite *sub_02095484(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, UnkStruct_ov16_0223E0C8 *param4, int heapID, int param6, int param7, int param8);
void sub_020954F0(UnkStruct_02095C48 *param0, int param1, int param2, int param3, int param4);
s8 sub_02095734(int param0);
void sub_02095750(int param0, u32 *param1, u32 *param2);

2
include/unk_020972FC.h
View File

@@ -3,7 +3,7 @@
#include "struct_defs/struct_020972FC.h"
UnkStruct_020972FC *sub_020972FC(u8 param0);
UnkStruct_020972FC *sub_020972FC(u8 heapID);
void sub_02097320(UnkStruct_020972FC *param0, u16 param1, u16 param2);
void sub_0209733C(UnkStruct_020972FC *param0, u8 param1, u8 param2, u8 param3);
u8 sub_02097368(u32 *param0, u16 param1);

2
include/unk_0209747C.h
View File

@@ -8,7 +8,7 @@
#include "savedata.h"
UnkStruct_0209747C *sub_0209747C(u32 param0, u32 param1, SaveData *param2, u32 param3);
UnkStruct_0209747C *sub_0209747C(u32 param0, u32 param1, SaveData *param2, u32 heapID);
void sub_020974EC(UnkStruct_0209747C *param0);
void sub_020974F4(UnkStruct_0209747C *param0, u16 param1);
void sub_020974F8(UnkStruct_0209747C *param0, u16 param1, u16 param2);

2
include/unk_020989DC.h
View File

@@ -8,7 +8,7 @@
#include "pokemon.h"
#include "savedata.h"
UnkStruct_0203D9B8 *sub_020989DC(SaveData *param0, int param1);
UnkStruct_0203D9B8 *sub_020989DC(SaveData *param0, int heapID);
void sub_02098AF0(UnkStruct_0203D9B8 *param0);
UnkEnum_02098EAC sub_02098EAC(Poffin *param0, u8 param1);
void sub_02098EF8(Poffin *param0, Pokemon *param1);

2
include/unk_02098FFC.h
View File

@@ -4,7 +4,7 @@
#include "struct_defs/struct_0209903C.h"
#include "struct_defs/struct_0209916C.h"
UnkStruct_0209903C *sub_02098FFC(int param0, u16 param1, u16 param2, u16 param3, int param4);
UnkStruct_0209903C *sub_02098FFC(int heapID, u16 param1, u16 param2, u16 param3, int param4);
void sub_0209903C(UnkStruct_0209903C *param0);
void sub_02099160(UnkStruct_0209903C *param0);
UnkStruct_0209916C *sub_0209916C(UnkStruct_0209903C *param0, int param1, u16 param2, u16 param3, u16 param4, u8 param5, u8 param6, int param7);

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

4
include/unk_020997B8.h
View File

@@ -5,9 +5,9 @@
#include "pokemon.h"
UnkStruct_020997B8 *sub_020997B8(u32 param0);
UnkStruct_020997B8 *sub_020997B8(u32 heapID);
void sub_020997D0(UnkStruct_020997B8 *param0);
u16 *sub_020997D8(Pokemon *param0, u32 param1);
u16 *sub_020997D8(Pokemon *mon, u32 heapID);
BOOL sub_020998D8(u16 *param0);
#endif // POKEPLATINUM_UNK_020997B8_H

24
src/battle/battle_display.c
View File

@@ -1458,7 +1458,7 @@ void ov16_0225E434(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
UnkStruct_ov12_022380DC v0;
ov16_02264530(battleSys, param2, &v0, param1->battler);
ov12_02238390(&v0, 5);
ov12_02238390(&v0, HEAP_ID_BATTLE);
ClearCommand(battleSys, param1->battler, param2->unk_00);
}
@@ -1738,15 +1738,15 @@ static void ov16_0225EA80(SysTask *param0, void *param1)
if (BattleSystem_BattleType(v0->unk_00) & BATTLE_TYPE_2vs2) {
if ((BattleSystem_BattleStatus(v0->unk_00) & 0x20) == 0) {
if (v0->unk_82 == 2) {
v0->unk_10 = ov12_02223764(v0->unk_00, 5);
v0->unk_10 = ov12_02223764(v0->unk_00, HEAP_ID_BATTLE);
}
}
} else {
if ((BattleSystem_BattleStatus(v0->unk_00) & 0x20) == 0) {
if ((ov16_0223ED60(v0->unk_00) == 1) && (v0->unk_82 == 2)) {
v0->unk_10 = ov12_02223764(v0->unk_00, 5);
v0->unk_10 = ov12_02223764(v0->unk_00, HEAP_ID_BATTLE);
} else if (v0->unk_82 == 0) {
v0->unk_10 = ov12_02223764(v0->unk_00, 5);
v0->unk_10 = ov12_02223764(v0->unk_00, HEAP_ID_BATTLE);
} else {
(void)0;
}
@@ -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);
}
@@ -1970,7 +1970,7 @@ static void ov16_0225F0C0(SysTask *param0, void *param1)
}
{
v0->unk_10 = NULL;
v0->unk_10 = ov12_02223764(v0->unk_00, 5);
v0->unk_10 = ov12_02223764(v0->unk_00, HEAP_ID_BATTLE);
}
v0->unk_83++;
break;
@@ -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++;
@@ -2129,7 +2129,7 @@ static void ov16_0225F0C0(SysTask *param0, void *param1)
UnkStruct_ov16_02265BBC v13;
ov16_02264530(v0->unk_00, &v0->unk_28, &v12, v0->unk_81);
ov12_02238390(&v12, 5);
ov12_02238390(&v12, HEAP_ID_BATTLE);
ov16_02266B78(v0->unk_00, NULL, &v13, 1, 16, v0->unk_81, v0->unk_81, NULL);
ov16_02264408(v0->unk_00, v0->unk_04, v1, &v13);
@@ -4652,7 +4652,7 @@ static void ov16_022626C0(SysTask *param0, void *param1)
UnkStruct_ov16_02265BBC v6;
ov16_02264530(v0->unk_00, &v0->unk_10, &v5, v0->unk_69);
ov12_02238390(&v5, 5);
ov12_02238390(&v5, HEAP_ID_BATTLE);
ov16_02266B78(v0->unk_00, NULL, &v6, 1, 16, v0->unk_69, v0->unk_69, NULL);
ov16_02264408(v0->unk_00, v0->unk_04, v0->unk_0C, &v6);
@@ -4960,7 +4960,7 @@ static void ov16_02262DC4(SysTask *param0, void *param1)
UnkStruct_ov16_02265BBC v4;
ov16_02264530(v0->unk_00, &v0->unk_08, &v3, v0->unk_61);
ov12_02238390(&v3, 5);
ov12_02238390(&v3, HEAP_ID_BATTLE);
ov16_02266B78(v0->unk_00, NULL, &v4, 1, 16, v0->unk_61, v0->unk_61, NULL);
ov16_02264408(v0->unk_00, v0->unk_04, v1, &v4);
@@ -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;
@@ -5423,7 +5423,7 @@ static void ov16_02263688(SysTask *param0, void *param1)
switch (v0->unk_0E) {
case 0:
GF_ASSERT(v0->unk_04->unk_88 == NULL);
v0->unk_04->unk_88 = ov12_022234F8(v0->unk_00, 5, v0->unk_0D);
v0->unk_04->unk_88 = ov12_022234F8(v0->unk_00, HEAP_ID_BATTLE, v0->unk_0D);
v0->unk_0E++;
break;
default:

6
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();
@@ -10868,7 +10868,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1)
sub_0200F344(1, 0x0);
v3 = BattleSystem_PartyPokemon(v2->battleSys, v1, v2->battleCtx->selectedPartySlot[v1]);
v16 = sub_0208712C(5, 1, Pokemon_GetValue(v3, MON_DATA_SPECIES, NULL), 10, ov16_0223EDA4(v2->battleSys));
v16 = sub_0208712C(HEAP_ID_BATTLE, 1, Pokemon_GetValue(v3, MON_DATA_SPECIES, NULL), 10, ov16_0223EDA4(v2->battleSys));
v2->tmpPtr[1] = v16;
if (BattleSystem_PartyCount(v2->battleSys, 0) < 6) {
@@ -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;

17
src/battle/ov16_0223B140.c
View File

@@ -600,7 +600,7 @@ static void ov16_0223B790(OverlayManager *param0)
NARC_dtor(v9);
}
battleSys->unk_88 = sub_0200762C(5);
battleSys->unk_88 = sub_0200762C(HEAP_ID_BATTLE);
sub_02008A84(battleSys->unk_88, 0, (0x20 * 6));
ov16_0223F36C(battleSys);
@@ -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)

18
src/overlay004/ov4_021D0D80.c
View File

@@ -101,13 +101,13 @@ static void ov4_021D24AC(int param0, void *param1);
static UnkStruct_ov4_0221A400 *Unk_ov4_0221A400 = NULL;
int ov4_021D0D80(SaveData *param0, int param1, int param2, int param3)
int ov4_021D0D80(SaveData *param0, int heapID, int param2, int param3)
{
void *v0;
GF_ASSERT(Unk_ov4_0221A400 == NULL);
v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov4_0221A400) + 32);
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov4_0221A400) + 32);
MI_CpuClear8(v0, sizeof(UnkStruct_ov4_0221A400) + 32);
Unk_ov4_0221A400 = (UnkStruct_ov4_0221A400 *)(((u32)v0 + 31) / 32 * 32);
@@ -117,10 +117,10 @@ int ov4_021D0D80(SaveData *param0, int param1, int param2, int param3)
Unk_ov4_0221A400->unk_F9C = NULL;
Unk_ov4_0221A400->unk_FB4 = NULL;
Unk_ov4_0221A400->unk_1064 = 0;
Unk_ov4_0221A400->unk_1078 = param1;
Unk_ov4_0221A400->unk_107C = param1;
Unk_ov4_0221A400->unk_1078 = heapID;
Unk_ov4_0221A400->unk_107C = heapID;
Unk_ov4_0221A400->unk_1080 = param2;
Unk_ov4_0221A400->unk_F84 = Heap_AllocFromHeap(param1, param2 + ((4 * 1024) * 3) + 32);
Unk_ov4_0221A400->unk_F84 = Heap_AllocFromHeap(heapID, param2 + ((4 * 1024) * 3) + 32);
Unk_ov4_0221A400->unk_F8C = NULL;
Unk_ov4_0221A400->unk_F88 = NNS_FndCreateExpHeap((void *)(((u32)Unk_ov4_0221A400->unk_F84 + 31) / 32 * 32), param2);
Unk_ov4_0221A400->unk_F90 = NULL;
@@ -972,7 +972,7 @@ static void ov4_021D1E60()
Unk_ov4_0221A400->unk_1084 = 0;
}
void ov4_021D1E74(int param0)
void ov4_021D1E74(int heapID)
{
int v0;
int v1 = 1;
@@ -1013,7 +1013,7 @@ void ov4_021D1E74(int param0)
break;
}
ov4_021D2CC0(param0, v0, v1);
ov4_021D2CC0(heapID, v0, v1);
ov4_021D2EF4(ov4_021D1E60);
Unk_ov4_0221A400->unk_1084 = 1;
@@ -1529,13 +1529,13 @@ int ov4_021D2610(void)
return DWC_GetNumConnectionHost();
}
void ov4_021D2618(BOOL param0, int param1)
void ov4_021D2618(BOOL param0, int heapID)
{
if (param0) {
Unk_ov4_0221A400->unk_107C = 11;
if (Unk_ov4_0221A400->unk_F8C == NULL) {
Unk_ov4_0221A400->unk_F8C = Heap_AllocFromHeap(param1, 0xf000 + 32);
Unk_ov4_0221A400->unk_F8C = Heap_AllocFromHeap(heapID, 0xf000 + 32);
Unk_ov4_0221A400->unk_F90 = NNS_FndCreateExpHeap((void *)(((u32)Unk_ov4_0221A400->unk_F8C + 31) / 32 * 32), 0xf000);
NNS_FndSetGroupIDForExpHeap(Unk_ov4_0221A400->unk_F90, 16);
Unk_ov4_0221A400->unk_F94 = NNS_FndGetTotalFreeSizeForExpHeap(Unk_ov4_0221A400->unk_F90);

12
src/overlay004/ov4_021D2808.c
View File

@@ -383,14 +383,14 @@ BOOL ov4_021D2C70(int param0, void *param1, int param2)
return 0;
}
static void ov4_021D2C98(void **param0, void **param1, int param2, int param3)
static void ov4_021D2C98(void **param0, void **param1, int param2, int heapID)
{
*param0 = Heap_AllocFromHeap(param3, param2 + 32);
*param0 = Heap_AllocFromHeap(heapID, param2 + 32);
MI_CpuClear8(*param0, param2 + 32);
*param1 = (UnkStruct_ov4_0221A408 *)(((u32)*param0 + 31) / 32 * 32);
}
void ov4_021D2CC0(int param0, int param1, int param2)
void ov4_021D2CC0(int heapID, int param1, int param2)
{
u8 v0[3] = { 13, 13, 13 };
u32 v1;
@@ -400,11 +400,11 @@ void ov4_021D2CC0(int param0, int param1, int param2)
if (Unk_ov4_0221A408 == NULL) {
void *v4 = NULL;
ov4_021D2C98(&v4, (void **)&Unk_ov4_0221A408, sizeof(UnkStruct_ov4_0221A408), param0);
ov4_021D2C98(&v4, (void **)&Unk_ov4_0221A408, sizeof(UnkStruct_ov4_0221A408), heapID);
Unk_ov4_0221A408->unk_880 = v4;
ov4_021D2C98((void **)&Unk_ov4_0221A408->unk_888, (void **)&Unk_ov4_0221A408->unk_884, VCT_AUDIO_BUFFER_SIZE * param2 * VCT_DEFAULT_AUDIO_BUFFER_COUNT + 32, param0);
ov4_021D2C98((void **)&Unk_ov4_0221A408->unk_888, (void **)&Unk_ov4_0221A408->unk_884, VCT_AUDIO_BUFFER_SIZE * param2 * VCT_DEFAULT_AUDIO_BUFFER_COUNT + 32, heapID);
Unk_ov4_0221A408->unk_19F4 = param0;
Unk_ov4_0221A408->unk_19F4 = heapID;
Unk_ov4_0221A408->unk_198C = NULL;
ov4_021D2808();

36
src/overlay005/encounter_effect.c
View File

@@ -772,7 +772,7 @@ void ov5_021DE5A4(UnkStruct_ov5_021DE47C *param0, UnkStruct_ov5_021DE5A4 *param1
}
}
void ov5_021DE5D0(Sprite *param0, u32 param1, u32 param2, u8 param3, u16 param4)
void ov5_021DE5D0(Sprite *param0, u32 heapID, u32 param2, u8 param3, u16 param4)
{
UnkStruct_ov5_021DE5D0 v0;
NNSG2dPaletteData *v1;
@@ -780,8 +780,8 @@ void ov5_021DE5D0(Sprite *param0, u32 param1, u32 param2, u8 param3, u16 param4)
u16 *v3;
sub_02076AAC(param2, 2, &v0);
v3 = Heap_AllocFromHeap(param1, 32);
v2 = Graphics_GetPlttData(v0.unk_00, v0.unk_08, &v1, param1);
v3 = Heap_AllocFromHeap(heapID, 32);
v2 = Graphics_GetPlttData(v0.unk_00, v0.unk_08, &v1, heapID);
BlendPalette(v1->pRawData, v3, 16, param3, param4);
ov5_021DE67C(param0, v3, 32);
@@ -824,11 +824,9 @@ static void ov5_021DE67C(Sprite *param0, void *param1, u32 param2)
GX_LoadOBJPltt(param1, NNS_G2dGetImagePaletteLocation(v0, NNS_G2D_VRAM_TYPE_2DMAIN), param2);
}
UnkStruct_ov5_021DE6BC *ov5_021DE6A4(u32 param0)
UnkStruct_ov5_021DE6BC *ov5_021DE6A4(u32 heapID)
{
UnkStruct_ov5_021DE6BC *v0;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021DE6BC));
UnkStruct_ov5_021DE6BC *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021DE6BC));
memset(v0, 0, sizeof(UnkStruct_ov5_021DE6BC));
return v0;
@@ -875,11 +873,9 @@ BOOL ov5_021DE71C(UnkStruct_ov5_021DE6BC *param0)
return v0;
}
UnkStruct_ov5_021DE79C *ov5_021DE784(u32 param0)
static UnkStruct_ov5_021DE79C *ov5_021DE784(u32 heapID)
{
UnkStruct_ov5_021DE79C *v0;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021DE79C));
UnkStruct_ov5_021DE79C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021DE79C));
memset(v0, 0, sizeof(UnkStruct_ov5_021DE79C));
return v0;
@@ -961,7 +957,7 @@ static void ov5_021DE89C(Window *param0, s32 param1, s32 param2, s32 param3, s32
Window_FillRectWithColor(param0, param5, param3, param1, param4 - param3, param2 - param1);
}
UnkStruct_ov5_021DE928 *ov5_021DE8F8(u32 param0)
UnkStruct_ov5_021DE928 *ov5_021DE8F8(u32 heapID)
{
UnkStruct_ov5_021DE928 *v0;
int v1;
@@ -970,7 +966,7 @@ UnkStruct_ov5_021DE928 *ov5_021DE8F8(u32 param0)
memset(v0, 0, sizeof(UnkStruct_ov5_021DE928));
for (v1 = 0; v1 < 48; v1++) {
v0->unk_04[v1] = ov5_021DE784(param0);
v0->unk_04[v1] = ov5_021DE784(heapID);
}
return v0;
@@ -1041,11 +1037,9 @@ BOOL ov5_021DE988(UnkStruct_ov5_021DE928 *param0)
return 0;
}
UnkStruct_ov5_021DEA98 *ov5_021DEA80(u32 param0)
UnkStruct_ov5_021DEA98 *ov5_021DEA80(u32 heapID)
{
UnkStruct_ov5_021DEA98 *v0;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021DEA98));
UnkStruct_ov5_021DEA98 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021DEA98));
memset(v0, 0, sizeof(UnkStruct_ov5_021DEA98));
return v0;
}
@@ -1128,16 +1122,16 @@ static void ov5_021DEB04(Window *param0, u16 param1, u16 param2, u8 param3)
}
}
UnkStruct_ov5_021DEC18 *ov5_021DEBEC(u32 param0)
UnkStruct_ov5_021DEC18 *ov5_021DEBEC(u32 heapID)
{
UnkStruct_ov5_021DEC18 *v0;
int v1;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021DEC18));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021DEC18));
memset(v0, 0, sizeof(UnkStruct_ov5_021DEC18));
for (v1 = 0; v1 < 8; v1++) {
v0->unk_00[v1] = ov5_021DEA80(param0);
v0->unk_00[v1] = ov5_021DEA80(heapID);
}
return v0;
@@ -1435,7 +1429,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);

6
src/overlay005/encounter_effect_core.c
View File

@@ -1169,7 +1169,7 @@ void EncounterEffect_Trainer_Water_HigherLevel(SysTask *param0, void *param1)
Sprite_SetDrawFlag(v1->unk_1D4[v3], 0);
Sprite_SetAffineOverwriteMode(v1->unk_1D4[v3], 2);
v1->unk_258[v3] = ov5_021DE6A4(4);
v1->unk_258[v3] = ov5_021DE6A4(HEAP_ID_FIELD);
}
GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -1518,7 +1518,7 @@ void EncounterEffect_Trainer_Cave_HigherLevel(SysTask *param0, void *param1)
Window_FillTilemap(v1->unk_264, 0);
Window_ScheduleCopyToVRAM(v1->unk_264);
v1->unk_268 = ov5_021DE8F8(4);
v1->unk_268 = ov5_021DE8F8(HEAP_ID_FIELD);
v0->state++;
break;
@@ -2144,7 +2144,7 @@ void EncounterEffect_GalacticBoss(SysTask *param0, void *param1)
Sprite_SetExplicitPriority(v1->unk_1DC, 1);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
v1->unk_04 = ov5_021DEBEC(4);
v1->unk_04 = ov5_021DEBEC(HEAP_ID_FIELD);
v1->unk_00 = Window_New(4, 1);
Window_Add(v0->fieldSystem->bgConfig, v1->unk_00, 3, 0, 0, 32, 32, 0, 0);

10
src/overlay005/fieldmap.c
View File

@@ -184,7 +184,7 @@ static BOOL FieldMap_Init(OverlayManager *overlayMan, int *param1)
fieldSystem->unk_04 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(FieldSystem_sub2));
MI_CpuClear8(fieldSystem->unk_04, sizeof(FieldSystem_sub2));
fieldSystem->unk_04->unk_04 = ov5_021D1A94(fieldSystem, 4, 8);
fieldSystem->unk_04->unk_04 = ov5_021D1A94(fieldSystem, HEAP_ID_FIELD, 8);
ov5_021D1414();
@@ -222,7 +222,7 @@ static BOOL FieldMap_Init(OverlayManager *overlayMan, int *param1)
fieldSystem->unk_04->hBlankSystem = HBlankSystem_New(4);
HBlankSystem_Start(fieldSystem->unk_04->hBlankSystem);
fieldSystem->unk_04->unk_20 = ov5_021EF4BC(4, fieldSystem->unk_04->hBlankSystem);
fieldSystem->unk_04->unk_20 = ov5_021EF4BC(HEAP_ID_FIELD, fieldSystem->unk_04->hBlankSystem);
break;
case 2:
ov5_021D5BD8(fieldSystem);
@@ -813,7 +813,7 @@ static void ov5_021D17EC(FieldSystem *fieldSystem)
ov5_021EA6D0(fieldSystem->unk_28, 1);
}
fieldSystem->unk_A0 = ov5_021EF28C(8, 4);
fieldSystem->unk_A0 = ov5_021EF28C(8, HEAP_ID_FIELD);
fieldSystem->unk_A8 = HoneyTree_ShakeDataInit();
if (fieldSystem->mapLoadType == MAP_LOAD_TYPE_OVERWORLD) {
@@ -825,7 +825,7 @@ static void ov5_021D17EC(FieldSystem *fieldSystem)
static void ov5_021D1878(FieldSystem *fieldSystem)
{
fieldSystem->unk_40 = ov5_021DF440(fieldSystem, 34, 4);
fieldSystem->unk_40 = ov5_021DF440(fieldSystem, 34, HEAP_ID_FIELD);
{
int v0 = 80;
@@ -837,7 +837,7 @@ static void ov5_021D1878(FieldSystem *fieldSystem)
ov5_021DF47C(fieldSystem->unk_40, v0);
}
ov5_021DF488(fieldSystem->unk_40, 4, 32, 32, 32, 32, (0x500 * (32 / 2)), (0x80 * (32 / 2)), (0x800 * 32));
ov5_021DF488(fieldSystem->unk_40, HEAP_ID_FIELD, 32, 32, 32, 32, (0x500 * (32 / 2)), (0x80 * (32 / 2)), (0x800 * 32));
if ((fieldSystem->mapLoadType == MAP_LOAD_TYPE_UNDERGROUND) || (fieldSystem->mapLoadType == MAP_LOAD_TYPE_UNION)) {
MapObjectMan_SetEndMovement(fieldSystem->mapObjMan, 0);

10
src/overlay005/ov5_021D1A94.c
View File

@@ -30,23 +30,23 @@ struct UnkStruct_ov5_021D1BEC_t {
void *unk_10;
};
UnkStruct_ov5_021D1A94 *ov5_021D1A94(FieldSystem *fieldSystem, int param1, int param2)
UnkStruct_ov5_021D1A94 *ov5_021D1A94(FieldSystem *fieldSystem, int heapID, int param2)
{
UnkStruct_ov5_021D1A94 *v0;
u32 v1;
v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov5_021D1A94));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021D1A94));
v0->fieldSystem = fieldSystem;
v0->unk_04 = param1;
v0->unk_04 = heapID;
v0->unk_08 = param2;
v0->unk_0C = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov5_021D1BEC) * param2);
v0->unk_0C = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021D1BEC) * param2);
MI_CpuClear32(v0->unk_0C, sizeof(UnkStruct_ov5_021D1BEC) * param2);
v1 = SysTaskManager_GetRequiredSize(param2);
v0->unk_10 = Heap_AllocFromHeap(param1, v1);
v0->unk_10 = Heap_AllocFromHeap(heapID, v1);
v0->unk_10 = SysTaskManager_Init(param2, v0->unk_10);
return v0;

46
src/overlay005/ov5_021D2F14.c
View File

@@ -18,7 +18,7 @@ static BOOL ov5_021D3478(SpriteResourceList *param0, SpriteResource *param1);
static void ov5_021D34AC(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, int param3, int param4, int param5);
static void ov5_021D3518(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, int param3, int param4, int param5);
void ov5_021D2F14(UnkStruct_ov5_021D30A8 *param0, const SpriteResourceDataPaths *param1, u32 param2, u32 param3)
void ov5_021D2F14(UnkStruct_ov5_021D30A8 *param0, const SpriteResourceDataPaths *param1, u32 param2, u32 heapID)
{
SpriteResourceTable *v0;
SpriteResourceTable *v1;
@@ -26,8 +26,8 @@ void ov5_021D2F14(UnkStruct_ov5_021D30A8 *param0, const SpriteResourceDataPaths
u32 v3;
u32 v4;
param0->unk_00 = SpriteList_InitRendering(param2, &param0->unk_04, param3);
param0->unk_1C6 = param3;
param0->unk_00 = SpriteList_InitRendering(param2, &param0->unk_04, heapID);
param0->heapId = heapID;
if (param1->asStruct.mcellResources == NULL) {
param0->unk_1C4 = 6 - 2;
@@ -35,27 +35,27 @@ void ov5_021D2F14(UnkStruct_ov5_021D30A8 *param0, const SpriteResourceDataPaths
param0->unk_1C4 = 6;
}
v1 = Heap_AllocFromHeap(param3, SpriteResourceTable_Size() * param0->unk_1C4);
v1 = Heap_AllocFromHeap(heapID, SpriteResourceTable_Size() * param0->unk_1C4);
for (v4 = 0; v4 < param0->unk_1C4; v4++) {
v0 = SpriteResourceTable_GetArrayElement(v1, v4);
v2 = ReadFileToHeap(param3, param1->asArray[v4]);
v2 = ReadFileToHeap(heapID, param1->asArray[v4]);
SpriteResourceTable_LoadFromBinary(v2, v0, param3);
SpriteResourceTable_LoadFromBinary(v2, v0, heapID);
Heap_FreeToHeap(v2);
}
for (v4 = 0; v4 < param0->unk_1C4; v4++) {
v0 = SpriteResourceTable_GetArrayElement(v1, v4);
v3 = SpriteResourceTable_GetCount(v0);
param0->unk_194[v4] = SpriteResourceCollection_New(v3, v4, param3);
param0->unk_194[v4] = SpriteResourceCollection_New(v3, v4, heapID);
}
for (v4 = 0; v4 < param0->unk_1C4; v4++) {
v0 = SpriteResourceTable_GetArrayElement(v1, v4);
v3 = SpriteResourceTable_GetCount(v0);
param0->unk_1AC[v4] = SpriteResourceList_New(v3, param3);
SpriteResourceCollection_Extend(param0->unk_194[v4], v0, param0->unk_1AC[v4], param3);
param0->unk_1AC[v4] = SpriteResourceList_New(v3, heapID);
SpriteResourceCollection_Extend(param0->unk_194[v4], v0, param0->unk_1AC[v4], heapID);
}
for (v4 = 0; v4 < param0->unk_1C4; v4++) {
@@ -67,8 +67,8 @@ void ov5_021D2F14(UnkStruct_ov5_021D30A8 *param0, const SpriteResourceDataPaths
SpriteTransfer_RequestCharListAtEnd(param0->unk_1AC[0]);
SpriteTransfer_RequestPlttFreeSpaceList(param0->unk_1AC[1]);
v2 = ReadFileToHeap(param3, param1->asStruct.spriteTable);
param0->unk_190 = SpriteResourcesHeaderList_NewFromResdat(v2, param3, param0->unk_194[0], param0->unk_194[1], param0->unk_194[2], param0->unk_194[3], param0->unk_194[4], param0->unk_194[5]);
v2 = ReadFileToHeap(heapID, param1->asStruct.spriteTable);
param0->unk_190 = SpriteResourcesHeaderList_NewFromResdat(v2, heapID, param0->unk_194[0], param0->unk_194[1], param0->unk_194[2], param0->unk_194[3], param0->unk_194[4], param0->unk_194[5]);
Heap_FreeToHeap(v2);
}
@@ -106,7 +106,7 @@ Sprite *ov5_021D3104(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplateFromRes
v0.affineZRotation = 0;
v0.priority = param1->priority;
v0.vramType = param1->vramType;
v0.heapID = param0->unk_1C6;
v0.heapID = param0->heapId;
v1 = SpriteList_AddAffine(&v0);
GF_ASSERT(v1);
@@ -126,7 +126,7 @@ void ov5_021D3190(UnkStruct_ov5_021D30A8 *param0, SpriteResourceCapacities *para
u32 v4, v5;
param0->unk_00 = SpriteList_InitRendering(param2, &param0->unk_04, param3);
param0->unk_1C6 = param3;
param0->heapId = param3;
if ((param1->asStruct.mcellCapacity == 0) || (param1->asStruct.manimCapacity == 0)) {
param0->unk_1C4 = 6 - 2;
@@ -163,7 +163,7 @@ void ov5_021D3270(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, int pa
return;
}
v0 = SpriteResourceCollection_AddPalette(param0->unk_194[1], param1, param2, param3, param6, param5, param4, param0->unk_1C6);
v0 = SpriteResourceCollection_AddPalette(param0->unk_194[1], param1, param2, param3, param6, param5, param4, param0->heapId);
if (v0 != NULL) {
v1 = SpriteTransfer_RequestPlttFreeSpace(v0);
@@ -187,7 +187,7 @@ void ov5_021D32E8(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, int
return;
}
v0 = SpriteResourceCollection_AddPaletteFrom(param0->unk_194[1], param1, param2, param3, param6, param5, param4, param0->unk_1C6);
v0 = SpriteResourceCollection_AddPaletteFrom(param0->unk_194[1], param1, param2, param3, param6, param5, param4, param0->heapId);
if (v0 != NULL) {
v1 = SpriteTransfer_RequestPlttFreeSpace(v0);
@@ -230,7 +230,7 @@ void ov5_021D33B0(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, BOOL p
return;
}
v0 = SpriteResourceCollection_AddTiles(param0->unk_194[0], param1, param2, param3, param5, param4, param0->unk_1C6);
v0 = SpriteResourceCollection_AddTiles(param0->unk_194[0], param1, param2, param3, param5, param4, param0->heapId);
if (v0 != NULL) {
SpriteTransfer_RequestCharAtEnd(v0);
@@ -250,7 +250,7 @@ void ov5_021D3414(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, BOOL
return;
}
v0 = SpriteResourceCollection_AddTilesFrom(param0->unk_194[0], param1, param2, param3, param5, param4, param0->unk_1C6);
v0 = SpriteResourceCollection_AddTilesFrom(param0->unk_194[0], param1, param2, param3, param5, param4, param0->heapId);
if (v0 != NULL) {
SpriteTransfer_RequestCharAtEnd(v0);
@@ -290,7 +290,7 @@ static void ov5_021D34AC(UnkStruct_ov5_021D30A8 *param0, int param1, int param2,
return;
}
v0 = SpriteResourceCollection_Add(param0->unk_194[param4], param1, param2, param3, param5, param4, param0->unk_1C6);
v0 = SpriteResourceCollection_Add(param0->unk_194[param4], param1, param2, param3, param5, param4, param0->heapId);
if (v0 != NULL) {
v1 = ov5_021D3478(param0->unk_1AC[param4], v0);
@@ -311,7 +311,7 @@ static void ov5_021D3518(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param
return;
}
v0 = SpriteResourceCollection_AddFrom(param0->unk_194[param4], param1, param2, param3, param5, param4, param0->unk_1C6);
v0 = SpriteResourceCollection_AddFrom(param0->unk_194[param4], param1, param2, param3, param5, param4, param0->heapId);
if (v0 != NULL) {
v1 = ov5_021D3478(param0->unk_1AC[param4], v0);
@@ -331,10 +331,10 @@ ManagedSprite *ov5_021D3584(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplate
AffineSpriteListTemplate v3;
int v4[6];
v2 = Heap_AllocFromHeap(param0->unk_1C6, sizeof(ManagedSprite));
v2 = Heap_AllocFromHeap(param0->heapId, sizeof(ManagedSprite));
v2->resourceHeaderList = Heap_AllocFromHeap(param0->unk_1C6, sizeof(SpriteResourcesHeaderList));
v2->resourceHeaderList->headers = Heap_AllocFromHeap(param0->unk_1C6, sizeof(SpriteResourcesHeader));
v2->resourceHeaderList = Heap_AllocFromHeap(param0->heapId, sizeof(SpriteResourcesHeaderList));
v2->resourceHeaderList->headers = Heap_AllocFromHeap(param0->heapId, sizeof(SpriteResourcesHeader));
v2->resourceHeader = v2->resourceHeaderList->headers;
for (v0 = 0; v0 < 6; v0++) {
@@ -372,7 +372,7 @@ ManagedSprite *ov5_021D3584(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplate
v3.affineZRotation = 0;
v3.priority = param1->priority;
v3.vramType = param1->vramType;
v3.heapID = param0->unk_1C6;
v3.heapID = param0->heapId;
v2->sprite = SpriteList_AddAffine(&v3);

40
src/overlay005/ov5_021DF440.c
View File

@@ -40,7 +40,7 @@ typedef struct UnkStruct_ov5_021DF8FC_t UnkStruct_ov5_021DF8FC;
typedef struct UnkStruct_ov5_021DF8C8_t UnkStruct_ov5_021DF8C8;
typedef struct UnkStruct_ov5_021DF47C_t {
u32 unk_00;
u32 heapId;
u32 unk_04;
u32 unk_08;
u32 unk_0C;
@@ -97,7 +97,7 @@ static const UnkStruct_ov5_021FF85C *ov5_021DF6D0(u32 param0);
static void ov5_021DF6F8(UnkStruct_ov5_021DF47C *param0);
static void ov5_021DF708(UnkStruct_ov5_021DF47C *param0);
static void ov5_021DF71C(UnkStruct_ov5_021DF47C *param0);
static void ov5_021DF754(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
static void ov5_021DF754(UnkStruct_ov5_021DF47C *param0, u32 heapID, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
static void ov5_021DF7C4(UnkStruct_ov5_021DF47C *param0);
static void ov5_021DF8C8(UnkStruct_ov5_021DF47C *param0, UnkStruct_ov5_021DF8FC *param1, u32 param2);
static void ov5_021DF8FC(UnkStruct_ov5_021DF8FC *param0);
@@ -108,17 +108,17 @@ static void ov5_021DFA88(UnkStruct_ov5_021DF47C *param0, u32 param1, TextureReso
static void ov5_021DFAC0(SysTask *param0, void *param1);
static void ov5_021DFADC(SysTask *param0, void *param1);
UnkStruct_ov5_021DF47C *ov5_021DF440(FieldSystem *fieldSystem, u32 param1, u32 param2)
UnkStruct_ov5_021DF47C *ov5_021DF440(FieldSystem *fieldSystem, u32 param1, u32 heapID)
{
UnkStruct_ov5_021DF47C *v0;
v0 = Heap_AllocFromHeap(param2, (sizeof(UnkStruct_ov5_021DF47C)));
v0 = Heap_AllocFromHeap(heapID, (sizeof(UnkStruct_ov5_021DF47C)));
memset(v0, 0, (sizeof(UnkStruct_ov5_021DF47C)));
v0->unk_00 = param2;
v0->heapId = heapID;
v0->unk_04 = param1;
v0->fieldSystem = fieldSystem;
v0->unk_14 = Heap_AllocFromHeap(param2, (sizeof(UnkStruct_ov5_021DF6AC)) * param1);
v0->unk_14 = Heap_AllocFromHeap(heapID, (sizeof(UnkStruct_ov5_021DF6AC)) * param1);
ov5_021DF5E8(v0);
ov5_021DF588(v0);
@@ -132,9 +132,9 @@ void ov5_021DF47C(UnkStruct_ov5_021DF47C *param0, u32 param1)
ov5_021DF6F8(param0);
}
void ov5_021DF488(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8)
void ov5_021DF488(UnkStruct_ov5_021DF47C *param0, u32 heapID, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8)
{
ov5_021DF754(param0, param1, param2, param3, param4, param5, param6, param7, param8);
ov5_021DF754(param0, heapID, param2, param3, param4, param5, param6, param7, param8);
}
void ov5_021DF4A8(UnkStruct_ov5_021DF47C *param0, u32 param1)
@@ -184,9 +184,9 @@ void *ov5_021DF528(const UnkStruct_ov5_021DF47C *param0, u32 param1, int param2)
void *v0;
if (param2 == 0) {
v0 = Heap_AllocFromHeap(param0->unk_00, param1);
v0 = Heap_AllocFromHeap(param0->heapId, param1);
} else {
v0 = Heap_AllocFromHeapAtEnd(param0->unk_00, param1);
v0 = Heap_AllocFromHeapAtEnd(param0->heapId, param1);
}
return v0;
@@ -230,7 +230,7 @@ UnkStruct_ov5_021DF47C *ov5_021DF578(const MapObject *param0)
static u32 ov5_021DF584(const UnkStruct_ov5_021DF47C *param0)
{
return param0->unk_00;
return param0->heapId;
}
static void ov5_021DF588(UnkStruct_ov5_021DF47C *param0)
@@ -385,7 +385,7 @@ static const UnkStruct_ov5_021FF85C *ov5_021DF6D0(u32 param0)
static void ov5_021DF6F8(UnkStruct_ov5_021DF47C *param0)
{
param0->unk_1C = sub_020711EC(param0->unk_00, param0->unk_08);
param0->unk_1C = sub_020711EC(param0->heapId, param0->unk_08);
}
static void ov5_021DF708(UnkStruct_ov5_021DF47C *param0)
@@ -421,7 +421,7 @@ void ov5_021DF74C(UnkStruct_ov101_021D5D90 *param0)
sub_0207136C(param0);
}
static void ov5_021DF754(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8)
static void ov5_021DF754(UnkStruct_ov5_021DF47C *param0, u32 heapID, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8)
{
UnkStruct_ov5_021DF8FC *v0;
UnkStruct_ov5_021EDDAC v1;
@@ -429,14 +429,14 @@ static void ov5_021DF754(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2,
v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021DF8FC)), 0, 0);
param0->unk_20 = v0;
v0->unk_00 = param1;
v0->unk_00 = heapID;
v0->unk_04 = param2;
v0->unk_06 = param3;
v0->unk_08 = param4;
v0->unk_0A = param5;
v0->unk_10 = ov5_021F067C(param1, 69, param6, param3);
v0->unk_14 = ov5_021F067C(param1, 70, param7, param4);
v0->unk_18 = TextureResourceManager_New(param5, param1);
v0->unk_10 = ov5_021F067C(heapID, HEAP_ID_69, param6, param3);
v0->unk_14 = ov5_021F067C(heapID, HEAP_ID_70, param7, param4);
v0->unk_18 = TextureResourceManager_New(param5, heapID);
ov5_021DF8C8(param0, v0, param2);
@@ -724,16 +724,16 @@ static void ov5_021DFADC(SysTask *param0, void *param1)
void ov5_021DFB00(UnkStruct_ov5_021DF47C *param0, UnkStruct_02073838 *param1, u32 param2, u32 param3, int param4)
{
sub_0207389C(param1, param2, param0->unk_18, param3, param0->unk_00, param4);
sub_0207389C(param1, param2, param0->unk_18, param3, param0->heapId, param4);
sub_020738EC(param1);
}
void ov5_021DFB24(UnkStruct_ov5_021DF47C *param0, UnkStruct_02073974 *param1, u32 param2, u32 param3, u32 param4)
{
sub_020739B4(param1, param2, param0->unk_18, param3, param0->unk_00, param4);
sub_020739B4(param1, param2, param0->unk_18, param3, param0->heapId, param4);
}
void ov5_021DFB40(UnkStruct_ov5_021DF47C *param0, UnkStruct_02073974 *param1, const UnkStruct_02073838 *param2, UnkStruct_02073974 *param3, u32 param4)
{
sub_02073A6C(param1, param2, param3, param4, param0->unk_00);
sub_02073A6C(param1, param2, param3, param4, param0->heapId);
}

4
src/overlay005/ov5_021ECE40.c
View File

@@ -498,14 +498,14 @@ static int ov5_021ED1C8(const MapObjectManager *param0, const MapObject *param1,
static void ov5_021ED224(UnkStruct_ov5_021ED0A4 *param0, int param1, int param2, int param3, int param4, int param5, int param6)
{
{
param0->unk_F8 = ov5_021F067C(4, 64, 0x1000 * param1, param1);
param0->unk_F8 = ov5_021F067C(HEAP_ID_FIELD, HEAP_ID_64, 0x1000 * param1, param1);
ov5_021ED558(param0);
ov5_021EDCC4(param0, param2);
ov5_021EDCCC(param0, param1 - param2);
}
{
param0->unk_FC = ov5_021F067C(4, 65, 0x80 * param3, param3);
param0->unk_FC = ov5_021F067C(HEAP_ID_FIELD, HEAP_ID_65, 0x80 * param3, param3);
ov5_021ED694(param0);
ov5_021EDCD4(param0, param4);
ov5_021EDCDC(param0, param3 - param4);

13
src/overlay005/ov5_021EF250.c
View File

@@ -41,18 +41,15 @@ static BOOL ov5_021EF250(const int param0, const int param1, const UnkStruct_ov5
return 0;
}
UnkStruct_ov5_021EF300 *ov5_021EF28C(const u8 param0, const u8 param1)
UnkStruct_ov5_021EF300 *ov5_021EF28C(const u8 param0, const u8 heapID)
{
u8 v0;
UnkStruct_ov5_021EF300 *v1;
UnkStruct_ov5_021EF300 *v1 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021EF300));
v1 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov5_021EF300));
v1->unk_04 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov5_021EF250) * param0);
v1->unk_04 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021EF250) * param0);
v1->unk_00 = param0;
for (v0 = 0; v0 < param0; v0++) {
v1->unk_04[v0].unk_14 = 0;
for (u8 i = 0; i < param0; i++) {
v1->unk_04[i].unk_14 = 0;
}
return v1;

8
src/overlay005/ov5_021EF4BC.c
View File

@@ -36,15 +36,13 @@ static void ov5_021EF6CC(UnkStruct_ov5_021EF4F8 *param0);
static void ov5_021EF6F0(UnkStruct_ov5_021EF4F8 *param0);
static void ov5_021EF710(UnkStruct_ov5_021EF4F8 *param0);
UnkStruct_ov5_021EF4F8 *ov5_021EF4BC(u32 param0, HBlankSystem *param1)
UnkStruct_ov5_021EF4F8 *ov5_021EF4BC(u32 heapID, HBlankSystem *param1)
{
UnkStruct_ov5_021EF4F8 *v0;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021EF4F8));
UnkStruct_ov5_021EF4F8 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021EF4F8));
memset(v0, 0, sizeof(UnkStruct_ov5_021EF4F8));
v0->unk_00 = 0;
v0->bufferManager = BufferManager_New(param0, v0->unk_0C, v0->unk_18C);
v0->bufferManager = BufferManager_New(heapID, v0->unk_0C, v0->unk_18C);
v0->unk_310 = param1;
return v0;

10
src/overlay005/ov5_021F067C.c
View File

@@ -29,7 +29,7 @@ static UnkStruct_ov5_021F0814 *ov5_021F07FC(UnkStruct_ov5_021F06D8 *param0);
static void ov5_021F0814(UnkStruct_ov5_021F0814 *param0, u32 param1, void *param2);
static void ov5_021F081C(UnkStruct_ov5_021F0814 *param0);
UnkStruct_ov5_021F06D8 *ov5_021F067C(u32 param0, u32 param1, u32 param2, u32 param3)
UnkStruct_ov5_021F06D8 *ov5_021F067C(u32 parentHeapID, u32 childHeapID, u32 param2, u32 param3)
{
u32 v0, v1;
UnkStruct_ov5_021F06D8 *v2;
@@ -38,19 +38,19 @@ UnkStruct_ov5_021F06D8 *ov5_021F067C(u32 param0, u32 param1, u32 param2, u32 par
v1 = param2 + v0 + (sizeof(UnkStruct_ov5_021F06D8));
{
BOOL v3 = Heap_Create(param0, param1, v1);
BOOL v3 = Heap_Create(parentHeapID, childHeapID, v1);
GF_ASSERT(v3 == 1);
}
param2 = v1 - param2;
v2 = Heap_AllocFromHeap(param1, param2);
v2 = Heap_AllocFromHeap(childHeapID, param2);
GF_ASSERT(v2 != NULL);
memset(v2, 0, param2);
v2->unk_00 = param0;
v2->unk_04 = param1;
v2->unk_00 = parentHeapID;
v2->unk_04 = childHeapID;
v2->unk_08 = param3;
v2->unk_0C = v1;
v2->unk_10 = v0;

103
src/overlay006/ov6_0223E140.c
View File

@@ -281,6 +281,7 @@ static void ov6_0223FDC4(Easy3DObject *param0, BOOL param1);
static void ov6_0223FDCC(Easy3DObject *param0, fx32 param1, fx32 param2, fx32 param3);
static void ov6_0223FDD4(Easy3DObject *param0, fx32 param1, fx32 param2, fx32 param3);
static void ov6_0223FDDC(Easy3DObject *param0, u16 param1, u32 param2);
static UnkStruct_ov6_0223FDE4 *ov6_0223FDE4(u32 heapID);
static void ov6_0223FF7C(UnkStruct_ov6_0223FDE4 *param0);
static BOOL ov6_0223FFC8(UnkStruct_ov6_0223FDE4 *param0);
static void ov6_0223FFE4(UnkStruct_ov6_0223FDE4 *param0, fx32 param1, fx32 param2);
@@ -290,7 +291,6 @@ static void ov6_02240260(UnkStruct_ov6_02240260 *param0, u32 param1, NNSFndAlloc
static void ov6_022402E4(UnkStruct_ov6_02240260 *param0, fx32 param1, fx32 param2, fx32 param3);
static void ov6_02240340(UnkStruct_ov6_02240260 *param0, NNSFndAllocator *param1);
static void ov6_02240600(UnkStruct_ov6_02240260 *param0);
static UnkStruct_ov6_02240774 *ov6_0224060C(u32 param0, u32 param1);
static void ov6_02240654(UnkStruct_ov6_02240774 *param0);
static void ov6_0224067C(UnkStruct_ov6_02240774 *param0, fx32 param1, fx32 param2, fx32 param3, s32 param4, u16 param5, u16 param6, u16 param7);
static void ov6_022406D8(UnkStruct_ov6_02240774 *param0);
@@ -301,7 +301,7 @@ static void ov6_022407E8(UnkStruct_ov6_022407B8 *param0, fx32 param1, fx32 param
static void ov6_0224085C(UnkStruct_ov6_022407B8 *param0);
static void ov6_0224089C(UnkStruct_ov6_022407B8 *param0);
static UnkStruct_ov6_022407B8 *ov6_022408A8(UnkStruct_ov6_02240774 *param0);
static UnkStruct_ov6_02240A00 *ov6_022408C8(u32 param0, u32 param1);
static UnkStruct_ov6_02240A00 *ov6_022408C8(u32 heapID, u32 param1);
static void ov6_02240968(UnkStruct_ov6_02240A00 *param0);
static void ov6_02240994(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32 param3, u16 param4, u16 param5, u16 param6);
static void ov6_022409D4(UnkStruct_ov6_02240A00 *param0);
@@ -525,7 +525,7 @@ void ov6_0223E384(FieldTask *taskMan)
UnkStruct_ov6_0223E33C *v1 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov6_0223E33C));
memset(v1, 0, sizeof(UnkStruct_ov6_0223E33C));
v1->unk_00 = ov6_0223FDE4(4);
v1->unk_00 = ov6_0223FDE4(HEAP_ID_FIELD);
ov6_0223FE1C(v1->unk_00, (FX32_CONST(2.0f)), 0, 1, 16, fieldSystem->camera);
FieldTask_InitCall(taskMan, ov6_0223E33C, v1);
@@ -612,7 +612,7 @@ void ov6_0223E4EC(FieldTask *param0)
UnkStruct_ov6_0223E33C *v1 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov6_0223E33C));
memset(v1, 0, sizeof(UnkStruct_ov6_0223E33C));
v1->unk_00 = ov6_0223FDE4(4);
v1->unk_00 = ov6_0223FDE4(HEAP_ID_FIELD);
ov6_0223FE1C(v1->unk_00, (FX32_CONST(4.0f)), 0, 1, 24, fieldSystem->camera);
@@ -626,7 +626,7 @@ static void ov6_0223E548(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
memset(v0, 0, sizeof(UnkStruct_ov6_0223E548));
v0->unk_48 = ov6_02240104(4, fieldSystem);
v0->unk_48 = ov6_02240104(HEAP_ID_FIELD, fieldSystem);
v0->unk_00 = 0;
}
@@ -685,7 +685,7 @@ static void ov6_0223E574(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
if (v0->unk_6C.unk_00 == 3) {
if (ov6_02240060(v0->unk_6C.unk_08) == 13) {
v0->unk_54 = ov6_02240B9C(4, fieldSystem);
v0->unk_54 = ov6_02240B9C(HEAP_ID_FIELD, fieldSystem);
}
}
@@ -832,7 +832,7 @@ static void ov6_0223E7B4(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
v3 = 0;
v4 = MapObject_GetZ(v1);
v0->unk_00 = ov6_02240768(4);
v0->unk_00 = ov6_02240768(HEAP_ID_FIELD);
ov6_0224077C(v0->unk_00, v2, v3, v4);
}
@@ -881,7 +881,7 @@ static void ov6_0223E830(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
VecFx32 v1;
CameraAngle v2;
#if (GAME_VERSION == 10 || GAME_VERSION == 12)
#if (GAME_VERSION == DIAMOND || GAME_VERSION == PLATINUM)
Camera_SetFOV(0x1701, fieldSystem->camera);
Camera_SetDistance(0xc8a55, fieldSystem->camera);
v1.x = 0x2280ef;
@@ -894,7 +894,7 @@ static void ov6_0223E830(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
Camera_SetAngleAroundTarget(&v2, fieldSystem->camera);
Camera_SetClipping(2 * FX32_ONE, 2000 * FX32_ONE, fieldSystem->camera);
#elif (GAME_VERSION == 11)
#elif (GAME_VERSION == PEARL)
Camera_SetFOV(0x10c1, fieldSystem->camera);
Camera_SetDistance(0xD5052, fieldSystem->camera);
v1.x = 0x1bffbd;
@@ -909,8 +909,8 @@ static void ov6_0223E830(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
Camera_SetClipping(14 * FX32_ONE, 2031 * FX32_ONE, fieldSystem->camera);
#endif
v0->unk_04 = ov6_022409F4(4);
v0->unk_08 = ov6_02240AC8(4);
v0->unk_04 = ov6_022409F4(HEAP_ID_FIELD);
v0->unk_08 = ov6_02240AC8(HEAP_ID_FIELD);
v1 = Camera_GetTarget(fieldSystem->camera);
@@ -943,8 +943,8 @@ static void ov6_0223E8D0(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
fieldSystem->areaLightMan = AreaLightManager_New(fieldSystem->areaModelAttrs, 3);
v0->unk_04 = ov6_022409F4(4);
v0->unk_08 = ov6_02240AC8(4);
v0->unk_04 = ov6_022409F4(HEAP_ID_FIELD);
v0->unk_08 = ov6_02240AC8(HEAP_ID_FIELD);
v1 = Camera_GetTarget(fieldSystem->camera);
@@ -977,8 +977,8 @@ static void ov6_0223E984(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
fieldSystem->areaLightMan = AreaLightManager_New(fieldSystem->areaModelAttrs, 3);
v0->unk_04 = ov6_022409F4(4);
v0->unk_08 = ov6_02240AC8(4);
v0->unk_04 = ov6_022409F4(HEAP_ID_FIELD);
v0->unk_08 = ov6_02240AC8(HEAP_ID_FIELD);
v1 = Camera_GetTarget(fieldSystem->camera);
@@ -1824,13 +1824,11 @@ static void ov6_0223FDDC(Easy3DObject *param0, u16 param1, u32 param2)
Easy3DObject_SetRotation(param0, param1, param2);
}
UnkStruct_ov6_0223FDE4 *ov6_0223FDE4(u32 param0)
UnkStruct_ov6_0223FDE4 *ov6_0223FDE4(u32 heapID)
{
UnkStruct_ov6_0223FDE4 *v0;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov6_0223FDE4));
UnkStruct_ov6_0223FDE4 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov6_0223FDE4));
memset(v0, 0, sizeof(UnkStruct_ov6_0223FDE4));
v0->camera1 = Camera_Alloc(param0);
v0->camera1 = Camera_Alloc(heapID);
v0->unk_40 = 5;
return v0;
@@ -2042,25 +2040,23 @@ void ov6_022400C4(UnkStruct_ov6_022400A8 *param0)
NNS_G3dGePopMtx(1);
}
UnkStruct_ov6_022401B8 *ov6_02240104(u32 param0, FieldSystem *fieldSystem)
UnkStruct_ov6_022401B8 *ov6_02240104(u32 heapID, FieldSystem *fieldSystem)
{
UnkStruct_ov6_022401B8 *v0;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov6_022401B8));
UnkStruct_ov6_022401B8 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov6_022401B8));
memset(v0, 0, sizeof(UnkStruct_ov6_022401B8));
v0->fieldSystem = fieldSystem;
v0->unk_00 = 0;
v0->unk_11C = param0;
v0->unk_11C = heapID;
Heap_FndInitAllocatorForExpHeap(&v0->unk_10C, param0, 32);
Heap_FndInitAllocatorForExpHeap(&v0->unk_10C, heapID, 32);
ov6_02240260(&v0->unk_34, v0->unk_11C, &v0->unk_10C);
{
BgConfig *v1 = FieldSystem_GetBgConfig(v0->fieldSystem);
Graphics_LoadTilesToBgLayer(172, 74, v1, 2, 0, 0, 0, param0);
Graphics_LoadTilemapToBgLayer(172, 76, v1, 2, 0, 0, 0, param0);
Graphics_LoadPalette(172, 75, 0, 0x20 * 6, 0x20, param0);
Graphics_LoadTilesToBgLayer(172, 74, v1, 2, 0, 0, 0, heapID);
Graphics_LoadTilemapToBgLayer(172, 76, v1, 2, 0, 0, 0, heapID);
Graphics_LoadPalette(172, 75, 0, 0x20 * 6, 0x20, heapID);
Bg_SetPriority(2, 1);
v0->unk_34.unk_00 = 0;
@@ -2400,18 +2396,15 @@ static void ov6_02240600(UnkStruct_ov6_02240260 *param0)
ov6_0223FDBC(&param0->unk_08);
}
static UnkStruct_ov6_02240774 *ov6_0224060C(u32 param0, u32 param1)
static UnkStruct_ov6_02240774 *ov6_0224060C(u32 heapID, u32 param1)
{
UnkStruct_ov6_02240774 *v0;
int v1;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov6_02240774));
UnkStruct_ov6_02240774 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov6_02240774));
memset(v0, 0, sizeof(UnkStruct_ov6_02240774));
ov6_0223FD58(&v0->unk_00, 98, param1, param0);
ov6_0223FD58(&v0->unk_00, 98, param1, heapID);
for (v1 = 0; v1 < 3; v1++) {
ov6_022407B8(&v0->unk_10[v1], &v0->unk_00);
for (int i = 0; i < 3; i++) {
ov6_022407B8(&v0->unk_10[i], &v0->unk_00);
}
v0->unk_1C0 = 0;
@@ -2476,9 +2469,9 @@ static void ov6_02240750(UnkStruct_ov6_02240774 *param0)
}
}
UnkStruct_ov6_02240774 *ov6_02240768(u32 param0)
UnkStruct_ov6_02240774 *ov6_02240768(u32 heapID)
{
return ov6_0224060C(param0, 6);
return ov6_0224060C(heapID, 6);
}
void ov6_02240774(UnkStruct_ov6_02240774 *param0)
@@ -2568,21 +2561,21 @@ static UnkStruct_ov6_022407B8 *ov6_022408A8(UnkStruct_ov6_02240774 *param0)
return NULL;
}
static UnkStruct_ov6_02240A00 *ov6_022408C8(u32 param0, u32 param1)
static UnkStruct_ov6_02240A00 *ov6_022408C8(u32 heapID, u32 param1)
{
UnkStruct_ov6_02240A00 *v0;
int v1;
NARC *v2;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov6_02240A00));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov6_02240A00));
memset(v0, 0, sizeof(UnkStruct_ov6_02240A00));
Heap_FndInitAllocatorForExpHeap(&v0->unk_C4, param0, 32);
v2 = NARC_ctor(NARC_INDEX_DATA__DEMO_CLIMAX, param0);
ov6_0223FD60(&v0->unk_78, v2, param1, param0);
Heap_FndInitAllocatorForExpHeap(&v0->unk_C4, heapID, 32);
v2 = NARC_ctor(NARC_INDEX_DATA__DEMO_CLIMAX, heapID);
ov6_0223FD60(&v0->unk_78, v2, param1, heapID);
for (v1 = 0; v1 < 3; v1++) {
ov6_0223FD70(&v0->unk_88[v1], &v0->unk_78, v2, 1 + v1, param0, &v0->unk_C4);
ov6_0223FD70(&v0->unk_88[v1], &v0->unk_78, v2, 1 + v1, heapID, &v0->unk_C4);
}
ov6_0223FDAC(&v0->unk_00, &v0->unk_78);
@@ -2633,9 +2626,9 @@ static void ov6_022409EC(UnkStruct_ov6_02240A00 *param0)
ov6_0223FDBC(&param0->unk_00);
}
UnkStruct_ov6_02240A00 *ov6_022409F4(u32 param0)
UnkStruct_ov6_02240A00 *ov6_022409F4(u32 heapID)
{
return ov6_022408C8(param0, 0);
return ov6_022408C8(heapID, 0);
}
void ov6_02240A00(UnkStruct_ov6_02240A00 *param0)
@@ -2669,9 +2662,9 @@ void ov6_02240A8C(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32
ov6_02240994(param0, param1 + -811008, param2 + 356351, param3 + -2162696, 59165, 21301, 31122);
}
UnkStruct_ov6_02240774 *ov6_02240AC8(u32 param0)
UnkStruct_ov6_02240774 *ov6_02240AC8(u32 heapID)
{
return ov6_0224060C(param0, 6);
return ov6_0224060C(heapID, 6);
}
void ov6_02240AD4(UnkStruct_ov6_02240774 *param0)
@@ -2772,23 +2765,23 @@ void include_unk_ov6_02248F30(void)
Unk_ov6_02248F30[0];
}
UnkStruct_ov6_02240C44 *ov6_02240B9C(u32 param0, FieldSystem *fieldSystem)
UnkStruct_ov6_02240C44 *ov6_02240B9C(u32 heapID, FieldSystem *fieldSystem)
{
UnkStruct_ov6_02240C44 *v0;
int v1;
NARC *v2;
v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov6_02240C44));
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov6_02240C44));
memset(v0, 0, sizeof(UnkStruct_ov6_02240C44));
v2 = NARC_ctor(NARC_INDEX_DATA__DEMO_CLIMAX, param0);
v2 = NARC_ctor(NARC_INDEX_DATA__DEMO_CLIMAX, heapID);
v0->fieldSystem = fieldSystem;
Heap_FndInitAllocatorForExpHeap(&v0->unk_DC, param0, 32);
ov6_0223FD60(&v0->unk_78, v2, 15, param0);
Heap_FndInitAllocatorForExpHeap(&v0->unk_DC, heapID, 32);
ov6_0223FD60(&v0->unk_78, v2, 15, heapID);
for (v1 = 0; v1 < 4; v1++) {
ov6_0223FD70(&v0->unk_88[v1], &v0->unk_78, v2, 16 + v1, param0, &v0->unk_DC);
ov6_0223FD70(&v0->unk_88[v1], &v0->unk_78, v2, 16 + v1, heapID, &v0->unk_DC);
}
ov6_0223FDAC(&v0->unk_00, &v0->unk_78);

12
src/overlay006/ov6_02243258.c
View File

@@ -283,7 +283,7 @@ static void ov6_02244FB4(UnkStruct_ov6_02243FFC *param0);
static void ov6_02244FE4(SysTask *param0, void *param1);
static void ov6_0224508C(UnkStruct_ov6_02243FFC *param0, ArchivedSprite *param1);
static void *ov6_0224509C(Pokemon *param0, ArchivedSprite *param1, u32 heapID);
static void *ov6_022450E4(ArchivedSprite *param0, u32 param1);
static void *ov6_022450E4(ArchivedSprite *param0, u32 heapID);
static SpriteResource *ov6_022450F4(UnkStruct_ov6_02243FFC *param0, NARC *param1);
static void ov6_02245118(UnkStruct_ov6_02243FFC *param0, void *param1);
static SpriteResource *ov6_0224514C(UnkStruct_ov6_02243FFC *param0, NARC *param1);
@@ -1700,7 +1700,7 @@ static void ov6_0224481C(UnkStruct_ov6_02243FFC *param0)
ov6_02244928(param0, v0);
NARC_dtor(v0);
param0->unk_244 = sub_020711EC(4, 32);
param0->unk_244 = sub_020711EC(HEAP_ID_FIELD, 32);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1);
}
@@ -1788,7 +1788,7 @@ static void ov6_02244928(UnkStruct_ov6_02243FFC *param0, NARC *param1)
}
param0->unk_270 = ov6_0224509C(param0->unk_5C, &param0->unk_258, HEAP_ID_FIELD);
param0->unk_274 = ov6_022450E4(&param0->unk_258, 4);
param0->unk_274 = ov6_022450E4(&param0->unk_258, HEAP_ID_FIELD);
}
static void ov6_02244B6C(UnkStruct_ov6_02243FFC *param0)
@@ -2070,9 +2070,9 @@ static void *ov6_0224509C(Pokemon *param0, ArchivedSprite *param1, u32 heapID)
return v0;
}
static void *ov6_022450E4(ArchivedSprite *param0, u32 param1)
static void *ov6_022450E4(ArchivedSprite *param0, u32 heapID)
{
void *v0 = sub_02013660(param0->archive, param0->palette, param1);
void *v0 = sub_02013660(param0->archive, param0->palette, heapID);
return v0;
}
@@ -2945,7 +2945,7 @@ static int ov6_02245D48(UnkStruct_ov6_02249270 *param0)
static int ov6_02245D60(UnkStruct_ov6_02249270 *param0)
{
param0->unk_1D4 = sub_020711EC(4, 32);
param0->unk_1D4 = sub_020711EC(HEAP_ID_FIELD, 32);
ov6_02243258(&param0->unk_18, 32, 2, 2, 2, 1, 4, 3, 4, 2);
{

4
src/overlay006/ov6_02248948.c
View File

@@ -60,9 +60,9 @@ static void ov6_02248948(SysTask *param0, void *param1)
}
}
void ov6_0224899C(FieldSystem *fieldSystem, u16 *param1, u32 param2, u32 param3)
void ov6_0224899C(FieldSystem *fieldSystem, u16 *param1, u32 param2, u32 heapID)
{
UnkStruct_ov6_02248948 *v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov6_02248948));
UnkStruct_ov6_02248948 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov6_02248948));
memset(v0, 0, sizeof(UnkStruct_ov6_02248948));

2
src/overlay007/shop_menu.c
View File

@@ -1547,7 +1547,7 @@ static const SpriteTemplateFromResourceHeader sShop_SpriteTemplates[] = {
static void Shop_DrawSprites(ShopMenu *shopMenu)
{
ov5_021D2F14(&shopMenu->unk_94, &sShop_SpriteResourcePaths, 4, 11);
ov5_021D2F14(&shopMenu->unk_94, &sShop_SpriteResourcePaths, 4, HEAP_ID_FIELDMAP);
for (u32 i = 0; i < SHOP_SPRITE_MAX; i++) {
shopMenu->sprites[i] = ov5_021D3104(&shopMenu->unk_94, &sShop_SpriteTemplates[i]);

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) {

15
src/overlay012/ov12_0221FC20.c
View File

@@ -4172,15 +4172,15 @@ int ov12_022234E4(int param0, int param1)
return Unk_ov12_02238928[param0][param1];
}
UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *battleSys, int param1, int param2)
UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *battleSys, int heapID, int param2)
{
int v0;
int v1[] = { 0, 0, 20, 10, 10, 20 };
UnkStruct_ov12_02223764 *v2;
v2 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov12_02223764));
v2 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov12_02223764));
v2->unk_00 = param1;
v2->unk_00 = heapID;
v2->unk_04 = param2;
v2->unk_08.unk_00 = ov16_0223E010(battleSys);
v2->unk_08.unk_04 = ov16_0223E018(battleSys);
@@ -4200,7 +4200,7 @@ UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *battleSys, int param1, int
int v3[6];
NARC *v4;
v4 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, param1);
v4 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, heapID);
for (v0 = 0; v0 < 4; v0++) {
if ((v0 != v2->unk_04) && (v2->unk_04 != 0xFF)) {
@@ -4322,12 +4322,9 @@ UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *battleSys, int param1, int
return v2;
}
UnkStruct_ov12_02223764 *ov12_02223764(BattleSystem *battleSys, int param1)
UnkStruct_ov12_02223764 *ov12_02223764(BattleSystem *battleSys, int heapID)
{
UnkStruct_ov12_02223764 *v0;
v0 = ov12_022234F8(battleSys, param1, 0xFF);
return v0;
return ov12_022234F8(battleSys, heapID, 0xFF);
}
void ov12_02223770(UnkStruct_ov12_02223764 *battleSys)

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;
}

4
src/overlay012/ov12_022380BC.c
View File

@@ -159,7 +159,7 @@ void ov12_022382BC(UnkStruct_ov12_022380DC *param0, int heapID)
sub_02007DEC(param0->unk_18[param0->unk_00], 1, v6);
}
void ov12_02238390(UnkStruct_ov12_022380DC *param0, int param1)
void ov12_02238390(UnkStruct_ov12_022380DC *param0, int heapID)
{
ArchivedSprite v0;
ArchivedSprite *v1;
@@ -187,7 +187,7 @@ void ov12_02238390(UnkStruct_ov12_022380DC *param0, int param1)
*v1 = v0;
sub_020089A0(param0->unk_18[param0->unk_00]);
sub_02013610(v1->archive, v1->character, param1, param0->unk_08[param0->unk_00]->unk_00);
sub_02013610(v1->archive, v1->character, heapID, param0->unk_08[param0->unk_00]->unk_00);
param0->unk_08[param0->unk_00]->unk_04 = v0.archive;
param0->unk_08[param0->unk_00]->unk_08 = v0.palette;

12
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;
@@ -197,7 +197,7 @@ int ov17_0223B140(OverlayManager *param0, int *param1)
SpriteSystem_InitManagerWithCapacities(v0->unk_0C.unk_18, v0->unk_0C.unk_1C, &Unk_ov17_02252DB0);
SetSubScreenViewRect(SpriteSystem_GetRenderer(v0->unk_0C.unk_18), 0, ((192 + 80) << FX32_SHIFT));
v0->unk_0C.unk_04 = sub_0200762C(21);
v0->unk_0C.unk_04 = sub_0200762C(HEAP_ID_21);
ov17_0223B884();
v0->unk_0C.unk_20 = ov12_0221FCDC(HEAP_ID_21);
@@ -207,16 +207,16 @@ 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_48 = StringTemplate_Default(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);
{
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);

6
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;
@@ -176,11 +176,11 @@ int ov17_0223CB1C(OverlayManager *param0, int *param1)
SpriteSystem_InitManagerWithCapacities(v0->unk_0C.unk_1C, v0->unk_0C.unk_20, &Unk_ov17_02252EC8);
SetSubScreenViewRect(SpriteSystem_GetRenderer(v0->unk_0C.unk_1C), 0, (256 * FX32_ONE));
v0->unk_0C.unk_04 = sub_0200762C(22);
v0->unk_0C.unk_04 = sub_0200762C(HEAP_ID_22);
ov17_0223D350();
v0->unk_0C.unk_38 = MessageLoader_Init(0, 26, 209, HEAP_ID_22);
v0->unk_0C.unk_3C = StringTemplate_Default(22);
v0->unk_0C.unk_3C = StringTemplate_Default(HEAP_ID_22);
v0->unk_0C.unk_40 = Strbuf_Init((2 * 160), HEAP_ID_22);
{

10
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;
@@ -278,13 +278,13 @@ int ov17_0223DAD0(OverlayManager *param0, int *param1)
SpriteSystem_InitManagerWithCapacities(v0->unk_14.unk_58, v0->unk_14.unk_5C, &Unk_ov17_02252FF0);
SetSubScreenViewRect(SpriteSystem_GetRenderer(v0->unk_14.unk_58), 0, (256 * FX32_ONE));
v0->unk_14.unk_44 = sub_0200762C(23);
v0->unk_14.unk_44 = sub_0200762C(HEAP_ID_23);
ov17_0223E450();
v0->unk_14.unk_84 = MessageLoader_Init(0, 26, 206, HEAP_ID_23);
v0->unk_14.unk_88 = StringTemplate_Default(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);

4
src/overlay017/ov17_022413D8.c
View File

@@ -475,7 +475,7 @@ void ov17_02241524(UnkStruct_ov17_0223F88C *param0, int param1)
GF_ASSERT(param0->unk_58[param1].unk_00 != NULL);
MI_CpuClear8(param0->unk_58[param1].unk_00, (32 * 10 * 10));
param0->unk_08[param1] = sub_02095484(param0->unk_04, param1, param0->unk_00->unk_00[param1], 0, &param0->unk_58[param1], 21, (256 - 40) - 32 * param1, (104 + 8) - 32 * param1, -0x200);
param0->unk_08[param1] = sub_02095484(param0->unk_04, param1, param0->unk_00->unk_00[param1], 0, &param0->unk_58[param1], HEAP_ID_21, (256 - 40) - 32 * param1, (104 + 8) - 32 * param1, -0x200);
sub_02007DEC(param0->unk_08[param1], 6, 1);
sub_02007DEC(param0->unk_08[param1], 37, 1);
@@ -500,7 +500,7 @@ void ov17_022415E4(UnkStruct_ov17_0223F88C *param0)
GF_ASSERT(param0->unk_58[v0].unk_00 == NULL);
param0->unk_58[v0].unk_00 = Heap_AllocFromHeap(HEAP_ID_21, (32 * 10 * 10));
param0->unk_08[v0] = sub_02095484(param0->unk_04, v0, param0->unk_00->unk_00[v0], 0, &param0->unk_58[v0], 21, (256 - 40) - 32 * v0, (104 + 8) - 32 * v0, -0x200);
param0->unk_08[v0] = sub_02095484(param0->unk_04, v0, param0->unk_00->unk_00[v0], 0, &param0->unk_58[v0], HEAP_ID_21, (256 - 40) - 32 * v0, (104 + 8) - 32 * v0, -0x200);
sub_02007DEC(param0->unk_08[v0], 6, 1);
sub_02007DEC(param0->unk_08[v0], 37, 1);

6
src/overlay017/ov17_02247A48.c
View File

@@ -237,7 +237,7 @@ static void ov17_02247B00(UnkStruct_ov17_0224F30C *param0, void *param1, const U
MI_CpuClear8(&v5, sizeof(UnkStruct_ov22_0225AF8C));
v5.unk_0C = 22;
v5.heapId = HEAP_ID_22;
v5.unk_04 = 128;
v5.unk_08 = (96 - 32) + 80 / 2;
v0->unk_F18[v1->unk_00].unk_04 = 128;
@@ -945,7 +945,7 @@ static void ov17_02248860(SysTask *param0, void *param1)
v2 = Pokemon_DPSpriteYOffset(v0->unk_38.unk_00->unk_0C.unk_00->unk_00[v0->unk_38.unk_0E], 2);
MI_CpuClear8(&v1, sizeof(UnkStruct_ov22_0225AF8C));
v1.unk_0C = 22;
v1.heapId = HEAP_ID_22;
v1.unk_04 = 128;
v1.unk_08 = (96 - 32) + v2;
v0->unk_38.unk_00->unk_F18[v0->unk_38.unk_0E].unk_00 = ov22_0225AFD4(&v1, v0->unk_38.unk_00->unk_00->unk_00.unk_E8[v0->unk_38.unk_0E]);
@@ -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);

2
src/overlay017/ov17_0224A0FC.c
View File

@@ -346,7 +346,7 @@ void ov17_0224A134(UnkStruct_ov17_0224DF54 *param0)
}
MI_CpuClear8(&v1, sizeof(UnkStruct_ov22_0225AF8C));
v1.unk_0C = 23;
v1.heapId = HEAP_ID_23;
for (v0 = 0; v0 < 4; v0++) {
int v3;

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