From aee9c362bbeb9ae717f4b93cbbd5fa0dd9a71450 Mon Sep 17 00:00:00 2001 From: Aetias <144526980+AetiasHax@users.noreply.github.com> Date: Mon, 21 Jul 2025 19:09:56 +0200 Subject: ActorRupee 90% (#124) * Remove `force_data` macro * Use size_t in `operator new` * Bump objdiff to v3.0.0-beta.10 * Decompile functions using gRandom * ActorRupee 90% * Fix old gRandom.Next calls * Revert objdiff * Clean up --- src/Main/Game/Game.cpp | 2 +- src/Main/Unknown/UnkStruct_02037750.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Main') diff --git a/src/Main/Game/Game.cpp b/src/Main/Game/Game.cpp index 71ccde10..b88ab53d 100644 --- a/src/Main/Game/Game.cpp +++ b/src/Main/Game/Game.cpp @@ -302,7 +302,7 @@ ARM void Game::Run() { if ((this->mUnk_0f4 & 7U) == 0) { data_027e0dbc.func_ov000_0207b9dc(); } else { - gRandom.Next(0); + gRandom.Next(0, 0); } } nextGameMode = 0; diff --git a/src/Main/Unknown/UnkStruct_02037750.cpp b/src/Main/Unknown/UnkStruct_02037750.cpp index 3d9fe9a5..01ae540e 100644 --- a/src/Main/Unknown/UnkStruct_02037750.cpp +++ b/src/Main/Unknown/UnkStruct_02037750.cpp @@ -101,7 +101,7 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { uVar10 = 0x0; } else { lVar2 = gRandom.mRandomValue * gRandom.mFactor; - uVar10 = gRandom.Next(lVar2); + uVar10 = gRandom.Next(0, lVar2); // uVar10 = *(int *)((int)&gRandom.mAddend + 0x4) + // *(int *)((int)&gRandom.mFactor + 0x4) * // *(uint *)&gRandom.mRandomValue + *(uint *)&gRandom.mFactor * @@ -133,7 +133,7 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { case 0xb: lVar2 = gRandom.mRandomValue * gRandom.mFactor; uVar7 = lVar2; - uVar10 = gRandom.Next(uVar7); + uVar10 = gRandom.Next(0, uVar7); return (int) (uVar10 * 0x64 >> 0x20) < (param1 + 0x4); case 0xc: @@ -143,7 +143,7 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { } else { lVar2 = gRandom.mRandomValue * gRandom.mFactor; uVar11 = lVar2; - uVar10 = gRandom.Next(uVar11); + uVar10 = gRandom.Next(0, uVar11); if (uVar7 != 0x0) { uVar10 = (uVar7 * uVar10 >> 0x20); @@ -168,7 +168,7 @@ ARM unk32 UnkStruct_02037750::vfunc_28(s32 param1) { } else { lVar2 = gRandom.mRandomValue * gRandom.mFactor; uVar11 = lVar2; - uVar10 = gRandom.Next(uVar11); + uVar10 = gRandom.Next(0, uVar11); if (uVar7 != 0x0) { uVar10 = (uVar7 * uVar10 >> 0x20); -- cgit v1.2.3