diff --git a/include/battle/ov16_0226DB7C.h b/include/battle/ov16_0226DB7C.h index f12f0f4ff4..997400010d 100644 --- a/include/battle/ov16_0226DB7C.h +++ b/include/battle/ov16_0226DB7C.h @@ -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); diff --git a/include/battle/ov16_0226DE44.h b/include/battle/ov16_0226DE44.h index 59049412b0..dd0a161332 100644 --- a/include/battle/ov16_0226DE44.h +++ b/include/battle/ov16_0226DE44.h @@ -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); diff --git a/include/overlay004/ov4_021D0D80.h b/include/overlay004/ov4_021D0D80.h index 6cd71b94a6..d0eab55c2b 100644 --- a/include/overlay004/ov4_021D0D80.h +++ b/include/overlay004/ov4_021D0D80.h @@ -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); diff --git a/include/overlay004/ov4_021D2808.h b/include/overlay004/ov4_021D2808.h index 50a9fa9c22..fa51a3cbeb 100644 --- a/include/overlay004/ov4_021D2808.h +++ b/include/overlay004/ov4_021D2808.h @@ -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); diff --git a/include/overlay005/encounter_effect.h b/include/overlay005/encounter_effect.h index fbd70c3aa4..45912148c3 100644 --- a/include/overlay005/encounter_effect.h +++ b/include/overlay005/encounter_effect.h @@ -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); diff --git a/include/overlay005/ov5_021D1A94.h b/include/overlay005/ov5_021D1A94.h index 48d4398949..62816b14ca 100644 --- a/include/overlay005/ov5_021D1A94.h +++ b/include/overlay005/ov5_021D1A94.h @@ -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); diff --git a/include/overlay005/ov5_021D2F14.h b/include/overlay005/ov5_021D2F14.h index cc6e125c81..48ab076371 100644 --- a/include/overlay005/ov5_021D2F14.h +++ b/include/overlay005/ov5_021D2F14.h @@ -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); diff --git a/include/overlay005/ov5_021DF440.h b/include/overlay005/ov5_021DF440.h index 285bc4e6d3..2b6b750966 100644 --- a/include/overlay005/ov5_021DF440.h +++ b/include/overlay005/ov5_021DF440.h @@ -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); diff --git a/include/overlay005/ov5_021EF250.h b/include/overlay005/ov5_021EF250.h index e09217f546..ee62c90e0e 100644 --- a/include/overlay005/ov5_021EF250.h +++ b/include/overlay005/ov5_021EF250.h @@ -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); diff --git a/include/overlay005/ov5_021EF4BC.h b/include/overlay005/ov5_021EF4BC.h index 13f32c4302..e6d2803fdf 100644 --- a/include/overlay005/ov5_021EF4BC.h +++ b/include/overlay005/ov5_021EF4BC.h @@ -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); diff --git a/include/overlay005/ov5_021F067C.h b/include/overlay005/ov5_021F067C.h index ed9d4173d9..be6c3692af 100644 --- a/include/overlay005/ov5_021F067C.h +++ b/include/overlay005/ov5_021F067C.h @@ -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); diff --git a/include/overlay005/struct_ov5_021D30A8.h b/include/overlay005/struct_ov5_021D30A8.h index 491d963ba0..369582dffe 100644 --- a/include/overlay005/struct_ov5_021D30A8.h +++ b/include/overlay005/struct_ov5_021D30A8.h @@ -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 diff --git a/include/overlay006/ov6_0223E140.h b/include/overlay006/ov6_0223E140.h index 0e220c64c3..7c498d1440 100644 --- a/include/overlay006/ov6_0223E140.h +++ b/include/overlay006/ov6_0223E140.h @@ -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); diff --git a/include/overlay006/ov6_02248948.h b/include/overlay006/ov6_02248948.h index 5048dc64f8..1dbc251342 100644 --- a/include/overlay006/ov6_02248948.h +++ b/include/overlay006/ov6_02248948.h @@ -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 diff --git a/include/overlay010/struct_ov10_0221F800.h b/include/overlay010/struct_ov10_0221F800.h index db76bd096d..0d2794e317 100644 --- a/include/overlay010/struct_ov10_0221F800.h +++ b/include/overlay010/struct_ov10_0221F800.h @@ -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; diff --git a/include/overlay011/ov11_0221F840.h b/include/overlay011/ov11_0221F840.h index 3cac52e7ac..d32bdbbebb 100644 --- a/include/overlay011/ov11_0221F840.h +++ b/include/overlay011/ov11_0221F840.h @@ -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); diff --git a/include/overlay012/ov12_0221FC20.h b/include/overlay012/ov12_0221FC20.h index fd35f8fae7..a3abad2bbf 100644 --- a/include/overlay012/ov12_0221FC20.h +++ b/include/overlay012/ov12_0221FC20.h @@ -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); diff --git a/include/overlay012/ov12_022237EC.h b/include/overlay012/ov12_022237EC.h index 5b79b76404..b20f9a7bf5 100644 --- a/include/overlay012/ov12_022237EC.h +++ b/include/overlay012/ov12_022237EC.h @@ -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); diff --git a/include/overlay012/ov12_02235E94.h b/include/overlay012/ov12_02235E94.h index 86263bf5cf..037c86f91f 100644 --- a/include/overlay012/ov12_02235E94.h +++ b/include/overlay012/ov12_02235E94.h @@ -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); diff --git a/include/overlay012/ov12_02237EFC.h b/include/overlay012/ov12_02237EFC.h index 56fd04598a..64b49244cb 100644 --- a/include/overlay012/ov12_02237EFC.h +++ b/include/overlay012/ov12_02237EFC.h @@ -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); diff --git a/include/overlay012/ov12_022380BC.h b/include/overlay012/ov12_022380BC.h index dc978f737e..3adfda5064 100644 --- a/include/overlay012/ov12_022380BC.h +++ b/include/overlay012/ov12_022380BC.h @@ -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 diff --git a/include/overlay012/struct_ov12_02236690.h b/include/overlay012/struct_ov12_02236690.h index aea2e361dd..0d0444e84c 100644 --- a/include/overlay012/struct_ov12_02236690.h +++ b/include/overlay012/struct_ov12_02236690.h @@ -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; diff --git a/include/overlay017/ov17_0223F118.h b/include/overlay017/ov17_0223F118.h index cedcfc6f30..f82af006c9 100644 --- a/include/overlay017/ov17_0223F118.h +++ b/include/overlay017/ov17_0223F118.h @@ -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); diff --git a/include/overlay021/ov21_021D1FA4.h b/include/overlay021/ov21_021D1FA4.h index 04622b052e..e5b4dd7eeb 100644 --- a/include/overlay021/ov21_021D1FA4.h +++ b/include/overlay021/ov21_021D1FA4.h @@ -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); diff --git a/include/overlay021/struct_ov21_021D1FA4.h b/include/overlay021/struct_ov21_021D1FA4.h index e523cd49cb..f8b9b4caa8 100644 --- a/include/overlay021/struct_ov21_021D1FA4.h +++ b/include/overlay021/struct_ov21_021D1FA4.h @@ -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 diff --git a/include/overlay021/struct_ov21_021E8E0C.h b/include/overlay021/struct_ov21_021E8E0C.h index 12eea450b9..5a506dee2e 100644 --- a/include/overlay021/struct_ov21_021E8E0C.h +++ b/include/overlay021/struct_ov21_021E8E0C.h @@ -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; diff --git a/include/overlay022/ov22_02255094.h b/include/overlay022/ov22_02255094.h index 8b3681e541..9a6a376676 100644 --- a/include/overlay022/ov22_02255094.h +++ b/include/overlay022/ov22_02255094.h @@ -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); diff --git a/include/overlay022/struct_ov22_022550D4.h b/include/overlay022/struct_ov22_022550D4.h index 1038dd4551..391b035f17 100644 --- a/include/overlay022/struct_ov22_022550D4.h +++ b/include/overlay022/struct_ov22_022550D4.h @@ -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 diff --git a/include/overlay022/struct_ov22_0225AF8C.h b/include/overlay022/struct_ov22_0225AF8C.h index 239b500e2a..c800ecfde2 100644 --- a/include/overlay022/struct_ov22_0225AF8C.h +++ b/include/overlay022/struct_ov22_0225AF8C.h @@ -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 diff --git a/include/overlay079/ov79_021D3768.h b/include/overlay079/ov79_021D3768.h index 34e19054a3..79e2d7644a 100644 --- a/include/overlay079/ov79_021D3768.h +++ b/include/overlay079/ov79_021D3768.h @@ -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); diff --git a/include/overlay083/ov83_0223D6A8.h b/include/overlay083/ov83_0223D6A8.h index 2928c93d51..f50ce95791 100644 --- a/include/overlay083/ov83_0223D6A8.h +++ b/include/overlay083/ov83_0223D6A8.h @@ -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); diff --git a/include/overlay083/struct_ov83_0223B784.h b/include/overlay083/struct_ov83_0223B784.h index 2d7129c8b8..776772a320 100644 --- a/include/overlay083/struct_ov83_0223B784.h +++ b/include/overlay083/struct_ov83_0223B784.h @@ -25,7 +25,7 @@ #include "bg_window.h" typedef struct { - int unk_00; + int heapID; BOOL unk_04; int unk_08; int unk_0C; diff --git a/include/overlay104/ov104_0223D5D0.h b/include/overlay104/ov104_0223D5D0.h index 9f8f281f75..a83cd59749 100644 --- a/include/overlay104/ov104_0223D5D0.h +++ b/include/overlay104/ov104_0223D5D0.h @@ -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); diff --git a/include/overlay114/ov114_0225C700.h b/include/overlay114/ov114_0225C700.h index 0e561cf0ca..bd1eb32785 100644 --- a/include/overlay114/ov114_0225C700.h +++ b/include/overlay114/ov114_0225C700.h @@ -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); diff --git a/include/overlay115/ov115_02260CEC.h b/include/overlay115/ov115_02260CEC.h index 2335c6aeaa..a087cbf504 100644 --- a/include/overlay115/ov115_02260CEC.h +++ b/include/overlay115/ov115_02260CEC.h @@ -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); diff --git a/include/overlay119/struct_ov119_021D1930.h b/include/overlay119/struct_ov119_021D1930.h index f7061380a9..68cea7aa54 100644 --- a/include/overlay119/struct_ov119_021D1930.h +++ b/include/overlay119/struct_ov119_021D1930.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV119_021D1930_H typedef struct { - int unk_00; + int heapId; int unk_04; } UnkStruct_ov119_021D1930; diff --git a/include/unk_0200762C.h b/include/unk_0200762C.h index 481d77703a..397db5eb44 100644 --- a/include/unk_0200762C.h +++ b/include/unk_0200762C.h @@ -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); diff --git a/include/unk_02012744.h b/include/unk_02012744.h index b5d154cd1b..69ec6b900b 100644 --- a/include/unk_02012744.h +++ b/include/unk_02012744.h @@ -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); diff --git a/include/unk_020131EC.h b/include/unk_020131EC.h index f6f6f9fa16..a4c9c3a886 100644 --- a/include/unk_020131EC.h +++ b/include/unk_020131EC.h @@ -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); diff --git a/include/unk_02014000.h b/include/unk_02014000.h index 8973790297..4fdecc35cf 100644 --- a/include/unk_02014000.h +++ b/include/unk_02014000.h @@ -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); diff --git a/include/unk_020158A8.h b/include/unk_020158A8.h index 4a16ca1f51..04419d1460 100644 --- a/include/unk_020158A8.h +++ b/include/unk_020158A8.h @@ -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); diff --git a/include/unk_02015920.h b/include/unk_02015920.h index d6f1a2a7ed..485e944d6c 100644 --- a/include/unk_02015920.h +++ b/include/unk_02015920.h @@ -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); diff --git a/include/unk_02024220.h b/include/unk_02024220.h index dedb7fcb9e..27fbe86b7c 100644 --- a/include/unk_02024220.h +++ b/include/unk_02024220.h @@ -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 diff --git a/include/unk_0202854C.h b/include/unk_0202854C.h index 5ea94b81f2..7952e5d9d0 100644 --- a/include/unk_0202854C.h +++ b/include/unk_0202854C.h @@ -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); diff --git a/include/unk_020298BC.h b/include/unk_020298BC.h index 52b48d36d3..c6eaf0551a 100644 --- a/include/unk_020298BC.h +++ b/include/unk_020298BC.h @@ -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); diff --git a/include/unk_0202F1D4.h b/include/unk_0202F1D4.h index 633452329b..6e3eea41db 100644 --- a/include/unk_0202F1D4.h +++ b/include/unk_0202F1D4.h @@ -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 diff --git a/include/unk_0203D1B8.h b/include/unk_0203D1B8.h index 4c3be800ca..9f34c378ba 100644 --- a/include/unk_0203D1B8.h +++ b/include/unk_0203D1B8.h @@ -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); diff --git a/include/unk_02056B30.h b/include/unk_02056B30.h index 6154b54573..40f347ffa1 100644 --- a/include/unk_02056B30.h +++ b/include/unk_02056B30.h @@ -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); diff --git a/include/unk_020711EC.h b/include/unk_020711EC.h index 2a7cdb1baa..a651f0c842 100644 --- a/include/unk_020711EC.h +++ b/include/unk_020711EC.h @@ -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); diff --git a/include/unk_0207C63C.h b/include/unk_0207C63C.h index c2c4f159cf..353fe2bc04 100644 --- a/include/unk_0207C63C.h +++ b/include/unk_0207C63C.h @@ -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); diff --git a/include/unk_0208694C.h b/include/unk_0208694C.h index 0edffb1550..72fed0fdc0 100644 --- a/include/unk_0208694C.h +++ b/include/unk_0208694C.h @@ -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 diff --git a/include/unk_020890F4.h b/include/unk_020890F4.h index b7129dc213..98ba8c7fc1 100644 --- a/include/unk_020890F4.h +++ b/include/unk_020890F4.h @@ -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 diff --git a/include/unk_02092494.h b/include/unk_02092494.h index 21fa12a76f..ad4cd76b6c 100644 --- a/include/unk_02092494.h +++ b/include/unk_02092494.h @@ -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); diff --git a/include/unk_02094EDC.h b/include/unk_02094EDC.h index b2f6b731f2..13eb038a2d 100644 --- a/include/unk_02094EDC.h +++ b/include/unk_02094EDC.h @@ -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); diff --git a/include/unk_020972FC.h b/include/unk_020972FC.h index ebf9fbb527..438ca4f89d 100644 --- a/include/unk_020972FC.h +++ b/include/unk_020972FC.h @@ -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); diff --git a/include/unk_0209747C.h b/include/unk_0209747C.h index baf36194d4..147f6099e8 100644 --- a/include/unk_0209747C.h +++ b/include/unk_0209747C.h @@ -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); diff --git a/include/unk_020989DC.h b/include/unk_020989DC.h index e088de08a9..d4b0ea6f4d 100644 --- a/include/unk_020989DC.h +++ b/include/unk_020989DC.h @@ -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); diff --git a/include/unk_02098FFC.h b/include/unk_02098FFC.h index 92d1467961..fe675e6ef2 100644 --- a/include/unk_02098FFC.h +++ b/include/unk_02098FFC.h @@ -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); diff --git a/include/unk_02099604.h b/include/unk_02099604.h index d8fa726df6..6dc5dc74f2 100644 --- a/include/unk_02099604.h +++ b/include/unk_02099604.h @@ -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 diff --git a/include/unk_020997B8.h b/include/unk_020997B8.h index f12a8298c6..a3d2a04313 100644 --- a/include/unk_020997B8.h +++ b/include/unk_020997B8.h @@ -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 diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index 045ab54269..95be7978bb 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -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: diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index 21b6bd4cfb..13ca65b3ab 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -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; diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 213faf104d..58ab593bac 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -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; diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index 3fc5582cbe..987f75a129 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -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); } } diff --git a/src/battle/ov16_0226DB7C.c b/src/battle/ov16_0226DB7C.c index b1417aa459..142b4c7632 100644 --- a/src/battle/ov16_0226DB7C.c +++ b/src/battle/ov16_0226DB7C.c @@ -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++) { diff --git a/src/battle/ov16_0226DE44.c b/src/battle/ov16_0226DE44.c index 3b847de6a6..4cf6ecf77e 100644 --- a/src/battle/ov16_0226DE44.c +++ b/src/battle/ov16_0226DE44.c @@ -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); diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index 95f8e86c9d..02281913c3 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -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); } diff --git a/src/dw_warp/dw_warp.c b/src/dw_warp/dw_warp.c index 07dc5c1827..58f89ae476 100644 --- a/src/dw_warp/dw_warp.c +++ b/src/dw_warp/dw_warp.c @@ -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) diff --git a/src/overlay004/ov4_021D0D80.c b/src/overlay004/ov4_021D0D80.c index 598d3128a6..6378442752 100644 --- a/src/overlay004/ov4_021D0D80.c +++ b/src/overlay004/ov4_021D0D80.c @@ -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); diff --git a/src/overlay004/ov4_021D2808.c b/src/overlay004/ov4_021D2808.c index 5e0bc18640..f0e4494bef 100644 --- a/src/overlay004/ov4_021D2808.c +++ b/src/overlay004/ov4_021D2808.c @@ -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(); diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c index f1af9adf2a..52ac4ecef8 100644 --- a/src/overlay005/encounter_effect.c +++ b/src/overlay005/encounter_effect.c @@ -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); diff --git a/src/overlay005/encounter_effect_core.c b/src/overlay005/encounter_effect_core.c index ea20f17753..8e81c56fc2 100644 --- a/src/overlay005/encounter_effect_core.c +++ b/src/overlay005/encounter_effect_core.c @@ -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); diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c index 5df58f691a..5791921b87 100644 --- a/src/overlay005/fieldmap.c +++ b/src/overlay005/fieldmap.c @@ -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); diff --git a/src/overlay005/ov5_021D1A94.c b/src/overlay005/ov5_021D1A94.c index 8cb8da7fe8..91dfcc589a 100644 --- a/src/overlay005/ov5_021D1A94.c +++ b/src/overlay005/ov5_021D1A94.c @@ -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; diff --git a/src/overlay005/ov5_021D2F14.c b/src/overlay005/ov5_021D2F14.c index 0b8b521bea..cee3a1098e 100644 --- a/src/overlay005/ov5_021D2F14.c +++ b/src/overlay005/ov5_021D2F14.c @@ -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, ¶m0->unk_04, param3); - param0->unk_1C6 = param3; + param0->unk_00 = SpriteList_InitRendering(param2, ¶m0->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, ¶m0->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); diff --git a/src/overlay005/ov5_021DF440.c b/src/overlay005/ov5_021DF440.c index 0c418c4ab5..105d702fb7 100644 --- a/src/overlay005/ov5_021DF440.c +++ b/src/overlay005/ov5_021DF440.c @@ -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); } diff --git a/src/overlay005/ov5_021ECE40.c b/src/overlay005/ov5_021ECE40.c index 482d37d848..cec7428b9b 100644 --- a/src/overlay005/ov5_021ECE40.c +++ b/src/overlay005/ov5_021ECE40.c @@ -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); diff --git a/src/overlay005/ov5_021EF250.c b/src/overlay005/ov5_021EF250.c index 19fd65fe51..1ef81a27fb 100644 --- a/src/overlay005/ov5_021EF250.c +++ b/src/overlay005/ov5_021EF250.c @@ -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; diff --git a/src/overlay005/ov5_021EF4BC.c b/src/overlay005/ov5_021EF4BC.c index cfea846be6..b7350a80fb 100644 --- a/src/overlay005/ov5_021EF4BC.c +++ b/src/overlay005/ov5_021EF4BC.c @@ -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; diff --git a/src/overlay005/ov5_021F067C.c b/src/overlay005/ov5_021F067C.c index c45055d444..3c98b22c47 100644 --- a/src/overlay005/ov5_021F067C.c +++ b/src/overlay005/ov5_021F067C.c @@ -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; diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c index 5b57dd41d3..5bf2bfa33d 100644 --- a/src/overlay006/ov6_0223E140.c +++ b/src/overlay006/ov6_0223E140.c @@ -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(¶m0->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(¶m0->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); diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c index 3cf98305f7..d0f0314571 100644 --- a/src/overlay006/ov6_02243258.c +++ b/src/overlay006/ov6_02243258.c @@ -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, ¶m0->unk_258, HEAP_ID_FIELD); - param0->unk_274 = ov6_022450E4(¶m0->unk_258, 4); + param0->unk_274 = ov6_022450E4(¶m0->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(¶m0->unk_18, 32, 2, 2, 2, 1, 4, 3, 4, 2); { diff --git a/src/overlay006/ov6_02248948.c b/src/overlay006/ov6_02248948.c index 9ca3cc6e29..ad8dc32a9a 100644 --- a/src/overlay006/ov6_02248948.c +++ b/src/overlay006/ov6_02248948.c @@ -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)); diff --git a/src/overlay007/shop_menu.c b/src/overlay007/shop_menu.c index 4113045870..b019d280a5 100644 --- a/src/overlay007/shop_menu.c +++ b/src/overlay007/shop_menu.c @@ -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]); diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 9e768d0f23..dd453a7ee4 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -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(¶m0->unk_B8C, 0, 1, 15); param0->unk_BAC = Text_AddPrinterWithParams(¶m0->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, ¶m0->unk_B7C, 0, 0x2, 0x13, 27, 4, 13, ((1 + (18 + 12)) + 9)); Window_Add(param0->unk_0C, ¶m0->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); diff --git a/src/overlay011/ov11_0221F840.c b/src/overlay011/ov11_0221F840.c index 326d14e3e4..31cc91ecdf 100644 --- a/src/overlay011/ov11_0221F840.c +++ b/src/overlay011/ov11_0221F840.c @@ -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) { diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c index f86d3e4cdc..e5b1dbe5ae 100644 --- a/src/overlay012/ov12_0221FC20.c +++ b/src/overlay012/ov12_0221FC20.c @@ -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) diff --git a/src/overlay012/ov12_022237EC.c b/src/overlay012/ov12_022237EC.c index 9bcf75e1b2..731b9e90f1 100644 --- a/src/overlay012/ov12_022237EC.c +++ b/src/overlay012/ov12_022237EC.c @@ -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; diff --git a/src/overlay012/ov12_02235E94.c b/src/overlay012/ov12_02235E94.c index 0c529db27c..5b30b31229 100644 --- a/src/overlay012/ov12_02235E94.c +++ b/src/overlay012/ov12_02235E94.c @@ -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; diff --git a/src/overlay012/ov12_02237EFC.c b/src/overlay012/ov12_02237EFC.c index 3b5265b5bb..0c786332b8 100644 --- a/src/overlay012/ov12_02237EFC.c +++ b/src/overlay012/ov12_02237EFC.c @@ -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; } diff --git a/src/overlay012/ov12_022380BC.c b/src/overlay012/ov12_022380BC.c index f604439f11..081c7d5976 100644 --- a/src/overlay012/ov12_022380BC.c +++ b/src/overlay012/ov12_022380BC.c @@ -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; diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c index c276b48ad6..87e4a88864 100644 --- a/src/overlay017/ov17_0223B140.c +++ b/src/overlay017/ov17_0223B140.c @@ -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); diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c index 32d5189648..2ebd9e4321 100644 --- a/src/overlay017/ov17_0223CB1C.c +++ b/src/overlay017/ov17_0223CB1C.c @@ -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); { diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index 6ca1346cd8..cbc4435bde 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -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); diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c index fc30e350a2..eb76be65e4 100644 --- a/src/overlay017/ov17_0223F118.c +++ b/src/overlay017/ov17_0223F118.c @@ -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) diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c index 0776b6598b..adcb9cc003 100644 --- a/src/overlay017/ov17_0223F7E4.c +++ b/src/overlay017/ov17_0223F7E4.c @@ -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); diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c index 396af1a041..cc10681767 100644 --- a/src/overlay017/ov17_022413D8.c +++ b/src/overlay017/ov17_022413D8.c @@ -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, ¶m0->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, ¶m0->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, ¶m0->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, ¶m0->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); diff --git a/src/overlay017/ov17_02247A48.c b/src/overlay017/ov17_02247A48.c index a244841424..706ed74447 100644 --- a/src/overlay017/ov17_02247A48.c +++ b/src/overlay017/ov17_02247A48.c @@ -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++; diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c index d98cd579ba..7c9ca64ab5 100644 --- a/src/overlay017/ov17_022492DC.c +++ b/src/overlay017/ov17_022492DC.c @@ -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); diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c index 62093a0f49..1ee592b30a 100644 --- a/src/overlay017/ov17_0224A0FC.c +++ b/src/overlay017/ov17_0224A0FC.c @@ -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; diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c index 4fe732ff37..c315c949ff 100644 --- a/src/overlay017/ov17_0224F4D4.c +++ b/src/overlay017/ov17_0224F4D4.c @@ -143,12 +143,12 @@ int ov17_0224F4D4(OverlayManager *param0, int *param1) G2_BlendNone(); G2S_BlendNone(); - Heap_Create(3, 24, 0x70000); + Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_24, 0x70000); - v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov17_0224FCA0), 24); + v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov17_0224FCA0), HEAP_ID_24); MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0224FCA0)); - v0->unk_0C = ov17_0223F140(24); + v0->unk_0C = ov17_0223F140(HEAP_ID_24); v0->unk_00 = OverlayManager_Args(param0); v0->unk_00->unk_150 = v0; v0->unk_00->unk_154 = 3; @@ -157,26 +157,26 @@ int ov17_0224F4D4(OverlayManager *param0, int *param1) ov17_0224FE1C(v0); v0->unk_127B = 0; - v0->unk_10.unk_C0 = PaletteData_New(24); + v0->unk_10.unk_C0 = PaletteData_New(HEAP_ID_24); PaletteData_SetAutoTransparent(v0->unk_10.unk_C0, 1); - PaletteData_AllocBuffer(v0->unk_10.unk_C0, 0, 0x200, 24); - PaletteData_AllocBuffer(v0->unk_10.unk_C0, 1, 0x200, 24); - PaletteData_AllocBuffer(v0->unk_10.unk_C0, 2, (((16 - 2) * 16) * sizeof(u16)), 24); - PaletteData_AllocBuffer(v0->unk_10.unk_C0, 3, 0x200, 24); + PaletteData_AllocBuffer(v0->unk_10.unk_C0, 0, 0x200, HEAP_ID_24); + PaletteData_AllocBuffer(v0->unk_10.unk_C0, 1, 0x200, HEAP_ID_24); + PaletteData_AllocBuffer(v0->unk_10.unk_C0, 2, (((16 - 2) * 16) * sizeof(u16)), HEAP_ID_24); + PaletteData_AllocBuffer(v0->unk_10.unk_C0, 3, 0x200, HEAP_ID_24); v0->unk_10.unk_20 = BgConfig_New(HEAP_ID_24); - VramTransfer_New(64, 24); + VramTransfer_New(64, HEAP_ID_24); SetAutorepeat(4, 8); ov17_0224FB34(v0->unk_10.unk_20); sub_0201E3D8(); sub_0201E450(4); - Font_InitManager(FONT_SUBSCREEN, 24); + Font_InitManager(FONT_SUBSCREEN, HEAP_ID_24); - v0->unk_10.unk_18 = SpriteSystem_Alloc(24); + v0->unk_10.unk_18 = SpriteSystem_Alloc(HEAP_ID_24); SpriteSystem_Init(v0->unk_10.unk_18, &Unk_ov17_02254B0C, &Unk_ov17_02254AC4, (16 + 16)); ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_64K); @@ -185,14 +185,14 @@ int ov17_0224F4D4(OverlayManager *param0, int *param1) v0->unk_10.unk_1C = SpriteManager_New(v0->unk_10.unk_18); SpriteSystem_InitSprites(v0->unk_10.unk_18, v0->unk_10.unk_1C, (64 + 64)); SpriteSystem_InitManagerWithCapacities(v0->unk_10.unk_18, v0->unk_10.unk_1C, &Unk_ov17_02254AD8); - v0->unk_10.unk_04 = sub_0200762C(24); + v0->unk_10.unk_04 = sub_0200762C(HEAP_ID_24); ov17_0224FDDC(); v0->unk_10.unk_B4 = MessageLoader_Init(0, 26, 218, HEAP_ID_24); - v0->unk_10.unk_B8 = StringTemplate_Default(24); + v0->unk_10.unk_B8 = StringTemplate_Default(HEAP_ID_24); v0->unk_10.unk_BC = Strbuf_Init((2 * 160), HEAP_ID_24); - v0->unk_10.unk_C4 = sub_02012744(10, 24); + v0->unk_10.unk_C4 = sub_02012744(10, HEAP_ID_24); ov17_0224FE60(v0); ov17_0224FE70(v0); diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c index a9f9183679..c20513093c 100644 --- a/src/overlay017/ov17_02250744.c +++ b/src/overlay017/ov17_02250744.c @@ -191,7 +191,7 @@ void ov17_02250744(UnkStruct_ov17_0224FCA0 *param0) GF_ASSERT(param0->unk_10.unk_C8[v1].unk_00 == NULL); param0->unk_10.unk_C8[v1].unk_00 = Heap_AllocFromHeap(HEAP_ID_24, (32 * 10 * 10)); - param0->unk_10.unk_08[v1] = sub_02095484(param0->unk_10.unk_04, v0, param0->unk_10.unk_00->unk_00[v1], 2, ¶m0->unk_10.unk_C8[v1], 24, Unk_ov17_02254BF4[v0][0], Unk_ov17_02254BF4[v0][1], Unk_ov17_02254BF4[v0][2]); + param0->unk_10.unk_08[v1] = sub_02095484(param0->unk_10.unk_04, v0, param0->unk_10.unk_00->unk_00[v1], 2, ¶m0->unk_10.unk_C8[v1], HEAP_ID_24, Unk_ov17_02254BF4[v0][0], Unk_ov17_02254BF4[v0][1], Unk_ov17_02254BF4[v0][2]); } } diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c index 8dc53b8c51..1e23f90370 100644 --- a/src/overlay019/ov19_021D0D80.c +++ b/src/overlay019/ov19_021D0D80.c @@ -3131,7 +3131,7 @@ static void ov19_021D4BE0(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_02042434 *p param0->unk_1A0 = Heap_AllocFromHeap(HEAP_ID_9, Pokemon_StructSize()); GF_ASSERT(param0->unk_19C); - param0->unk_128 = sub_0208712C(9, 2, 0, 8, param0->unk_1A4); + param0->unk_128 = sub_0208712C(HEAP_ID_9, 2, 0, 8, param0->unk_1A4); if (param1->unk_04 != 4) { param0->unk_17C = sub_02023FCC(Unk_ov19_021DFDF6, NELEMS(Unk_ov19_021DFDF6), ov19_021D53B8, param0, HEAP_ID_9); diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c index cec112c0a8..edabd7e1a3 100644 --- a/src/overlay019/ov19_021D61B0.c +++ b/src/overlay019/ov19_021D61B0.c @@ -183,7 +183,7 @@ BOOL ov19_021D61B0(UnkStruct_ov19_021D61B0 **param0, const UnkStruct_ov19_021D4D Graphics_LoadPartialPaletteFromOpenNARC(v3, 26, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 10, &(v0->unk_1A8)); Font_UseImmediateGlyphAccess(FONT_SYSTEM, 10); - v0->unk_1BC = sub_0200762C(10); + v0->unk_1BC = sub_0200762C(HEAP_ID_10); for (v1 = 0; v1 < 4; v1++) { v0->unk_08[v1] = NULL; diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c index f1751813e5..25e962b108 100644 --- a/src/overlay021/ov21_021D1FA4.c +++ b/src/overlay021/ov21_021D1FA4.c @@ -39,7 +39,7 @@ static void ov21_021D2830(BgConfig *param0, int param1); static void ov21_021D299C(BgConfig *param0); static void ov21_021D29D0(PokedexGraphicData *param0, int param1); static void ov21_021D2A00(PokedexGraphicData *param0); -static void ov21_021D2A0C(PokedexGraphicData *param0, int param1); +static void ov21_021D2A0C(PokedexGraphicData *param0, int heapID); static void ov21_021D2AB4(PokedexGraphicData *param0); static void ov21_021D2AE8(PokedexGraphicData *param0, int param1); static void ov21_021D2C10(PokedexGraphicData *param0); @@ -58,13 +58,13 @@ static void ov21_021D31F0(PokedexGraphicData *param0); static void ov21_021D3124(PokedexGraphicData *param0, int param1, int param2, int param3, int param4); static void ov21_021D3194(SysTask *param0, void *param1); -void ov21_021D1FA4(PokedexGraphicData *param0, int param1) +void ov21_021D1FA4(PokedexGraphicData *param0, int heapID) { GraphicsModes v0; UnkStruct_ov21_021D1FA4 v1; - param0->pokedexGraphics = NARC_ctor(NARC_INDEX_RESOURCE__ENG__ZUKAN__ZUKAN, param1); - param0->bgConfig = BgConfig_New(param1); + param0->pokedexGraphics = NARC_ctor(NARC_INDEX_RESOURCE__ENG__ZUKAN__ZUKAN, heapID); + param0->bgConfig = BgConfig_New(heapID); v0.displayMode = GX_DISPMODE_GRAPHICS; v0.mainBgMode = GX_BGMODE_0; @@ -73,14 +73,14 @@ void ov21_021D1FA4(PokedexGraphicData *param0, int param1) SetAllGraphicsModes(&v0); - ov21_021D2830(param0->bgConfig, param1); - ov21_021D29D0(param0, param1); + ov21_021D2830(param0->bgConfig, heapID); + ov21_021D29D0(param0, heapID); - param0->spriteList = SpriteList_InitRendering(128, ¶m0->g2Renderer, param1); - param0->spriteResourceCollection[0] = SpriteResourceCollection_New(32, 0, param1); - param0->spriteResourceCollection[1] = SpriteResourceCollection_New(32, 1, param1); - param0->spriteResourceCollection[2] = SpriteResourceCollection_New(32, 2, param1); - param0->spriteResourceCollection[3] = SpriteResourceCollection_New(32, 3, param1); + param0->spriteList = SpriteList_InitRendering(128, ¶m0->g2Renderer, heapID); + param0->spriteResourceCollection[0] = SpriteResourceCollection_New(32, 0, heapID); + param0->spriteResourceCollection[1] = SpriteResourceCollection_New(32, 1, heapID); + param0->spriteResourceCollection[2] = SpriteResourceCollection_New(32, 2, heapID); + param0->spriteResourceCollection[3] = SpriteResourceCollection_New(32, 3, heapID); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); @@ -88,17 +88,17 @@ void ov21_021D1FA4(PokedexGraphicData *param0, int param1) v1.unk_00 = param0->spriteList; v1.unk_04 = param0->bgConfig; v1.unk_08 = 16; - v1.unk_0C = param1; + v1.heapId = heapID; param0->unk_14C = ov21_021D4C0C(&v1); - Font_InitManager(FONT_SUBSCREEN, param1); + Font_InitManager(FONT_SUBSCREEN, heapID); - ov21_021D2A0C(param0, param1); - ov21_021D2AE8(param0, param1); - ov21_021D2C8C(param0, param1); - ov21_021D2E70(param0, param1); - ov21_021D2F5C(param0, param1); + ov21_021D2A0C(param0, heapID); + ov21_021D2AE8(param0, heapID); + ov21_021D2C8C(param0, heapID); + ov21_021D2E70(param0, heapID); + ov21_021D2F5C(param0, heapID); } void ov21_021D2098(PokedexGraphicData *param0) @@ -746,13 +746,13 @@ static void ov21_021D2A00(PokedexGraphicData *param0) Window_Remove(¶m0->window); } -static void ov21_021D2A0C(PokedexGraphicData *param0, int param1) +static void ov21_021D2A0C(PokedexGraphicData *param0, int heapID) { NNSGfdTexKey v0; NNSGfdPlttKey v1; int v2; - param0->unk_150 = sub_0200762C(param1); + param0->unk_150 = sub_0200762C(heapID); v0 = NNS_GfdAllocTexVram(0x8000, 0, 0); v1 = NNS_GfdAllocPlttVram(0x80, 0, NNS_GFD_ALLOC_FROM_LOW); @@ -766,10 +766,13 @@ static void ov21_021D2A0C(PokedexGraphicData *param0, int param1) { UnkStruct_ov22_022550D4 v3 = { - 8, 8, 8, 0 + .unk_00 = 8, + .unk_04 = 8, + .unk_08 = 8, + .heapID = HEAP_ID_SYSTEM }; - v3.unk_0C = param1; + v3.heapID = heapID; param0->unk_164 = sub_02015064(&v3); } } diff --git a/src/overlay021/ov21_021D4C0C.c b/src/overlay021/ov21_021D4C0C.c index bfec73633d..119dba4676 100644 --- a/src/overlay021/ov21_021D4C0C.c +++ b/src/overlay021/ov21_021D4C0C.c @@ -26,7 +26,7 @@ typedef struct UnkStruct_ov21_021D4C0C_t { BgConfig *unk_08; UnkStruct_ov21_021D4CA0 *unk_0C; int unk_10; - int unk_14; + int heapId; } UnkStruct_ov21_021D4C0C; static BOOL ov21_021D4EA4(UnkStruct_ov21_021D4CA0 *param0); @@ -34,15 +34,13 @@ static UnkStruct_ov21_021D4CA0 *ov21_021D4EB4(UnkStruct_ov21_021D4C0C *param0); UnkStruct_ov21_021D4C0C *ov21_021D4C0C(const UnkStruct_ov21_021D1FA4 *param0) { - UnkStruct_ov21_021D4C0C *v0; - - v0 = Heap_AllocFromHeap(param0->unk_0C, sizeof(UnkStruct_ov21_021D4C0C)); + UnkStruct_ov21_021D4C0C *v0 = Heap_AllocFromHeap(param0->heapId, sizeof(UnkStruct_ov21_021D4C0C)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4C0C)); - v0->unk_00 = sub_02012744(param0->unk_08, param0->unk_0C); - v0->unk_0C = Heap_AllocFromHeap(param0->unk_0C, sizeof(UnkStruct_ov21_021D4CA0) * param0->unk_08); + v0->unk_00 = sub_02012744(param0->unk_08, param0->heapId); + v0->unk_0C = Heap_AllocFromHeap(param0->heapId, sizeof(UnkStruct_ov21_021D4CA0) * param0->unk_08); GF_ASSERT(v0->unk_0C); memset(v0->unk_0C, 0, sizeof(UnkStruct_ov21_021D4CA0) * param0->unk_08); @@ -50,7 +48,7 @@ UnkStruct_ov21_021D4C0C *ov21_021D4C0C(const UnkStruct_ov21_021D1FA4 *param0) v0->unk_10 = param0->unk_08; v0->unk_04 = param0->unk_00; v0->unk_08 = param0->unk_04; - v0->unk_14 = param0->unk_0C; + v0->heapId = param0->heapId; return v0; } @@ -125,9 +123,7 @@ void ov21_021D4D3C(UnkStruct_ov21_021D4C0C *param0) Window *ov21_021D4D6C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2) { - Window *v0; - - v0 = Window_New(param0->unk_14, 1); + Window *v0 = Window_New(param0->heapId, 1); Window_Init(v0); Window_AddToTopLeftCorner(param0->unk_08, v0, param1, param2, 0, 0); @@ -146,7 +142,7 @@ u32 Pokedex_DisplayMessage(UnkStruct_ov21_021D4C0C *param0, Window *window, u32 Strbuf *strbuf; u32 strWidth; - messageLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, bankID, param0->unk_14); + messageLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, bankID, param0->heapId); GF_ASSERT(messageLoader); strbuf = MessageLoader_GetNewStrbuf(messageLoader, entryID); @@ -166,7 +162,7 @@ void ov21_021D4E10(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, int v2; int v3; - v0 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, param2, param0->unk_14); + v0 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, param2, param0->heapId); GF_ASSERT(v0); v1 = MessageLoader_GetNewStrbuf(v0, param3); diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index 1bfdc681f0..d4ddcdf55a 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -134,7 +134,7 @@ static void ov21_021E9B08(UnkStruct_ov21_021E9A9C *param0, int param1); UnkStruct_ov21_021E8D48 *ov21_021E8D48(const UnkStruct_ov21_021E8E0C *param0) { - UnkStruct_ov21_021E8D48 *v0 = Heap_AllocFromHeap(param0->unk_0C, sizeof(UnkStruct_ov21_021E8D48)); + UnkStruct_ov21_021E8D48 *v0 = Heap_AllocFromHeap(param0->heapId, sizeof(UnkStruct_ov21_021E8D48)); memset(v0, 0, sizeof(UnkStruct_ov21_021E8D48)); @@ -191,37 +191,37 @@ void ov21_021E8E04(UnkStruct_ov21_021E8D48 *param0, BOOL param1) static void ov21_021E8E0C(UnkStruct_ov21_021E8D48 *param0, const UnkStruct_ov21_021E8E0C *param1) { UnkStruct_ov21_021D1FA4 v0; - NARC *v1 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__ZUKAN__ZUKAN, param1->unk_0C); + NARC *v1 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__ZUKAN__ZUKAN, param1->heapId); int v2; param0->unk_220 = Pokemon_GetValue(param1->unk_10, MON_DATA_SPECIES, NULL); v2 = Pokemon_GetValue(param1->unk_10, MON_DATA_FORM, NULL); param0->unk_00 = param1->unk_00; - param0->unk_19C = SpriteList_InitRendering(32, ¶m0->unk_10, param1->unk_0C); + param0->unk_19C = SpriteList_InitRendering(32, ¶m0->unk_10, param1->heapId); - Utility_Clear2DMainOAM(param1->unk_0C); - ov21_021E9A0C(param1->unk_0C); + Utility_Clear2DMainOAM(param1->heapId); + ov21_021E9A0C(param1->heapId); - param0->unk_0C = ov21_021E99E0(param1->unk_08, param1->unk_10, 48, 72, param1->unk_0C); + param0->unk_0C = ov21_021E99E0(param1->unk_08, param1->unk_10, 48, 72, param1->heapId); param0->unk_08 = param1->unk_04; v0.unk_00 = param0->unk_19C; v0.unk_04 = param0->unk_00; v0.unk_08 = 3; - v0.unk_0C = param1->unk_0C; + v0.heapId = param1->heapId; param0->unk_1B0 = ov21_021D4C0C(&v0); - ov21_021E90B0(param0->unk_00, param1->unk_0C); + ov21_021E90B0(param0->unk_00, param1->heapId); G2_SetBlendBrightness((GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD), -16); - param0->unk_04 = ov21_021E91B0(param0->unk_00, param1->unk_0C); + param0->unk_04 = ov21_021E91B0(param0->unk_00, param1->heapId); - ov21_021E9208(param0->unk_1A0, param1->unk_0C); - ov21_021D2B88(¶m0->unk_1B4, param0->unk_1A0, param1->unk_0C, v1); - ov21_021D2D88(¶m0->unk_1B4, param0->unk_19C, param0->unk_1A0, param1->unk_0C, 2); - ov21_021E9240(¶m0->unk_1B4, param0->unk_1B0, param1->unk_0C, param0->unk_220, param1->unk_14); + ov21_021E9208(param0->unk_1A0, param1->heapId); + ov21_021D2B88(¶m0->unk_1B4, param0->unk_1A0, param1->heapId, v1); + ov21_021D2D88(¶m0->unk_1B4, param0->unk_19C, param0->unk_1A0, param1->heapId, 2); + ov21_021E9240(¶m0->unk_1B4, param0->unk_1B0, param1->heapId, param0->unk_220, param1->unk_14); ov21_021D1858(¶m0->unk_1B4, 172, 32); ov21_021D2E44(¶m0->unk_1B4, 1); @@ -234,18 +234,18 @@ static void ov21_021E8E0C(UnkStruct_ov21_021E8D48 *param0, const UnkStruct_ov21_ v3 = param0->unk_220; } - ov21_021E9458(¶m0->unk_1E4, param0->unk_1A0, v3, param1->unk_0C); - ov21_021E94B0(¶m0->unk_1E4, param0->unk_19C, param0->unk_1A0, param1->unk_0C); + ov21_021E9458(¶m0->unk_1E4, param0->unk_1A0, v3, param1->heapId); + ov21_021E94B0(¶m0->unk_1E4, param0->unk_19C, param0->unk_1A0, param1->heapId); } - ov21_021E95BC(¶m0->unk_200, param0->unk_1A0, param0->unk_220, param1->unk_0C, v1); - ov21_021E95F8(¶m0->unk_200, param0->unk_19C, param0->unk_1A0, param1->unk_0C, param0->unk_220); - ov21_021E9504(¶m0->unk_1F8, param0->unk_19C, param0->unk_1A0, param1->unk_0C, param0->unk_200.unk_08); - ov21_021E9560(¶m0->unk_1F8, param0->unk_1B0, param1->unk_0C, param0->unk_220, param0->unk_1B4.unk_0C[1]); - ov21_021E96A8(param0->unk_00, param1->unk_0C, v1); - ov21_021E97C4(param0->unk_00, param1->unk_0C, v1); - ov21_021E9968(param0->unk_04, param1->unk_0C, param0->unk_220); - ov21_021E9A40(¶m0->unk_228, param1->unk_0C, param1->unk_14, v1); + ov21_021E95BC(¶m0->unk_200, param0->unk_1A0, param0->unk_220, param1->heapId, v1); + ov21_021E95F8(¶m0->unk_200, param0->unk_19C, param0->unk_1A0, param1->heapId, param0->unk_220); + ov21_021E9504(¶m0->unk_1F8, param0->unk_19C, param0->unk_1A0, param1->heapId, param0->unk_200.unk_08); + ov21_021E9560(¶m0->unk_1F8, param0->unk_1B0, param1->heapId, param0->unk_220, param0->unk_1B4.unk_0C[1]); + ov21_021E96A8(param0->unk_00, param1->heapId, v1); + ov21_021E97C4(param0->unk_00, param1->heapId, v1); + ov21_021E9968(param0->unk_04, param1->heapId, param0->unk_220); + ov21_021E9A40(¶m0->unk_228, param1->heapId, param1->unk_14, v1); param0->unk_248 = 1; diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c index 61b07fb966..6a35525656 100644 --- a/src/overlay022/ov22_02255094.c +++ b/src/overlay022/ov22_02255094.c @@ -41,7 +41,7 @@ static void ov22_02255738(void); static void ov22_02255748(UnkStruct_ov22_0225A0E4 *param0, const UnkStruct_ov22_022550D4 *param1); static void ov22_02255784(UnkStruct_ov22_0225A0E4 *param0); static void ov22_02255794(UnkStruct_ov22_0225A0E4 *param0); -static void ov22_02255C24(UnkStruct_ov22_0225A0E4 *param0, int param1, int param2, int param3); +static void ov22_02255C24(UnkStruct_ov22_0225A0E4 *param0, int heapID, int param2, int param3); static void ov22_02255C90(UnkStruct_ov22_0225A0E4 *param0); static void ov22_02255BF4(UnkStruct_ov22_0225A0E4 *param0, int param1); static void ov22_02255C14(UnkStruct_ov22_0225A0E4 *param0); @@ -84,13 +84,16 @@ void ov22_022550B4(void) void ov22_022550D4(UnkStruct_ov22_0225A0E4 *param0) { UnkStruct_ov22_022550D4 v0 = { - 718, 118, 19, 14 + .unk_00 = 718, + .unk_04 = 118, + .unk_08 = 19, + .heapID = HEAP_ID_14 }; param0->unk_5C = NARC_ctor(NARC_INDEX_GRAPHIC__IMAGECLIP, 14); ov22_02255748(param0, &v0); - ov22_02255C24(param0, 14, 0x2800, 0x20); + ov22_02255C24(param0, HEAP_ID_14, 0x2800, 0x20); ov22_022559B4(param0); ov22_02255BF4(param0, 13); ov22_022559F8(param0); @@ -303,12 +306,12 @@ int ov22_02255420(NNSG2dCharacterData *param0, int param1, int param2, int param return 0; } -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) { ov22_02255748(param0, param1); - ov22_02255C24(param0, param2, 0x2800, 0x20); + ov22_02255C24(param0, heapID, 0x2800, 0x20); sub_02008B2C(param0->unk_20, 1); - ov22_02255BF4(param0, param2); + ov22_02255BF4(param0, heapID); } void ov22_022554A8(UnkStruct_ov22_0225A0E4 *param0, BgConfig *param1, int param2) @@ -497,10 +500,10 @@ static void ov22_02255738(void) static void ov22_02255748(UnkStruct_ov22_0225A0E4 *param0, const UnkStruct_ov22_022550D4 *param1) { param0->unk_00 = sub_02015064(param1); - param0->unk_04 = Heap_AllocFromHeap(param1->unk_0C, sizeof(UnkStruct_02015128 *) * (100 + 18)); + param0->unk_04 = Heap_AllocFromHeap(param1->heapID, sizeof(UnkStruct_02015128 *) * (100 + 18)); param0->unk_08 = (100 + 18); param0->unk_0C = 0; - param0->unk_10 = Heap_AllocFromHeap(param1->unk_0C, sizeof(UnkStruct_020151A4 *) * (1 + 18)); + param0->unk_10 = Heap_AllocFromHeap(param1->heapID, sizeof(UnkStruct_020151A4 *) * (1 + 18)); param0->unk_14 = (1 + 18); param0->unk_18 = 0; param0->unk_1C = 1; @@ -801,9 +804,9 @@ static void ov22_02255C14(UnkStruct_ov22_0225A0E4 *param0) param0->unk_30 = NULL; } -static void ov22_02255C24(UnkStruct_ov22_0225A0E4 *param0, int param1, int param2, int param3) +static void ov22_02255C24(UnkStruct_ov22_0225A0E4 *param0, int heapID, int param2, int param3) { - param0->unk_20 = sub_0200762C(param1); + param0->unk_20 = sub_0200762C(heapID); param0->unk_24 = NNS_GfdAllocTexVram(param2, 0, 0); param0->unk_28 = NNS_GfdAllocPlttVram(param3, 0, NNS_GFD_ALLOC_FROM_LOW); diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c index b1f2b5c132..2ae8611e85 100644 --- a/src/overlay022/ov22_02255D44.c +++ b/src/overlay022/ov22_02255D44.c @@ -226,8 +226,8 @@ int ov22_02255D44(OverlayManager *param0, int *param1) ov22_02256BAC(v0, v2->unk_0C); ov22_022589E0(&v0->unk_4FC, &v0->unk_458, &v0->unk_3CC, &v0->unk_00, &v0->unk_5C4, 1); - v0->unk_714 = sub_02015920(13); - v0->unk_718 = Window_New(13, 1); + v0->unk_714 = sub_02015920(HEAP_ID_13); + v0->unk_718 = Window_New(HEAP_ID_13, 1); v0->unk_70C = 0; sub_02004550(53, 0, 0); @@ -462,8 +462,8 @@ int ov22_02256174(OverlayManager *param0, int *param1) ov22_02256BF4(v0, v0->unk_720, v2->unk_08, v2->unk_1C, v2->unk_20); ov22_022589E0(&v0->unk_4FC, &v0->unk_458, &v0->unk_3CC, &v0->unk_00, &v0->unk_5C4, 0); - v0->unk_714 = sub_02015920(13); - v0->unk_718 = Window_New(13, 1); + v0->unk_714 = sub_02015920(HEAP_ID_13); + v0->unk_718 = Window_New(HEAP_ID_13, 1); v0->unk_70C = 0; sub_020959F4(v0->unk_734->unk_16); diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c index 6b16e4464c..ddfcd86663 100644 --- a/src/overlay022/ov22_02259C58.c +++ b/src/overlay022/ov22_02259C58.c @@ -164,7 +164,7 @@ void ov22_02259DBC(UnkStruct_ov22_02259D2C *param0, UnkStruct_ov22_0225A0E4 *par { Window *v0; - param0->unk_64 = sub_02012744(1, 13); + param0->unk_64 = sub_02012744(1, HEAP_ID_13); ov22_0225A218(param1); diff --git a/src/overlay022/ov22_0225AF8C.c b/src/overlay022/ov22_0225AF8C.c index d2ec9f9ddf..a4d7ee32ff 100644 --- a/src/overlay022/ov22_0225AF8C.c +++ b/src/overlay022/ov22_0225AF8C.c @@ -60,7 +60,7 @@ typedef struct { int unk_5C; int unk_60; int unk_64; - int unk_68; + int heapId; } UnkStruct_ov22_0225B4E4; static UnkStruct_ov22_0225B1BC *ov22_0225B1BC(const UnkStruct_ov22_0225B4E4 *param0); @@ -238,22 +238,22 @@ static UnkStruct_ov22_0225B1BC *ov22_0225B1BC(const UnkStruct_ov22_0225B4E4 *par UnkStruct_ov22_0225B1BC *v0; BOOL v1; - v0 = Heap_AllocFromHeap(param0->unk_68, sizeof(UnkStruct_ov22_0225B1BC)); + v0 = Heap_AllocFromHeap(param0->heapId, sizeof(UnkStruct_ov22_0225B1BC)); memset(v0, 0, sizeof(UnkStruct_ov22_0225B1BC)); - v0->unk_29C = param0->unk_68; - v0->unk_298 = Pokemon_New(param0->unk_68); + v0->unk_29C = param0->heapId; + v0->unk_298 = Pokemon_New(param0->heapId); sub_0202A61C(param0->unk_00, v0->unk_298); ov22_0225B2D4(v0, param0); - ov22_022554A8(&v0->unk_00, param0->unk_58, param0->unk_68); - ov22_02259484(&v0->unk_1E8, 21, param0->unk_68); + ov22_022554A8(&v0->unk_00, param0->unk_58, param0->heapId); + ov22_02259484(&v0->unk_1E8, 21, param0->heapId); - v0->unk_1F0 = ov22_02254DE0(20, param0->unk_68); + v0->unk_1F0 = ov22_02254DE0(20, param0->heapId); ov22_0225B388(v0, param0); ov22_0225B450(v0, param0); - ov22_0225AF44(&v0->unk_27C, &v0->unk_1F4, param0->unk_68); + ov22_0225AF44(&v0->unk_27C, &v0->unk_1F4, param0->heapId); v0->unk_2C4 = 1; v0->unk_2C8 = 1; @@ -268,18 +268,18 @@ static UnkStruct_ov22_0225B1BC *ov22_0225B258(const UnkStruct_ov22_0225B4E4 *par UnkStruct_ov22_0225B1BC *v0; BOOL v1; - v0 = Heap_AllocFromHeap(param0->unk_68, sizeof(UnkStruct_ov22_0225B1BC)); + v0 = Heap_AllocFromHeap(param0->heapId, sizeof(UnkStruct_ov22_0225B1BC)); memset(v0, 0, sizeof(UnkStruct_ov22_0225B1BC)); - v0->unk_29C = param0->unk_68; - v0->unk_298 = Pokemon_New(param0->unk_68); + v0->unk_29C = param0->heapId; + v0->unk_298 = Pokemon_New(param0->heapId); sub_0202A61C(param0->unk_00, v0->unk_298); ov22_0225B2D4(v0, param0); - ov22_02259484(&v0->unk_1E8, 21, param0->unk_68); + ov22_02259484(&v0->unk_1E8, 21, param0->heapId); - v0->unk_1F0 = ov22_02254DE0(20, param0->unk_68); + v0->unk_1F0 = ov22_02254DE0(20, param0->heapId); ov22_0225B388(v0, param0); @@ -296,15 +296,15 @@ static void ov22_0225B2D4(UnkStruct_ov22_0225B1BC *param0, const UnkStruct_ov22_ UnkStruct_ov22_02255CB8 v0; UnkStruct_ov22_022550D4 v1; - param0->unk_00.unk_5C = NARC_ctor(NARC_INDEX_GRAPHIC__IMAGECLIP, param1->unk_68); + param0->unk_00.unk_5C = NARC_ctor(NARC_INDEX_GRAPHIC__IMAGECLIP, param1->heapId); v1.unk_00 = (700 + 18); v1.unk_04 = (100 + 18); v1.unk_08 = (1 + 18); - v1.unk_0C = param1->unk_68; + v1.heapID = param1->heapId; - ov22_0225547C(¶m0->unk_00, &v1, param1->unk_68); - ov22_0225B588(¶m0->unk_00, &v0, param1, param1->unk_68); + ov22_0225547C(¶m0->unk_00, &v1, param1->heapId); + ov22_0225B588(¶m0->unk_00, &v0, param1, param1->heapId); ov22_022551B4(¶m0->unk_00, &v0); ov22_02255338(&v0); } @@ -352,7 +352,7 @@ static void ov22_0225B388(UnkStruct_ov22_0225B1BC *param0, const UnkStruct_ov22_ v2 = sub_0202A614(param1->unk_00); v3 = sub_0202A604(param1->unk_00); - ov22_02257964(¶m0->unk_1F4, param0->unk_298, &v4, v1, v2, v3, param1->unk_68); + ov22_02257964(¶m0->unk_1F4, param0->unk_298, &v4, v1, v2, v3, param1->heapId); } { @@ -374,7 +374,7 @@ static void ov22_0225B388(UnkStruct_ov22_0225B1BC *param0, const UnkStruct_ov22_ static void ov22_0225B450(UnkStruct_ov22_0225B1BC *param0, const UnkStruct_ov22_0225B4E4 *param1) { - ov22_02257C88(¶m0->unk_1F4, param1->unk_5C, param1->unk_68); + ov22_02257C88(¶m0->unk_1F4, param1->unk_5C, param1->heapId); } static void ov22_0225B464(UnkStruct_ov22_0225B1BC *param0) @@ -409,7 +409,7 @@ static void ov22_0225B4E4(UnkStruct_ov22_0225B4E4 *param0, const UnkStruct_ov22_ param0->unk_58 = param1->unk_00; param0->unk_60 = param1->unk_04; param0->unk_64 = param1->unk_08; - param0->unk_68 = param1->unk_0C; + param0->heapId = param1->heapId; } static void ov22_0225B4F8(UnkStruct_ov22_0225B4E4 *param0, const UnkStruct_02029C68 *param1) diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c index 2452769199..f8c4d13439 100644 --- a/src/overlay022/ov22_0225B660.c +++ b/src/overlay022/ov22_0225B660.c @@ -91,7 +91,7 @@ int ov22_0225B660(OverlayManager *param0, int *param1) v2.unk_00 = v0->unk_14.unk_40; v2.unk_04 = 72; v2.unk_08 = 16; - v2.unk_0C = 14; + v2.heapId = HEAP_ID_14; if (v0->unk_0C == 0) { v0->unk_10 = ov22_0225AF8C(&v2, v0->unk_00); diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c index e482aaa9a4..9b40a219ab 100644 --- a/src/overlay023/ov23_02253598.c +++ b/src/overlay023/ov23_02253598.c @@ -67,7 +67,7 @@ void ov23_02253598(UnkStruct_ov23_02253598 *param0, SecretBaseRecord *param1, Sa Unk_ov23_022577BC = param0; Unk_ov23_022577BC->unk_08 = param2; Unk_ov23_022577BC->unk_0C = param1; - Unk_ov23_022577BC->unk_10 = sub_0202855C(15); + Unk_ov23_022577BC->unk_10 = sub_0202855C(HEAP_ID_COMMUNICATION); CommSys_Seed(&Unk_ov23_022577BC->unk_14); } @@ -318,7 +318,7 @@ void ov23_02253A00(SecretBaseRecord *param0, int param1) sub_020594FC(); ov23_02253DFC(ov23_022421BC(), 640, 1); - v1 = sub_0202855C(4); + v1 = sub_0202855C(HEAP_ID_FIELD); MI_CpuCopy8(param0, v1, sub_02028558()); v0 = v2(v1); diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index 601b35cc43..1c95b54b46 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -550,7 +550,7 @@ static void ov58_021D12C4(UnkStruct_02095EAC *param0) MessageLoader_GetStrbuf(param0->unk_10, 7, param0->unk_28); param0->unk_442C = Heap_AllocFromHeap(HEAP_ID_39, 30 * 16 * 32); - param0->unk_9454 = sub_02015920(39); + param0->unk_9454 = sub_02015920(HEAP_ID_39); param0->unk_378 = 0; } diff --git a/src/overlay062/ov62_0222F2C0.c b/src/overlay062/ov62_0222F2C0.c index a5b8c9748b..87404b4dce 100644 --- a/src/overlay062/ov62_0222F2C0.c +++ b/src/overlay062/ov62_0222F2C0.c @@ -50,21 +50,21 @@ void ov62_0222F2C0(UnkStruct_0208C06C *param0) GXLayers_DisableEngineBLayers(); GX_SetVisiblePlane(0); GXS_SetVisiblePlane(0); - VramTransfer_New(4, 102); + VramTransfer_New(4, HEAP_ID_102); - param0->unk_14.unk_00 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__BATT_REC__BATT_REC_GRA, 102); + param0->unk_14.unk_00 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__BATT_REC__BATT_REC_GRA, HEAP_ID_102); param0->unk_14.unk_10 = BgConfig_New(HEAP_ID_102); - param0->unk_14.unk_14 = PaletteData_New(102); - param0->unk_14.unk_4C = sub_02024220(102, 0, 1, 0, 4, NULL); - param0->unk_14.unk_50 = sub_0200762C(102); + param0->unk_14.unk_14 = PaletteData_New(HEAP_ID_102); + param0->unk_14.unk_4C = sub_02024220(HEAP_ID_102, 0, 1, 0, 4, NULL); + param0->unk_14.unk_50 = sub_0200762C(HEAP_ID_102); NNS_G2dSetupSoftwareSpriteCamera(); PaletteData_SetAutoTransparent(param0->unk_14.unk_14, 1); - PaletteData_AllocBuffer(param0->unk_14.unk_14, 0, 0x200, 102); - PaletteData_AllocBuffer(param0->unk_14.unk_14, 1, 0x200, 102); - PaletteData_AllocBuffer(param0->unk_14.unk_14, 2, 0x200, 102); - PaletteData_AllocBuffer(param0->unk_14.unk_14, 3, 0x200, 102); + PaletteData_AllocBuffer(param0->unk_14.unk_14, 0, 0x200, HEAP_ID_102); + PaletteData_AllocBuffer(param0->unk_14.unk_14, 1, 0x200, HEAP_ID_102); + PaletteData_AllocBuffer(param0->unk_14.unk_14, 2, 0x200, HEAP_ID_102); + PaletteData_AllocBuffer(param0->unk_14.unk_14, 3, 0x200, HEAP_ID_102); ov62_0222F670(param0->unk_14.unk_10); ov62_0222F848(param0); @@ -124,7 +124,7 @@ void ov62_0222F2C0(UnkStruct_0208C06C *param0) } { - param0->unk_14.unk_3C = sub_02012744((5 * 2) + 10, 102); + param0->unk_14.unk_3C = sub_02012744((5 * 2) + 10, HEAP_ID_102); param0->unk_14.unk_34 = MessageLoader_Init(0, 26, 10, HEAP_ID_102); param0->unk_14.unk_38 = MessageLoader_Init(0, 26, 20, HEAP_ID_102); } diff --git a/src/overlay062/ov62_022300D8.c b/src/overlay062/ov62_022300D8.c index 652bdd2ae7..0c33d67e75 100644 --- a/src/overlay062/ov62_022300D8.c +++ b/src/overlay062/ov62_022300D8.c @@ -659,7 +659,7 @@ void ov62_02230E80(UnkStruct_0208C06C *param0) Window_Init(&v6); Window_AddToTopLeftCorner(param0->unk_14.unk_10, &v6, 20, 2, 0, 0); - v7[v11]->unk_18 = sub_02012B20(&v6, 102); + v7[v11]->unk_18 = sub_02012B20(&v6, HEAP_ID_102); v4 = sub_02012898(&v6, v8[v11], 102); CharTransfer_AllocRange(v4, 1, v8[v11], &v7[v11]->unk_1C); @@ -775,7 +775,7 @@ void ov62_0223118C(UnkStruct_ov62_022312B0 *param0, UnkStruct_ov62_0223118C *par Window_Init(&v6); Window_AddToTopLeftCorner(param1->unk_10, &v6, 20, 2, 0, 0); - param0->unk_10 = sub_02012B20(&v6, 102); + param0->unk_10 = sub_02012B20(&v6, HEAP_ID_102); v4 = sub_02012898(&v6, param2, 102); CharTransfer_AllocRange(v4, 1, param2, ¶m0->unk_14); diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index 5d18a3b98f..259e89e7a4 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -214,11 +214,11 @@ static BOOL ov62_02237D24(UnkStruct_0208C06C *param0) v0->unk_218.unk_00 = param0->unk_14.unk_10; v0->unk_218.unk_04 = (128 - 56); v0->unk_218.unk_08 = (96 - 64 - 16); - v0->unk_218.unk_0C = 102; + v0->unk_218.heapId = HEAP_ID_102; } { - v0->unk_230.unk_08 = sub_02029C68(102); + v0->unk_230.unk_08 = sub_02029C68(HEAP_ID_102); v0->unk_250.unk_00 = sub_02030A80(HEAP_ID_102); } diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index 17265ee7cf..6a72514a99 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -330,7 +330,7 @@ static int ov64_0223044C(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222DFD static void ov64_022305CC(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); static void ov64_022305D4(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3); static void ov64_022305D8(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); -static UnkStruct_0208737C *ov64_022305DC(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, u32 param2); +static UnkStruct_0208737C *ov64_022305DC(UnkStruct_ov64_02230444 *param0, UnkStruct_ov64_0222E060 *param1, u32 heapID); static void ov64_02230620(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3); static int ov64_02230628(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); static void ov64_02230678(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2); @@ -629,7 +629,7 @@ int ov64_0222DDAC(OverlayManager *param0, int *param1) v1 = ov64_0222F0C4(&v0->unk_304, &v0->unk_28C, &v0->unk_04, 52); break; case 2: - v1 = ov64_0223044C(&v0->unk_410, v0, &v0->unk_28C, &v0->unk_04, 52); + v1 = ov64_0223044C(&v0->unk_410, v0, &v0->unk_28C, &v0->unk_04, HEAP_ID_52); break; case 3: v1 = ov64_02230628(&v0->unk_41C, &v0->unk_28C, &v0->unk_04); @@ -2771,22 +2771,22 @@ static void ov64_02230444 (UnkStruct_ov64_02230444 * param0, UnkStruct_ov64_0222 ov64_022305D4(param0, param1, param2, param3); } -static int ov64_0223044C (UnkStruct_ov64_02230444 * param0, UnkStruct_ov64_0222DFD0 * param1, UnkStruct_ov64_0222E060 * param2, UnkStruct_ov64_0222E21C * param3, u32 param4) +static int ov64_0223044C (UnkStruct_ov64_02230444 * param0, UnkStruct_ov64_0222DFD0 * param1, UnkStruct_ov64_0222E060 * param2, UnkStruct_ov64_0222E21C * param3, u32 heapID) { int v0[4]; switch (param2->unk_04) { case 0: - param0->unk_04 = ov64_022305DC(param0, param2, param4); + param0->unk_04 = ov64_022305DC(param0, param2, heapID); v0[0] = 4; v0[1] = 4; v0[2] = 4; v0[3] = 0; - param0->unk_08 = sub_02089400(param4, 12, v0, SaveData_Options(param2->unk_00), 0, 0); + param0->unk_08 = sub_02089400(heapID, 12, v0, SaveData_Options(param2->unk_00), 0, 0); ov64_0222DFD0(param1); - param0->unk_00 = OverlayManager_New(&Unk_020F2DAC, param0->unk_04, param4); + param0->unk_00 = OverlayManager_New(&Unk_020F2DAC, param0->unk_04, heapID); param2->unk_04 = 1; break; case 1: @@ -2797,7 +2797,7 @@ static int ov64_0223044C (UnkStruct_ov64_02230444 * param0, UnkStruct_ov64_0222D OverlayManager_Free(param0->unk_00); if (param0->unk_04->unk_14 == 0) { - param0->unk_00 = OverlayManager_New(&Unk_020F2DBC, param0->unk_08, param4); + param0->unk_00 = OverlayManager_New(&Unk_020F2DBC, param0->unk_08, heapID); param2->unk_04 = 2; } else { ov64_0222E074(param2, 0, 0); @@ -2817,12 +2817,12 @@ static int ov64_0223044C (UnkStruct_ov64_02230444 * param0, UnkStruct_ov64_0222D case 3: sub_0208716C(param0->unk_04); sub_02089438(param0->unk_08); - ov64_0222DF48(param1, param4); + ov64_0222DF48(param1, heapID); return 1; case 4: - param0->unk_04 = ov64_022305DC(param0, param2, param4); + param0->unk_04 = ov64_022305DC(param0, param2, heapID); ov64_0222DFD0(param1); - param0->unk_00 = OverlayManager_New(&Unk_020F2DAC, param0->unk_04, param4); + param0->unk_00 = OverlayManager_New(&Unk_020F2DAC, param0->unk_04, heapID); param2->unk_04 = 5; break; case 5: @@ -2843,7 +2843,7 @@ static int ov64_0223044C (UnkStruct_ov64_02230444 * param0, UnkStruct_ov64_0222D break; case 6: sub_0208716C(param0->unk_04); - ov64_0222DF48(param1, param4); + ov64_0222DF48(param1, heapID); return 1; } @@ -2865,11 +2865,11 @@ static void ov64_022305D8 (UnkStruct_ov64_02230444 * param0, UnkStruct_ov64_0222 return; } -static UnkStruct_0208737C * ov64_022305DC (UnkStruct_ov64_02230444 * param0, UnkStruct_ov64_0222E060 * param1, u32 param2) +static UnkStruct_0208737C * ov64_022305DC (UnkStruct_ov64_02230444 * param0, UnkStruct_ov64_0222E060 * param1, u32 heapID) { UnkStruct_0208737C * v0; - v0 = sub_0208712C(param2, 7, 0, 7, SaveData_Options(param1->unk_00)); + v0 = sub_0208712C(heapID, 7, 0, 7, SaveData_Options(param1->unk_00)); if (param1->unk_34.unk_04 == 1) { { diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 0536a205f1..dcbcb03194 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -130,7 +130,7 @@ static int ov65_0222EBB8(void); static void ov65_02232F90(UnkStruct_ov65_0222EBE0 *param0, u32 param1); static void ov65_02232FB0(UnkStruct_ov65_0222EBE0 *param0, u32 param1, u32 param2); static BOOL ov65_02232FCC(const UnkStruct_ov65_0222EBE0 *param0); -static void ov65_02232FE0(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 param2); +static void ov65_02232FE0(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID); static void ov65_02233068(UnkStruct_ov65_0222EBE0 *param0); static u32 ov65_022330C0(UnkStruct_ov65_0222EBE0 *param0, u32 param1); static void ov65_022331E0(UnkStruct_ov65_0222EBE0 *param0); @@ -145,7 +145,7 @@ static void ov65_022336A4(UnkStruct_ov65_0222EBE0 *param0, u32 param1); static void ov65_022336C4(UnkStruct_ov65_0222EBE0 *param0); static void ov65_022332C4(u32 param0, u32 param1, void *param2); static void ov65_02234A10(UnkStruct_ov65_0222EBE0 *param0); -static void ov65_022332FC(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 param2); +static void ov65_022332FC(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID); static void ov65_02233570(UnkStruct_ov65_0222EBE0 *param0); static void ov65_022335F8(NNSG2dScreenData *param0, u8 param1); static void ov65_022336D4(UnkStruct_ov65_0222EBE0 *param0); @@ -166,7 +166,7 @@ static void ov65_02234788(UnkStruct_ov65_0222EBE0 *param0, u8 param1, u8 param2, static u32 ov65_0223484C(u32 param0, TextColor *param1); static void ov65_02234900(UnkStruct_ov65_0222EBE0 *param0, Window *param1, u32 param2, u32 param3, u32 param4); static void ov65_0223498C(UnkStruct_ov65_0222EBE0 *param0, Window *param1, u32 param2, u32 param3, u32 param4); -static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 param2); +static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID); static void ov65_02234CFC(UnkStruct_ov65_0222EBE0 *param0); static void ov65_02234D6C(UnkStruct_ov65_0222EBE0 *param0); static void ov65_02234DA0(UnkStruct_ov65_0222EBE0 *param0); @@ -1503,7 +1503,7 @@ static void ov65_0222EE18(UnkStruct_ov65_0222EBE0 *param0, NARC *param1) param0->unk_31C[v0] = SpriteResourceCollection_New(1, v0, 54); } - param0->unk_32C = sub_02012744(1, 54); + param0->unk_32C = sub_02012744(1, HEAP_ID_54); } static void ov65_0222EE8C(UnkStruct_ov65_0222EBE0 *param0) @@ -2428,7 +2428,7 @@ static int ov65_0222FFAC(UnkStruct_ov65_0222EBE0 *param0, int param1) } if (ov65_02232FCC(param0) == 0) { - ov65_02232FE0(param0, v3, 54); + ov65_02232FE0(param0, v3, HEAP_ID_54); } ov65_022336A4(param0, 54); @@ -4925,7 +4925,7 @@ static BOOL ov65_02232FCC(const UnkStruct_ov65_0222EBE0 *param0) return 1; } -static void ov65_02232FE0(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 param2) +static void ov65_02232FE0(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID) { static const TouchScreenHitTable v0[8] = { { 0, 47, 0, 119 }, @@ -4945,10 +4945,10 @@ static void ov65_02232FE0(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 par GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0); - param0->unk_BE0.unk_4C = sub_02023FCC(v0, 8, ov65_022332C4, param0, param2); - param0->unk_BE0.unk_00 = StringTemplate_Default(param2); + param0->unk_BE0.unk_4C = sub_02023FCC(v0, 8, ov65_022332C4, param0, heapID); + param0->unk_BE0.unk_00 = StringTemplate_Default(heapID); - ov65_022332FC(param0, param1, param2); + ov65_022332FC(param0, param1, heapID); param0->unk_BE0.unk_78 = 1; @@ -5133,31 +5133,31 @@ static void ov65_022332C4(u32 param0, u32 param1, void *param2) } } -static void ov65_022332FC(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 param2) +static void ov65_022332FC(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID) { int v0, v1; int v2, v3; Bg_ClearTilemap(param0->unk_15C, 4); - Graphics_LoadPaletteFromOpenNARC(param1, 16, 4, 0 * 32, 4 * 32, param2); - Graphics_LoadPaletteFromOpenNARC(param1, 19, 4, 4 * 32, 5 * 32, param2); - Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 15, param0->unk_15C, 4, 0, 0, 0, param2); - Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 18, param0->unk_15C, 6, (0 + 48), 0, 0, param2); - Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 17, param0->unk_15C, 4, 0, 0, 0, param2); + Graphics_LoadPaletteFromOpenNARC(param1, 16, 4, 0 * 32, 4 * 32, heapID); + Graphics_LoadPaletteFromOpenNARC(param1, 19, 4, 4 * 32, 5 * 32, heapID); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 15, param0->unk_15C, 4, 0, 0, 0, heapID); + Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 18, param0->unk_15C, 6, (0 + 48), 0, 0, heapID); + Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 17, param0->unk_15C, 4, 0, 0, 0, heapID); - param0->unk_BE0.unk_04 = Graphics_GetScrnDataFromOpenNARC(param1, 20, 0, ¶m0->unk_BE0.unk_08, param2); + param0->unk_BE0.unk_04 = Graphics_GetScrnDataFromOpenNARC(param1, 20, 0, ¶m0->unk_BE0.unk_08, heapID); ov65_022335F8(param0->unk_BE0.unk_08, (0 + 48)); for (v0 = 0; v0 < 7; v0++) { - param0->unk_BE0.unk_0C[v0] = Graphics_GetScrnDataFromOpenNARC(param1, 21 + v0, 0, ¶m0->unk_BE0.unk_28[v0], param2); + param0->unk_BE0.unk_0C[v0] = Graphics_GetScrnDataFromOpenNARC(param1, 21 + v0, 0, ¶m0->unk_BE0.unk_28[v0], heapID); ov65_022335F8(param0->unk_BE0.unk_28[v0], (0 + 48)); } - param0->unk_BE0.unk_44 = Graphics_GetScrnDataFromOpenNARC(param1, 28, 0, ¶m0->unk_BE0.unk_48, param2); + param0->unk_BE0.unk_44 = Graphics_GetScrnDataFromOpenNARC(param1, 28, 0, ¶m0->unk_BE0.unk_48, heapID); ov65_022335F8(param0->unk_BE0.unk_48, (0 + 48)); - Font_LoadScreenIndicatorsPalette(4, 15 * 32, param2); + Font_LoadScreenIndicatorsPalette(4, 15 * 32, heapID); for (v0 = 0; v0 < 8; v0++) { v2 = v0 / 4; @@ -5180,7 +5180,7 @@ static void ov65_022332FC(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 par Window_FillTilemap(¶m0->unk_BE0.unk_1FC, 0); Window_ScheduleCopyToVRAM(¶m0->unk_BE0.unk_1FC); - ov65_02234A68(param0, param1, param2); + ov65_02234A68(param0, param1, heapID); } static void ov65_02233570(UnkStruct_ov65_0222EBE0 *param0) @@ -6636,7 +6636,7 @@ static void ov65_02234A10(UnkStruct_ov65_0222EBE0 *param0) } } -static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 param2) +static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 heapID) { BOOL v0; int v1; @@ -6676,10 +6676,10 @@ static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 par GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 0); - param0->unk_BE0.unk_20C[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_31C[0], param1, 42, 0, 30, NNS_G2D_VRAM_TYPE_2DSUB, param2); - param0->unk_BE0.unk_20C[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_31C[1], param1, 43, 0, 30, NNS_G2D_VRAM_TYPE_2DSUB, 8, param2); - param0->unk_BE0.unk_20C[2] = SpriteResourceCollection_AddFrom(param0->unk_31C[2], param1, 40, 0, 30, 2, param2); - param0->unk_BE0.unk_20C[3] = SpriteResourceCollection_AddFrom(param0->unk_31C[3], param1, 41, 0, 30, 3, param2); + param0->unk_BE0.unk_20C[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_31C[0], param1, 42, 0, 30, NNS_G2D_VRAM_TYPE_2DSUB, heapID); + param0->unk_BE0.unk_20C[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_31C[1], param1, 43, 0, 30, NNS_G2D_VRAM_TYPE_2DSUB, 8, heapID); + param0->unk_BE0.unk_20C[2] = SpriteResourceCollection_AddFrom(param0->unk_31C[2], param1, 40, 0, 30, 2, heapID); + param0->unk_BE0.unk_20C[3] = SpriteResourceCollection_AddFrom(param0->unk_31C[3], param1, 41, 0, 30, 3, heapID); v0 = SpriteTransfer_RequestCharAtEndWithHardwareMappingType(param0->unk_BE0.unk_20C[0]); GF_ASSERT(v0); @@ -6694,18 +6694,18 @@ static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 par for (v1 = 0; v1 < 3; v1++) { v9[v1].list = param0->unk_18C; v9[v1].resourceData = &v2; - v9[v1].heapID = param2; + v9[v1].heapID = heapID; param0->unk_BE0.unk_21C[v1] = SpriteList_AddAffine(&v9[v1]); Sprite_SetAnim(param0->unk_BE0.unk_21C[v1], Unk_ov65_02238930[v1]); } - Font_InitManager(FONT_SUBSCREEN, param2); + Font_InitManager(FONT_SUBSCREEN, heapID); Window_Init(&v3); Window_AddToTopLeftCorner(param0->unk_15C, &v3, 8, 2, 0, 0); - v4 = Strbuf_Init(64, param2); + v4 = Strbuf_Init(64, heapID); MessageLoader_GetStrbuf(param0->unk_168, 73, v4); { @@ -6715,7 +6715,7 @@ static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 par Strbuf_Free(v4); - v5 = sub_02012B20(&v3, param2); + v5 = sub_02012B20(&v3, heapID); v6 = sub_02012B58(v5, NNS_G2D_VRAM_TYPE_2DSUB); v0 = CharTransfer_AllocRange(v6, 1, NNS_G2D_VRAM_TYPE_2DSUB, ¶m0->unk_BE0.unk_228); @@ -6732,7 +6732,7 @@ static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 par v7.unk_20 = 0; v7.unk_24 = 0; v7.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB; - v7.unk_2C = param2; + v7.unk_2C = heapID; param0->unk_BE0.unk_234 = sub_02012B60(&v7, v5); @@ -6740,7 +6740,7 @@ static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 par Window_Remove(&v3); Font_Free(FONT_SUBSCREEN); - param0->unk_BE0.unk_244 = sub_02023FCC(Unk_ov65_0223895C, 3, ov65_02234E40, param0, param2); + param0->unk_BE0.unk_244 = sub_02023FCC(Unk_ov65_0223895C, 3, ov65_02234E40, param0, heapID); } static void ov65_02234CFC(UnkStruct_ov65_0222EBE0 *param0) @@ -6910,9 +6910,9 @@ static BOOL ov65_02234FCC(UnkStruct_ov65_0222EBE0 *param0, int param1, int param ov4_021D2584(param0->unk_04->unk_00.unk_21); if (ov65_0222DD64(param2) == 1) { - ov4_021D2618(1, 121); + ov4_021D2618(1, HEAP_ID_121); } else { - ov4_021D2618(0, 121); + ov4_021D2618(0, HEAP_ID_121); } sub_0209C3AC(); diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index fed89cc1ff..0a2227f148 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -1222,7 +1222,7 @@ static BOOL ov65_022374DC(UnkStruct_ov65_022367A8 *param0) } if (ov65_02237450(param0) == 1) { - ov4_021D1E74(97); + ov4_021D1E74(HEAP_ID_97); param0->unk_00.unk_11 = 1; return 1; } diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index 46945ecf0a..6daf1d3e38 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -281,7 +281,7 @@ static u32 ov69_0225D194(const VecFx32 *param0, const VecFx32 *param1); static u32 ov69_0225D1E0(const UnkStruct_ov69_0225CE64 *param0, u32 param1, UnkStruct_ov66_02231428 param2); static BOOL ov69_0225D268(UnkStruct_ov69_0225CE64 *param0, u8 param1, u8 param2); static void ov69_0225D2A8(UnkStruct_ov69_0225CE64 *param0, const UnkStruct_ov66_02230F50 *param1); -static void ov69_0225D318(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 param2); +static void ov69_0225D318(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 heapID); static void ov69_0225D35C(UnkStruct_ov69_0225D35C *param0); static void ov69_0225D384(UnkStruct_ov69_0225D35C *param0); static void ov69_0225D390(UnkStruct_ov69_0225D35C *param0); @@ -289,7 +289,7 @@ static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 static void ov69_0225D504(UnkStruct_ov69_0225D35C *param0); static void ov69_0225D53C(UnkStruct_ov69_0225D35C *param0, u32 param1); static void ov69_0225D5D8(UnkStruct_ov69_0225D35C *param0); -static void ov69_0225D604(UnkStruct_ov69_0225D35C *param0, u32 param1); +static void ov69_0225D604(UnkStruct_ov69_0225D35C *param0, u32 heapID); static void ov69_0225D63C(UnkStruct_ov69_0225D35C *param0); static void ov69_0225D64C(void); static void ov69_0225D6D8(UnkStruct_ov69_0225D71C *param0, UnkStruct_ov69_0225D35C *param1, u32 param2); @@ -322,7 +322,7 @@ static void ov69_0225DC54(UnkStruct_ov69_0225DC48 *param0); static int ov69_0225DD10(const UnkStruct_ov69_0225DC48 *param0, u32 param1); static void ov69_0225DD2C(UnkStruct_ov69_0225DC48 *param0); static void ov69_0225DD44(UnkStruct_ov69_0225DC48 *param0); -static void ov69_0225DD60(UnkStruct_ov69_0225DDC8 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, SaveData *param3, u32 param4); +static void ov69_0225DD60(UnkStruct_ov69_0225DDC8 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, SaveData *param3, u32 heapID); static void ov69_0225DDC8(UnkStruct_ov69_0225DDC8 *param0); static void ov69_0225DDFC(UnkStruct_ov69_0225DDC8 *param0); static u32 ov69_0225DE40(UnkStruct_ov69_0225DDC8 *param0); @@ -682,9 +682,9 @@ int ov69_0225C700(OverlayManager *param0, int *param1) UnkStruct_ov66_02230F50 *v1; v1 = OverlayManager_Args(param0); - Heap_Create(3, 105, 0x50000); + Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_105, 0x50000); - v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov69_0225CE64), 105); + v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov69_0225CE64), HEAP_ID_105); memset(v0, 0, sizeof(UnkStruct_ov69_0225CE64)); v0->unk_0C = sub_0202C878(v1->unk_04); @@ -694,13 +694,13 @@ int ov69_0225C700(OverlayManager *param0, int *param1) v0->unk_1C = v1->unk_08; ov69_0225D2A8(v0, v1); - ov69_0225D318(&v0->unk_20, v0->unk_10, 105); + ov69_0225D318(&v0->unk_20, v0->unk_10, HEAP_ID_105); ov69_0225D6D8(&v0->unk_1DC, &v0->unk_20, 105); ov69_0225EF1C(&v0->unk_1CC, 105); ov69_0225D7A0(&v0->unk_288, v1->unk_00, &v0->unk_20, v0->unk_04, 105); ov69_0225DA74(&v0->unk_BC30, v0->unk_04, 105); ov69_0225DBB4(&v0->unk_BC44, &v0->unk_20, &v0->unk_1CC, 105); - ov69_0225DD60(&v0->unk_BF64, &v0->unk_20, &v0->unk_1CC, v1->unk_04, 105); + ov69_0225DD60(&v0->unk_BF64, &v0->unk_20, &v0->unk_1CC, v1->unk_04, HEAP_ID_105); ov69_0225DEC0(&v0->unk_BC70, &v0->unk_20, &v0->unk_1CC, 105); ov69_0225D030(v0, v1); @@ -1369,16 +1369,16 @@ static void ov69_0225D2A8(UnkStruct_ov69_0225CE64 *param0, const UnkStruct_ov66_ } } -static void ov69_0225D318(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 param2) +static void ov69_0225D318(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 heapID) { - param0->unk_1A8 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTIMER, param2); + param0->unk_1A8 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTIMER, heapID); - VramTransfer_New(64, param2); + VramTransfer_New(64, heapID); GXLayers_SetBanks(&Unk_ov69_0225F0C0); - ov69_0225D3A4(param0, param1, param2); - ov69_0225D53C(param0, param2); - ov69_0225D604(param0, param2); + ov69_0225D3A4(param0, param1, heapID); + ov69_0225D53C(param0, heapID); + ov69_0225D604(param0, heapID); } static void ov69_0225D35C(UnkStruct_ov69_0225D35C *param0) @@ -1506,9 +1506,9 @@ static void ov69_0225D5D8(UnkStruct_ov69_0225D35C *param0) RenderOam_Free(); } -static void ov69_0225D604(UnkStruct_ov69_0225D35C *param0, u32 param1) +static void ov69_0225D604(UnkStruct_ov69_0225D35C *param0, u32 heapID) { - param0->unk_1A4 = sub_02024220(param1, 0, 2, 0, 4, ov69_0225D64C); + param0->unk_1A4 = sub_02024220(heapID, 0, 2, 0, 4, ov69_0225D64C); NNS_G3dGlbLightVector(0, 0, 0, (-(FX32_ONE - 1))); } @@ -1935,7 +1935,7 @@ static void ov69_0225DD44(UnkStruct_ov69_0225DC48 *param0) Window_DrawStandardFrame(¶m0->unk_1C, 0, (1 + (18 + 12)), 0); } -static void ov69_0225DD60(UnkStruct_ov69_0225DDC8 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, SaveData *param3, u32 param4) +static void ov69_0225DD60(UnkStruct_ov69_0225DDC8 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, SaveData *param3, u32 heapID) { memset(param0, 0, sizeof(UnkStruct_ov69_0225DC48)); @@ -1946,14 +1946,14 @@ static void ov69_0225DD60(UnkStruct_ov69_0225DDC8 *param0, UnkStruct_ov69_0225D3 param0->unk_08 = Options_TextFrameDelay(v0); } - param0->unk_0C = Strbuf_Init(128, param4); + param0->unk_0C = Strbuf_Init(128, heapID); Window_Add(param1->unk_00, ¶m0->unk_10, 1, 2, 1, 27, 4, 1, (((1 + (18 + 12)) + 9) + (6 * 2))); Window_FillTilemap(¶m0->unk_10, 15); ov69_0225EF84(param2, 5, param0->unk_0C); - param0->unk_20 = sub_02015920(param4); + param0->unk_20 = sub_02015920(heapID); } static void ov69_0225DDC8(UnkStruct_ov69_0225DDC8 *param0) diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index 3b8555b26e..760dd18be8 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -229,7 +229,7 @@ typedef struct UnkStruct_ov70_0225DEE8_t { } UnkStruct_ov70_0225DEE8; static void ov70_0225E4C8(void *param0); -static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 param2); +static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 heapID); static void ov70_0225E6C0(UnkStruct_ov70_0225E4EC *param0); static void ov70_0225E6D0(UnkStruct_ov70_0225E4EC *param0); static void ov70_0225E740(UnkStruct_ov70_0225E4EC *param0); @@ -591,10 +591,10 @@ int ov70_0225D9A4(OverlayManager *param0, int *param1) v1 = OverlayManager_Args(param0); - Heap_Create(3, 112, 0x3a000); - Heap_Create(3, 113, 0x3d000); + Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_112, 0x3a000); + Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_113, 0x3d000); - v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov70_0225DEE8), 112); + v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov70_0225DEE8), HEAP_ID_112); memset(v0, 0, sizeof(UnkStruct_ov70_0225DEE8)); v0->unk_38 = &v1->unk_0C; @@ -608,7 +608,7 @@ int ov70_0225D9A4(OverlayManager *param0, int *param1) RenderControlFlags_SetSpeedUpOnTouch(0); v0->unk_458 = SaveData_GetTrainerInfo(v1->unk_00); - ov70_0225E4EC(&v0->unk_3C, v1->unk_00, 112); + ov70_0225E4EC(&v0->unk_3C, v1->unk_00, HEAP_ID_112); v0->unk_44C = ov70_0225C858(112); { @@ -1257,12 +1257,12 @@ static void ov70_0225E4C8(void *param0) ov70_0225E740(&v0->unk_3C); } -static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 param2) +static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 heapID) { G2_BlendNone(); G2S_BlendNone(); - VramTransfer_New(32, param2); + VramTransfer_New(32, heapID); GXLayers_SetBanks(&Unk_ov70_0226D664); gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); @@ -1275,11 +1275,11 @@ static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 int v0; SetAllGraphicsModes(&Unk_ov70_0226D5BC); - param0->unk_00 = BgConfig_New(param2); + param0->unk_00 = BgConfig_New(heapID); for (v0 = 0; v0 < 4; v0++) { Bg_InitFromTemplate(param0->unk_00, Unk_ov70_0226D5CC[v0], &Unk_ov70_0226D6B4[v0], 0); - Bg_ClearTilesRange(Unk_ov70_0226D5CC[v0], 32, 0, param2); + Bg_ClearTilesRange(Unk_ov70_0226D5CC[v0], 32, 0, heapID); Bg_ClearTilemap(param0->unk_00, Unk_ov70_0226D5CC[v0]); } } @@ -1291,14 +1291,14 @@ static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 v1 = SaveData_Options(param1); v2 = Options_Frame(v1); - Font_LoadTextPalette(0, 5 * 32, param2); - Font_LoadScreenIndicatorsPalette(0, 4 * 32, param2); + Font_LoadTextPalette(0, 5 * 32, heapID); + Font_LoadScreenIndicatorsPalette(0, 4 * 32, heapID); - LoadStandardWindowGraphics(param0->unk_00, Unk_ov70_0226D5CC[0], ((1 + (18 + 12)) + ((18 + 12) + 24)), 3, 0, param2); - LoadMessageBoxGraphics(param0->unk_00, Unk_ov70_0226D5CC[0], 1, 1, v2, param2); - LoadSignpostContentGraphics(param0->unk_00, Unk_ov70_0226D5CC[0], (1 + (18 + 12)), 2, SIGNPOST_TYPE_SCROLLING, 0, param2); + LoadStandardWindowGraphics(param0->unk_00, Unk_ov70_0226D5CC[0], ((1 + (18 + 12)) + ((18 + 12) + 24)), 3, 0, heapID); + LoadMessageBoxGraphics(param0->unk_00, Unk_ov70_0226D5CC[0], 1, 1, v2, heapID); + LoadSignpostContentGraphics(param0->unk_00, Unk_ov70_0226D5CC[0], (1 + (18 + 12)), 2, SIGNPOST_TYPE_SCROLLING, 0, heapID); - Graphics_LoadPalette(186, 90, 0, 2 * 32, 32, param2); + Graphics_LoadPalette(186, 90, 0, 2 * 32, 32, heapID); } { @@ -1306,9 +1306,9 @@ static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 NNS_G2dInitOamManagerModule(); - RenderOam_Init(0, 126, 0, 31, 0, 126, 0, 31, param2); + RenderOam_Init(0, 126, 0, 31, 0, 126, 0, 31, heapID); CharTransfer_InitWithVramModes(&Unk_ov70_0226D5DC, GX_OBJVRAMMODE_CHAR_1D_32K, GX_OBJVRAMMODE_CHAR_1D_64K); - PlttTransfer_Init(24, param2); + PlttTransfer_Init(24, heapID); CharTransfer_ClearBuffers(); PlttTransfer_Clear(); @@ -1317,21 +1317,21 @@ static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 ReserveSlotsForWirelessIconPalette(NNS_G2D_VRAM_TYPE_2DMAIN); sub_02039734(); - param0->unk_04 = SpriteList_InitRendering(24, ¶m0->unk_08, param2); + param0->unk_04 = SpriteList_InitRendering(24, ¶m0->unk_08, heapID); SetSubScreenViewRect(¶m0->unk_08, 0, (256 * FX32_ONE)); for (v3 = 0; v3 < 4; v3++) { - param0->unk_194[v3] = SpriteResourceCollection_New(24, v3, param2); + param0->unk_194[v3] = SpriteResourceCollection_New(24, v3, heapID); } - param0->unk_1A4 = CellTransfer_New(24, param2); + param0->unk_1A4 = CellTransfer_New(24, heapID); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } { - param0->unk_1A8 = sub_02024220(param2, 0, 2, 0, 4, ov70_0225E754); + param0->unk_1A8 = sub_02024220(heapID, 0, 2, 0, 4, ov70_0225E754); } } diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index dae16348ee..30eabf0b2f 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -406,7 +406,7 @@ static void ov72_0223DB98(UnkStruct_ov72_0223DB98 *param0) MessageLoader_GetStrbuf(param0->unk_14, 12, param0->unk_2C); MessageLoader_GetStrbuf(param0->unk_14, 9, param0->unk_30); - param0->unk_5D00 = sub_02015920(39); + param0->unk_5D00 = sub_02015920(HEAP_ID_39); MI_CpuClearFast(¶m0->unk_5D04, sizeof(UnkStruct_ov72_0223EAD8)); } diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index a9c7baf8e9..c41baa56a1 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -46,7 +46,7 @@ FS_EXTERN_OVERLAY(game_start); typedef struct { - int unk_00; + int heapId; SaveData *unk_04; Options *unk_08; int unk_0C; @@ -126,28 +126,28 @@ static const OverlayManagerTemplate Unk_ov72_021D3820 = { int ov73_021D0D80(OverlayManager *param0, int *param1) { UnkStruct_ov73_021D1058 *v0; - int v1 = 82; + int childHeapId = HEAP_ID_82; - Heap_Create(3, v1, 0x40000); + Heap_Create(HEAP_ID_APPLICATION, childHeapId, 0x40000); - v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov73_021D1058), v1); + v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov73_021D1058), childHeapId); memset(v0, 0, sizeof(UnkStruct_ov73_021D1058)); - v0->unk_00 = v1; + v0->heapId = childHeapId; v0->unk_04 = ((ApplicationArgs *)OverlayManager_Args(param0))->saveData; v0->unk_08 = SaveData_Options(v0->unk_04); v0->unk_0C = 0; v0->unk_10 = 0; v0->unk_14 = NULL; - v0->unk_70 = sub_0208712C(v1, 0, 0, 7, v0->unk_08); - v0->unk_74 = sub_0208712C(v1, 3, 0, 7, v0->unk_08); + v0->unk_70 = sub_0208712C(childHeapId, 0, 0, 7, v0->unk_08); + v0->unk_74 = sub_0208712C(childHeapId, 3, 0, 7, v0->unk_08); v0->unk_88 = 0; v0->unk_89 = 0; v0->unk_8A = 0; v0->unk_8B = 0; v0->unk_90 = 0; - v0->unk_B8 = Heap_AllocFromHeap(v1, 0x20); - v0->unk_BC = Heap_AllocFromHeap(v1, 0x20); + v0->unk_B8 = Heap_AllocFromHeap(childHeapId, 0x20); + v0->unk_BC = Heap_AllocFromHeap(childHeapId, 0x20); return 1; } @@ -183,12 +183,12 @@ int ov73_021D0E20(OverlayManager *param0, int *param1) break; case 1: if (ov73_021D2318(v0) == 1) { - StartScreenTransition(0, 0, 0, 0x0, 6, 1, v0->unk_00); + StartScreenTransition(0, 0, 0, 0x0, 6, 1, v0->heapId); *param1 = 2; } if (v0->unk_14 != NULL) { - StartScreenTransition(0, 0, 0, 0x0, 6, 1, v0->unk_00); + StartScreenTransition(0, 0, 0, 0x0, 6, 1, v0->heapId); *param1 = 3; } break; @@ -229,7 +229,7 @@ int ov73_021D0E20(OverlayManager *param0, int *param1) int ov73_021D0F7C(OverlayManager *param0, int *param1) { UnkStruct_ov73_021D1058 *v0 = OverlayManager_Data(param0); - int v1 = v0->unk_00; + int v1 = v0->heapId; Heap_FreeToHeap(v0->unk_B8); Heap_FreeToHeap(v0->unk_BC); @@ -306,7 +306,7 @@ static void ov73_021D1058(UnkStruct_ov73_021D1058 *param0) } { - param0->unk_18 = BgConfig_New(param0->unk_00); + param0->unk_18 = BgConfig_New(param0->heapId); } { @@ -356,10 +356,10 @@ static void ov73_021D1058(UnkStruct_ov73_021D1058 *param0) Bg_InitFromTemplate(param0->unk_18, 3, &v2, 0); Bg_ClearTilemap(param0->unk_18, 3); - LoadMessageBoxGraphics(param0->unk_18, 0, (0x400 - (18 + 12)), 4, 0, param0->unk_00); - LoadStandardWindowGraphics(param0->unk_18, 0, ((0x400 - (18 + 12)) - 9), 3, 0, param0->unk_00); - Font_LoadTextPalette(0, 5 * (2 * 16), param0->unk_00); - Font_LoadScreenIndicatorsPalette(0, 6 * (2 * 16), param0->unk_00); + LoadMessageBoxGraphics(param0->unk_18, 0, (0x400 - (18 + 12)), 4, 0, param0->heapId); + LoadStandardWindowGraphics(param0->unk_18, 0, ((0x400 - (18 + 12)) - 9), 3, 0, param0->heapId); + Font_LoadTextPalette(0, 5 * (2 * 16), param0->heapId); + Font_LoadScreenIndicatorsPalette(0, 6 * (2 * 16), param0->heapId); } { BgTemplate v2 = { @@ -440,12 +440,12 @@ static void ov73_021D1238(UnkStruct_ov73_021D1058 *param0) static void ov73_021D12C4(UnkStruct_ov73_021D1058 *param0) { - param0->unk_4C = MessageLoader_Init(1, 26, 389, param0->unk_00); + param0->unk_4C = MessageLoader_Init(1, 26, 389, param0->heapId); Text_ResetAllPrinters(); - param0->unk_60 = sub_0201567C(NULL, 0, 6, param0->unk_00); - param0->unk_64 = StringTemplate_Default(param0->unk_00); + param0->unk_60 = sub_0201567C(NULL, 0, 6, param0->heapId); + param0->unk_64 = StringTemplate_Default(param0->heapId); param0->unk_50 = 0; param0->unk_54 = 0; param0->unk_2C = 0; @@ -460,7 +460,7 @@ static void ov73_021D1300(UnkStruct_ov73_021D1058 *param0) static void ov73_021D1318(UnkStruct_ov73_021D1058 *param0) { - param0->unk_68 = sub_02015920(param0->unk_00); + param0->unk_68 = sub_02015920(param0->heapId); } static void ov73_021D1328(UnkStruct_ov73_021D1058 *param0) @@ -700,9 +700,9 @@ static BOOL ov73_021D1510(UnkStruct_ov73_021D1058 *param0, u32 param1, int param RenderControlFlags_SetAutoScrollFlags(0); { - Strbuf *v1 = Strbuf_Init(0x400, param0->unk_00); + Strbuf *v1 = Strbuf_Init(0x400, param0->heapId); - param0->unk_5C = Strbuf_Init(0x400, param0->unk_00); + param0->unk_5C = Strbuf_Init(0x400, param0->heapId); MessageLoader_GetStrbuf(param0->unk_4C, param1, v1); StringTemplate_SetStrbuf(param0->unk_64, 0, param0->unk_70->unk_18, param0->unk_84, 1, GAME_LANGUAGE); @@ -763,7 +763,7 @@ static BOOL ov73_021D1648(UnkStruct_ov73_021D1058 *param0, int param1, int param case 2: v2 = &Unk_ov72_021D37CC; - if ((gGameVersion == 10) || (GAME_VERSION == 12)) { + if ((gGameVersion == DIAMOND) || (GAME_VERSION == PLATINUM)) { v3 = Unk_ov72_021D3954; v5 = NELEMS(Unk_ov72_021D3954); } else { @@ -775,7 +775,7 @@ static BOOL ov73_021D1648(UnkStruct_ov73_021D1058 *param0, int param1, int param Window_AddFromTemplate(param0->unk_18, ¶m0->unk_30, v2); - param0->unk_44 = StringList_New(v5, param0->unk_00); + param0->unk_44 = StringList_New(v5, param0->heapId); for (v4 = 0; v4 < v5; v4++) { StringList_AddFromMessageBank(param0->unk_44, param0->unk_4C, v3[v4].unk_00, v3[v4].unk_04); @@ -788,7 +788,7 @@ static BOOL ov73_021D1648(UnkStruct_ov73_021D1058 *param0, int param1, int param v1.cursorCallback = ov73_021D1634; v1.window = ¶m0->unk_30; - param0->unk_40 = ListMenu_New(&v1, 0, 0, param0->unk_00); + param0->unk_40 = ListMenu_New(&v1, 0, 0, param0->heapId); Window_DrawStandardFrame(v1.window, 1, ((0x400 - (18 + 12)) - 9), 3); Window_CopyToVRAM(¶m0->unk_30); @@ -828,7 +828,7 @@ static BOOL ov73_021D1784(UnkStruct_ov73_021D1058 *param0, u32 param1, int param switch (param0->unk_54) { case 0: Bg_ToggleLayer(0, 0); - param0->unk_5C = Strbuf_Init(0x400, param0->unk_00); + param0->unk_5C = Strbuf_Init(0x400, param0->heapId); MessageLoader_GetStrbuf(param0->unk_4C, param1, param0->unk_5C); if (param2 == 1) { @@ -898,9 +898,9 @@ static BOOL ov73_021D1784(UnkStruct_ov73_021D1058 *param0, u32 param1, int param static void ov73_021D1930(UnkStruct_ov73_021D1058 *param0) { - Graphics_LoadTilesToBgLayer(125, 0, param0->unk_18, 3, 0, 0, 0, param0->unk_00); - Bg_ClearTilesRange(0, 32, 0, param0->unk_00); - Graphics_LoadTilesToBgLayer(125, 24, param0->unk_18, 7, 0, 0, 0, param0->unk_00); + Graphics_LoadTilesToBgLayer(125, 0, param0->unk_18, 3, 0, 0, 0, param0->heapId); + Bg_ClearTilesRange(0, 32, 0, param0->heapId); + Graphics_LoadTilesToBgLayer(125, 24, param0->unk_18, 7, 0, 0, 0, param0->heapId); { int v0, v1; @@ -916,8 +916,8 @@ static void ov73_021D1930(UnkStruct_ov73_021D1058 *param0) v1 = 26; } - Graphics_LoadPalette(125, v0, 0, 0 * (2 * 16), (2 * 16) * 3, param0->unk_00); - Graphics_LoadPalette(125, v1, 4, 0 * (2 * 16), (2 * 16) * 5, param0->unk_00); + Graphics_LoadPalette(125, v0, 0, 0 * (2 * 16), (2 * 16) * 3, param0->heapId); + Graphics_LoadPalette(125, v1, 4, 0 * (2 * 16), (2 * 16) * 5, param0->heapId); } ov73_021D19DC(param0); @@ -936,7 +936,7 @@ static void ov73_021D19DC(UnkStruct_ov73_021D1058 *param0) return; } - Graphics_LoadTilemapToBgLayer(125, v0[param0->unk_88], param0->unk_18, 3, 0, 0, 0, param0->unk_00); + Graphics_LoadTilemapToBgLayer(125, v0[param0->unk_88], param0->unk_18, 3, 0, 0, 0, param0->heapId); } static void ov73_021D1A20(UnkStruct_ov73_021D1058 *param0) @@ -956,16 +956,16 @@ static void ov73_021D1A20(UnkStruct_ov73_021D1058 *param0) }; if ((param0->unk_89 != 0) && (param0->unk_89 < 12)) { - Graphics_LoadTilesToBgLayer(125, v0[param0->unk_89][0], param0->unk_18, 1, 0, 0, 0, param0->unk_00); - Graphics_LoadPalette(125, v0[param0->unk_89][1], 0, 7 * (2 * 16), (2 * 16), param0->unk_00); - Graphics_LoadTilemapToBgLayer(125, 23, param0->unk_18, 1, 0, 0, 0, param0->unk_00); + Graphics_LoadTilesToBgLayer(125, v0[param0->unk_89][0], param0->unk_18, 1, 0, 0, 0, param0->heapId); + Graphics_LoadPalette(125, v0[param0->unk_89][1], 0, 7 * (2 * 16), (2 * 16), param0->heapId); + Graphics_LoadTilemapToBgLayer(125, 23, param0->unk_18, 1, 0, 0, 0, param0->heapId); ov73_021D14DC(param0, 1, 7); } if ((param0->unk_8A != 0) && (param0->unk_8A < 12)) { - Graphics_LoadTilesToBgLayer(125, v0[param0->unk_8A][0], param0->unk_18, 2, 0, 0, 0, param0->unk_00); - Graphics_LoadPalette(125, v0[param0->unk_8A][1], 0, 8 * (2 * 16), (2 * 16), param0->unk_00); - Graphics_LoadTilemapToBgLayer(125, 23, param0->unk_18, 2, 0, 0, 0, param0->unk_00); + Graphics_LoadTilesToBgLayer(125, v0[param0->unk_8A][0], param0->unk_18, 2, 0, 0, 0, param0->heapId); + Graphics_LoadPalette(125, v0[param0->unk_8A][1], 0, 8 * (2 * 16), (2 * 16), param0->heapId); + Graphics_LoadTilemapToBgLayer(125, 23, param0->unk_18, 2, 0, 0, 0, param0->heapId); ov73_021D14DC(param0, 2, 8); } } @@ -978,7 +978,7 @@ static void ov73_021D1B14(UnkStruct_ov73_021D1058 *param0) return; } - Graphics_LoadTilemapToBgLayer(125, v0[param0->unk_8B], param0->unk_18, 7, 0, 0, 0, param0->unk_00); + Graphics_LoadTilemapToBgLayer(125, v0[param0->unk_8B], param0->unk_18, 7, 0, 0, 0, param0->heapId); if (param0->unk_8B == 1) { ov73_021D14DC(param0, 7, 3); @@ -1103,7 +1103,7 @@ static void ov73_021D1B80(UnkStruct_ov73_021D1058 *param0) BuildArchivedPokemonSprite(&v0, 427, 0, 2, 0, 0, 0); - v1 = Heap_AllocFromHeap(param0->unk_00, (10 * 10) * 2); + v1 = Heap_AllocFromHeap(param0->heapId, (10 * 10) * 2); { int v8; @@ -1113,8 +1113,8 @@ static void ov73_021D1B80(UnkStruct_ov73_021D1058 *param0) } } - v2 = sub_0201363C(v0.archive, v0.character, param0->unk_00); - v3 = sub_02013660(v0.archive, v0.palette, param0->unk_00); + v2 = sub_0201363C(v0.archive, v0.character, param0->heapId); + v3 = sub_02013660(v0.archive, v0.palette, param0->heapId); MI_CpuCopy32(v3, param0->unk_B8, 0x20); @@ -1124,7 +1124,7 @@ static void ov73_021D1B80(UnkStruct_ov73_021D1058 *param0) ov73_021D14DC(param0, v4, v6); - Bg_ClearTilesRange(v4, 32, 0, param0->unk_00); + Bg_ClearTilesRange(v4, 32, 0, param0->heapId); Bg_LoadTiles(param0->unk_18, v4, v2, (10 * 10) * 0x20, 1); Bg_LoadPalette(v4, v3, (2 * 16), (2 * 16) * v6); Bg_FillTilemapRect(param0->unk_18, v5, 0, 0, 0, 32, 24, v7); @@ -1132,7 +1132,7 @@ static void ov73_021D1B80(UnkStruct_ov73_021D1058 *param0) ov73_021D14DC(param0, v5, v7); - Bg_ClearTilesRange(v5, 32, 0, param0->unk_00); + Bg_ClearTilesRange(v5, 32, 0, param0->heapId); Bg_LoadTiles(param0->unk_18, v5, v2, (10 * 10) * 0x20, 1); Bg_LoadPalette(v5, v3, (2 * 16), (2 * 16) * v7); Heap_FreeToHeap(v3); @@ -1142,12 +1142,12 @@ static void ov73_021D1B80(UnkStruct_ov73_021D1058 *param0) static void ov73_021D1CE0(UnkStruct_ov73_021D1058 *param0) { - Graphics_LoadTilemapToBgLayer(125, 40, param0->unk_18, 6, 0, 0, 0, param0->unk_00); + Graphics_LoadTilemapToBgLayer(125, 40, param0->unk_18, 6, 0, 0, 0, param0->heapId); ov73_021D14DC(param0, 6, 9); - Graphics_LoadPalette(125, 41, 4, 7 * (2 * 16), (2 * 16) * 3, param0->unk_00); - Bg_ClearTilesRange(6, 32, 0, param0->unk_00); - Graphics_LoadTilesToBgLayer(125, 32, param0->unk_18, 6, 0x20, 0, 0, param0->unk_00); + Graphics_LoadPalette(125, 41, 4, 7 * (2 * 16), (2 * 16) * 3, param0->heapId); + Bg_ClearTilesRange(6, 32, 0, param0->heapId); + Graphics_LoadTilesToBgLayer(125, 32, param0->unk_18, 6, 0x20, 0, 0, param0->heapId); } static BOOL ov73_021D1D44(UnkStruct_ov73_021D1058 *param0, int param1, int param2) @@ -1209,7 +1209,7 @@ static void ov73_021D1DE8(UnkStruct_ov73_021D1058 *param0) { int v0[] = { 9, 10, 11, 12 }; - Graphics_LoadTilesToBgLayer(125, v0[param0->unk_8C], param0->unk_18, 1, 0, 0, 0, param0->unk_00); + Graphics_LoadTilesToBgLayer(125, v0[param0->unk_8C], param0->unk_18, 1, 0, 0, 0, param0->heapId); } } else { if (param0->unk_8F) { @@ -1224,7 +1224,7 @@ static void ov73_021D1DE8(UnkStruct_ov73_021D1058 *param0) { int v1[] = { 14, 15, 16, 17 }; - Graphics_LoadTilesToBgLayer(125, v1[param0->unk_8E], param0->unk_18, 2, 0, 0, 0, param0->unk_00); + Graphics_LoadTilesToBgLayer(125, v1[param0->unk_8E], param0->unk_18, 2, 0, 0, 0, param0->heapId); } } } @@ -1267,7 +1267,7 @@ static BOOL ov73_021D1F18(UnkStruct_ov73_021D1058 *param0) if (v1 == 0xff) { v0 = 1; } else { - Graphics_LoadTilesToBgLayer(125, v1, param0->unk_18, 1, 0, 0, 0, param0->unk_00); + Graphics_LoadTilesToBgLayer(125, v1, param0->unk_18, 1, 0, 0, 0, param0->heapId); } return v0; @@ -1419,7 +1419,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) sub_020055D0(1029, 0); Bg_ToggleLayer(0, 1); Bg_ToggleLayer(7, 1); - StartScreenTransition(0, 1, 1, 0x0, 6, 1, param0->unk_00); + StartScreenTransition(0, 1, 1, 0x0, 6, 1, param0->heapId); param0->unk_0C = 1; break; case 1: @@ -1444,7 +1444,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) ov73_021D1A20(param0); Bg_ToggleLayer(3, 1); Bg_ToggleLayer(1, 1); - StartScreenTransition(3, 1, 1, 0x0, 16, 4, param0->unk_00); + StartScreenTransition(3, 1, 1, 0x0, 16, 4, param0->heapId); param0->unk_0C = 4; break; case 4: @@ -1483,7 +1483,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) } break; case 8: - StartScreenTransition(0, 0, 0, 0x0, 6, 1, param0->unk_00); + StartScreenTransition(0, 0, 0, 0x0, 6, 1, param0->heapId); param0->unk_0C = 9; break; case 9: @@ -1502,7 +1502,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) ov73_021D19DC(param0); param0->unk_8B = 1; ov73_021D1B14(param0); - StartScreenTransition(0, 1, 1, 0x0, 6, 1, param0->unk_00); + StartScreenTransition(0, 1, 1, 0x0, 6, 1, param0->heapId); param0->unk_0C = 11; break; case 11: @@ -1595,7 +1595,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) case 24: if (ov73_021D1334(param0, 6, 1) == 1) { sub_02015A54(param0->unk_68); - StartScreenTransition(0, 0, 0, 0x0, 6, 1, param0->unk_00); + StartScreenTransition(0, 0, 0, 0x0, 6, 1, param0->heapId); param0->unk_0C = 25; } break; @@ -1632,7 +1632,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) ov73_021D1B14(param0); Bg_ToggleLayer(1, 1); Bg_SetOffset(param0->unk_18, 1, 0, 0); - StartScreenTransition(0, 1, 1, 0x0, 6, 1, param0->unk_00); + StartScreenTransition(0, 1, 1, 0x0, 6, 1, param0->heapId); param0->unk_0C = 29; break; case 29: @@ -1650,7 +1650,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) ov73_021D19DC(param0); param0->unk_8B = 2; ov73_021D1B14(param0); - StartScreenTransition(0, 1, 1, 0x0, 6, 1, param0->unk_00); + StartScreenTransition(0, 1, 1, 0x0, 6, 1, param0->heapId); param0->unk_0C = 32; break; case 32: @@ -1689,7 +1689,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) } break; case 39: - StartScreenTransition(0, 0, 0, 0x0, 6, 1, param0->unk_00); + StartScreenTransition(0, 0, 0, 0x0, 6, 1, param0->heapId); param0->unk_0C = 40; break; case 40: @@ -1712,7 +1712,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) } break; case 43: - StartScreenTransition(4, 0, 0, 0x0, 6, 1, param0->unk_00); + StartScreenTransition(4, 0, 0, 0x0, 6, 1, param0->heapId); param0->unk_0C = 44; break; case 44: @@ -1721,7 +1721,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) param0->unk_8B = 4; ov73_021D1B14(param0); Bg_ToggleLayer(6, 1); - StartScreenTransition(4, 1, 1, 0x0, 6, 1, param0->unk_00); + StartScreenTransition(4, 1, 1, 0x0, 6, 1, param0->heapId); param0->unk_0C = 45; } break; @@ -1759,7 +1759,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) param0->unk_0C = 50; } else { - Graphics_LoadTilesToBgLayer(125, v3[param0->unk_94[0]], param0->unk_18, 6, 0x20, 0, 0, param0->unk_00); + Graphics_LoadTilesToBgLayer(125, v3[param0->unk_94[0]], param0->unk_18, 6, 0x20, 0, 0, param0->heapId); param0->unk_94[0]++; param0->unk_94[1] = 4; } @@ -1973,7 +1973,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) break; case 76: param0->unk_70->unk_04 = param0->unk_84; - param0->unk_14 = OverlayManager_New(&Unk_020F2DAC, param0->unk_70, param0->unk_00); + param0->unk_14 = OverlayManager_New(&Unk_020F2DAC, param0->unk_70, param0->heapId); param0->unk_0C = 77; break; case 77: @@ -1989,7 +1989,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) Bg_SetOffset(param0->unk_18, 2, 0, 0); } - StartScreenTransition(0, 1, 1, 0x0, 6, 1, param0->unk_00); + StartScreenTransition(0, 1, 1, 0x0, 6, 1, param0->heapId); param0->unk_0C = 78; break; case 78: @@ -2100,7 +2100,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) case 5: { u32 v9; - if ((gGameVersion == 10) || (GAME_VERSION == 12)) { + if ((gGameVersion == DIAMOND) || (GAME_VERSION == PLATINUM)) { v9 = Unk_ov72_021D3954[param0->unk_48 - 1].unk_00; } else { v9 = Unk_ov73_021D1648[param0->unk_48 - 1].unk_00; @@ -2124,7 +2124,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) } break; case 92: - param0->unk_14 = OverlayManager_New(&Unk_020F2DAC, param0->unk_74, param0->unk_00); + param0->unk_14 = OverlayManager_New(&Unk_020F2DAC, param0->unk_74, param0->heapId); param0->unk_0C = 93; break; case 93: @@ -2133,7 +2133,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) Bg_ToggleLayer(7, 1); Bg_ToggleLayer(1, 1); Bg_SetOffset(param0->unk_18, 1, 0, 0); - StartScreenTransition(0, 1, 1, 0x0, 6, 1, param0->unk_00); + StartScreenTransition(0, 1, 1, 0x0, 6, 1, param0->heapId); param0->unk_0C = 94; break; case 94: @@ -2232,7 +2232,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) } break; case 108: - param0->unk_14 = OverlayManager_New(&Unk_ov72_021D3820, NULL, param0->unk_00); + param0->unk_14 = OverlayManager_New(&Unk_ov72_021D3820, NULL, param0->heapId); param0->unk_0C = 109; break; case 109: diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c index 4d5e154ae5..296c35ece6 100644 --- a/src/overlay076/ov76_0223B870.c +++ b/src/overlay076/ov76_0223B870.c @@ -102,8 +102,8 @@ static void ov76_0223B870(TouchScreenRect *rect, ManagedSprite *param1, int para void ov76_0223B8A8(UnkStruct_ov76_0223DE00 *param0) { - param0->unk_D4.unk_160 = sub_02012744(2, 53); - Font_InitManager(FONT_SUBSCREEN, 53); + param0->unk_D4.unk_160 = sub_02012744(2, HEAP_ID_53); + Font_InitManager(FONT_SUBSCREEN, HEAP_ID_53); } void ov76_0223B8C4(UnkStruct_ov76_0223DE00 *param0) @@ -379,10 +379,7 @@ void ov76_0223BD30(UnkStruct_ov76_0223DE00 *param0, s8 param1, int param2) GenericPointerData *ov76_0223BE6C(void) { - GenericPointerData *v0; - - v0 = sub_02024220(53, 0, 2, 0, 2, ov76_0223BE8C); - return v0; + return sub_02024220(HEAP_ID_53, 0, 2, 0, 2, ov76_0223BE8C); } void ov76_0223BE8C(void) diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c index d75b7703ad..170feae1be 100644 --- a/src/overlay076/ov76_0223D338.c +++ b/src/overlay076/ov76_0223D338.c @@ -866,7 +866,7 @@ static BOOL ov76_0223DF94(UnkStruct_ov76_0223DE00 *param0) Pokemon_SetValue(param0->unk_428, MON_DATA_MAIL_ID, (u8 *)&v1); Pokemon_SetValue(param0->unk_428, MON_DATA_171, &v2); - param0->unk_D4.unk_154 = ov12_02236004(53, &v3); + param0->unk_D4.unk_154 = ov12_02236004(HEAP_ID_53, &v3); ov12_02236320(param0->unk_D4.unk_154); } param0->unk_3DC++; @@ -1028,7 +1028,7 @@ static BOOL ov76_0223DF94(UnkStruct_ov76_0223DE00 *param0) v9.unk_10 = 25; v9.unk_11 = 6; - param0->unk_D4.unk_150 = sub_02015920(53); + param0->unk_D4.unk_150 = sub_02015920(HEAP_ID_53); sub_02015958(param0->unk_D4.unk_150, &v9); } diff --git a/src/overlay077/ov77_021D6C70.c b/src/overlay077/ov77_021D6C70.c index 38e10e10c4..e31d03fe9a 100644 --- a/src/overlay077/ov77_021D6C70.c +++ b/src/overlay077/ov77_021D6C70.c @@ -140,7 +140,7 @@ void ov77_021D6CFC(UnkStruct_ov77_021D6CFC *param0) } } - param0->unk_00 = sub_0200762C(76); + param0->unk_00 = sub_0200762C(HEAP_ID_76); for (v0 = 0; v0 < 3; v0++) { BuildArchivedPokemonSprite(&v1, v5[v0], 0, 2, 0, NULL, NULL); @@ -153,7 +153,7 @@ void ov77_021D6CFC(UnkStruct_ov77_021D6CFC *param0) sub_02014000(); param0->unk_14 = Heap_AllocFromHeap(HEAP_ID_76, 0x4800); - param0->unk_18 = sub_02014014(ov77_021D6C70, ov77_021D6C94, param0->unk_14, 0x4800, 1, 76); + param0->unk_18 = sub_02014014(ov77_021D6C70, ov77_021D6C94, param0->unk_14, 0x4800, 1, HEAP_ID_76); camera = sub_02014784(param0->unk_18); Camera_SetClipping((FX32_ONE), (FX32_ONE * 900), camera); diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c index 27a1e30829..51f3e7196d 100644 --- a/src/overlay079/ov79_021D2268.c +++ b/src/overlay079/ov79_021D2268.c @@ -88,7 +88,7 @@ struct UnkStruct_ov79_021D29B4_t { }; typedef struct { - int unk_00; + int heapId; int unk_04; int unk_08; u16 unk_0C; @@ -168,12 +168,12 @@ int ov79_021D22AC(OverlayManager *param0, int *param1) UnkStruct_02098DE8 *v0 = OverlayManager_Args(param0); UnkStruct_ov79_021D2928 *v1; - Heap_Create(3, 46, 0x10000); + Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_46, 0x10000); - v1 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov79_021D2928), 46); + v1 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov79_021D2928), HEAP_ID_46); MI_CpuClear8(v1, sizeof(UnkStruct_ov79_021D2928)); - v1->unk_00 = 46; + v1->heapId = HEAP_ID_46; v1->unk_10 = v0; return 1; @@ -217,7 +217,7 @@ int ov79_021D22E4(OverlayManager *param0, int *param1) } v0->unk_04 = 0; - StartScreenTransition(0, 1, 1, 0x0, 6, 1, v0->unk_00); + StartScreenTransition(0, 1, 1, 0x0, 6, 1, v0->heapId); break; case 3: if (!IsScreenTransitionDone()) { @@ -230,7 +230,7 @@ int ov79_021D22E4(OverlayManager *param0, int *param1) return 0; } - StartScreenTransition(0, 0, 0, 0x0, 6, 1, v0->unk_00); + StartScreenTransition(0, 0, 0, 0x0, 6, 1, v0->heapId); break; case 5: if (!IsScreenTransitionDone()) { @@ -268,7 +268,7 @@ int ov79_021D2460(OverlayManager *param0, int *param1) OverlayManager_FreeData(param0); - Heap_Destroy(v0->unk_00); + Heap_Destroy(v0->heapId); return 1; } @@ -285,7 +285,7 @@ static int ov79_021D247C(UnkStruct_ov79_021D2928 *param0) break; case 2: ov79_021D27D8(param0); - ov79_021D3768(¶m0->unk_40, ¶m0->unk_30, param0->unk_00); + ov79_021D3768(¶m0->unk_40, ¶m0->unk_30, param0->heapId); ov79_021D2864(param0); param0->unk_04 = 0; @@ -357,7 +357,7 @@ static void ov79_021D257C(UnkStruct_ov79_021D2928 *param0) ov79_021D255C(); - param0->unk_68 = BgConfig_New(param0->unk_00); + param0->unk_68 = BgConfig_New(param0->heapId); { GraphicsModes v2 = { @@ -424,7 +424,7 @@ static void ov79_021D257C(UnkStruct_ov79_021D2928 *param0) v1 = v4[v0]; Bg_InitFromTemplate(param0->unk_68, v1, &(v3[v0]), 0); Bg_ClearTilemap(param0->unk_68, v1); - Bg_ClearTilesRange(v1, 32, 0, param0->unk_00); + Bg_ClearTilesRange(v1, 32, 0, param0->heapId); } } } @@ -445,16 +445,16 @@ static void ov79_021D2634(UnkStruct_ov79_021D2928 *param0) { NARC *v0; - v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PORUDEMO, param0->unk_00); + v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PORUDEMO, param0->heapId); - sub_0208C210(param0->unk_68, param0->unk_00, v0, 87, 2, 2, 0, 0, 0); - sub_0208C210(param0->unk_68, param0->unk_00, v0, 87, 3, 4, 0, 0, 0); + sub_0208C210(param0->unk_68, param0->heapId, v0, 87, 2, 2, 0, 0, 0); + sub_0208C210(param0->unk_68, param0->heapId, v0, 87, 3, 4, 0, 0, 0); - sub_0208C210(param0->unk_68, param0->unk_00, v0, 87, 0, 2, 2, 0x20 * 0x1, 0); - sub_0208C210(param0->unk_68, param0->unk_00, v0, 87, 1, 4, 2, 0x20 * 0x5, 0); + sub_0208C210(param0->unk_68, param0->heapId, v0, 87, 0, 2, 2, 0x20 * 0x1, 0); + sub_0208C210(param0->unk_68, param0->heapId, v0, 87, 1, 4, 2, 0x20 * 0x5, 0); - sub_0208C210(param0->unk_68, param0->unk_00, v0, 87, 4, 2, 1, 0, 0); - sub_0208C210(param0->unk_68, param0->unk_00, v0, 87, 5, 4, 1, 0, 0); + sub_0208C210(param0->unk_68, param0->heapId, v0, 87, 4, 2, 1, 0, 0); + sub_0208C210(param0->unk_68, param0->heapId, v0, 87, 5, 4, 1, 0, 0); NARC_dtor(v0); @@ -470,8 +470,8 @@ static void ov79_021D270C(UnkStruct_ov79_021D2928 *param0) Window_AddFromTemplate(param0->unk_68, &(param0->unk_6C), &v0); Window_FillTilemap(¶m0->unk_6C, ((0 << 4) | 0)); - LoadMessageBoxGraphics(param0->unk_68, 1, 1, 14, param0->unk_10->unk_0B, param0->unk_00); - Font_LoadScreenIndicatorsPalette(0, 15 * 32, param0->unk_00); + LoadMessageBoxGraphics(param0->unk_68, 1, 1, 14, param0->unk_10->unk_0B, param0->heapId); + Font_LoadScreenIndicatorsPalette(0, 15 * 32, param0->heapId); } static void ov79_021D2754(UnkStruct_ov79_021D2928 *param0) @@ -484,9 +484,9 @@ static void ov79_021D2768(UnkStruct_ov79_021D2928 *param0) { int v0 = 0; - param0->unk_18 = MessageLoader_Init(0, 26, 462, param0->unk_00); - param0->unk_1C.unk_00 = StringTemplate_New(1, 64, param0->unk_00); - param0->unk_1C.unk_04 = Strbuf_Init(64, param0->unk_00); + param0->unk_18 = MessageLoader_Init(0, 26, 462, param0->heapId); + param0->unk_1C.unk_00 = StringTemplate_New(1, 64, param0->heapId); + param0->unk_1C.unk_04 = Strbuf_Init(64, param0->heapId); for (v0 = 0; v0 < 3; v0++) { param0->unk_1C.unk_08[v0] = MessageLoader_GetNewStrbuf(param0->unk_18, v0); @@ -513,7 +513,7 @@ static void ov79_021D27D8(UnkStruct_ov79_021D2928 *param0) param0->unk_30.unk_07 = Pokemon_GetGender(param0->unk_10->unk_00); param0->unk_30.unk_06 = Pokemon_GetNature(param0->unk_10->unk_00); param0->unk_30.unk_08 = SpeciesData_GetFormValue(param0->unk_30.unk_04, Pokemon_GetValue(param0->unk_10->unk_00, MON_DATA_FORM, NULL), 28) ^ 1; - param0->unk_30.unk_0C = Strbuf_Init(12, param0->unk_00); + param0->unk_30.unk_0C = Strbuf_Init(12, param0->heapId); Pokemon_GetValue(param0->unk_10->unk_00, MON_DATA_NICKNAME_STRBUF, param0->unk_30.unk_0C); @@ -527,9 +527,9 @@ static void ov79_021D2858(UnkStruct_ov79_021D2928 *param0) static void ov79_021D2864(UnkStruct_ov79_021D2928 *param0) { - VramTransfer_New(32, param0->unk_00); + VramTransfer_New(32, param0->heapId); - param0->unk_7C = SpriteSystem_Alloc(param0->unk_00); + param0->unk_7C = SpriteSystem_Alloc(param0->heapId); { RenderOamTemplate v0 = { @@ -551,10 +551,10 @@ static void ov79_021D2864(UnkStruct_ov79_021D2928 *param0) }; SpriteSystem_Init(param0->unk_7C, &v0, &v1, 32); - RenderOam_ClearMain(param0->unk_00); + RenderOam_ClearMain(param0->heapId); } - param0->unk_5C = sub_02098FFC(param0->unk_00, 2, 2, (NNS_G2D_VRAM_TYPE_2DMAIN), 0); + param0->unk_5C = sub_02098FFC(param0->heapId, 2, 2, (NNS_G2D_VRAM_TYPE_2DMAIN), 0); param0->unk_60[0] = sub_0209916C(param0->unk_5C, param0->unk_10->unk_08, 100, 90, 0, 1, 0, 0); ManagedSprite_SetDrawFlag(param0->unk_60[0]->unk_04, 0); @@ -687,10 +687,10 @@ static int ov79_021D2AF0(UnkStruct_ov79_021D2928 *param0, UnkStruct_ov79_021D29B switch (param0->unk_30.unk_09) { case 1: - Sound_PlayPokemonCry(11, param0->unk_30.unk_04, 0, 127, param0->unk_00, v0); + Sound_PlayPokemonCry(11, param0->unk_30.unk_04, 0, 127, param0->heapId, v0); break; default: - Sound_PlayPokemonCry(0, param0->unk_30.unk_04, 0, 127, param0->unk_00, v0); + Sound_PlayPokemonCry(0, param0->unk_30.unk_04, 0, 127, param0->heapId, v0); break; } diff --git a/src/overlay079/ov79_021D3768.c b/src/overlay079/ov79_021D3768.c index 419864a743..180d2dd036 100644 --- a/src/overlay079/ov79_021D3768.c +++ b/src/overlay079/ov79_021D3768.c @@ -17,9 +17,9 @@ #include "unk_0202419C.h" static void ov79_021D3870(UnkStruct_ov79_021D3820 *param0, int param1); -static void ov79_021D38D0(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *param1, int param2); +static void ov79_021D38D0(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *param1, int heapIDs); -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) { MI_CpuClear8(param0, sizeof(UnkStruct_ov79_021D3820)); @@ -36,8 +36,8 @@ void ov79_021D3768(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *par G3_SwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_W); G3_ViewPort(0, 0, 255, 191); - ov79_021D3870(param0, param2); - ov79_021D38D0(param0, param1, param2); + ov79_021D3870(param0, heapID); + ov79_021D38D0(param0, param1, heapID); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); G2_SetBG0Priority(1); @@ -81,12 +81,12 @@ static void ov79_021D3870(UnkStruct_ov79_021D3820 *param0, int param1) Camera_SetAsActive(param0->camera); } -static void ov79_021D38D0(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *param1, int param2) +static void ov79_021D38D0(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *param1, int heapID) { ArchivedSprite v0; PokemonSprite *v1; - param0->unk_04 = sub_0200762C(param2); + param0->unk_04 = sub_0200762C(heapID); Pokemon_BuildArchivedSprite(&v0, param1->unk_00, 2); diff --git a/src/overlay082/ov82_0223B140.c b/src/overlay082/ov82_0223B140.c index 6baf4b97e7..ac73931bba 100644 --- a/src/overlay082/ov82_0223B140.c +++ b/src/overlay082/ov82_0223B140.c @@ -42,7 +42,7 @@ int ov82_0223B164(OverlayManager *param0, int *param1) v0->unk_10 = v1; if ((v1->unk_20) && (v1->unk_24)) { - ov4_021D1E74(55); + ov4_021D1E74(HEAP_ID_55); } v0->unk_26 = v1->unk_20; diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c index 288f5e5162..f7a62b6a36 100644 --- a/src/overlay083/ov83_0223B5A0.c +++ b/src/overlay083/ov83_0223B5A0.c @@ -107,14 +107,14 @@ int ov83_0223B5B0(OverlayManager *param0, int *param1) UnkStruct_ov83_0223C344 *v0 = OverlayManager_Args(param0); UnkStruct_ov83_0223B784 *v1; - Heap_Create(3, 56, 0x20000); + Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_56, 0x20000); v1 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov83_0223B784), 56); memset(v1, 0, sizeof(UnkStruct_ov83_0223B784)); v0->unk_18 = v1; - v1->unk_00 = 56; + v1->heapID = HEAP_ID_56; - VramTransfer_New(16, v1->unk_00); + VramTransfer_New(16, v1->heapID); if (v0->unk_06_0 == 1) { v1->unk_1490 = 1; @@ -195,7 +195,7 @@ int ov83_0223B65C(OverlayManager *param0, int *param1) } ov83_0223CBA4(v3); - sub_02038A1C(v3->unk_00, v3->unk_20); + sub_02038A1C(v3->heapID, v3->unk_20); if (v3->unk_04) { return 1; @@ -210,7 +210,7 @@ int ov83_0223B710(OverlayManager *param0, int *param1) UnkStruct_ov83_0223C344 *v1 = OverlayManager_Args(param0); UnkStruct_ov83_0223B784 *v2 = (UnkStruct_ov83_0223B784 *)OverlayManager_Data(param0); - v0 = v2->unk_00; + v0 = v2->heapID; if (v1->unk_26) { if (CommSys_CurNetId() == 0) { @@ -260,9 +260,9 @@ static int ov83_0223B78C(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 ov83_0223FDB0(¶m1->unk_34C); } - ov83_0223DEA0(¶m1->unk_5B0, param1->unk_1488, ¶m1->unk_15E0, ¶m1->unk_1494, param1->unk_24, param1->unk_00); + ov83_0223DEA0(¶m1->unk_5B0, param1->unk_1488, ¶m1->unk_15E0, ¶m1->unk_1494, param1->unk_24, param1->heapID); ov83_0223E340(¶m1->unk_608); - ov83_0223E6D4(¶m1->unk_6A0, param1->unk_1488, ¶m1->unk_15E0, ¶m1->unk_1494, param1->unk_24, param1->unk_00); + ov83_0223E6D4(¶m1->unk_6A0, param1->unk_1488, ¶m1->unk_15E0, ¶m1->unk_1494, param1->unk_24, param1->heapID); ov83_0223E244(¶m1->unk_5E4); ov83_0223E244(¶m1->unk_5F0); ov83_0223E244(¶m1->unk_5FC); @@ -287,7 +287,7 @@ static int ov83_0223B78C(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 (*param2)++; break; case 1: - StartScreenTransition(0, 1, 1, 0xffff, 6, 1, param1->unk_00); + StartScreenTransition(0, 1, 1, 0xffff, 6, 1, param1->heapID); (*param2)++; break; case 2: @@ -371,7 +371,7 @@ static int ov83_0223B9EC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 switch (*param2) { case 0: - ov83_0223F790(¶m1->unk_1480, param1->unk_00, param1->unk_20); + ov83_0223F790(¶m1->unk_1480, param1->heapID, param1->unk_20); (*param2)++; break; case 1: @@ -547,7 +547,7 @@ static int ov83_0223BCEC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 break; } - StartScreenTransition(3, 0, 0, 0x0, 6, 1, param1->unk_00); + StartScreenTransition(3, 0, 0, 0x0, 6, 1, param1->heapID); (*param2)++; break; case 2: @@ -597,8 +597,8 @@ static int ov83_0223BCEC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 break; case 4: if (ov83_0223D570(param1->unk_148C) == 0) { - v0 = Poffin_New(param1->unk_00); - ov83_0223FFD4(¶m1->unk_34C, v0, ¶m1->unk_1494, param1->unk_1488, param1->unk_00); + v0 = Poffin_New(param1->heapID); + ov83_0223FFD4(¶m1->unk_34C, v0, ¶m1->unk_1494, param1->unk_1488, param1->heapID); v1 = ov83_0223D508(28, v0, Poffin_SizeOf(), param1->unk_148C); Heap_FreeToHeap(v0); @@ -646,8 +646,8 @@ static int ov83_0223BF74(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 param1->unk_31C = 0; - ov83_0223F730(¶m1->unk_1478, 128, 144, param1->unk_1494.unk_58.unk_0C, param1->unk_00); - StartScreenTransition(3, 1, 0, 0x0, 6, 1, param1->unk_00); + ov83_0223F730(¶m1->unk_1478, 128, 144, param1->unk_1494.unk_58.unk_0C, param1->heapID); + StartScreenTransition(3, 1, 0, 0x0, 6, 1, param1->heapID); (*param2)++; break; case 1: @@ -797,7 +797,7 @@ static int ov83_0223C258(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 void *journalEntryOnlineEvent; if (param1->unk_1490 == 1) { - journalEntryOnlineEvent = JournalEntry_CreateEventMadePoffins(param1->unk_00); + journalEntryOnlineEvent = JournalEntry_CreateEventMadePoffins(param1->heapID); JournalEntry_SaveData(param0->unk_10->unk_1C, journalEntryOnlineEvent, JOURNAL_ONLINE_EVENT); } } @@ -813,7 +813,7 @@ static int ov83_0223C258(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 } break; case 2: - StartScreenTransition(0, 0, 0, 0x0, 6, 1, param1->unk_00); + StartScreenTransition(0, 0, 0, 0x0, 6, 1, param1->heapID); (*param2)++; break; case 3: @@ -1057,7 +1057,7 @@ static void ov83_0223C82C(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B7 { int v0; - param1->unk_1494.unk_100 = Poffin_New(param1->unk_00); + param1->unk_1494.unk_100 = Poffin_New(param1->heapID); param1->unk_1494.unk_144 = ov83_0223D570(param1->unk_148C); for (v0 = 0; v0 < 4; v0++) { diff --git a/src/overlay083/ov83_0223C958.c b/src/overlay083/ov83_0223C958.c index e4c1baab0d..afc0be1cbb 100644 --- a/src/overlay083/ov83_0223C958.c +++ b/src/overlay083/ov83_0223C958.c @@ -43,28 +43,26 @@ static void ov83_0223D068(UnkStruct_ov83_0223B784 *param0); void ov83_0223C958(UnkStruct_ov83_0223B784 *param0) { - NARC *v0; - - v0 = NARC_ctor(NARC_INDEX_GRAPHIC__NUTMIXER, param0->unk_00); + NARC *v0 = NARC_ctor(NARC_INDEX_GRAPHIC__NUTMIXER, param0->heapID); ov83_0223CE9C(param0); - ov83_0223CC30(&(param0->unk_20), param0->unk_00); + ov83_0223CC30(&(param0->unk_20), param0->heapID); ov83_0223CD64(param0); ov83_0223CCF8(param0); ov83_0223CD28(param0); ov83_0223CDD0(param0, v0); - ov83_0223DEE0(¶m0->unk_5B0, param0->unk_20, param0->unk_00, v0); - ov83_0223E720(¶m0->unk_6A0, param0->unk_20, param0->unk_00, v0); - ov83_0223E368(¶m0->unk_608, param0->unk_320, param0->unk_00, v0); - ov83_0223E28C(¶m0->unk_5E4, ¶m0->unk_2C, param0->unk_1CC, param0->unk_00, 0, 0); + ov83_0223DEE0(¶m0->unk_5B0, param0->unk_20, param0->heapID, v0); + ov83_0223E720(¶m0->unk_6A0, param0->unk_20, param0->heapID, v0); + ov83_0223E368(¶m0->unk_608, param0->unk_320, param0->heapID, v0); + ov83_0223E28C(¶m0->unk_5E4, ¶m0->unk_2C, param0->unk_1CC, param0->heapID, 0, 0); - ov83_0223E28C(¶m0->unk_5FC, ¶m0->unk_2C, param0->unk_1CC, param0->unk_00, 0, 2); - ov83_0223E28C(¶m0->unk_5F0, ¶m0->unk_2C, param0->unk_1CC, param0->unk_00, 5, 0); - ov83_0223E5DC(¶m0->unk_680, ¶m0->unk_2C, param0->unk_1CC, param0->unk_00); - ov83_0223ED6C(¶m0->unk_6D8, ¶m0->unk_2C, param0->unk_1CC, param0->unk_00); - ov83_0223F2C4(¶m0->unk_AEC, ¶m0->unk_2C, param0->unk_00, v0); - ov83_0223F4CC(¶m0->unk_B6C, ¶m0->unk_2C, param0->unk_1CC, param0->unk_00); + ov83_0223E28C(¶m0->unk_5FC, ¶m0->unk_2C, param0->unk_1CC, param0->heapID, 0, 2); + ov83_0223E28C(¶m0->unk_5F0, ¶m0->unk_2C, param0->unk_1CC, param0->heapID, 5, 0); + ov83_0223E5DC(¶m0->unk_680, ¶m0->unk_2C, param0->unk_1CC, param0->heapID); + ov83_0223ED6C(¶m0->unk_6D8, ¶m0->unk_2C, param0->unk_1CC, param0->heapID); + ov83_0223F2C4(¶m0->unk_AEC, ¶m0->unk_2C, param0->heapID, v0); + ov83_0223F4CC(¶m0->unk_B6C, ¶m0->unk_2C, param0->unk_1CC, param0->heapID); ov83_0223CF2C(param0); @@ -101,7 +99,7 @@ void ov83_0223CAA4(UnkStruct_ov83_0223B784 *param0) int ov83_0223CB5C(UnkStruct_ov83_0223B784 *param0, int *param1) { - ov83_0223DB4C(¶m0->unk_3C0, ¶m0->unk_1494.unk_6C, ¶m0->unk_2C, param0->unk_1CC, param0->unk_00); + ov83_0223DB4C(¶m0->unk_3C0, ¶m0->unk_1494.unk_6C, ¶m0->unk_2C, param0->unk_1CC, param0->heapID); return param0->unk_0C + 1; } @@ -270,7 +268,7 @@ static void ov83_0223CCCC(BgConfig **param0) static void ov83_0223CCF8(UnkStruct_ov83_0223B784 *param0) { - ov83_0223D754(¶m0->unk_2C, 72, 16, param0->unk_00); + ov83_0223D754(¶m0->unk_2C, 72, 16, param0->heapID); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } @@ -283,10 +281,13 @@ static void ov83_0223CD1C(UnkStruct_ov83_0223B784 *param0) static void ov83_0223CD28(UnkStruct_ov83_0223B784 *param0) { UnkStruct_ov22_022550D4 v0 = { - 48, 32, 32, 0 + .unk_00 = 48, + .unk_04 = 32, + .unk_08 = 32, + .heapID = HEAP_ID_SYSTEM }; - v0.unk_0C = param0->unk_00; + v0.heapID = param0->heapID; param0->unk_320 = sub_02015064(&v0); } @@ -298,7 +299,7 @@ static void ov83_0223CD54(UnkStruct_ov83_0223B784 *param0) static void ov83_0223CD64(UnkStruct_ov83_0223B784 *param0) { NNS_G2dInitOamManagerModule(); - RenderOam_Init(0, 128, 0, 32, 0, 128, 0, 32, param0->unk_00); + RenderOam_Init(0, 128, 0, 32, 0, 128, 0, 32, param0->heapID); { CharTransferTemplate v0 = { @@ -307,12 +308,12 @@ static void ov83_0223CD64(UnkStruct_ov83_0223B784 *param0) 0x0, }; - v0.heapID = param0->unk_00; + v0.heapID = param0->heapID; CharTransfer_InitWithVramModes(&v0, GX_OBJVRAMMODE_CHAR_1D_128K, GX_OBJVRAMMODE_CHAR_1D_32K); } - PlttTransfer_Init(32, param0->unk_00); + PlttTransfer_Init(32, param0->heapID); CharTransfer_ClearBuffers(); PlttTransfer_Clear(); } @@ -338,9 +339,9 @@ static void ov83_0223CDD0(UnkStruct_ov83_0223B784 *param0, NARC *param1) for (v0 = 0; v0 < 6; v0++) { if ((v0 > 0) && (v1[v0] == 8)) { - ov83_0223D894(¶m0->unk_2C, ¶m0->unk_1CC[v0], param1, param0->unk_1CC[0].unk_00[1], 14 + (3 * v0), 13 + (3 * v0), 12 + (3 * v0), 2000 + v0, param0->unk_00); + ov83_0223D894(¶m0->unk_2C, ¶m0->unk_1CC[v0], param1, param0->unk_1CC[0].unk_00[1], 14 + (3 * v0), 13 + (3 * v0), 12 + (3 * v0), 2000 + v0, param0->heapID); } else { - ov83_0223D7A8(¶m0->unk_2C, ¶m0->unk_1CC[v0], param1, v1[v0], 2, 14 + (3 * v0), 13 + (3 * v0), 12 + (3 * v0), 2000 + v0, param0->unk_00); + ov83_0223D7A8(¶m0->unk_2C, ¶m0->unk_1CC[v0], param1, v1[v0], 2, 14 + (3 * v0), 13 + (3 * v0), 12 + (3 * v0), 2000 + v0, param0->heapID); } } } @@ -382,9 +383,9 @@ static void ov83_0223CF2C(UnkStruct_ov83_0223B784 *param0) { int v0; - param0->unk_15E0.unk_00 = MessageLoader_Init(0, 26, 464, param0->unk_00); - param0->unk_15E0.unk_04 = StringTemplate_New(4, 64, param0->unk_00); - param0->unk_15E0.unk_08 = Strbuf_Init(64, param0->unk_00); + param0->unk_15E0.unk_00 = MessageLoader_Init(0, 26, 464, param0->heapID); + param0->unk_15E0.unk_04 = StringTemplate_New(4, 64, param0->heapID); + param0->unk_15E0.unk_08 = Strbuf_Init(64, param0->heapID); param0->unk_15E0.unk_0C = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 0); param0->unk_15E0.unk_10 = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 1); param0->unk_15E0.unk_14 = MessageLoader_GetNewStrbuf(param0->unk_15E0.unk_00, 2); diff --git a/src/overlay083/ov83_0223D150.c b/src/overlay083/ov83_0223D150.c index 7c00c21eab..aaaf93518d 100644 --- a/src/overlay083/ov83_0223D150.c +++ b/src/overlay083/ov83_0223D150.c @@ -30,7 +30,7 @@ void ov83_0223D150(UnkStruct_ov83_0223B784 *param0, TrainerInfo *param1) param0->unk_1488 = 1; } - param0->unk_148C = ov83_0223D4CC(ov83_0223D144(), ov83_0223D14C(), param0, param0->unk_1490, param0->unk_00); + param0->unk_148C = ov83_0223D4CC(ov83_0223D144(), ov83_0223D14C(), param0, param0->unk_1490, param0->heapID); memset(param0->unk_1494.unk_130, 4, sizeof(u8) * 4); if (param0->unk_1490 == 1) { diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c index 959e9c4f1a..648707039d 100644 --- a/src/overlay083/ov83_0223D6A8.c +++ b/src/overlay083/ov83_0223D6A8.c @@ -1840,9 +1840,9 @@ void ov83_0223F784(UnkStruct_ov83_0223F770 *param0) sub_02099160(param0->unk_00); } -void ov83_0223F790(UnkStruct_ov83_0223F7A4 *param0, int param1, BgConfig *param2) +void ov83_0223F790(UnkStruct_ov83_0223F7A4 *param0, int heapID, BgConfig *param2) { - param0->unk_00 = sub_02015920(param1); + param0->unk_00 = sub_02015920(heapID); param0->unk_04 = param2; } diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index db35db58f3..0913a8626b 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -863,7 +863,7 @@ static void ov86_0223BAC8(UnkStruct_ov86_0223B3C8 *param0, NNSG2dCellDataBank *p NNS_G2dLoadPalette(v8, 192, NNS_G2D_VRAM_TYPE_2DMAIN, &v6); sub_02076AAC(((TrainerInfo_Gender(param0->unk_0C->unk_00) == 1) ? 1 : 0), 2, &v4); - sub_020135F0(v4.unk_00, v4.unk_14, 63, &v0[0], param0->unk_310); + sub_020135F0(v4.unk_00, v4.unk_14, HEAP_ID_63, &v0[0], param0->unk_310); DC_FlushRange(param0->unk_310, 3200); GX_LoadOBJ(param0->unk_310, 38400, 3200); diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c index 601067e96f..6e93a65a48 100644 --- a/src/overlay095/ov95_02247B6C.c +++ b/src/overlay095/ov95_02247B6C.c @@ -105,13 +105,13 @@ void *ov95_02247B6C(UnkStruct_ov95_02247628 *param0) v0->unk_00 = param0; v0->unk_04 = 0; v0->unk_54 = ov95_02247628(param0); - v0->unk_0C = sub_0200762C(58); + v0->unk_0C = sub_0200762C(HEAP_ID_58); v0->unk_10 = NULL; v0->unk_68 = Strbuf_Init(300, HEAP_ID_58); v0->unk_6C = Strbuf_Init(300, HEAP_ID_58); v0->unk_78 = NULL; v0->unk_7C = NULL; - v0->unk_80 = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, 58); + v0->unk_80 = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, HEAP_ID_58); } return v0; diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c index 4aacca32d6..4bd024c3fe 100644 --- a/src/overlay095/ov95_0224B3D8.c +++ b/src/overlay095/ov95_0224B3D8.c @@ -129,14 +129,14 @@ void *ov95_0224B3D8(UnkStruct_ov95_02247628 *param0) v0->unk_00 = param0; v0->unk_04 = 0; v0->unk_58 = ov95_02247628(param0); - v0->unk_10 = sub_0200762C(58); + v0->unk_10 = sub_0200762C(HEAP_ID_58); v0->unk_14 = NULL; v0->unk_6C = Strbuf_Init(300, HEAP_ID_58); v0->unk_70 = Strbuf_Init(300, HEAP_ID_58); v0->unk_7C = NULL; v0->unk_80 = NULL; v0->unk_74 = NULL; - v0->unk_84 = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, 58); + v0->unk_84 = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, HEAP_ID_58); } return v0; diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index 1f0963b7b3..ae3f283eda 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -1788,7 +1788,7 @@ static int ov97_02235624(OverlayManager *param0, int *param1) memset(v0, 0, sizeof(UnkStruct_ov97_02234A2C)); v0->unk_20 = BgConfig_New(HEAP_ID_78); - v0->unk_E8EC = sub_02015920(78); + v0->unk_E8EC = sub_02015920(HEAP_ID_78); sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); diff --git a/src/overlay098/ov98_02246C20.c b/src/overlay098/ov98_02246C20.c index 31f6b41195..ef5d69823d 100644 --- a/src/overlay098/ov98_02246C20.c +++ b/src/overlay098/ov98_02246C20.c @@ -352,7 +352,7 @@ void *ov98_02246FC4(UnkStruct_ov98_02246E88 *param0) v0[2] = 4; v0[3] = 4; - param0->unk_98 = sub_02089400(108, 16, v0, SaveData_Options(param0->unk_04), 4, 0); + param0->unk_98 = sub_02089400(HEAP_ID_108, 16, v0, SaveData_Options(param0->unk_04), 4, 0); return param0->unk_98; } @@ -385,7 +385,7 @@ void *ov98_02247070(UnkStruct_ov98_02246E88 *param0) v0[2] = 0; v0[3] = 0; - param0->unk_98 = sub_0208941C(108, 7, v0, SaveData_Options(param0->unk_04), 5, 1, 1, param0->unk_7C); + param0->unk_98 = sub_0208941C(HEAP_ID_108, 7, v0, SaveData_Options(param0->unk_04), 5, 1, 1, param0->unk_7C); return param0->unk_98; } @@ -408,7 +408,7 @@ void *ov98_022470F8(UnkStruct_ov98_02246E88 *param0) v0[2] = 0; v0[3] = 0; - param0->unk_98 = sub_02089400(108, 4, v0, SaveData_Options(param0->unk_04), 6, 0); + param0->unk_98 = sub_02089400(HEAP_ID_108, 4, v0, SaveData_Options(param0->unk_04), 6, 0); return param0->unk_98; } diff --git a/src/overlay099/ov99_021D0D80.c b/src/overlay099/ov99_021D0D80.c index 7ec5c5bbfb..f9a3d0bd87 100644 --- a/src/overlay099/ov99_021D0D80.c +++ b/src/overlay099/ov99_021D0D80.c @@ -77,7 +77,7 @@ static void ov99_021D1380(BgConfig *param0); static void ov99_021D1720(UnkStruct_ov99_021D2CB0 *param0); static void ov99_021D1918(UnkStruct_ov99_021D2CB0 *param0); static void ov99_021D19A0(UnkStruct_ov99_021D2CB0 *param0); -static GenericPointerData *ov99_021D19AC(int param0); +static GenericPointerData *ov99_021D19AC(int heapID); static void ov99_021D19C8(void); static void ov99_021D1A4C(GenericPointerData *param0); static void ov99_021D16E4(UnkStruct_ov99_021D2CB0 *param0); @@ -101,24 +101,24 @@ int ov99_021D0D80(OverlayManager *param0, int *param1) G2_BlendNone(); G2S_BlendNone(); - Heap_Create(3, 75, 0x80000); + Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_75, 0x80000); - v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov99_021D2CB0), 75); + v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov99_021D2CB0), HEAP_ID_75); MI_CpuClear8(v0, sizeof(UnkStruct_ov99_021D2CB0)); v0->unk_00 = OverlayManager_Args(param0); - v0->unk_10 = ov99_021D19AC(75); - v0->unk_0C = PaletteData_New(75); + v0->unk_10 = ov99_021D19AC(HEAP_ID_75); + v0->unk_0C = PaletteData_New(HEAP_ID_75); - PaletteData_AllocBuffer(v0->unk_0C, 0, 0x200, 75); - PaletteData_AllocBuffer(v0->unk_0C, 1, 0x200, 75); - PaletteData_AllocBuffer(v0->unk_0C, 2, 0x200 - 0x40, 75); - PaletteData_AllocBuffer(v0->unk_0C, 3, 0x200, 75); + PaletteData_AllocBuffer(v0->unk_0C, 0, 0x200, HEAP_ID_75); + PaletteData_AllocBuffer(v0->unk_0C, 1, 0x200, HEAP_ID_75); + PaletteData_AllocBuffer(v0->unk_0C, 2, 0x200 - 0x40, HEAP_ID_75); + PaletteData_AllocBuffer(v0->unk_0C, 3, 0x200, HEAP_ID_75); PaletteData_SetAutoTransparent(v0->unk_0C, 1); v0->unk_08 = BgConfig_New(HEAP_ID_75); - VramTransfer_New(64, 75); + VramTransfer_New(64, HEAP_ID_75); SetAutorepeat(4, 8); ov99_021D1380(v0->unk_08); @@ -127,11 +127,11 @@ int ov99_021D0D80(OverlayManager *param0, int *param1) sub_0201E450(4); v0->unk_20 = MessageLoader_Init(0, 26, 548, HEAP_ID_75); - v0->unk_10F8 = NARC_ctor(NARC_INDEX_GRAPHIC__ENDING, 75); + v0->unk_10F8 = NARC_ctor(NARC_INDEX_GRAPHIC__ENDING, HEAP_ID_75); ov99_021D1918(v0); - v0->unk_18 = SpriteSystem_Alloc(75); + v0->unk_18 = SpriteSystem_Alloc(HEAP_ID_75); SpriteSystem_Init(v0->unk_18, &Unk_ov99_021D4760, &Unk_ov99_021D4718, (16 + 16)); ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_128K); @@ -768,12 +768,9 @@ static void ov99_021D19A0(UnkStruct_ov99_021D2CB0 *param0) Camera_Delete(param0->camera); } -static GenericPointerData *ov99_021D19AC(int param0) +static GenericPointerData *ov99_021D19AC(int heapID) { - GenericPointerData *v0; - - v0 = sub_02024220(param0, 0, 1, 0, 1, ov99_021D19C8); - return v0; + return sub_02024220(heapID, 0, 1, 0, 1, ov99_021D19C8); } static void ov99_021D19C8(void) diff --git a/src/overlay100/ov100_021D0D80.c b/src/overlay100/ov100_021D0D80.c index 032cfa5557..6b90fa1f0c 100644 --- a/src/overlay100/ov100_021D0D80.c +++ b/src/overlay100/ov100_021D0D80.c @@ -214,24 +214,24 @@ static void ov100_021D1034(UnkStruct_ov100_021D46C8 *param0) GX_SetVisiblePlane(0); GXS_SetVisiblePlane(0); - param0->unk_00 = NARC_ctor(NARC_INDEX_ARC__DEMO_TENGAN_GRA, 111); + param0->unk_00 = NARC_ctor(NARC_INDEX_ARC__DEMO_TENGAN_GRA, HEAP_ID_111); param0->unk_0C = BgConfig_New(HEAP_ID_111); - param0->unk_10 = PaletteData_New(111); - param0->unk_14 = sub_02024220(111, 0, 1, 0, 4, NULL); - param0->camera = Camera_Alloc(111); + param0->unk_10 = PaletteData_New(HEAP_ID_111); + param0->unk_14 = sub_02024220(HEAP_ID_111, 0, 1, 0, 4, NULL); + param0->camera = Camera_Alloc(HEAP_ID_111); param0->unk_2C = MessageLoader_Init(0, 26, 234, HEAP_ID_111); PaletteData_SetAutoTransparent(param0->unk_10, 1); - PaletteData_AllocBuffer(param0->unk_10, 0, 0x200, 111); - PaletteData_AllocBuffer(param0->unk_10, 1, 0x200, 111); - PaletteData_AllocBuffer(param0->unk_10, 2, 0x200, 111); - PaletteData_AllocBuffer(param0->unk_10, 3, 0x200, 111); + PaletteData_AllocBuffer(param0->unk_10, 0, 0x200, HEAP_ID_111); + PaletteData_AllocBuffer(param0->unk_10, 1, 0x200, HEAP_ID_111); + PaletteData_AllocBuffer(param0->unk_10, 2, 0x200, HEAP_ID_111); + PaletteData_AllocBuffer(param0->unk_10, 3, 0x200, HEAP_ID_111); ov100_021D1208(param0->unk_0C); ov100_021D0FA0(param0); G3X_AlphaBlend(1); - Heap_FndInitAllocatorForExpHeap(¶m0->unk_1C, 111, 32); + Heap_FndInitAllocatorForExpHeap(¶m0->unk_1C, HEAP_ID_111, 32); } static void ov100_021D111C(UnkStruct_ov100_021D46C8 *param0) diff --git a/src/overlay101/ov101_021D0D80.c b/src/overlay101/ov101_021D0D80.c index 7ab0c00dbd..adc80795c0 100644 --- a/src/overlay101/ov101_021D0D80.c +++ b/src/overlay101/ov101_021D0D80.c @@ -570,7 +570,7 @@ static void ov101_021D1868(UnkStruct_ov101_021D13C8 *param0) static void ov101_021D186C(UnkStruct_ov101_021D13C8 *param0) { - param0->unk_44C = sub_020711EC(79, 128); + param0->unk_44C = sub_020711EC(HEAP_ID_79, 128); } static void ov101_021D1884(UnkStruct_ov101_021D13C8 *param0) diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c index 32c57c69d8..937b2475b7 100644 --- a/src/overlay104/ov104_0222FBE4.c +++ b/src/overlay104/ov104_0222FBE4.c @@ -1483,7 +1483,7 @@ static BOOL ov104_02230910(UnkStruct_ov104_0222E930 *param0) UnkStruct_ov104_02230BE4 *v1; v1 = sub_0209B970(param0->unk_00->unk_00); - v0 = sub_0208712C(11, 0, 0, 8, (void *)v1->unk_04); + v0 = sub_0208712C(HEAP_ID_FIELDMAP, 0, 0, 8, (void *)v1->unk_04); sub_0209B988(param0->unk_00->unk_00, &Unk_020F2DAC, v0, 0, ov104_02230950); diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c index dc42a9d3f7..a5a5d82d07 100644 --- a/src/overlay104/ov104_0223C2D4.c +++ b/src/overlay104/ov104_0223C2D4.c @@ -72,7 +72,7 @@ UnkStruct_ov104_0223C4CC *ov104_0223C2D4(UnkStruct_0209B75C *param0); void ov104_0223C4CC(UnkStruct_ov104_0223C4CC *param0); static void ov104_0223C8E8(UnkStruct_ov104_0223C4CC *param0); static void ov104_0223CC10(UnkStruct_ov104_0223C4CC *param0); -static GenericPointerData *ov104_0223CF4C(int param0); +static GenericPointerData *ov104_0223CF4C(int heapID); static void ov104_0223CF68(void); static void ov104_0223CFEC(GenericPointerData *param0); static void ov104_0223D3B0(UnkStruct_ov104_0223C4CC *param0); @@ -148,18 +148,18 @@ UnkStruct_ov104_0223C4CC *ov104_0223C2D4(UnkStruct_0209B75C *param0) v0->unk_3C.unk_34[v1] = 0xffff; } - v0->unk_0C = ov104_0223CF4C(94); - v0->unk_04 = PaletteData_New(94); + v0->unk_0C = ov104_0223CF4C(HEAP_ID_94); + v0->unk_04 = PaletteData_New(HEAP_ID_94); PaletteData_SetAutoTransparent(v0->unk_04, 1); - PaletteData_AllocBuffer(v0->unk_04, 0, 0x200, 94); - PaletteData_AllocBuffer(v0->unk_04, 1, 0x200, 94); - PaletteData_AllocBuffer(v0->unk_04, 2, 0x200 - 0x40, 94); - PaletteData_AllocBuffer(v0->unk_04, 3, 0x200, 94); + PaletteData_AllocBuffer(v0->unk_04, 0, 0x200, HEAP_ID_94); + PaletteData_AllocBuffer(v0->unk_04, 1, 0x200, HEAP_ID_94); + PaletteData_AllocBuffer(v0->unk_04, 2, 0x200 - 0x40, HEAP_ID_94); + PaletteData_AllocBuffer(v0->unk_04, 3, 0x200, HEAP_ID_94); v0->unk_00 = BgConfig_New(HEAP_ID_94); - VramTransfer_New(64, 94); + VramTransfer_New(64, HEAP_ID_94); SetAutorepeat(4, 8); ov104_0223C948(v0->unk_00, v2); @@ -171,7 +171,7 @@ UnkStruct_ov104_0223C4CC *ov104_0223C2D4(UnkStruct_0209B75C *param0) ov104_0223CFF4(v0); - v0->unk_10 = ov104_0223D5D0(94); + v0->unk_10 = ov104_0223D5D0(HEAP_ID_94); ov104_0223CC74(v0, v2, v4); @@ -777,12 +777,9 @@ static void ov104_0223CEEC(UnkStruct_ov104_0223C4CC *param0) ov63_0222D7B4(param0->unk_30); } -static GenericPointerData *ov104_0223CF4C(int param0) +static GenericPointerData *ov104_0223CF4C(int heapID) { - GenericPointerData *v0; - - v0 = sub_02024220(param0, 0, 1, 0, 1, ov104_0223CF68); - return v0; + return sub_02024220(heapID, 0, 1, 0, 1, ov104_0223CF68); } static void ov104_0223CF68(void) diff --git a/src/overlay104/ov104_0223D5D0.c b/src/overlay104/ov104_0223D5D0.c index 9682a1af35..aba4bd5457 100644 --- a/src/overlay104/ov104_0223D5D0.c +++ b/src/overlay104/ov104_0223D5D0.c @@ -12,21 +12,19 @@ typedef struct UnkStruct_ov104_0223D5F0_t { UnkStruct_02014014 *unk_00[8]; - u16 unk_20; + u16 heapId; } UnkStruct_ov104_0223D5F0; static u32 ov104_0223D720(u32 param0, BOOL param1); static u32 ov104_0223D744(u32 param0, BOOL param1); static void ov104_0223D708(UnkStruct_02014014 *param0); -UnkStruct_ov104_0223D5F0 *ov104_0223D5D0(int param0) +UnkStruct_ov104_0223D5F0 *ov104_0223D5D0(int heapID) { - UnkStruct_ov104_0223D5F0 *v0; - - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov104_0223D5F0)); + UnkStruct_ov104_0223D5F0 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov104_0223D5F0)); MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0223D5F0)); - v0->unk_20 = param0; + v0->heapId = heapID; sub_02014000(); return v0; @@ -55,14 +53,14 @@ UnkStruct_02014014 *ov104_0223D614(UnkStruct_ov104_0223D5F0 *param0, int param1, GF_ASSERT(param0->unk_00[param1] == NULL); - v1 = Heap_AllocFromHeap(param0->unk_20, 0x4800); - v0 = sub_02014014(ov104_0223D720, ov104_0223D744, v1, 0x4800, 1, param0->unk_20); + v1 = Heap_AllocFromHeap(param0->heapId, 0x4800); + v0 = sub_02014014(ov104_0223D720, ov104_0223D744, v1, 0x4800, 1, param0->heapId); camera = sub_02014784(v0); Camera_SetClipping((FX32_ONE), (FX32_ONE * 900), camera); sub_02014788(v0, param3); - v3 = sub_020144C4(157, param2, param0->unk_20); + v3 = sub_020144C4(157, param2, param0->heapId); sub_020144CC(v0, v3, (1 << 1) | (1 << 3), 1); param0->unk_00[param1] = v0; diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c index 6bbfc9e876..d642f22419 100644 --- a/src/overlay104/ov104_0223DC7C.c +++ b/src/overlay104/ov104_0223DC7C.c @@ -255,7 +255,7 @@ static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 param1, const U v7 = SpriteSystem_LoadPaletteBufferFromOpenNarc(param0->unk_1C, 2, param0->unk_14, param0->unk_18, param0->unk_24, 11, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 2004); param0->unk_164 |= 1 << v7; - param0->unk_30 = sub_02012744(4, 94); + param0->unk_30 = sub_02012744(4, HEAP_ID_94); { MessageLoader *v9; diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index d114156cec..055727bc7c 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -359,7 +359,7 @@ int ov105_02241AE0(OverlayManager *param0, int *param1) v1 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov105_02241FF4), 93); memset(v1, 0, sizeof(UnkStruct_ov105_02241FF4)); - v1->unk_124 = sub_02024220(93, 0, 2, 0, 2, ov105_02245CD0); + v1->unk_124 = sub_02024220(HEAP_ID_93, 0, 2, 0, 2, ov105_02245CD0); v1->unk_4C = BgConfig_New(HEAP_ID_93); v1->unk_00 = param0; @@ -2807,7 +2807,7 @@ static void ov105_022452A0(UnkStruct_ov105_02241FF4 *param0) ov105_022452E4(); - param0->unk_124 = sub_02024220(93, 0, 2, 0, 2, ov105_02245CD0); + param0->unk_124 = sub_02024220(HEAP_ID_93, 0, 2, 0, 2, ov105_02245CD0); param0->unk_4C = BgConfig_New(HEAP_ID_93); ov105_0224531C(param0); @@ -2834,13 +2834,13 @@ static void ov105_0224531C(UnkStruct_ov105_02241FF4 *param0) { int v0, v1; - param0->unk_338 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG, 93); + param0->unk_338 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG, HEAP_ID_93); ov105_02244678(param0); ov105_0224472C(param0); param0->unk_1C = MessageLoader_Init(1, 26, 364, HEAP_ID_93); - param0->unk_20 = StringTemplate_Default(93); + param0->unk_20 = StringTemplate_Default(HEAP_ID_93); param0->unk_24 = Strbuf_Init(800, HEAP_ID_93); param0->unk_28 = Strbuf_Init(800, HEAP_ID_93); @@ -2849,9 +2849,9 @@ static void ov105_0224531C(UnkStruct_ov105_02241FF4 *param0) } Font_LoadTextPalette(0, 13 * 32, HEAP_ID_93); - Font_LoadScreenIndicatorsPalette(0, 12 * 32, 93); + Font_LoadScreenIndicatorsPalette(0, 12 * 32, HEAP_ID_93); - param0->unk_128 = sub_0200762C(93); + param0->unk_128 = sub_0200762C(HEAP_ID_93); if (CommSys_IsInitialized()) { ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_32K); diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index c4aaa3e9f4..15d74a9eb7 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -1202,7 +1202,7 @@ static void ov111_021D1D68(UnkStruct_ov111_021D0F7C *param0) static void ov111_021D1F70(UnkStruct_ov111_021D0F7C *param0) { - param0->unk_3FC = sub_02015920(115); + param0->unk_3FC = sub_02015920(HEAP_ID_115); return; } diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index cd1625ea2a..a3c4119cf6 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -136,7 +136,7 @@ static void ov113_0225D12C(BgConfig *param0); static void ov113_0225D160(UnkStruct_ov113_0225DBCC *param0, NARC *param1); static void ov113_0225DBCC(UnkStruct_ov113_0225DBCC *param0); static void ov113_0225DC4C(UnkStruct_ov113_0225DBCC *param0); -static GenericPointerData *ov113_0225DC6C(int param0); +static GenericPointerData *ov113_0225DC6C(int heapID); static void ov113_0225DC88(void); static void ov113_0225DD0C(GenericPointerData *param0); static void ov113_0225D9FC(UnkStruct_ov113_0225DBCC *param0); @@ -345,9 +345,9 @@ int ov113_0225C700(OverlayManager *param0, int *param1) G2_BlendNone(); G2S_BlendNone(); - Heap_Create(3, 118, 0x50000); + Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_118, 0x50000); - v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov113_0225DBCC), 118); + v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov113_0225DBCC), HEAP_ID_118); MI_CpuClear8(v0, sizeof(UnkStruct_ov113_0225DBCC)); v0->unk_00 = OverlayManager_Args(param0); @@ -359,32 +359,32 @@ int ov113_0225C700(OverlayManager *param0, int *param1) v0->unk_19D4 = (32 << 8); v0->unk_19D8 = v0->unk_19D4; - v0->unk_14 = ov113_0225DC6C(118); - v0->unk_0C = PaletteData_New(118); + v0->unk_14 = ov113_0225DC6C(HEAP_ID_118); + v0->unk_0C = PaletteData_New(HEAP_ID_118); PaletteData_SetAutoTransparent(v0->unk_0C, 1); - PaletteData_AllocBuffer(v0->unk_0C, 0, 0x200, 118); - PaletteData_AllocBuffer(v0->unk_0C, 1, 0x200, 118); - PaletteData_AllocBuffer(v0->unk_0C, 2, 0x200 - 0x40, 118); - PaletteData_AllocBuffer(v0->unk_0C, 3, 0x200, 118); + PaletteData_AllocBuffer(v0->unk_0C, 0, 0x200, HEAP_ID_118); + PaletteData_AllocBuffer(v0->unk_0C, 1, 0x200, HEAP_ID_118); + PaletteData_AllocBuffer(v0->unk_0C, 2, 0x200 - 0x40, HEAP_ID_118); + PaletteData_AllocBuffer(v0->unk_0C, 3, 0x200, HEAP_ID_118); PaletteData_SetAutoTransparent(v0->unk_0C, 1); v0->unk_08 = BgConfig_New(HEAP_ID_118); - VramTransfer_New(64, 118); + VramTransfer_New(64, HEAP_ID_118); SetAutorepeat(4, 8); ov113_0225CF58(v0->unk_08); sub_0201E3D8(); sub_0201E450(4); - Font_InitManager(FONT_SUBSCREEN, 118); + Font_InitManager(FONT_SUBSCREEN, HEAP_ID_118); - v0->unk_2C = StringTemplate_Default(118); + v0->unk_2C = StringTemplate_Default(HEAP_ID_118); v0->unk_30 = MessageLoader_Init(0, 26, 650, HEAP_ID_118); - v0->unk_10 = sub_02012744(4, 118); - v0->unk_160 = NARC_ctor(NARC_INDEX_GRAPHIC__FOOTPRINT_BOARD, 118); - v0->unk_164 = NARC_ctor(NARC_INDEX_POKETOOL__POKEFOOT__POKEFOOT, 118); + v0->unk_10 = sub_02012744(4, HEAP_ID_118); + v0->unk_160 = NARC_ctor(NARC_INDEX_GRAPHIC__FOOTPRINT_BOARD, HEAP_ID_118); + v0->unk_164 = NARC_ctor(NARC_INDEX_POKETOOL__POKEFOOT__POKEFOOT, HEAP_ID_118); ov113_0225D160(v0, v0->unk_160); ov113_0225DAA8(v0, v0->unk_160); @@ -412,7 +412,7 @@ int ov113_0225C700(OverlayManager *param0, int *param1) ov113_0225D6F8(v0); ov113_0225D7CC(v0); - v0->unk_24 = sub_02015920(118); + v0->unk_24 = sub_02015920(HEAP_ID_118); StartScreenTransition(0, 1, 1, 0x0, 6, 1, 118); @@ -1261,12 +1261,9 @@ static void ov113_0225DC4C(UnkStruct_ov113_0225DBCC *param0) } } -static GenericPointerData *ov113_0225DC6C(int param0) +static GenericPointerData *ov113_0225DC6C(int heapID) { - GenericPointerData *v0; - - v0 = sub_02024220(param0, 0, 2, 0, 2, ov113_0225DC88); - return v0; + return sub_02024220(heapID, 0, 2, 0, 2, ov113_0225DC88); } static void ov113_0225DC88(void) diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index d36203a0eb..2f3e048599 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -331,14 +331,14 @@ static BOOL ov114_0225E438(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_022 static void ov114_0225E4B0(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, s32 param2); static void ov114_0225E500(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, s32 param2); static void ov114_0225E550(NARC *param0, u32 param1, u32 param2); -static UnkStruct_ov114_0225D678 *ov114_0225D48C(const UnkStruct_ov114_0225C76C *param0, u32 param1, u32 param2); +static UnkStruct_ov114_0225D678 *ov114_0225D48C(const UnkStruct_ov114_0225C76C *param0, u32 param1, u32 heapID); static void ov114_0225D5BC(UnkStruct_ov114_0225D678 *param0, u32 param1); static void ov114_0225D678(UnkStruct_ov114_0225D678 *param0); static void ov114_0225D688(SysTask *param0, void *param1); static void ov114_0225DA0C(SysTask *param0, void *param1); static int ov114_0225DA2C(const u8 *param0, u32 param1); static BOOL ov114_0225DA5C(UnkStruct_ov114_0225D678 *param0); -static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2, u32 param3); +static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2, u32 heapID); static void ov114_0225E744(UnkStruct_ov114_0225E854 *param0, u32 param1); static void ov114_0225E854(UnkStruct_ov114_0225E854 *param0); static void ov114_0225E874(SysTask *param0, void *param1); @@ -348,9 +348,9 @@ static void ov114_0225F148(UnkStruct_ov114_0225E854 *param0, NARC *param1, u32 p static void ov114_0225F168(UnkStruct_ov114_0225E854 *param0); static void ov114_0225F19C(UnkStruct_ov114_0225E854 *param0); static void ov114_0225F224(UnkStruct_ov114_0225E854 *param0); -static void ov114_0225F234(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_0225CEF0 *param1, u32 param2, u32 param3); +static void ov114_0225F234(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_0225CEF0 *param1, u32 param2, u32 heapID); static void ov114_0225F270(UnkStruct_ov114_0225F270 *param0); -static BOOL ov114_0225F27C(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_0225D338 *param1, UnkStruct_ov114_0225D084 *param2, u32 param3, u32 param4); +static BOOL ov114_0225F27C(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_0225D338 *param1, UnkStruct_ov114_0225D084 *param2, u32 param3, u32 heapID); static BOOL ov114_0225F420(const UnkStruct_ov114_0225F270 *param0); static void ov114_0225F424(UnkStruct_ov114_0225F270 *param0, u32 param1, BOOL param2, u32 param3); static void ov114_0225F47C(UnkStruct_ov114_0225F270 *param0, BOOL param1); @@ -877,19 +877,19 @@ TrainerInfo *ov114_0225C7CC(const UnkStruct_ov114_0225C76C *param0, u32 param1) return param0->unk_0C->unk_20[param1]; } -UnkStruct_ov114_0225D678 *ov114_0225C814(const UnkStruct_ov114_0225C76C *param0, u32 param1) +UnkStruct_ov114_0225D678 *ov114_0225C814(const UnkStruct_ov114_0225C76C *param0, u32 heapID) { - return ov114_0225D48C(param0, UnkEnum_ov66_022324D0_00, param1); + return ov114_0225D48C(param0, UnkEnum_ov66_022324D0_00, heapID); } -UnkStruct_ov114_0225D678 *ov114_0225C820(const UnkStruct_ov114_0225C76C *param0, u32 param1) +UnkStruct_ov114_0225D678 *ov114_0225C820(const UnkStruct_ov114_0225C76C *param0, u32 heapID) { - return ov114_0225D48C(param0, UnkEnum_ov66_022324D0_01, param1); + return ov114_0225D48C(param0, UnkEnum_ov66_022324D0_01, heapID); } -UnkStruct_ov114_0225D678 *ov114_0225C82C(const UnkStruct_ov114_0225C76C *param0, u32 param1) +UnkStruct_ov114_0225D678 *ov114_0225C82C(const UnkStruct_ov114_0225C76C *param0, u32 heapID) { - return ov114_0225D48C(param0, UnkEnum_ov66_022324D0_02, param1); + return ov114_0225D48C(param0, UnkEnum_ov66_022324D0_02, heapID); } void ov114_0225C838(UnkStruct_ov114_0225D678 *param0) @@ -933,19 +933,19 @@ int ov114_0225C8CC(const UnkStruct_ov114_0225D678 *param0) return param0->unk_06; } -UnkStruct_ov114_0225E854 *ov114_0225C8E0(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2) +UnkStruct_ov114_0225E854 *ov114_0225C8E0(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 heapID) { - return ov114_0225E5A8(param0, param1, UnkEnum_ov66_022324D0_00, param2); + return ov114_0225E5A8(param0, param1, UnkEnum_ov66_022324D0_00, heapID); } -UnkStruct_ov114_0225E854 *ov114_0225C8EC(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2) +UnkStruct_ov114_0225E854 *ov114_0225C8EC(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 heapID) { - return ov114_0225E5A8(param0, param1, UnkEnum_ov66_022324D0_01, param2); + return ov114_0225E5A8(param0, param1, UnkEnum_ov66_022324D0_01, heapID); } -UnkStruct_ov114_0225E854 *ov114_0225C8F8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2) +UnkStruct_ov114_0225E854 *ov114_0225C8F8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 heapID) { - return ov114_0225E5A8(param0, param1, UnkEnum_ov66_022324D0_02, param2); + return ov114_0225E5A8(param0, param1, UnkEnum_ov66_022324D0_02, heapID); } void ov114_0225C904(UnkStruct_ov114_0225E854 *param0) @@ -1622,14 +1622,14 @@ static void ov114_0225D474(UnkStruct_ov114_0225D338 *param0, u32 param1) } } -static UnkStruct_ov114_0225D678 *ov114_0225D48C(const UnkStruct_ov114_0225C76C *param0, u32 param1, u32 param2) +static UnkStruct_ov114_0225D678 *ov114_0225D48C(const UnkStruct_ov114_0225C76C *param0, u32 param1, u32 heapID) { UnkStruct_ov114_0225D678 *v0; int v1; sub_02004550(19, 1211, 0); - v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov114_0225D678)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov114_0225D678)); memset(v0, 0, sizeof(UnkStruct_ov114_0225D678)); memcpy(&v0->unk_08, param0, sizeof(UnkStruct_ov114_0225C76C)); @@ -1642,15 +1642,15 @@ static UnkStruct_ov114_0225D678 *ov114_0225D48C(const UnkStruct_ov114_0225C76C * GXLayers_SetBanks(&Unk_ov114_022601B4); - v0->unk_02 = param2; + v0->unk_02 = heapID; ov114_02260060(v0); ov114_0225E0F8(&v0->unk_18, &v0->unk_08); - ov114_0225CEF0(&v0->unk_30, &Unk_ov114_0226018C, Unk_ov114_02260284, 5, param2); - ov114_0225CFCC(&v0->unk_84, 16, 1, 1, param2); - ov114_0225CCD0(&v0->unk_214, 1, param2); - ov114_0225D084(&v0->unk_3C, param2); - ov114_0225D5BC(v0, param2); + ov114_0225CEF0(&v0->unk_30, &Unk_ov114_0226018C, Unk_ov114_02260284, 5, heapID); + ov114_0225CFCC(&v0->unk_84, 16, 1, 1, heapID); + ov114_0225CCD0(&v0->unk_214, 1, heapID); + ov114_0225D084(&v0->unk_3C, heapID); + ov114_0225D5BC(v0, heapID); { BOOL v2; @@ -1659,14 +1659,14 @@ static UnkStruct_ov114_0225D678 *ov114_0225D48C(const UnkStruct_ov114_0225C76C * v3 = ov114_0225C78C(&v0->unk_08, v0->unk_08.unk_09); v2 = ov114_0225C7A4(&v0->unk_08, v3); - ov114_0225D290(&v0->unk_4C, &v0->unk_30, v0->unk_08.unk_00, v2, param2); + ov114_0225D290(&v0->unk_4C, &v0->unk_30, v0->unk_08.unk_00, v2, heapID); } v0->unk_650 = SysTask_Start(ov114_0225D688, v0, 0); v0->unk_654 = SysTask_ExecuteAfterVBlank(ov114_0225DA0C, v0, 0); if (v0->unk_08.unk_0A) { - ov4_021D1E74(param2); + ov4_021D1E74(heapID); } return v0; @@ -2468,12 +2468,12 @@ static void ov114_0225E550(NARC *param0, u32 param1, u32 param2) Graphics_LoadPaletteWithSrcOffsetFromOpenNARC(param0, 5, 4, v0 * 32, 5 * 32, 32, param2); } -static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2, u32 param3) +static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2, u32 heapID) { UnkStruct_ov114_0225E854 *v0; int v1; - v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov114_0225E854)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov114_0225E854)); memset(v0, 0, sizeof(UnkStruct_ov114_0225E854)); memcpy(&v0->unk_1C, param1, sizeof(UnkStruct_ov114_0225C9A8)); memcpy(&v0->unk_0C, param0, sizeof(UnkStruct_ov114_0225C76C)); @@ -2489,16 +2489,16 @@ static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C * GXLayers_SetBanks(&Unk_ov114_022601DC); - v0->unk_02 = param3; + v0->unk_02 = heapID; ov114_0225E0F8(&v0->unk_34, &v0->unk_0C); - VramTransfer_New(16, param3); + VramTransfer_New(16, heapID); - ov114_0225CEF0(&v0->unk_4C, &Unk_ov114_0226014C, Unk_ov114_02260324, 6, param3); - ov114_0225CFCC(&v0->unk_A0, 32, 2, 2, param3); - ov114_0225CCD0(&v0->unk_230, 2, param3); - ov114_0225D084(&v0->unk_58, param3); - ov114_0225E744(v0, param3); + ov114_0225CEF0(&v0->unk_4C, &Unk_ov114_0226014C, Unk_ov114_02260324, 6, heapID); + ov114_0225CFCC(&v0->unk_A0, 32, 2, 2, heapID); + ov114_0225CCD0(&v0->unk_230, 2, heapID); + ov114_0225D084(&v0->unk_58, heapID); + ov114_0225E744(v0, heapID); { BOOL v2; @@ -2506,10 +2506,10 @@ static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C * v3 = ov114_0225C78C(&v0->unk_0C, v0->unk_0C.unk_09); v2 = ov114_0225C7A4(&v0->unk_0C, v3); - ov114_0225D290(&v0->unk_68, &v0->unk_4C, v0->unk_0C.unk_00, v2, param3); + ov114_0225D290(&v0->unk_68, &v0->unk_4C, v0->unk_0C.unk_00, v2, heapID); } - ov114_0225F234(&v0->unk_24C, &v0->unk_4C, v0->unk_0C.unk_0A, param3); + ov114_0225F234(&v0->unk_24C, &v0->unk_4C, v0->unk_0C.unk_0A, heapID); { int v4; @@ -2534,7 +2534,7 @@ static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C * v0->unk_6AC = SysTask_ExecuteAfterVBlank(ov114_0225F124, v0, 0); if (v0->unk_0C.unk_0A) { - ov4_021D1E74(param3); + ov4_021D1E74(heapID); } return v0; @@ -3197,7 +3197,7 @@ static void ov114_0225F224(UnkStruct_ov114_0225E854 *param0) Heap_FreeToHeap(param0->unk_6B8); } -static void ov114_0225F234(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_0225CEF0 *param1, u32 param2, u32 param3) +static void ov114_0225F234(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_0225CEF0 *param1, u32 param2, u32 heapID) { memset(param0, 0, sizeof(UnkStruct_ov114_0225F270)); @@ -3207,7 +3207,7 @@ static void ov114_0225F234(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_022 param0->unk_08.unk_0C = 2; param0->unk_08.unk_10 = 24; param0->unk_08.unk_11 = 8; - param0->unk_04 = sub_02015920(param3); + param0->unk_04 = sub_02015920(heapID); param0->unk_01 = param2; param0->unk_1D = 1; } @@ -3217,17 +3217,17 @@ static void ov114_0225F270(UnkStruct_ov114_0225F270 *param0) sub_02015938(param0->unk_04); } -static BOOL ov114_0225F27C(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_0225D338 *param1, UnkStruct_ov114_0225D084 *param2, u32 param3, u32 param4) +static BOOL ov114_0225F27C(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_0225D338 *param1, UnkStruct_ov114_0225D084 *param2, u32 param3, u32 heapID) { u32 v0; switch (param0->unk_00) { case 0: - StartScreenTransition(0, 0, 1, 0x0, 6, 1, param4); - sub_020397C8(0, param4); + StartScreenTransition(0, 0, 1, 0x0, 6, 1, heapID); + sub_020397C8(0, heapID); if (param0->unk_01) { - ov4_021D1E74(param4); + ov4_021D1E74(heapID); } param0->unk_00++; @@ -3299,7 +3299,7 @@ static BOOL ov114_0225F27C(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_022 } break; case 10: - StartScreenTransition(4, 0, 0, 0x0, 6, 1, param4); + StartScreenTransition(4, 0, 0, 0x0, 6, 1, heapID); param0->unk_00++; break; case 11: diff --git a/src/overlay115/ov115_02260440.c b/src/overlay115/ov115_02260440.c index c32eb1ad3c..e6c9f98ae2 100644 --- a/src/overlay115/ov115_02260440.c +++ b/src/overlay115/ov115_02260440.c @@ -116,7 +116,7 @@ int ov115_0226048C(OverlayManager *param0, int *param1) switch (*param1) { case 0: - v0->unk_00 = ov114_0225C814(&v0->unk_08, 99); + v0->unk_00 = ov114_0225C814(&v0->unk_08, HEAP_ID_99); (*param1)++; break; @@ -158,11 +158,11 @@ int ov115_0226048C(OverlayManager *param0, int *param1) v0->unk_7C = 1; } - v0->unk_34 = ov115_02260CEC(99, (30 * 40), v0->unk_74, v0->unk_46, &v0->unk_48); + v0->unk_34 = ov115_02260CEC(HEAP_ID_99, (30 * 40), v0->unk_74, v0->unk_46, &v0->unk_48); sub_02039734(); if (v1->unk_38) { - ov4_021D1E74(99); + ov4_021D1E74(HEAP_ID_99); } { @@ -341,7 +341,7 @@ int ov115_0226048C(OverlayManager *param0, int *param1) ov114_0225C9A8(&v0->unk_18, v0->unk_08.unk_08); v9 = v0->unk_18.unk_10[v0->unk_46]; } - v0->unk_04 = ov114_0225C8E0(&v0->unk_08, &v0->unk_18, 99); + v0->unk_04 = ov114_0225C8E0(&v0->unk_08, &v0->unk_18, HEAP_ID_99); (*param1)++; break; case 15: { diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c index ed3d56f5ee..16d284aefe 100644 --- a/src/overlay115/ov115_02260CEC.c +++ b/src/overlay115/ov115_02260CEC.c @@ -418,17 +418,17 @@ static void ov115_02263294(UnkStruct_ov115_022632C8 *param0, u32 param1, u32 par static void ov115_022632C8(UnkStruct_ov115_022632C8 *param0); static u32 ov115_022632D8(const UnkStruct_ov115_022632C8 *param0); static BOOL ov115_022632DC(const UnkStruct_ov115_022632C8 *param0, u32 param1); -static void ov115_022633FC(UnkStruct_ov115_02260D78 *param0, u32 param1); +static void ov115_022633FC(UnkStruct_ov115_02260D78 *param0, u32 heapID); static void ov115_02263560(UnkStruct_ov115_02260D78 *param0); static void ov115_02263640(const UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_02261ADC *param1); static void ov115_0226369C(const UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_02261ADC *param1); static void ov115_02263308(void); static void ov115_02263328(void); -static void ov115_022633B4(UnkStruct_ov115_02261ADC *param0, u32 param1, u32 param2, u32 param3); +static void ov115_022633B4(UnkStruct_ov115_02261ADC *param0, u32 param1, u32 param2, u32 heapID); static void ov115_022633EC(UnkStruct_ov115_02261ADC *param0); static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1); static void ov115_02263954(UnkStruct_ov115_02261ADC *param0); -static void ov115_02263990(UnkStruct_ov115_02261ADC *param0, u32 param1); +static void ov115_02263990(UnkStruct_ov115_02261ADC *param0, u32 heapID); static void ov115_02263A3C(UnkStruct_ov115_02261ADC *param0); static void ov115_02263BCC(UnkStruct_ov115_02261ADC *param0, u32 param1); static void ov115_02263C04(UnkStruct_ov115_02261ADC *param0); @@ -499,7 +499,7 @@ static void ov115_022652A4(UnkStruct_ov115_022653CC *param0, u8 param1); static void ov115_022652C0(UnkStruct_ov115_022653CC *param0, UnkStruct_ov115_02261ADC *param1); static void ov115_022653CC(UnkStruct_ov115_022653CC *param0); static void ov115_022653F4(UnkStruct_ov115_02261ADC *param0, s16 param1, u16 param2); -static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1, NARC *param2, u32 param3); +static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1, NARC *param2, u32 heapID); static void ov115_02265688(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1); static void ov115_02265700(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1, u32 param2); static void ov115_02265788(UnkStruct_ov115_02265788 *param0); @@ -709,12 +709,12 @@ static const s16 Unk_ov115_02265B7C[12] = { 0x4D }; -UnkStruct_ov115_02260D78 *ov115_02260CEC(u32 param0, u32 param1, u32 param2, u32 param3, UnkStruct_ov115_02262F50 *param4) +UnkStruct_ov115_02260D78 *ov115_02260CEC(u32 heapID, u32 param1, u32 param2, u32 param3, UnkStruct_ov115_02262F50 *param4) { UnkStruct_ov115_02260D78 *v0; u32 v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov115_02260D78)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov115_02260D78)); memset(v0, 0, sizeof(UnkStruct_ov115_02260D78)); v0->unk_04 = 1; @@ -725,8 +725,8 @@ UnkStruct_ov115_02260D78 *ov115_02260CEC(u32 param0, u32 param1, u32 param2, u32 v0->unk_8720 = param4; ov115_02261B34(v0, &v0->unk_19CC); - ov115_022633FC(v0, param0); - ov115_02262FB4(&v0->unk_8730, &v0->unk_1AB4, param0); + ov115_022633FC(v0, heapID); + ov115_02262FB4(&v0->unk_8730, &v0->unk_1AB4, heapID); ov115_0226327C(&v0->unk_8770); v1 = sub_0201E3F4(Unk_ov115_022666C0, 8, 4); @@ -2868,10 +2868,10 @@ static void ov115_02263328(void) G3_ViewPort(0, 0, 255, 191); } -static void ov115_022633B4(UnkStruct_ov115_02261ADC *param0, u32 param1, u32 param2, u32 param3) +static void ov115_022633B4(UnkStruct_ov115_02261ADC *param0, u32 param1, u32 param2, u32 heapID) { - param0->unk_18 = sub_02024220(param3, 0, 1, 0, 4, ov115_02263328); - ov115_02263C24(param0, param1, param2, param3); + param0->unk_18 = sub_02024220(heapID, 0, 1, 0, 4, ov115_02263328); + ov115_02263C24(param0, param1, param2, heapID); } static void ov115_022633EC(UnkStruct_ov115_02261ADC *param0) @@ -2880,35 +2880,35 @@ static void ov115_022633EC(UnkStruct_ov115_02261ADC *param0) sub_020242C4(param0->unk_18); } -static void ov115_022633FC(UnkStruct_ov115_02260D78 *param0, u32 param1) +static void ov115_022633FC(UnkStruct_ov115_02260D78 *param0, u32 heapID) { NARC *v0; - Heap_FndInitAllocatorForExpHeap(¶m0->unk_1AB4.unk_6BBC, param1, 32); + Heap_FndInitAllocatorForExpHeap(¶m0->unk_1AB4.unk_6BBC, heapID, 32); ov115_02263308(); - ov115_022633B4(¶m0->unk_1AB4, param0->unk_10, param0->unk_14, param1); - ov115_0226376C(¶m0->unk_1AB4, param1); - ov115_02263990(¶m0->unk_1AB4, param1); - ov115_02263BCC(¶m0->unk_1AB4, param1); + ov115_022633B4(¶m0->unk_1AB4, param0->unk_10, param0->unk_14, heapID); + ov115_0226376C(¶m0->unk_1AB4, heapID); + ov115_02263990(¶m0->unk_1AB4, heapID); + ov115_02263BCC(¶m0->unk_1AB4, heapID); - v0 = NARC_ctor(NARC_INDEX_GRAPHIC__BUCKET, param1); + v0 = NARC_ctor(NARC_INDEX_GRAPHIC__BUCKET, heapID); - ov115_02263A74(¶m0->unk_1AB4, v0, param1); - ov115_02264E48(¶m0->unk_1AB4.unk_204, ¶m0->unk_1AB4, v0, param0->unk_10, param0->unk_14, param1, ¶m0->unk_1AB4.unk_6BBC); - ov115_02263DF8(¶m0->unk_1AB4.unk_524, v0, param1, ¶m0->unk_1AB4.unk_6BBC); - ov115_022643EC(¶m0->unk_1AB4, v0, param1); - ov115_02264B40(¶m0->unk_1AB4, ¶m0->unk_1AB4.unk_6A34, param0->unk_14, param1); - ov115_02264C0C(¶m0->unk_1AB4, ¶m0->unk_1AB4.unk_6A3C, param0->unk_14, param1); - ov115_02263CD8(¶m0->unk_1AB4, v0, param0->unk_14, param1); - ov115_022617E8(¶m0->unk_1AB4.unk_4E8, ¶m0->unk_1AB4, param0->unk_8720, param0->unk_10, param0->unk_14, v0, param1); - ov115_02261AC8(¶m0->unk_1AB4, param0->unk_10, param0->unk_14, param1); - ov115_02261520(¶m0->unk_1AB4.unk_3E8, ¶m0->unk_1AB4, param0->unk_10, param0->unk_14, param1); + ov115_02263A74(¶m0->unk_1AB4, v0, heapID); + ov115_02264E48(¶m0->unk_1AB4.unk_204, ¶m0->unk_1AB4, v0, param0->unk_10, param0->unk_14, heapID, ¶m0->unk_1AB4.unk_6BBC); + ov115_02263DF8(¶m0->unk_1AB4.unk_524, v0, heapID, ¶m0->unk_1AB4.unk_6BBC); + ov115_022643EC(¶m0->unk_1AB4, v0, heapID); + ov115_02264B40(¶m0->unk_1AB4, ¶m0->unk_1AB4.unk_6A34, param0->unk_14, heapID); + ov115_02264C0C(¶m0->unk_1AB4, ¶m0->unk_1AB4.unk_6A3C, param0->unk_14, heapID); + ov115_02263CD8(¶m0->unk_1AB4, v0, param0->unk_14, heapID); + ov115_022617E8(¶m0->unk_1AB4.unk_4E8, ¶m0->unk_1AB4, param0->unk_8720, param0->unk_10, param0->unk_14, v0, heapID); + ov115_02261AC8(¶m0->unk_1AB4, param0->unk_10, param0->unk_14, heapID); + ov115_02261520(¶m0->unk_1AB4.unk_3E8, ¶m0->unk_1AB4, param0->unk_10, param0->unk_14, heapID); ov115_022652A4(¶m0->unk_1AB4.unk_758, param0->unk_14); - ov115_02265478(¶m0->unk_1AB4.unk_6B1C, ¶m0->unk_1AB4, v0, param1); + ov115_02265478(¶m0->unk_1AB4.unk_6B1C, ¶m0->unk_1AB4, v0, heapID); NARC_dtor(v0); - param0->unk_1AB4.unk_754 = ov114_0225CAD4(param0->unk_1AB4.unk_1C, param1); + param0->unk_1AB4.unk_754 = ov114_0225CAD4(param0->unk_1AB4.unk_1C, heapID); } static void ov115_02263560(UnkStruct_ov115_02260D78 *param0) @@ -3155,37 +3155,37 @@ static void ov115_02263954(UnkStruct_ov115_02261ADC *param0) Heap_FreeToHeap(param0->unk_00); } -static void ov115_02263990(UnkStruct_ov115_02261ADC *param0, u32 param1) +static void ov115_02263990(UnkStruct_ov115_02261ADC *param0, u32 heapID) { int v0; NNS_G2dInitOamManagerModule(); - RenderOam_Init(0, 126, 0, 31, 0, 126, 0, 31, param1); + RenderOam_Init(0, 126, 0, 31, 0, 126, 0, 31, heapID); { CharTransferTemplate v1 = { 16, (128 * 1024), (16 * 1024), 0 }; - v1.heapID = param1; + v1.heapID = heapID; CharTransfer_InitWithVramModes(&v1, GX_OBJVRAMMODE_CHAR_1D_128K, GX_OBJVRAMMODE_CHAR_1D_128K); } - PlttTransfer_Init(16, param1); + PlttTransfer_Init(16, heapID); CharTransfer_ClearBuffers(); PlttTransfer_Clear(); ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_128K); ReserveSlotsForWirelessIconPalette(NNS_G2D_VRAM_TYPE_2DMAIN); - param0->unk_1C = SpriteList_InitRendering(128, ¶m0->unk_20, param1); + param0->unk_1C = SpriteList_InitRendering(128, ¶m0->unk_20, heapID); SetSubScreenViewRect(¶m0->unk_20, 0, (512 << FX32_SHIFT)); for (v0 = 0; v0 < 4; v0++) { - param0->unk_1AC[v0] = SpriteResourceCollection_New(16, v0, param1); + param0->unk_1AC[v0] = SpriteResourceCollection_New(16, v0, heapID); } - param0->unk_1F0 = sub_02012744(8, param1); + param0->unk_1F0 = sub_02012744(8, heapID); } static void ov115_02263A3C(UnkStruct_ov115_02261ADC *param0) @@ -4381,17 +4381,17 @@ static void ov115_022653F4(UnkStruct_ov115_02261ADC *param0, s16 param1, u16 par } } -static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1, NARC *param2, u32 param3) +static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1, NARC *param2, u32 heapID) { - param0->unk_9C = param3; + param0->unk_9C = heapID; { BOOL v0; - param0->unk_00[0] = SpriteResourceCollection_AddTilesFrom(param1->unk_1AC[0], param2, 10, 0, 140, NNS_G2D_VRAM_TYPE_2DMAIN, param3); - param0->unk_00[1] = SpriteResourceCollection_AddPaletteFrom(param1->unk_1AC[1], param2, 11, 0, 140, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param3); - param0->unk_00[2] = SpriteResourceCollection_AddFrom(param1->unk_1AC[2], param2, 9, 0, 140, 2, param3); - param0->unk_00[3] = SpriteResourceCollection_AddFrom(param1->unk_1AC[3], param2, 8, 0, 140, 3, param3); + param0->unk_00[0] = SpriteResourceCollection_AddTilesFrom(param1->unk_1AC[0], param2, 10, 0, 140, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); + param0->unk_00[1] = SpriteResourceCollection_AddPaletteFrom(param1->unk_1AC[1], param2, 11, 0, 140, NNS_G2D_VRAM_TYPE_2DMAIN, 1, heapID); + param0->unk_00[2] = SpriteResourceCollection_AddFrom(param1->unk_1AC[2], param2, 9, 0, 140, 2, heapID); + param0->unk_00[3] = SpriteResourceCollection_AddFrom(param1->unk_1AC[3], param2, 8, 0, 140, 3, heapID); v0 = SpriteTransfer_RequestCharAtEndWithHardwareMappingType(param0->unk_00[0]); GF_ASSERT(v0); @@ -4412,7 +4412,7 @@ static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022 v1.position.y = (FX32_CONST(48)); v1.priority = (0 + 1); v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN; - v1.heapID = param3; + v1.heapID = heapID; param0->unk_34 = SpriteList_Add(&v1); Sprite_SetDrawFlag(param0->unk_34, 0); @@ -4423,15 +4423,15 @@ static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022 BOOL v3; UnkStruct_020127E8 v4; - param0->unk_5C = Strbuf_Init(16, param3); + param0->unk_5C = Strbuf_Init(16, heapID); Window_AddToTopLeftCorner(param1->unk_00, ¶m0->unk_38, 3, 2, 0, 0); - param0->unk_4C = sub_02012B20(¶m0->unk_38, param3); + param0->unk_4C = sub_02012B20(¶m0->unk_38, heapID); v2 = sub_02012B58(param0->unk_4C, NNS_G2D_VRAM_TYPE_2DMAIN); v3 = CharTransfer_AllocRange(v2, 1, NNS_G2D_VRAM_TYPE_2DMAIN, ¶m0->unk_50); GF_ASSERT(v3 == 1); - param0->unk_60 = SpriteResourceCollection_AddPalette(param1->unk_1AC[1], 14, 6, 0, 150, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param3); + param0->unk_60 = SpriteResourceCollection_AddPalette(param1->unk_1AC[1], 14, 6, 0, 150, NNS_G2D_VRAM_TYPE_2DMAIN, 1, heapID); v3 = SpriteTransfer_RequestPlttFreeSpace(param0->unk_60); GF_ASSERT(v3); @@ -4448,7 +4448,7 @@ static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022 v4.unk_20 = 0; v4.unk_24 = 0; v4.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN; - v4.unk_2C = param3; + v4.unk_2C = heapID; param0->unk_48 = sub_02012B60(&v4, param0->unk_4C); diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c index 3c1d2cead3..ead32fd9ae 100644 --- a/src/overlay116/ov116_022604C4.c +++ b/src/overlay116/ov116_022604C4.c @@ -228,7 +228,7 @@ static void ov116_022604C4(UnkStruct_ov116_0226139C *param0) PaletteData_LoadBufferFromHardware(param0->unk_48.unk_14, 2, 0 * 16, 16 * 0x20); if (param0->unk_80->unk_3C) { - ov4_021D1E74(106); + ov4_021D1E74(HEAP_ID_106); } } @@ -446,7 +446,7 @@ int ov116_02260CF4(OverlayManager *param0, int *param1) switch (*param1) { case 0: v1 = 1; - v0->unk_94 = ov114_0225C820(&v0->unk_84, 106); + v0->unk_94 = ov114_0225C820(&v0->unk_84, HEAP_ID_106); ov116_0226178C(v0, v1, 1, param1); break; case 1: @@ -613,7 +613,7 @@ int ov116_02260CF4(OverlayManager *param0, int *param1) ov114_0225C9A8(&v0->unk_98, v0->unk_84.unk_08); } - v0->unk_B0 = ov114_0225C8EC(&v0->unk_84, &v0->unk_98, 106); + v0->unk_B0 = ov114_0225C8EC(&v0->unk_84, &v0->unk_98, HEAP_ID_106); ov116_0226178C(v0, v1, 18, param1); break; case 18: @@ -758,20 +758,20 @@ int ov116_0226126C(OverlayManager *param0, int *param1) static void ov116_022612CC(UnkStruct_ov116_0226139C *param0) { - param0->unk_48.unk_00 = NARC_ctor(NARC_INDEX_ARC__MANENE, 106); - param0->unk_48.unk_04 = NARC_ctor(NARC_INDEX_GRAPHIC__BUCKET, 106); + param0->unk_48.unk_00 = NARC_ctor(NARC_INDEX_ARC__MANENE, HEAP_ID_106); + param0->unk_48.unk_04 = NARC_ctor(NARC_INDEX_GRAPHIC__BUCKET, HEAP_ID_106); param0->unk_48.unk_10 = BgConfig_New(HEAP_ID_106); - param0->unk_48.unk_14 = PaletteData_New(106); - param0->unk_48.unk_18 = sub_02024220(106, 0, 1, 0, 4, NULL); - param0->unk_48.camera = Camera_Alloc(106); + param0->unk_48.unk_14 = PaletteData_New(HEAP_ID_106); + param0->unk_48.unk_18 = sub_02024220(HEAP_ID_106, 0, 1, 0, 4, NULL); + param0->unk_48.camera = Camera_Alloc(HEAP_ID_106); ov116_02261C88(param0); PaletteData_SetAutoTransparent(param0->unk_48.unk_14, 1); - PaletteData_AllocBuffer(param0->unk_48.unk_14, 0, 0x200, 106); - PaletteData_AllocBuffer(param0->unk_48.unk_14, 1, 0x200, 106); - PaletteData_AllocBuffer(param0->unk_48.unk_14, 2, 0x200, 106); - PaletteData_AllocBuffer(param0->unk_48.unk_14, 3, 0x200, 106); + PaletteData_AllocBuffer(param0->unk_48.unk_14, 0, 0x200, HEAP_ID_106); + PaletteData_AllocBuffer(param0->unk_48.unk_14, 1, 0x200, HEAP_ID_106); + PaletteData_AllocBuffer(param0->unk_48.unk_14, 2, 0x200, HEAP_ID_106); + PaletteData_AllocBuffer(param0->unk_48.unk_14, 3, 0x200, HEAP_ID_106); ov116_02261494(param0->unk_48.unk_10); ov116_022616CC(param0); @@ -794,7 +794,7 @@ static void ov116_022612CC(UnkStruct_ov116_0226139C *param0) G3X_SetEdgeColorTable(v0); } - Heap_FndInitAllocatorForExpHeap(¶m0->unk_48.unk_24, 106, 32); + Heap_FndInitAllocatorForExpHeap(¶m0->unk_48.unk_24, HEAP_ID_106, 32); } void ov116_0226139C(UnkStruct_ov116_0226139C *param0) diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c index ba6dfa0d36..d097c4236e 100644 --- a/src/overlay117/ov117_02260668.c +++ b/src/overlay117/ov117_02260668.c @@ -59,7 +59,7 @@ #include "vram_transfer.h" static void ov117_02260DA0(void *param0); -static GenericPointerData *ov117_02260E14(int param0); +static GenericPointerData *ov117_02260E14(int heapID); static void ov117_02260E34(void); static void ov117_02260EB8(GenericPointerData *param0); static void ov117_02260F7C(SysTask *param0, void *param1); @@ -191,31 +191,31 @@ int ov117_02260668(OverlayManager *param0, int *param1) G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG0, GX_BLEND_ALL, 16, 16); G2S_SetBlendAlpha((GX_BLEND_PLANEMASK_BG3), (GX_BLEND_BGALL | GX_BLEND_PLANEMASK_OBJ), 13, 3); - v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov117_02261280), 110); + v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov117_02261280), HEAP_ID_110); MI_CpuClear8(v0, sizeof(UnkStruct_ov117_02261280)); - Heap_FndInitAllocatorForExpHeap(&v0->unk_A8, 110, 32); + Heap_FndInitAllocatorForExpHeap(&v0->unk_A8, HEAP_ID_110, 32); - v0->unk_98 = ov117_02260E14(110); + v0->unk_98 = ov117_02260E14(HEAP_ID_110); v0->unk_00 = OverlayManager_Args(param0); ov117_022665FC(v0); - v0->unk_8C = PaletteData_New(110); + v0->unk_8C = PaletteData_New(HEAP_ID_110); PaletteData_SetAutoTransparent(v0->unk_8C, 1); - PaletteData_AllocBuffer(v0->unk_8C, 0, 0x200, 110); - PaletteData_AllocBuffer(v0->unk_8C, 1, 0x200, 110); - PaletteData_AllocBuffer(v0->unk_8C, 2, (((16 - 2) * 16) * sizeof(u16)), 110); - PaletteData_AllocBuffer(v0->unk_8C, 3, 0x200, 110); + PaletteData_AllocBuffer(v0->unk_8C, 0, 0x200, HEAP_ID_110); + PaletteData_AllocBuffer(v0->unk_8C, 1, 0x200, HEAP_ID_110); + PaletteData_AllocBuffer(v0->unk_8C, 2, (((16 - 2) * 16) * sizeof(u16)), HEAP_ID_110); + PaletteData_AllocBuffer(v0->unk_8C, 3, 0x200, HEAP_ID_110); v0->unk_2C = BgConfig_New(HEAP_ID_110); - VramTransfer_New(64, 110); + VramTransfer_New(64, HEAP_ID_110); SetAutorepeat(4, 8); ov117_022610D8(v0->unk_2C); sub_0201E3D8(); sub_0201E450(4); ov117_02260EC0(v0); - v0->unk_24 = SpriteSystem_Alloc(110); + v0->unk_24 = SpriteSystem_Alloc(HEAP_ID_110); SpriteSystem_Init(v0->unk_24, &Unk_ov117_022669A8, &Unk_ov117_0226697C, (16 + 16)); ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_64K); @@ -229,9 +229,9 @@ int ov117_02260668(OverlayManager *param0, int *param1) ov117_02261574(v0); v0->unk_80 = MessageLoader_Init(0, 26, 9, HEAP_ID_110); - v0->unk_84 = StringTemplate_Default(110); + v0->unk_84 = StringTemplate_Default(HEAP_ID_110); v0->unk_88 = Strbuf_Init((2 * 160), HEAP_ID_110); - v0->unk_90 = sub_02012744((2 * 6 + 6 + 1), 110); + v0->unk_90 = sub_02012744((2 * 6 + 6 + 1), HEAP_ID_110); ov117_02265210(v0, &v0->unk_1468); @@ -284,7 +284,7 @@ int ov117_02260668(OverlayManager *param0, int *param1) SetVBlankCallback(ov117_02260DA0, v0); if (v0->unk_00->unk_3C) { - ov4_021D1E74(110); + ov4_021D1E74(HEAP_ID_110); } return 1; @@ -509,12 +509,9 @@ static void ov117_02260DA0(void *param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static GenericPointerData *ov117_02260E14(int param0) +static GenericPointerData *ov117_02260E14(int heapID) { - GenericPointerData *v0; - - v0 = sub_02024220(param0, 0, 1, 0, 2, ov117_02260E34); - return v0; + return sub_02024220(heapID, 0, 1, 0, 2, ov117_02260E34); } static void ov117_02260E34(void) @@ -907,7 +904,7 @@ static void ov117_02261574(UnkStruct_ov117_02261280 *param0) sub_02014000(); v0 = Heap_AllocFromHeap(HEAP_ID_110, 0x4800); - param0->unk_A4 = sub_02014014(ov117_02261644, ov117_02261668, v0, 0x4800, 1, 110); + param0->unk_A4 = sub_02014014(ov117_02261644, ov117_02261668, v0, 0x4800, 1, HEAP_ID_110); camera = sub_02014784(param0->unk_A4); Camera_SetClipping((FX32_ONE), (FX32_ONE * 900), camera); diff --git a/src/overlay117/ov117_02266498.c b/src/overlay117/ov117_02266498.c index 80741ad345..cb7bd3adb0 100644 --- a/src/overlay117/ov117_02266498.c +++ b/src/overlay117/ov117_02266498.c @@ -75,7 +75,7 @@ int ov117_022664BC(OverlayManager *param0, int *param1) } break; case 1: - v0->unk_04 = ov114_0225C82C(&v0->unk_00->unk_00, 110); + v0->unk_04 = ov114_0225C82C(&v0->unk_00->unk_00, HEAP_ID_110); (*param1)++; break; case 2: @@ -87,7 +87,7 @@ int ov117_022664BC(OverlayManager *param0, int *param1) } break; case 3: - v0->unk_08 = ov114_0225C8F8(&v0->unk_00->unk_00, &v0->unk_00->unk_10, 110); + v0->unk_08 = ov114_0225C8F8(&v0->unk_00->unk_00, &v0->unk_00->unk_10, HEAP_ID_110); (*param1)++; break; case 4: diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c index 637830c0df..5b22008943 100644 --- a/src/overlay118/ov118_021D0D80.c +++ b/src/overlay118/ov118_021D0D80.c @@ -191,7 +191,7 @@ static void ov118_021D0FDC(OverlayMetadata *param0) sub_02014000(); v0 = Heap_AllocFromHeap(HEAP_ID_12, 0x4800); - param0->unk_18 = sub_02014014(ov118_021D1128, ov118_021D114C, v0, 0x4800, 1, 12); + param0->unk_18 = sub_02014014(ov118_021D1128, ov118_021D114C, v0, 0x4800, 1, HEAP_ID_12); camera = sub_02014784(param0->unk_18); Camera_SetClipping((FX32_ONE), (FX32_ONE * 900), camera); diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c index ebed5258a2..387b304ac3 100644 --- a/src/overlay119/ov119_021D0D80.c +++ b/src/overlay119/ov119_021D0D80.c @@ -47,8 +47,8 @@ void ov119_021D0DF4(void); void ov119_021D0E78(void); static u32 ov119_021D13B4(u32 param0, BOOL param1); static u32 ov119_021D13D0(u32 param0, BOOL param1); -static UnkStruct_02014014 *ov119_021D13EC(int param0); -static UnkStruct_02014014 *ov119_021D1434(int param0, int param1, int param2); +static UnkStruct_02014014 *ov119_021D13EC(int heapID); +static UnkStruct_02014014 *ov119_021D1434(int heapID, int param1, int param2); static void ov119_021D1474(SPLEmitter *param0); void ov119_021D0D80(void) @@ -68,10 +68,7 @@ void ov119_021D0DA8(void) GenericPointerData *ov119_021D0DD4(void) { - GenericPointerData *v0; - - v0 = sub_02024220(71, 0, 2, 0, 2, ov119_021D0DF4); - return v0; + return sub_02024220(HEAP_ID_71, 0, 2, 0, 2, ov119_021D0DF4); } void ov119_021D0DF4(void) @@ -425,14 +422,14 @@ static u32 ov119_021D13D0(u32 param0, BOOL param1) return v1; } -static UnkStruct_02014014 *ov119_021D13EC(int param0) +static UnkStruct_02014014 *ov119_021D13EC(int heapID) { UnkStruct_02014014 *v0; void *v1; Camera *camera; - v1 = Heap_AllocFromHeap(param0, 0x4800); - v0 = sub_02014014(ov119_021D13B4, ov119_021D13D0, v1, 0x4800, 1, param0); + v1 = Heap_AllocFromHeap(heapID, 0x4800); + v0 = sub_02014014(ov119_021D13B4, ov119_021D13D0, v1, 0x4800, 1, heapID); camera = sub_02014784(v0); if (camera != NULL) { @@ -442,13 +439,10 @@ static UnkStruct_02014014 *ov119_021D13EC(int param0) return v0; } -static UnkStruct_02014014 *ov119_021D1434(int param0, int param1, int param2) +static UnkStruct_02014014 *ov119_021D1434(int heapID, int param1, int param2) { - UnkStruct_02014014 *v0; - void *v1; - - v0 = ov119_021D13EC(param0); - v1 = sub_020144C4(param1, param2, param0); + UnkStruct_02014014 *v0 = ov119_021D13EC(heapID); + void *v1 = sub_020144C4(param1, param2, heapID); sub_020144CC(v0, v1, (1 << 1) | (1 << 3), 1); @@ -477,14 +471,12 @@ UnkStruct_ov119_021D14DC *ov119_021D14AC(UnkStruct_ov119_021D1930 *param0) int v1; int v2; int v3; - UnkStruct_ov119_021D14DC *v4; - - v4 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_ov119_021D14DC)); + UnkStruct_ov119_021D14DC *v4 = Heap_AllocFromHeap(param0->heapId, sizeof(UnkStruct_ov119_021D14DC)); GF_ASSERT(v4 != NULL); v4->unk_00 = *param0; - v4->unk_0C = ov119_021D1434(v4->unk_00.unk_00, 119, v4->unk_00.unk_04); + v4->unk_0C = ov119_021D1434(v4->unk_00.heapId, 119, v4->unk_00.unk_04); sub_02014788(v4->unk_0C, 1); diff --git a/src/overlay119/ov119_021D191C.c b/src/overlay119/ov119_021D191C.c index 8b962dafb1..050fccbf48 100644 --- a/src/overlay119/ov119_021D191C.c +++ b/src/overlay119/ov119_021D191C.c @@ -64,7 +64,7 @@ static BOOL ov119_021D1930(UnkStruct_ov119_021D0FD0 *param0) { UnkStruct_ov119_021D1930 v1; - v1.unk_00 = 71; + v1.heapId = HEAP_ID_71; v1.unk_04 = 0; param0->unk_04.unk_40 = ov119_021D14AC(&v1); @@ -248,7 +248,7 @@ static BOOL ov119_021D1BD0(UnkStruct_ov119_021D0FD0 *param0) { UnkStruct_ov119_021D1930 v1; - v1.unk_00 = 71; + v1.heapId = HEAP_ID_71; v1.unk_04 = 1; param0->unk_04.unk_40 = ov119_021D14AC(&v1); } diff --git a/src/render_window.c b/src/render_window.c index 8f90da33aa..eae1262fe0 100644 --- a/src/render_window.c +++ b/src/render_window.c @@ -854,7 +854,7 @@ static void CreatePokemonPreviewSprite(PokemonPreview *preview, u8 x, u8 y) static void LoadAndDrawPokemonPreviewSprite(UnkStruct_ov5_021D30A8 *param0, u16 species, u8 gender) { - void *buf = sub_0200762C(param0->unk_1C6); + void *buf = sub_0200762C(param0->heapId); ArchivedSprite sprite; BuildArchivedPokemonSprite(&sprite, species, gender, FACE_FRONT, FALSE, NULL, NULL); @@ -864,7 +864,7 @@ static void LoadAndDrawPokemonPreviewSprite(UnkStruct_ov5_021D30A8 *param0, u16 static void LoadAndDrawPokemonPreviewSpriteFromStruct(UnkStruct_ov5_021D30A8 *param0, Pokemon *mon) { - void *buf = sub_0200762C(param0->unk_1C6); + void *buf = sub_0200762C(param0->heapId); ArchivedSprite sprite; Pokemon_BuildArchivedSprite(&sprite, mon, FACE_FRONT); @@ -886,15 +886,15 @@ static void DrawPokemonPreviewSprite(UnkStruct_ov5_021D30A8 *param0, ArchivedSpr NNSG2dImageProxy *imageProxy; const NNSG2dImagePaletteProxy *paletteProxy; - buf = Heap_AllocFromHeap(param0->unk_1C6, POKEMON_SPRITE_WHOLE_SIZE_BYTES); + buf = Heap_AllocFromHeap(param0->heapId, POKEMON_SPRITE_WHOLE_SIZE_BYTES); // frame 0 UnkStruct_02013610 v6 = { 0, 0, 10, 10 }; - sub_020135F0(sprite->archive, sprite->character, param0->unk_1C6, &v6, buf); + sub_020135F0(sprite->archive, sprite->character, param0->heapId, &v6, buf); // frame 1 UnkStruct_02013610 v7 = { 10, 0, 10, 10 }; - sub_020135F0(sprite->archive, sprite->character, param0->unk_1C6, &v7, buf + POKEMON_SPRITE_FRAME_SIZE_BYTES); + sub_020135F0(sprite->archive, sprite->character, param0->heapId, &v7, buf + POKEMON_SPRITE_FRAME_SIZE_BYTES); charResource = SpriteResourceCollection_Find(param0->unk_194[SPRITE_RESOURCE_CHAR], POKEMON_PREVIEW_RESOURCE_ID); imageProxy = SpriteTransfer_GetImageProxy(charResource); @@ -905,7 +905,7 @@ static void DrawPokemonPreviewSprite(UnkStruct_ov5_021D30A8 *param0, ArchivedSpr Heap_FreeToHeap(buf); - buf = sub_02013660(sprite->archive, sprite->palette, param0->unk_1C6); + buf = sub_02013660(sprite->archive, sprite->palette, param0->heapId); plttResource = SpriteResourceCollection_Find(param0->unk_194[SPRITE_RESOURCE_PLTT], POKEMON_PREVIEW_RESOURCE_ID); paletteProxy = SpriteTransfer_GetPaletteProxy(plttResource, imageProxy); offset = NNS_G2dGetImagePaletteLocation(paletteProxy, NNS_G2D_VRAM_TYPE_2DMAIN); diff --git a/src/scrcmd.c b/src/scrcmd.c index 3e4613390f..cf0d154a2c 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -4239,7 +4239,7 @@ static BOOL ScrCmd_1D7(ScriptContext *ctx) void **v2 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); v0 = ScriptContext_ReadHalfWord(ctx); - *v2 = sub_02099674(ctx->fieldSystem, v0, 11); + *v2 = sub_02099674(ctx->fieldSystem, v0, HEAP_ID_FIELDMAP); ScriptContext_Pause(ctx, sub_02041CC8); return 1; @@ -7488,13 +7488,13 @@ static BOOL ScrCmd_29E(ScriptContext *ctx) switch (v0) { case 0: - ov6_0224899C(fieldSystem, v1, 0, 32); + ov6_0224899C(fieldSystem, v1, 0, HEAP_ID_FIELD_TASK); break; case 1: - ov6_0224899C(fieldSystem, v1, 1, 32); + ov6_0224899C(fieldSystem, v1, 1, HEAP_ID_FIELD_TASK); break; case 2: - ov6_0224899C(fieldSystem, v1, 2, 32); + ov6_0224899C(fieldSystem, v1, 2, HEAP_ID_FIELD_TASK); break; default: GF_ASSERT(0); diff --git a/src/start_menu.c b/src/start_menu.c index d14331da22..591ee87aac 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1522,7 +1522,7 @@ static BOOL sub_0203C0A0(FieldTask *taskMan) fieldSystem = FieldTask_GetFieldSystem(taskMan); menu = FieldTask_GetEnv(taskMan); - menu->unk_25C = sub_0209747C(2, 0, fieldSystem->saveData, 11); + menu->unk_25C = sub_0209747C(2, 0, fieldSystem->saveData, HEAP_ID_FIELDMAP); sub_02014A9C(&v2, 4); sub_02097500(menu->unk_25C, &v2); @@ -1656,7 +1656,7 @@ static void sub_0203C2D8(FieldTask *taskMan, u16 param1) fieldSystem = FieldTask_GetFieldSystem(taskMan); menu = FieldTask_GetEnv(taskMan); - menu->unk_25C = sub_020972FC(11); + menu->unk_25C = sub_020972FC(HEAP_ID_FIELDMAP); v2 = SaveData_GetBag(fieldSystem->saveData); sub_02097320(menu->unk_25C, param1, 1); v6 = 0; diff --git a/src/unk_02005474.c b/src/unk_02005474.c index 1c9ecbbe63..4fa5f06b0b 100644 --- a/src/unk_02005474.c +++ b/src/unk_02005474.c @@ -47,7 +47,7 @@ BOOL sub_02005844(u16 param0, u8 param1); BOOL sub_0200590C(u16 param0, u8 param1, u8 param2); void sub_0200592C(int param0); int sub_0200598C(void); -void sub_02005E64(int param0, int param1); +void sub_02005E64(int param0, int heapID); static void sub_02005EB0(SysTask *param0, void *param1); void sub_02005F24(void); static BOOL sub_02006038(u16 param0, u8 param1); @@ -686,7 +686,7 @@ static void sub_02005E4C(u16 param0, int param1, int param2) return; } -void sub_02005E64(int param0, int param1) +void sub_02005E64(int param0, int heapID) { UnkStruct_02005E64 *v0 = NULL; SysTask **v1 = sub_02003D5C(35); @@ -697,7 +697,7 @@ void sub_02005E64(int param0, int param1) sub_02005F24(); - v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02005E64)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02005E64)); if (v0 == NULL) { GF_ASSERT(FALSE); diff --git a/src/unk_0200762C.c b/src/unk_0200762C.c index 7510f1fc4d..17bfd8e28f 100644 --- a/src/unk_0200762C.c +++ b/src/unk_0200762C.c @@ -271,7 +271,6 @@ static const UnkStruct_020E4E62 *Unk_021007A4[] = { (UnkStruct_020E4E62 *)&Unk_020E4F4C }; -void *sub_0200762C(int param0); void sub_02007768(UnkStruct_02007768 *param0); void sub_02007B6C(UnkStruct_02007768 *param0); PokemonSprite *sub_02007C34(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame *param6, UnkFuncPtr_02007C34 *param7); @@ -309,7 +308,7 @@ static void sub_020088D8(PokemonSprite *param0); static u8 sub_020091AC(u8 param0); static void sub_020091C0(PokemonSprite *param0, u8 *param1); -void *sub_0200762C(int param0) +void *sub_0200762C(int heapID) { UnkStruct_02007768 *v0; int v1, v2, v3, v4; @@ -317,19 +316,19 @@ void *sub_0200762C(int param0) u8 *v6; void *v7; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02007768)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02007768)); - v0->unk_2E8 = param0; + v0->unk_2E8 = heapID; v0->unk_330 = 0; v0->unk_2EC = 0; v0->unk_2F0 = (32 * 32 * 0x20); v0->unk_2F4 = 0; v0->unk_2F8 = (0x20 * 4); - v0->unk_2FC = Heap_AllocFromHeap(param0, (32 * 32 * 0x20)); - v0->unk_300 = Heap_AllocFromHeap(param0, (0x20 * 6)); + v0->unk_2FC = Heap_AllocFromHeap(heapID, (32 * 32 * 0x20)); + v0->unk_300 = Heap_AllocFromHeap(heapID, (0x20 * 6)); MI_CpuClearFast(v0->unk_300, sizeof(0x20 * 6)); - v0->unk_304 = Heap_AllocFromHeap(param0, (0x20 * 6)); + v0->unk_304 = Heap_AllocFromHeap(heapID, (0x20 * 6)); MI_CpuClearFast(v0->unk_304, sizeof(0x20 * 6)); for (v1 = 0; v1 < 4; v1++) { diff --git a/src/unk_02012744.c b/src/unk_02012744.c index 86d942902f..248c4d814d 100644 --- a/src/unk_02012744.c +++ b/src/unk_02012744.c @@ -91,22 +91,21 @@ static const u8 Unk_020E52E4[12][2] = { { 0x1, 0x1 } }; -UnkStruct_02012744 *sub_02012744(int param0, int param1) +UnkStruct_02012744 *sub_02012744(int param0, int heapID) { UnkStruct_02012744 *v0; int v1; - v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02012744)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02012744)); GF_ASSERT(v0); for (v1 = 0; v1 < 12; v1++) { - v0->unk_00[v1] = Graphics_GetCellBank( - 35, v1, 0, &v0->unk_30[v1], param1); + v0->unk_00[v1] = Graphics_GetCellBank(35, v1, 0, &v0->unk_30[v1], heapID); GF_ASSERT(v0->unk_00[v1]); } - v0->unk_60 = Heap_AllocFromHeap(param1, sizeof(FontOAM) * param0); + v0->unk_60 = Heap_AllocFromHeap(heapID, sizeof(FontOAM) * param0); GF_ASSERT(v0->unk_60); v0->unk_64 = param0; @@ -333,15 +332,13 @@ void sub_02012AF0(FontOAM *param0, GXOamMode param1) } } -UnkStruct_02012B20 *sub_02012B20(const Window *param0, int param1) +UnkStruct_02012B20 *sub_02012B20(const Window *param0, int heapID) { - UnkStruct_02012B20 *v0; - - v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02012B20)); + UnkStruct_02012B20 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02012B20)); v0->unk_00.unk_0C = &v0->unk_00; v0->unk_00.unk_10 = &v0->unk_00; - v0->unk_14 = sub_02012DE4(param0->width, param0->height, param1, &v0->unk_00); + v0->unk_14 = sub_02012DE4(param0->width, param0->height, heapID, &v0->unk_00); return v0; } diff --git a/src/unk_020131EC.c b/src/unk_020131EC.c index 8fa26e9b78..b503d5e996 100644 --- a/src/unk_020131EC.c +++ b/src/unk_020131EC.c @@ -173,15 +173,15 @@ void sub_020133D4(int param0, int param1, int param2, int param3, int param4, in Heap_FreeToHeap(v0); } -void *sub_020134A8(int param0, int param1, int param2, int param3, int param4, int param5, int param6) +static void *sub_020134A8(int param0, int param1, int heapID, int param3, int param4, int param5, int param6) { void *v0; int v1; v1 = ((param5 * param6) * ((8 / 2) * 8)); - v0 = Heap_AllocFromHeap(param2, v1); + v0 = Heap_AllocFromHeap(heapID, v1); - sub_020133D4(param0, param1, param2, param3, param4, param5, param6, v0); + sub_020133D4(param0, param1, heapID, param3, param4, param5, param6, v0); return v0; } @@ -214,7 +214,7 @@ void sub_02013560(int param0, int param1, const UnkStruct_02013610 *param2, int sub_020134E4(param0, param1, param2->unk_00, param2->unk_04, param2->unk_08, param2->unk_0C, param3, param4, param5); } -void sub_02013584(int param0, int param1, int param2, int param3, int param4, int param5, int param6, void *param7) +void sub_02013584(int param0, int param1, int heapID, int param3, int param4, int param5, int param6, void *param7) { int v0; int v1; @@ -231,7 +231,7 @@ void sub_02013584(int param0, int param1, int param2, int param3, int param4, in v1 = NELEMS(v4); v2 = 0; - v3 = sub_020134A8(param0, param1, param2, param3, param4, param5, param6); + v3 = sub_020134A8(param0, param1, heapID, param3, param4, param5, param6); for (v0 = 0; v0 < v1; v0++) { sub_02013560(param5, param6, &v4[v0], &v2, v3, param7); @@ -240,12 +240,12 @@ void sub_02013584(int param0, int param1, int param2, int param3, int param4, in Heap_FreeToHeap(v3); } -void sub_020135F0(int param0, int param1, int param2, const UnkStruct_02013610 *param3, void *param4) +void sub_020135F0(int param0, int param1, int heapID, const UnkStruct_02013610 *param3, void *param4) { - sub_02013584(param0, param1, param2, param3->unk_00, param3->unk_04, param3->unk_08, param3->unk_0C, param4); + sub_02013584(param0, param1, heapID, param3->unk_00, param3->unk_04, param3->unk_08, param3->unk_0C, param4); } -void sub_02013610(int param0, int param1, int param2, void *param3) +void sub_02013610(int param0, int param1, int heapID, void *param3) { const UnkStruct_02013610 v0 = { 0x0, @@ -254,23 +254,23 @@ void sub_02013610(int param0, int param1, int param2, void *param3) 0xA }; - sub_020135F0(param0, param1, param2, &v0, param3); + sub_020135F0(param0, param1, heapID, &v0, param3); } -void *sub_0201363C(int param0, int param1, int param2) +void *sub_0201363C(int param0, int param1, int heapID) { void *v0 = NULL; int v1; v1 = (10 * 10 * ((8 / 2) * 8)); - v0 = Heap_AllocFromHeap(param2, v1); + v0 = Heap_AllocFromHeap(heapID, v1); - sub_02013610(param0, param1, param2, v0); + sub_02013610(param0, param1, heapID, v0); return v0; } -void *sub_02013660(int param0, int param1, int param2) +void *sub_02013660(int param0, int param1, int heapID) { NNSG2dPaletteData *v0; void *v1; @@ -278,8 +278,8 @@ void *sub_02013660(int param0, int param1, int param2) int v3; BOOL v4; - v2 = Heap_AllocFromHeap(param2, 0x20); - v1 = NARC_AllocAndReadWholeMemberByIndexPair(param0, param1, param2); + v2 = Heap_AllocFromHeap(heapID, 0x20); + v1 = NARC_AllocAndReadWholeMemberByIndexPair(param0, param1, heapID); v4 = NNS_G2dGetUnpackedPaletteData(v1, &v0); GF_ASSERT(v4 == 1); diff --git a/src/unk_02014000.c b/src/unk_02014000.c index 5f8c54969d..9ecb66e739 100644 --- a/src/unk_02014000.c +++ b/src/unk_02014000.c @@ -128,7 +128,7 @@ void sub_02014000(void) } } -UnkStruct_02014014 *sub_02014014(UnkFuncPtr_02014014 param0, UnkFuncPtr_02014014 param1, void *param2, int param3, int param4, int param5) +UnkStruct_02014014 *sub_02014014(UnkFuncPtr_02014014 param0, UnkFuncPtr_02014014 param1, void *param2, int param3, int param4, int heapID) { UnkStruct_02014014 *v0; int v1; @@ -142,7 +142,7 @@ UnkStruct_02014014 *sub_02014014(UnkFuncPtr_02014014 param0, UnkFuncPtr_02014014 return NULL; } - v0 = Heap_AllocFromHeap(param5, sizeof(UnkStruct_02014014)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02014014)); if (v0 == NULL) { GF_ASSERT(FALSE); } @@ -163,7 +163,7 @@ UnkStruct_02014014 *sub_02014014(UnkFuncPtr_02014014 param0, UnkFuncPtr_02014014 Unk_021BF618[v1] = v0; if (param4 == 1) { - v0->camera = Camera_Alloc(param5); + v0->camera = Camera_Alloc(heapID); { VEC_Set(&v0->unk_24, 0, 0, 0); v0->unk_30 = 8192; diff --git a/src/unk_02015064.c b/src/unk_02015064.c index 6895755f97..529d8984bc 100644 --- a/src/unk_02015064.c +++ b/src/unk_02015064.c @@ -53,9 +53,9 @@ static void sub_020152C0(UnkStruct_02015214 *param0); static void sub_020152E0(UnkStruct_02015128 *param0); static void sub_020152EC(UnkStruct_020151A4 *param0); static void sub_02015468(UnkStruct_02015214 *param0); -static UnkStruct_02015214 *sub_020152F8(int param0, int param1); -static UnkStruct_02015128 *sub_02015328(int param0, int param1); -static UnkStruct_020151A4 *sub_02015358(int param0, int param1); +static UnkStruct_02015214 *sub_020152F8(int param0, int heapID); +static UnkStruct_02015128 *sub_02015328(int param0, int heapID); +static UnkStruct_020151A4 *sub_02015358(int param0, int heapID); static UnkStruct_02015214 *sub_02015388(UnkStruct_02015064 *param0); static UnkStruct_02015128 *sub_020153B4(UnkStruct_02015064 *param0); static UnkStruct_020151A4 *sub_020153E0(UnkStruct_02015064 *param0); @@ -70,14 +70,14 @@ UnkStruct_02015064 *sub_02015064(const UnkStruct_ov22_022550D4 *param0) UnkStruct_02015064 *v0; int v1; - v0 = Heap_AllocFromHeap(param0->unk_0C, sizeof(UnkStruct_02015064)); + v0 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_02015064)); GF_ASSERT(v0); - v0->unk_00 = sub_020152F8(param0->unk_00, param0->unk_0C); + v0->unk_00 = sub_020152F8(param0->unk_00, param0->heapID); v0->unk_04 = param0->unk_00; - v0->unk_08 = sub_02015328(param0->unk_04, param0->unk_0C); + v0->unk_08 = sub_02015328(param0->unk_04, param0->heapID); v0->unk_0C = param0->unk_04; - v0->unk_10 = sub_02015358(param0->unk_08, param0->unk_0C); + v0->unk_10 = sub_02015358(param0->unk_08, param0->heapID); v0->unk_14 = param0->unk_08; return v0; @@ -313,46 +313,37 @@ static void sub_020152EC(UnkStruct_020151A4 *param0) NNS_G2dInitImagePaletteProxy(¶m0->unk_04); } -static UnkStruct_02015214 *sub_020152F8(int param0, int param1) +static UnkStruct_02015214 *sub_020152F8(int param0, int heapID) { - UnkStruct_02015214 *v0; - int v1; - - v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02015214) * param0); + UnkStruct_02015214 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02015214) * param0); GF_ASSERT(v0); - for (v1 = 0; v1 < param0; v1++) { - sub_020152C0(v0 + v1); + for (int i = 0; i < param0; i++) { + sub_020152C0(v0 + i); } return v0; } -static UnkStruct_02015128 *sub_02015328(int param0, int param1) +static UnkStruct_02015128 *sub_02015328(int param0, int heapID) { - UnkStruct_02015128 *v0; - int v1; - - v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02015128) * param0); + UnkStruct_02015128 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02015128) * param0); GF_ASSERT(v0); - for (v1 = 0; v1 < param0; v1++) { - sub_020152E0(v0 + v1); + for (int i = 0; i < param0; i++) { + sub_020152E0(v0 + i); } return v0; } -static UnkStruct_020151A4 *sub_02015358(int param0, int param1) +static UnkStruct_020151A4 *sub_02015358(int param0, int heapID) { - UnkStruct_020151A4 *v0; - int v1; - - v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_020151A4) * param0); + UnkStruct_020151A4 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_020151A4) * param0); GF_ASSERT(v0); - for (v1 = 0; v1 < param0; v1++) { - sub_020152EC(v0 + v1); + for (int i = 0; i < param0; i++) { + sub_020152EC(v0 + i); } return v0; @@ -360,11 +351,9 @@ static UnkStruct_020151A4 *sub_02015358(int param0, int param1) static UnkStruct_02015214 *sub_02015388(UnkStruct_02015064 *param0) { - int v0; - - for (v0 = 0; v0 < param0->unk_04; v0++) { - if (param0->unk_00[v0].unk_1C == 0) { - return param0->unk_00 + v0; + for (int i = 0; i < param0->unk_04; i++) { + if (param0->unk_00[i].unk_1C == 0) { + return param0->unk_00 + i; } } @@ -373,11 +362,9 @@ static UnkStruct_02015214 *sub_02015388(UnkStruct_02015064 *param0) static UnkStruct_02015128 *sub_020153B4(UnkStruct_02015064 *param0) { - int v0; - - for (v0 = 0; v0 < param0->unk_04; v0++) { - if (param0->unk_08[v0].unk_00 == 0) { - return param0->unk_08 + v0; + for (int i = 0; i < param0->unk_04; i++) { + if (param0->unk_08[i].unk_00 == 0) { + return param0->unk_08 + i; } } @@ -386,11 +373,9 @@ static UnkStruct_02015128 *sub_020153B4(UnkStruct_02015064 *param0) static UnkStruct_020151A4 *sub_020153E0(UnkStruct_02015064 *param0) { - int v0; - - for (v0 = 0; v0 < param0->unk_04; v0++) { - if (param0->unk_10[v0].unk_00 == 0) { - return param0->unk_10 + v0; + for (int i = 0; i < param0->unk_04; i++) { + if (param0->unk_10[i].unk_00 == 0) { + return param0->unk_10 + i; } } diff --git a/src/unk_020158A8.c b/src/unk_020158A8.c index 359cc9110c..74342dc8c8 100644 --- a/src/unk_020158A8.c +++ b/src/unk_020158A8.c @@ -9,18 +9,18 @@ #include "message.h" #include "strbuf.h" -UnkStruct_020158A8 *sub_020158A8(int param0) +UnkStruct_020158A8 *sub_020158A8(int heapID) { UnkStruct_020158A8 *v0; int v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_020158A8)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_020158A8)); MI_CpuClear8(v0, sizeof(UnkStruct_020158A8)); - v0->unk_00 = MessageLoader_Init(0, 26, 465, param0); + v0->unk_00 = MessageLoader_Init(0, 26, 465, heapID); for (v1 = 0; v1 < 29; v1++) { - v0->unk_04[v1] = Strbuf_Init(22, param0); + v0->unk_04[v1] = Strbuf_Init(22, heapID); MessageLoader_GetStrbuf(v0->unk_00, v1, v0->unk_04[v1]); } diff --git a/src/unk_02015920.c b/src/unk_02015920.c index 7972d316fe..ee51309d84 100644 --- a/src/unk_02015920.c +++ b/src/unk_02015920.c @@ -68,7 +68,7 @@ typedef struct UnkStruct_02015920_t { UnkStruct_02015C38 unk_0C[2]; BgConfig *unk_7C; u32 unk_80; - u32 unk_84; + u32 heapID; fx32 unk_88[4]; u8 unk_98; u8 unk_99; @@ -77,7 +77,7 @@ typedef struct UnkStruct_02015920_t { u8 unk_9B_4 : 4; } UnkStruct_02015920; -static void sub_02015A80(UnkStruct_02015920 *param0, u32 param1); +static void sub_02015A80(UnkStruct_02015920 *param0, u32 heapID); static void sub_02015AC0(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1); static void sub_02015AE4(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1); static void sub_02015B14(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1); @@ -90,20 +90,18 @@ static void sub_02015D60(UnkStruct_02015C38 *param0); static void sub_02015D8C(UnkStruct_02015D8C *param0, const fx32 *param1, u32 param2); static void sub_02015D98(UnkStruct_02015D8C *param0, fx32 param1); static u32 sub_02015DA0(const UnkStruct_02015D8C *param0); -static void sub_02015DCC(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5); -static void sub_02015E1C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5); +static void sub_02015DCC(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 heapID); +static void sub_02015E1C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 heapID); static void sub_02015E64(SysTask *param0, void *param1); static void sub_02015EA0(SysTask *param0, void *param1); static void sub_02015EE8(BgConfig *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4); static void sub_02015F34(const NNSG2dScreenData *param0, int param1); static void sub_02015F54(const NNSG2dScreenData *param0, int param1); -UnkStruct_02015920 *sub_02015920(u32 param0) +UnkStruct_02015920 *sub_02015920(u32 heapID) { - UnkStruct_02015920 *v0; - - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02015920)); - sub_02015A80(v0, param0); + UnkStruct_02015920 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02015920)); + sub_02015A80(v0, heapID); return v0; } @@ -191,22 +189,22 @@ void sub_02015A54(UnkStruct_02015920 *param0) sub_02015D00(¶m0->unk_0C[v0]); } - sub_02015A80(param0, param0->unk_84); + sub_02015A80(param0, param0->heapID); } -static void sub_02015A80(UnkStruct_02015920 *param0, u32 param1) +static void sub_02015A80(UnkStruct_02015920 *param0, u32 heapID) { memset(param0, 0, sizeof(UnkStruct_02015920)); param0->unk_9B_0 = 0; - param0->unk_84 = param1; + param0->heapID = heapID; param0->unk_9A = 3; param0->unk_9B_4 = 0x8; } static void sub_02015AC0(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1) { - sub_02015DCC(84, 1, param0->unk_7C, param0->unk_80, param1->unk_08, param0->unk_84); + sub_02015DCC(84, 1, param0->unk_7C, param0->unk_80, param1->unk_08, param0->heapID); } static void sub_02015AE4(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1) @@ -219,7 +217,7 @@ static void sub_02015AE4(UnkStruct_02015920 *param0, const UnkStruct_02015958 *p v0 = 4; } - sub_02015E1C(84, 0, v0, param1->unk_0C * 32, 2 * 32, param0->unk_84); + sub_02015E1C(84, 0, v0, param1->unk_0C * 32, 2 * 32, param0->heapID); } static void sub_02015B14(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1) @@ -248,7 +246,7 @@ static void sub_02015B14(UnkStruct_02015920 *param0, const UnkStruct_02015958 *p v2.unk_2D = (v0 * (40 / 8)) + param0->unk_99; v2.unk_20 += v0; - sub_02015C38(¶m0->unk_0C[v0], &v2, param0->unk_84); + sub_02015C38(¶m0->unk_0C[v0], &v2, param0->heapID); } } @@ -263,7 +261,7 @@ static void sub_02015BA4(UnkStruct_02015920 *param0, const UnkStruct_02015958 *p param0->unk_04[v0].rect.right = (param0->unk_98 * 8) + (6 * 8); } - param0->unk_00 = sub_02023FCC(param0->unk_04, 2, sub_02015C08, param0, param0->unk_84); + param0->unk_00 = sub_02023FCC(param0->unk_04, 2, sub_02015C08, param0, param0->heapID); } static void sub_02015C08(u32 param0, u32 param1, void *param2) @@ -364,14 +362,12 @@ static u32 sub_02015DA0(const UnkStruct_02015D8C *param0) return param0->unk_04 - 1; } -static void sub_02015DCC(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5) +static void sub_02015DCC(u32 param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 heapID) { - UnkStruct_02015DCC *v0; - - v0 = Heap_AllocFromHeap(param5, sizeof(UnkStruct_02015DCC)); + UnkStruct_02015DCC *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02015DCC)); memset(v0, 0, sizeof(UnkStruct_02015DCC)); - v0->unk_08 = Graphics_GetCharData(param0, param1, 1, &v0->unk_04, param5); + v0->unk_08 = Graphics_GetCharData(param0, param1, 1, &v0->unk_04, heapID); v0->unk_00 = param2; v0->unk_0C = param3; v0->unk_10 = param4; @@ -379,14 +375,12 @@ static void sub_02015DCC(u32 param0, u32 param1, BgConfig *param2, u32 param3, u SysTask_ExecuteAfterVBlank(sub_02015E64, v0, 128); } -static void sub_02015E1C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5) +static void sub_02015E1C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 heapID) { - UnkStruct_02015E1C *v0; - - v0 = Heap_AllocFromHeap(param5, sizeof(UnkStruct_02015E1C)); + UnkStruct_02015E1C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02015E1C)); memset(v0, 0, sizeof(UnkStruct_02015E1C)); - v0->unk_04 = Graphics_GetPlttData(param0, param1, &v0->unk_00, param5); + v0->unk_04 = Graphics_GetPlttData(param0, param1, &v0->unk_00, heapID); v0->unk_08 = param2; v0->unk_0C = param3; v0->unk_10 = param4; diff --git a/src/unk_02024220.c b/src/unk_02024220.c index 108669041f..b0285752bf 100644 --- a/src/unk_02024220.c +++ b/src/unk_02024220.c @@ -12,12 +12,12 @@ static void sub_020242DC(void); -GenericPointerData *sub_02024220(u32 param0, int param1, int param2, int param3, int param4, UnkFuncPtr_02024220 param5) +GenericPointerData *sub_02024220(u32 heapID, int param1, int param2, int param3, int param4, UnkFuncPtr_02024220 param5) { int v0, v1; - GenericPointerData *v2 = Heap_AllocFromHeap(param0, sizeof(GenericPointerData)); + GenericPointerData *v2 = Heap_AllocFromHeap(heapID, sizeof(GenericPointerData)); - v2->unk_00 = param0; + v2->unk_00 = heapID; NNS_G3dInit(); diff --git a/src/unk_0202854C.c b/src/unk_0202854C.c index 5a416900a5..396cc39fbd 100644 --- a/src/unk_0202854C.c +++ b/src/unk_0202854C.c @@ -85,11 +85,9 @@ int sub_02028558(void) return sizeof(SecretBaseRecord); } -SecretBaseRecord *sub_0202855C(u32 param0) +SecretBaseRecord *sub_0202855C(u32 heapID) { - SecretBaseRecord *v0; - - v0 = Heap_AllocFromHeap(param0, sizeof(SecretBaseRecord)); + SecretBaseRecord *v0 = Heap_AllocFromHeap(heapID, sizeof(SecretBaseRecord)); MI_CpuFill8(v0, 0, sizeof(SecretBaseRecord)); return v0; } diff --git a/src/unk_020298BC.c b/src/unk_020298BC.c index 73431f932c..89d1a2b4b3 100644 --- a/src/unk_020298BC.c +++ b/src/unk_020298BC.c @@ -338,21 +338,17 @@ int sub_02029C64(void) return sizeof(UnkStruct_02029C88); } -UnkStruct_02029C68 *sub_02029C68(u32 param0) +UnkStruct_02029C68 *sub_02029C68(u32 heapID) { - UnkStruct_02029C68 *v0; - - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02029C68)); + UnkStruct_02029C68 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02029C68)); inline_02029BFC(v0); return v0; } -UnkStruct_02029C88 *sub_02029C88(u32 param0) +UnkStruct_02029C88 *sub_02029C88(u32 heapID) { - UnkStruct_02029C88 *v0; - - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02029C88)); + UnkStruct_02029C88 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02029C88)); inline_02029BFC_1(v0); return v0; diff --git a/src/unk_020366A0.c b/src/unk_020366A0.c index 584ab44879..a0ba59b424 100644 --- a/src/unk_020366A0.c +++ b/src/unk_020366A0.c @@ -2215,7 +2215,7 @@ static void sub_020386B4(void) } if (CommSys_InitServer(1, 1, 512, 1)) { - ov4_021D0D80(Unk_021C07D4->unk_28, 49, (0x2B000 + 0x1400), CommLocal_MaxMachines(Unk_021C07D4->unk_4A) + 1); + ov4_021D0D80(Unk_021C07D4->unk_28, HEAP_ID_49, (0x2B000 + 0x1400), CommLocal_MaxMachines(Unk_021C07D4->unk_4A) + 1); ov4_021D2170(sub_020389FC); CommSys_SwitchTransitionTypeToParallel(); sub_02036C94(sub_0203862C, (30 * 60 * 2)); @@ -2543,7 +2543,7 @@ static void sub_02038BA8(void) } if (CommSys_InitServer(1, 1, 512, 1)) { - ov4_021D0D80(Unk_021C07D4->unk_28, 49, 0x58000, CommLocal_MaxMachines(Unk_021C07D4->unk_4A) + 1); + ov4_021D0D80(Unk_021C07D4->unk_28, HEAP_ID_49, 0x58000, CommLocal_MaxMachines(Unk_021C07D4->unk_4A) + 1); ov4_021D2170(sub_020389FC); CommSys_SwitchTransitionTypeToParallel(); ov4_021D2584(0); diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index 3f2859a4d6..615f916671 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -705,10 +705,10 @@ void sub_0203D80C(FieldTask *taskMan, u16 *param1, u16 *param2, u16 *param3) v0->unk_08 = param3; if (param3 == NULL) { - v0->unk_0C = sub_0209747C(0, 0, fieldSystem->saveData, 32); + v0->unk_0C = sub_0209747C(0, 0, fieldSystem->saveData, HEAP_ID_FIELD_TASK); sub_020974F4(v0->unk_0C, *param2); } else { - v0->unk_0C = sub_0209747C(1, 0, fieldSystem->saveData, 32); + v0->unk_0C = sub_0209747C(1, 0, fieldSystem->saveData, HEAP_ID_FIELD_TASK); sub_020974F8(v0->unk_0C, *param2, *param3); } @@ -828,11 +828,9 @@ static void sub_0203D9A8(FieldSystem *fieldSystem, UnkStruct_0203D9B8 *param1) FieldSystem_StartChildProcess(fieldSystem, &Unk_020F6890, param1); } -UnkStruct_0203D9B8 *sub_0203D9B8(FieldSystem *fieldSystem, int param1) +UnkStruct_0203D9B8 *sub_0203D9B8(FieldSystem *fieldSystem, int heapID) { - UnkStruct_0203D9B8 *v0; - - v0 = sub_020989DC(FieldSystem_GetSaveData(fieldSystem), param1); + UnkStruct_0203D9B8 *v0 = sub_020989DC(FieldSystem_GetSaveData(fieldSystem), heapID); sub_0203D9A8(fieldSystem, v0); return v0; @@ -1260,7 +1258,7 @@ void sub_0203DFE8(FieldTask *param0, int param1, int param2, int param3, int par v2->unk_00 = 0; v2->unk_04 = param4; v2->unk_08 = param6; - v2->unk_0C = sub_0208712C(11, param1, param2, param3, SaveData_Options(fieldSystem->saveData)); + v2->unk_0C = sub_0208712C(HEAP_ID_FIELDMAP, param1, param2, param3, SaveData_Options(fieldSystem->saveData)); v2->unk_10 = Strbuf_Init(12, HEAP_ID_FIELDMAP); switch (param1) { diff --git a/src/unk_0204EDA4.c b/src/unk_0204EDA4.c index f0f8f4eacf..dd750cb45f 100644 --- a/src/unk_0204EDA4.c +++ b/src/unk_0204EDA4.c @@ -55,13 +55,13 @@ BOOL ScrCmd_Dummy21E(ScriptContext *ctx) BOOL ScrCmd_21F(ScriptContext *param0) { - Pokemon *v0; + Pokemon *mon; u16 *v1; u16 *v2 = ScriptContext_GetVarPointer(param0); u16 v3 = ScriptContext_GetVar(param0); - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSystem->saveData), v3); - v1 = sub_020997D8(v0, 32); + mon = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSystem->saveData), v3); + v1 = sub_020997D8(mon, HEAP_ID_FIELD_TASK); *v2 = sub_020998D8(v1); Heap_FreeToHeap(v1); @@ -73,7 +73,7 @@ static void sub_0204EE90(ScriptContext *param0, u16 param1, Pokemon *param2, u16 void **v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, 19); UnkStruct_020997B8 *v1; - v1 = sub_020997B8(32); + v1 = sub_020997B8(HEAP_ID_FIELD_TASK); *v0 = v1; v1->unk_00 = param2; @@ -94,14 +94,14 @@ BOOL ScrCmd_220(ScriptContext *param0) BOOL ScrCmd_221(ScriptContext *param0) { - Pokemon *v0; + Pokemon *mon; u16 v1 = ScriptContext_GetVar(param0); u16 *v2; - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSystem->saveData), v1); - v2 = sub_020997D8(v0, 32); + mon = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSystem->saveData), v1); + v2 = sub_020997D8(mon, HEAP_ID_FIELD_TASK); - sub_0204EE90(param0, 1, v0, v2); + sub_0204EE90(param0, 1, mon, v2); return 1; } diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index ec407b176f..b2222f4635 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -661,7 +661,7 @@ static void sub_02068B5C(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *p fieldSystem = FieldTask_GetFieldSystem(param0->unk_00); v1 = FieldTask_GetEnv(param0->unk_00); - v2 = sub_0203D9B8(fieldSystem, 11); + v2 = sub_0203D9B8(fieldSystem, HEAP_ID_FIELDMAP); v1->unk_25C = v2; sub_0203B674(v1, sub_0203C710); @@ -675,7 +675,7 @@ static BOOL sub_02068B8C(UnkStruct_02068870 *param0) static void *sub_02068B9C(void *param0) { - return sub_0203D9B8(param0, 11); + return sub_0203D9B8(param0, HEAP_ID_FIELDMAP); } static void sub_02068BA8(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) diff --git a/src/unk_020711EC.c b/src/unk_020711EC.c index 759388353f..06973b2170 100644 --- a/src/unk_020711EC.c +++ b/src/unk_020711EC.c @@ -46,9 +46,9 @@ typedef struct UnkStruct_020711EC_t { static SysTask *sub_02071400(UnkStruct_ov101_021D5D90 *param0, int param1); static void sub_02071420(SysTask *param0, void *param1); -static UnkStruct_020711EC *sub_0207142C(int param0); +static UnkStruct_020711EC *sub_0207142C(int heapID); static void sub_02071450(UnkStruct_020711EC *param0); -static UnkStruct_ov101_021D5D90 *sub_0207145C(int param0, int param1); +static UnkStruct_ov101_021D5D90 *sub_0207145C(int heapID, int param1); static void sub_02071480(UnkStruct_020711EC *param0); static void sub_02071490(UnkStruct_ov101_021D5D90 *param0); static int sub_020714E8(const UnkStruct_020711EC *param0); @@ -62,15 +62,15 @@ static void sub_020715C8(UnkStruct_ov101_021D5D90 *param0, SysTask *param1); static SysTask *sub_020715CC(UnkStruct_ov101_021D5D90 *param0); static void sub_020715D0(UnkStruct_ov101_021D5D90 *param0, const UnkStruct_020711EC *param1); -UnkStruct_020711EC *sub_020711EC(int param0, int param1) +UnkStruct_020711EC *sub_020711EC(int heapID, int param1) { UnkStruct_020711EC *v0; - v0 = sub_0207142C(param0); + v0 = sub_0207142C(heapID); - v0->unk_0C = sub_0207145C(param0, param1); + v0->unk_0C = sub_0207145C(heapID, param1); v0->unk_00 = param1; - v0->unk_08 = param0; + v0->unk_08 = heapID; return v0; } @@ -245,11 +245,9 @@ static void sub_02071420(SysTask *param0, void *param1) sub_0207153C(v0); } -static UnkStruct_020711EC *sub_0207142C(int param0) +static UnkStruct_020711EC *sub_0207142C(int heapID) { - UnkStruct_020711EC *v0; - - v0 = Heap_AllocFromHeap(param0, (sizeof(UnkStruct_020711EC))); + UnkStruct_020711EC *v0 = Heap_AllocFromHeap(heapID, (sizeof(UnkStruct_020711EC))); GF_ASSERT(v0 != NULL); memset(v0, 0, (sizeof(UnkStruct_020711EC))); @@ -261,12 +259,12 @@ static void sub_02071450(UnkStruct_020711EC *param0) Heap_FreeToHeapExplicit(param0->unk_08, param0); } -static UnkStruct_ov101_021D5D90 *sub_0207145C(int param0, int param1) +static UnkStruct_ov101_021D5D90 *sub_0207145C(int heapID, int param1) { UnkStruct_ov101_021D5D90 *v0; param1 *= (sizeof(UnkStruct_ov101_021D5D90)); - v0 = Heap_AllocFromHeap(param0, param1); + v0 = Heap_AllocFromHeap(heapID, param1); GF_ASSERT(v0 != NULL); memset(v0, 0, param1); diff --git a/src/unk_0207C63C.c b/src/unk_0207C63C.c index 9d4bfd6bb5..f806d74bb8 100644 --- a/src/unk_0207C63C.c +++ b/src/unk_0207C63C.c @@ -17,7 +17,6 @@ void sub_0207C63C(void); void sub_0207C664(void); -GenericPointerData *sub_0207C690(int param0); void sub_0207C6AC(void); void sub_0207C730(void); void sub_0207C770(void); @@ -46,12 +45,9 @@ void sub_0207C664(void) G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, 7, 8); } -GenericPointerData *sub_0207C690(int param0) +GenericPointerData *sub_0207C690(int heapID) { - GenericPointerData *v0; - - v0 = sub_02024220(param0, 0, 2, 0, 2, sub_0207C6AC); - return v0; + return sub_02024220(heapID, 0, 2, 0, 2, sub_0207C6AC); } void sub_0207C6AC(void) diff --git a/src/unk_0207DA28.c b/src/unk_0207DA28.c index 39568eb991..7f8ca040e8 100644 --- a/src/unk_0207DA28.c +++ b/src/unk_0207DA28.c @@ -210,7 +210,7 @@ static BOOL sub_0207DA28(FieldTask *param0) } break; case 14: - v2->unk_10 = (void *)sub_020996A0(fieldSystem, 11, v2->unk_14); + v2->unk_10 = (void *)sub_020996A0(fieldSystem, HEAP_ID_FIELDMAP, v2->unk_14); v2->unk_04++; break; case 15: diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index 8b2cc9a174..d0f2dded53 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -124,7 +124,7 @@ static u8 CheckDuplicateValues(GameWindowLayout *param0); static u8 CheckUniqueValues(GameWindowLayout *param0); static u8 CheckEqualityInArray(GameWindowLayout *param0); static BOOL ValidateGameWindowState(GameWindowLayout *param0); -static GenericPointerData *sub_0207EAD4(int param0); +static GenericPointerData *sub_0207EAD4(int heapID); static void sub_0207EAF4(void); static void sub_0207EB64(GenericPointerData *param0); static int ProcessMessageResult(GameWindowLayout *param0); @@ -870,7 +870,7 @@ void sub_0207EA74(GameWindowLayout *param0, int param1) Bg_FreeTilemapBuffer(param0->unk_00, 0); GX_SetGraphicsMode(GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_3D); - param0->unk_B28 = sub_0207EAD4(12); + param0->unk_B28 = sub_0207EAD4(HEAP_ID_12); } else { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); sub_0207EB64(param0->unk_B28); @@ -882,12 +882,9 @@ void sub_0207EA74(GameWindowLayout *param0, int param1) } } -static GenericPointerData *sub_0207EAD4(int param0) +static GenericPointerData *sub_0207EAD4(int heapID) { - GenericPointerData *v0; - - v0 = sub_02024220(param0, 0, 1, 0, 2, sub_0207EAF4); - return v0; + return sub_02024220(heapID, 0, 1, 0, 2, sub_0207EAF4); } static void sub_0207EAF4(void) diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index d3f661c3a3..d78b68a2b8 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -1189,18 +1189,18 @@ static int sub_02086F3C(OverlayManager *param0, int *param1) return 1; } -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) { UnkStruct_0208737C *v0; - v0 = (UnkStruct_0208737C *)Heap_AllocFromHeap(param0, sizeof(UnkStruct_0208737C)); + v0 = (UnkStruct_0208737C *)Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0208737C)); v0->unk_00 = param1; v0->unk_04 = param2; v0->unk_0C = param3; v0->unk_14 = 0; v0->unk_1C[0] = 0xffff; - v0->unk_18 = Strbuf_Init(32, param0); + v0->unk_18 = Strbuf_Init(32, heapID); v0->unk_44 = 0; v0->unk_48 = NULL; v0->unk_10 = 0; diff --git a/src/unk_020890F4.c b/src/unk_020890F4.c index 382d6e9577..485a028e37 100644 --- a/src/unk_020890F4.c +++ b/src/unk_020890F4.c @@ -155,15 +155,15 @@ static int sub_0208927C(OverlayManager *param0, int *param1) return 1; } -UnkStruct_02089438 *sub_020893B4(int param0, int param1, int param2[], Options *param3, u32 param4, u32 param5) +UnkStruct_02089438 *sub_020893B4(int heapID, int param1, int param2[], Options *param3, u32 param4, u32 param5) { int v0; UnkStruct_02089438 *v1 = NULL; - v1 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02089438)); + v1 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02089438)); v1->unk_00 = param1; - v1->unk_1C = Strbuf_Init(param1 + 1, param0); + v1->unk_1C = Strbuf_Init(param1 + 1, heapID); v1->unk_20 = param3; for (v0 = 0; v0 < 4; v0++) { @@ -177,18 +177,18 @@ UnkStruct_02089438 *sub_020893B4(int param0, int param1, int param2[], Options * return v1; } -UnkStruct_02089438 *sub_02089400(int param0, 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 *v0 = sub_020893B4(param0, param1, param2, param3, param4, param5); + UnkStruct_02089438 *v0 = sub_020893B4(heapID, param1, param2, param3, param4, param5); v0->unk_24 = 0; v0->unk_28 = 0; return v0; } -UnkStruct_02089438 *sub_0208941C(int param0, int param1, int param2[], Options *param3, u32 param4, u32 param5, u32 param6, u32 param7) +UnkStruct_02089438 *sub_0208941C(int heapID, int param1, int param2[], Options *param3, u32 param4, u32 param5, u32 param6, u32 param7) { - UnkStruct_02089438 *v0 = sub_020893B4(param0, param1, param2, param3, param4, param5); + UnkStruct_02089438 *v0 = sub_020893B4(heapID, param1, param2, param3, param4, param5); v0->unk_24 = param6; v0->unk_28 = param7; diff --git a/src/unk_0208A3F4.c b/src/unk_0208A3F4.c index bf86de2dca..fffaa309a7 100644 --- a/src/unk_0208A3F4.c +++ b/src/unk_0208A3F4.c @@ -674,8 +674,8 @@ void sub_0208AF44(UnkStruct_02089688 *param0) void sub_0208AFCC(UnkStruct_02089688 *param0) { - param0->unk_2C0.unk_8C = sub_02012744(2, 101); - Font_InitManager(FONT_SUBSCREEN, 101); + param0->unk_2C0.unk_8C = sub_02012744(2, HEAP_ID_101); + Font_InitManager(FONT_SUBSCREEN, HEAP_ID_101); } void sub_0208AFE8(UnkStruct_02089688 *param0) diff --git a/src/unk_02092494.c b/src/unk_02092494.c index 6b1b73c1d2..e1f687442e 100644 --- a/src/unk_02092494.c +++ b/src/unk_02092494.c @@ -30,12 +30,12 @@ static void BoxPokemon_ResetMetLocationAndDate(BoxPokemon *boxMon, int isHatch); static void BoxPokemon_SetMetLevelToCurrentLevel(BoxPokemon *boxMon); static void BoxPokemon_SetFatefulEncounterFlag(BoxPokemon *boxMon); -PokemonInfoDisplayStruct *sub_02092494(Pokemon *param0, BOOL param1, int param2) +PokemonInfoDisplayStruct *sub_02092494(Pokemon *param0, BOOL param1, int heapID) { PokemonInfoDisplayStruct *v0; - v0 = Heap_AllocFromHeap(param2, sizeof(PokemonInfoDisplayStruct)); - v0->unk_00 = param2; + v0 = Heap_AllocFromHeap(heapID, sizeof(PokemonInfoDisplayStruct)); + v0->unk_00 = heapID; v0->unk_04 = MessageLoader_Init(1, 26, 455, v0->unk_00); v0->unk_08 = StringTemplate_New(9, 32, v0->unk_00); v0->unk_0C = param0; diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c index 23598d3028..4352f6c34b 100644 --- a/src/unk_020933F8.c +++ b/src/unk_020933F8.c @@ -427,7 +427,7 @@ UnkStruct_02095C48 *sub_02093800(const UnkStruct_02093800 *param0) v0->unk_197E = param0->unk_04; for (v2 = 0; v2 < 4; v2++) { - v0->unk_00.unk_E8[v2] = sub_02029C88(20); + v0->unk_00.unk_E8[v2] = sub_02029C88(HEAP_ID_20); } sub_020954F0(v0, 11, v0->unk_00.unk_10E, v0->unk_00.unk_10F, v0->unk_00.unk_110); diff --git a/src/unk_02094EDC.c b/src/unk_02094EDC.c index ae434cfd36..2ae8f472f4 100644 --- a/src/unk_02094EDC.c +++ b/src/unk_02094EDC.c @@ -664,7 +664,7 @@ void sub_02095380(const UnkStruct_ov6_02248BE8 *param0, Pokemon *param1, int par } } -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) { ArchivedSprite v0; PokemonSprite *v1; @@ -676,7 +676,7 @@ PokemonSprite *sub_02095484(UnkStruct_02007768 *param0, int param1, Pokemon *par if (param4 != NULL) { GF_ASSERT(param4->unk_00 != NULL); - sub_02013610(v0.archive, v0.character, param5, param4->unk_00); + sub_02013610(v0.archive, v0.character, heapID, param4->unk_00); param4->unk_08 = v0.palette; param4->unk_04 = v0.archive; } diff --git a/src/unk_020972FC.c b/src/unk_020972FC.c index f6b4543bb4..530dbdd531 100644 --- a/src/unk_020972FC.c +++ b/src/unk_020972FC.c @@ -9,9 +9,9 @@ static void sub_02097344(u32 *param0, u16 param1); -UnkStruct_020972FC *sub_020972FC(u8 param0) +UnkStruct_020972FC *sub_020972FC(u8 heapID) { - UnkStruct_020972FC *v0 = (UnkStruct_020972FC *)Heap_AllocFromHeap(param0, sizeof(UnkStruct_020972FC)); + UnkStruct_020972FC *v0 = (UnkStruct_020972FC *)Heap_AllocFromHeap(heapID, sizeof(UnkStruct_020972FC)); memset(v0, 0, sizeof(UnkStruct_020972FC)); return v0; } diff --git a/src/unk_0209747C.c b/src/unk_0209747C.c index 57a16bb930..df14276fe3 100644 --- a/src/unk_0209747C.c +++ b/src/unk_0209747C.c @@ -33,9 +33,9 @@ struct UnkStruct_0209747C_t { u16 unk_20[2]; }; -UnkStruct_0209747C *sub_0209747C(u32 param0, u32 param1, SaveData *saveData, u32 param3) +UnkStruct_0209747C *sub_0209747C(u32 param0, u32 param1, SaveData *saveData, u32 heapID) { - UnkStruct_0209747C *v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_0209747C)); + UnkStruct_0209747C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0209747C)); v0->unk_00 = param0; v0->unk_01 = param1; diff --git a/src/unk_02097624.c b/src/unk_02097624.c index c5037f5c78..c678eee9cc 100644 --- a/src/unk_02097624.c +++ b/src/unk_02097624.c @@ -29,7 +29,7 @@ FS_EXTERN_OVERLAY(overlay20); FS_EXTERN_OVERLAY(overlay75); typedef struct { - int unk_00; + int heapId; u16 unk_04; u16 unk_06; void *unk_08; @@ -51,7 +51,6 @@ int sub_02097750(UnkStruct_02097728 *param0, Pokemon *param1); void sub_02097770(UnkStruct_02097728 *param0); int sub_02097788(UnkStruct_02028430 *param0, Pokemon *param1, int param2); int sub_020977E4(UnkStruct_02028430 *param0, u16 param1, Pokemon *param2, int param3); -UnkStruct_020978D8 *sub_02097834(const UnkStruct_0202818C *param0, int param1); void sub_020978D8(UnkStruct_020978D8 *param0); void sub_020978F0(UnkStruct_0202818C *param0, UnkStruct_020978D8 *param1); @@ -218,17 +217,17 @@ int sub_020977E4(UnkStruct_02028430 *param0, u16 param1, Pokemon *param2, int pa return param1; } -UnkStruct_020978D8 *sub_02097834(const UnkStruct_0202818C *param0, int param1) +UnkStruct_020978D8 *sub_02097834(const UnkStruct_0202818C *param0, int heapID) { u16 v0; UnkStruct_020978D8 *v1; - v1 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_020978D8)); + v1 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_020978D8)); MI_CpuClear8(v1, sizeof(UnkStruct_020978D8)); v1->unk_00 = 0; v1->unk_08 = sub_02028308(param0); - v1->unk_10 = Strbuf_Init(8, param1); + v1->unk_10 = Strbuf_Init(8, heapID); Strbuf_CopyChars(v1->unk_10, sub_0202830C((UnkStruct_0202818C *)param0)); @@ -289,8 +288,8 @@ static int sub_02097944(OverlayManager *param0, int *param1) v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_02097944), 40); MI_CpuClear8(v0, sizeof(UnkStruct_02097944)); - v0->unk_00 = 40; - v0->unk_10 = sub_02097834(v1->unk_14, v0->unk_00); + v0->heapId = HEAP_ID_40; + v0->unk_10 = sub_02097834(v1->unk_14, v0->heapId); v0->unk_10->unk_04 = SaveData_Options(v1->unk_10); if (v1->unk_00 == 1) { @@ -330,7 +329,7 @@ static int sub_020979A8(OverlayManager *param0, int *param1) switch (*param1) { case 0: v0->unk_10->unk_00 = v1->unk_00; - v0->unk_0C = OverlayManager_New(&v2, v0->unk_10, v0->unk_00); + v0->unk_0C = OverlayManager_New(&v2, v0->unk_10, v0->heapId); *param1 = 1; break; case 1: @@ -365,7 +364,7 @@ static int sub_020979A8(OverlayManager *param0, int *param1) return 1; case 3: - v0->unk_08 = sub_0209747C(2, 0, v1->unk_10, v0->unk_00); + v0->unk_08 = sub_0209747C(2, 0, v1->unk_10, v0->heapId); if (sub_02014BBC(&(v0->unk_10->unk_1A[v0->unk_10->unk_02]))) { sub_02014CC0(&(v0->unk_14), &(v0->unk_10->unk_1A[v0->unk_10->unk_02])); @@ -374,7 +373,7 @@ static int sub_020979A8(OverlayManager *param0, int *param1) } sub_02097500(v0->unk_08, &(v0->unk_14)); - v0->unk_0C = OverlayManager_New(&v3, v0->unk_08, v0->unk_00); + v0->unk_0C = OverlayManager_New(&v3, v0->unk_08, v0->heapId); *param1 = 4; break; case 4: @@ -400,7 +399,7 @@ static int sub_02097AF8(OverlayManager *param0, int *param1) sub_020978D8(v0->unk_10); OverlayManager_FreeData(param0); - Heap_Destroy(v0->unk_00); + Heap_Destroy(v0->heapId); return 1; } diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c index 7c7c61e2da..a9905d19c0 100644 --- a/src/unk_02097B18.c +++ b/src/unk_02097B18.c @@ -153,7 +153,7 @@ static int sub_02097B18(OverlayManager *param0, int *param1) ov76_0223EB64(v0->unk_D4.unk_10); ov76_0223BF10(); - v0->unk_D4.unk_D0 = sub_0200762C(53); + v0->unk_D4.unk_D0 = sub_0200762C(HEAP_ID_53); v0->unk_D4.unk_188 = sub_02015F84(HEAP_ID_53, 1, 0); { diff --git a/src/unk_02098218.c b/src/unk_02098218.c index 71f6b66df7..ed0f93ad50 100644 --- a/src/unk_02098218.c +++ b/src/unk_02098218.c @@ -75,7 +75,7 @@ static int sub_02098218(OverlayManager *param0, int *param1) v1->unk_04.unk_0C = Options_TextFrameDelay(v1->unk_00->unk_0C.unk_04); v1->unk_04.unk_10 = Options_Frame(v1->unk_00->unk_0C.unk_04); v1->unk_04.unk_34 = ov119_021D0DD4(); - v1->unk_04.unk_38 = sub_0200762C(71); + v1->unk_04.unk_38 = sub_0200762C(HEAP_ID_71); v1->unk_04.unk_3C = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, 71); v1->unk_04.unk_00 = BgConfig_New(HEAP_ID_71); @@ -240,7 +240,7 @@ static BOOL sub_0209843C(FieldTask *param0) v9 = Pokemon_GetValue(v0->unk_0C.unk_00, MON_DATA_SPECIES, 0); - v0->unk_08 = sub_0208712C(11, 1, v9, 10, SaveData_Options(FieldSystem_GetSaveData(fieldSystem))); + v0->unk_08 = sub_0208712C(HEAP_ID_FIELDMAP, 1, v9, 10, SaveData_Options(FieldSystem_GetSaveData(fieldSystem))); v0->unk_08->unk_10 = Pokemon_GetValue(v0->unk_0C.unk_00, MON_DATA_GENDER, NULL); v0->unk_08->unk_08 = Pokemon_GetValue(v0->unk_0C.unk_00, MON_DATA_FORM, NULL); FieldTask_RunApplication(param0, &Unk_020F2DAC, v0->unk_08); diff --git a/src/unk_020989DC.c b/src/unk_020989DC.c index 85bbe381be..28d1e52bc2 100644 --- a/src/unk_020989DC.c +++ b/src/unk_020989DC.c @@ -89,7 +89,7 @@ const OverlayManagerTemplate Unk_020F6890 = { 0xFFFFFFFF }; -UnkStruct_0203D9B8 *sub_020989DC(SaveData *param0, int param1) +UnkStruct_0203D9B8 *sub_020989DC(SaveData *param0, int heapID) { UnkStruct_0203D9B8 *v0; Poffin *v1; @@ -99,7 +99,7 @@ UnkStruct_0203D9B8 *sub_020989DC(SaveData *param0, int param1) u8 v5 = 0, v6 = 0, v7 = 0; u8 v8 = 0; - v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_0203D9B8)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0203D9B8)); MI_CpuClear8(v0, sizeof(UnkStruct_0203D9B8)); v0->unk_08 = Poffin_GetSavedataBlock(param0); @@ -108,8 +108,8 @@ UnkStruct_0203D9B8 *sub_020989DC(SaveData *param0, int param1) v0->unk_14 = SaveData_GetBag(param0); v0->unk_18 = SaveData_Options(param0); - v1 = Poffin_New(param1); - v3 = StringTemplate_New(1, 32, param1); + v1 = Poffin_New(heapID); + v3 = StringTemplate_New(1, 32, heapID); for (v5 = 0; v5 < MAX_POFFINS; v5++) { Poffin_CopyToCaseSlot(v0->unk_08, v5, v1); diff --git a/src/unk_02099604.c b/src/unk_02099604.c index b2d8eaa1df..eada91dccf 100644 --- a/src/unk_02099604.c +++ b/src/unk_02099604.c @@ -15,15 +15,11 @@ FS_EXTERN_OVERLAY(overlay82); -UnkStruct_ov82_0223B164 *sub_02099604(int param0, SaveData *param1, int param2, JournalEntry *param3); -UnkStruct_ov82_0223B164 *sub_02099674(FieldSystem *fieldSystem, int param1, int param2); -UnkStruct_ov82_0223B164 *sub_020996A0(FieldSystem *fieldSystem, int param1, BOOL param2); - -UnkStruct_ov82_0223B164 *sub_02099604(int param0, SaveData *param1, int param2, JournalEntry *param3) +static UnkStruct_ov82_0223B164 *sub_02099604(int param0, SaveData *param1, int heapID, JournalEntry *param3) { UnkStruct_ov82_0223B164 *v0; - v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov82_0223B164)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov82_0223B164)); MI_CpuClear8(v0, sizeof(UnkStruct_ov82_0223B164)); v0->unk_0C = param1; @@ -54,21 +50,21 @@ static void sub_0209964C(FieldSystem *fieldSystem, UnkStruct_ov82_0223B164 *para } } -UnkStruct_ov82_0223B164 *sub_02099674(FieldSystem *fieldSystem, int param1, int param2) +UnkStruct_ov82_0223B164 *sub_02099674(FieldSystem *fieldSystem, int param1, int heapID) { UnkStruct_ov82_0223B164 *v0; - v0 = sub_02099604(param1, FieldSystem_GetSaveData(fieldSystem), param2, fieldSystem->journalEntry); + v0 = sub_02099604(param1, FieldSystem_GetSaveData(fieldSystem), heapID, fieldSystem->journalEntry); sub_0209964C(fieldSystem, v0); return v0; } -UnkStruct_ov82_0223B164 *sub_020996A0(FieldSystem *fieldSystem, int param1, BOOL param2) +UnkStruct_ov82_0223B164 *sub_020996A0(FieldSystem *fieldSystem, int heapID, BOOL param2) { UnkStruct_ov82_0223B164 *v0; - v0 = sub_02099604(1, FieldSystem_GetSaveData(fieldSystem), param1, fieldSystem->journalEntry); + v0 = sub_02099604(1, FieldSystem_GetSaveData(fieldSystem), heapID, fieldSystem->journalEntry); v0->unk_20 = 1; v0->unk_24 = param2; diff --git a/src/unk_020997B8.c b/src/unk_020997B8.c index ce66835214..60a93c3695 100644 --- a/src/unk_020997B8.c +++ b/src/unk_020997B8.c @@ -8,9 +8,9 @@ #include "heap.h" #include "pokemon.h" -UnkStruct_020997B8 *sub_020997B8(u32 param0) +UnkStruct_020997B8 *sub_020997B8(u32 heapID) { - UnkStruct_020997B8 *v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_020997B8)); + UnkStruct_020997B8 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_020997B8)); memset(v0, 0, sizeof(UnkStruct_020997B8)); return v0; @@ -21,7 +21,7 @@ void sub_020997D0(UnkStruct_020997B8 *param0) Heap_FreeToHeap(param0); } -u16 *sub_020997D8(Pokemon *param0, u32 param1) +u16 *sub_020997D8(Pokemon *mon, u32 heapID) { u16 *v0; u16 *v1; @@ -31,16 +31,16 @@ u16 *sub_020997D8(Pokemon *param0, u32 param1) u8 v5; u8 v6, v7, v8; - v3 = (u16)Pokemon_GetValue(param0, MON_DATA_SPECIES, NULL); - v5 = (u8)Pokemon_GetValue(param0, MON_DATA_FORM, NULL); - v4 = (u8)Pokemon_GetValue(param0, MON_DATA_LEVEL, NULL); + v3 = (u16)Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL); + v5 = (u8)Pokemon_GetValue(mon, MON_DATA_FORM, NULL); + v4 = (u8)Pokemon_GetValue(mon, MON_DATA_LEVEL, NULL); for (v7 = 0; v7 < LEARNED_MOVES_MAX; v7++) { - v2[v7] = (u16)Pokemon_GetValue(param0, MON_DATA_MOVE1 + v7, NULL); + v2[v7] = (u16)Pokemon_GetValue(mon, MON_DATA_MOVE1 + v7, NULL); } - v0 = Heap_AllocFromHeap(param1, (44 / 2) * 2); - v1 = Heap_AllocFromHeap(param1, (44 / 2) * 2); + v0 = Heap_AllocFromHeap(heapID, (44 / 2) * 2); + v1 = Heap_AllocFromHeap(heapID, (44 / 2) * 2); Pokemon_LoadLevelUpMovesOf(v3, v5, v0); diff --git a/src/unk_0209ACF4.c b/src/unk_0209ACF4.c index 9c9f0cd6a8..89a7f0dcd5 100644 --- a/src/unk_0209ACF4.c +++ b/src/unk_0209ACF4.c @@ -68,10 +68,10 @@ void sub_0209ACF4(FieldTask *param0) v1->fieldSystem = fieldSystem; v1->unk_04 = Strbuf_Init(400, HEAP_ID_FIELD_TASK); v1->unk_08 = Strbuf_Init(400, HEAP_ID_FIELD_TASK); - v1->unk_0C = StringTemplate_Default(32); + v1->unk_0C = StringTemplate_Default(HEAP_ID_FIELD_TASK); v1->unk_10 = MessageLoader_Init(1, 26, 420, HEAP_ID_FIELD_TASK); - v1->unk_14 = ColoredArrow_New(32); - v1->unk_50 = sub_0209747C(2, 0, v1->fieldSystem->saveData, 32); + v1->unk_14 = ColoredArrow_New(HEAP_ID_FIELD_TASK); + v1->unk_50 = sub_0209747C(2, 0, v1->fieldSystem->saveData, HEAP_ID_FIELD_TASK); sub_02097520(v1->unk_50); Window_Init(&(v1->unk_18)); diff --git a/src/unk_0209B344.c b/src/unk_0209B344.c index 0ed768e89b..86a6ab9c8f 100644 --- a/src/unk_0209B344.c +++ b/src/unk_0209B344.c @@ -38,8 +38,8 @@ void sub_0209B344(FieldTask *param0, u16 *param1) UnkStruct_0209B3AC *v1 = Heap_AllocFromHeap(HEAP_ID_FIELD_TASK, sizeof(UnkStruct_0209B3AC)); v1->fieldSystem = fieldSystem; - v1->unk_04 = StringTemplate_Default(32); - v1->unk_10 = sub_0209747C(2, 0, v1->fieldSystem->saveData, 32); + v1->unk_04 = StringTemplate_Default(HEAP_ID_FIELD_TASK); + v1->unk_10 = sub_0209747C(2, 0, v1->fieldSystem->saveData, HEAP_ID_FIELD_TASK); v1->unk_14 = SaveData_MiscSaveBlock(fieldSystem->saveData); v1->unk_20 = param1;