mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-04 09:08:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bunch of m symbols

Browse Source
This commit is contained in:
robojumper
2025-07-24 13:55:13 +02:00
parent e8350dc568
commit 39be7ff72c
18 changed files with 98 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/toBeSorted/attention.cpp
+2 -1
View File
@@ -5,6 +5,7 @@
#include "d/d_heap.h"
#include "d/d_pad.h"
#include "m/m_angle.h"
#include "m/m_heap.h"
#include "nw4r/g3d/res/g3d_resfile.h"
#include "toBeSorted/arc_managers/oarc_manager.h"
#include "toBeSorted/event_manager.h"
@@ -81,7 +82,7 @@ bool AttentionManager::create() {
field_0xBD5 = 0;
field_0xBD4 = 0;
if (!mAllocator.createNewTempFrmHeap(-1, dHeap::work1Heap.heap, "Attention", 0x20, 0)) {
if (!mAllocator.createFrmHeapToCurrent(-1, dHeap::work1Heap.heap, "Attention", 0x20, mHeap::OPT_NONE)) {
return 0;
}
mModels.mMdls[0].field_0x79 = 0;
src/toBeSorted/d_emitter.cpp
+2 -1
View File
@@ -2,6 +2,7 @@
// vtable order
#include "JSystem/JParticle/JPAEmitter.h"
#include "JSystem/JParticle/JPAParticle.h"
#include "m/m_heap.h"
#include "rvl/GX/GXTypes.h"
#include "toBeSorted/d_d3d.h"
// clang-format on
@@ -910,7 +911,7 @@ bool dJEffManager_c::createEffManagers() {
}
}
ms_allocator->createNewTempFrmHeap(-1, dHeap::work1Heap.heap, "dJEffManager_c::ms_allocator", 0x20, 0);
ms_allocator->createFrmHeapToCurrent(-1, dHeap::work1Heap.heap, "dJEffManager_c::ms_allocator", 0x20, mHeap::OPT_NONE);
for (s32 idx = 0; idx < 2; idx++) {
sFogProcs[idx].create(idx, sInts[idx], -1, ms_allocator);
}
src/toBeSorted/d_particle.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ static u16 extractResUserIdx(u16 particleResId) {
namespace dParticle {
JPAResourceManager *res_c::init(const void *jpc, const void *jpn, EGG::Heap *heap) {
mpHeap = mHeap::createFrmHeap(-1, heap, "dParticle::res_c", 0x20, 0);
mpHeap = mHeap::createFrmHeap(-1, heap, "dParticle::res_c", 0x20, mHeap::OPT_NONE);
if (mpHeap == nullptr) {
return nullptr;
}
src/toBeSorted/time_area_mgr.cpp
+2 -1
View File
@@ -2,6 +2,7 @@
#include "d/d_heap.h"
#include "d/d_sc_game.h"
#include "m/m_heap.h"
#include "nw4r/g3d/g3d_obj.h"
dTimeAreaMgr_c::dTimeAreaMgr_c() {
@@ -13,7 +14,7 @@ dTimeAreaMgr_c::~dTimeAreaMgr_c() {
}
bool dTimeAreaMgr_c::init() {
mAllocator.replaceWithNewFrmHeap(-1, dHeap::work1Heap.heap, "dTimeAreaMgr_c::m_allocator", 0x20, 0);
mAllocator.createFrmHeap(-1, dHeap::work1Heap.heap, "dTimeAreaMgr_c::m_allocator", 0x20, mHeap::OPT_NONE);
mProcA.create(&mAllocator);
mProcB.create(&mAllocator);
mAllocator.adjustFrmHeap();