mirror of
https://github.com/zeldaret/ph
synced 2026-06-24 17:03:21 -04:00
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
This commit is contained in:
@@ -95,14 +95,13 @@ enum ActorTypeId_ {
|
||||
|
||||
class ActorType_UnkClass {
|
||||
public:
|
||||
u32 unk_00;
|
||||
u32 unk_04;
|
||||
u32 unk_08;
|
||||
u32 unk_0C;
|
||||
u32 unk_10;
|
||||
/* 0 */ u32 mUnk_0;
|
||||
/* 4 */ s32 mUnk_4;
|
||||
/* 8 */
|
||||
|
||||
ActorType_UnkClass(u32 unk_00, u32 unk_04) :
|
||||
unk_00(unk_00),
|
||||
unk_04(unk_04) {}
|
||||
mUnk_0(unk_00),
|
||||
mUnk_4(unk_04) {}
|
||||
};
|
||||
|
||||
class Actor;
|
||||
|
||||
@@ -12,10 +12,10 @@ struct Random {
|
||||
/**
|
||||
* Generate a random number from 0 (inclusive) to `max` (exclusive)
|
||||
*/
|
||||
inline u32 Next(u32 max) {
|
||||
inline u32 Next(u32 min, u32 max) {
|
||||
mRandomValue = mAddend + mFactor * mRandomValue;
|
||||
u64 result = (mRandomValue >> 32) * max;
|
||||
return result >> 32;
|
||||
u64 result = (mRandomValue >> 32) * (max - min);
|
||||
return (result >> 32) + min;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
#include "global.h"
|
||||
#include "types.h"
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
struct UnkStruct_0202e894 {
|
||||
/* 00 */ u32 mId;
|
||||
/* 04 */ u32 *mUnk_04;
|
||||
@@ -19,8 +21,8 @@ extern u32 *data_027e0ce0[];
|
||||
|
||||
class SysObject {
|
||||
public:
|
||||
static void *operator new(unsigned long length, u32 *id, u32 idLength);
|
||||
static void *operator new[](unsigned long length, u32 *id, u32 idLength);
|
||||
static void *operator new(size_t length, u32 *id, u32 idLength);
|
||||
static void *operator new[](size_t length, u32 *id, u32 idLength);
|
||||
static void operator delete(void *ptr);
|
||||
static void operator delete[](void *ptr);
|
||||
};
|
||||
|
||||
@@ -26,8 +26,4 @@
|
||||
#pragma define_section sbss ".data" \
|
||||
".sbss"
|
||||
|
||||
// Force variables to be in .data by using #pragma section force_data begin|end
|
||||
#pragma define_section force_data ".data" \
|
||||
".data"
|
||||
|
||||
#endif
|
||||
|
||||
@@ -16,6 +16,7 @@ typedef char s8;
|
||||
typedef s8 unk8;
|
||||
typedef s16 unk16;
|
||||
typedef s32 unk32;
|
||||
typedef s64 unk64;
|
||||
|
||||
#ifndef __cplusplus
|
||||
typedef s32 bool;
|
||||
|
||||
Reference in New Issue
Block a user