diff options
| author | petrie911 <69443847+petrie911@users.noreply.github.com> | 2024-02-10 12:09:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-10 15:09:27 -0300 |
| commit | 25694f9d493c3dfbd92084605af5f36332a43817 (patch) | |
| tree | b1066f92fa35b2652eec20834caa024201be8778 /include | |
| parent | b435e2b63fc6fec4d7affdb4e46e6310d23e3e77 (diff) | |
Finished Ve1, added permuter macros, fixed an error in Player struct (#121)
* format
* format
* cleanup
* offsets
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 7 | ||||
| -rw-r--r-- | include/macros.h | 2 | ||||
| -rw-r--r-- | include/sf64player.h | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/include/functions.h b/include/functions.h index 62562fa7..c66f4cdf 100644 --- a/include/functions.h +++ b/include/functions.h @@ -514,6 +514,7 @@ void func_80095604(Player*); void func_80094954(Effect*); void func_80094BBC(Effect*); void func_80094D20(f32, f32); +void func_80096A74(Player* player); // fox_97F80 void func_80098860(Plane* plane, Vec3f* point, Vec3f* normal); @@ -531,7 +532,7 @@ void func_800A1FB0(Gfx**, u8 , u8); void func_800A24DC(s32); void func_800A26C0(void); void func_800A25DC(void); -Actor* func_800A3608(s32); +Actor* func_800A3608(ObjectId); // fox_A4290 bool func_800A3690(Vec3f*, Vec3f*, s32, Vec3f*); @@ -611,8 +612,8 @@ void func_menu_80187520(u32, void*); void func_menu_8019E8D0(void); void func_i1_80198414(void); -s32 func_i1_801937F4(s32, Gfx**, Vec3f*, Vec3f*, void*); -void func_i1_80193D64(s32, Vec3f*, void*); +// s32 func_i1_801937F4(s32, Gfx**, Vec3f*, Vec3f*, void*); +// void func_i1_80193D64(s32, Vec3f*, void*); void func_ending_8018A96C(void); void func_ending_8018AAC4(void); diff --git a/include/macros.h b/include/macros.h index 1df9889c..3756c919 100644 --- a/include/macros.h +++ b/include/macros.h @@ -7,6 +7,7 @@ #define RAND_FLOAT(max) (Rand_ZeroOne()*(max)) #define RAND_INT(max) ((s32)(Rand_ZeroOne()*(max))) #define RAND_FLOAT_CENTERED(width) ((Rand_ZeroOne()-0.5f)*(width)) +#define RAND_DOUBLE_CENTERED(width) ((Rand_ZeroOne()-0.5)*(width)) #define RAND_RANGE(min, max) (((max) - (min)) * (Rand_ZeroOne() - (min) / ((min) - (max)))) #define RAND_FLOAT_SEEDED(max) (Rand_ZeroOneSeeded()*(max)) @@ -16,6 +17,7 @@ #define SEGMENTED_TO_VIRTUAL(segment) ((void*)OS_PHYSICAL_TO_K0(gSegments[((uintptr_t)(segment)<<4)>>0x1C]+(((uintptr_t)(segment))&0xFFFFFF))) #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0])) +#define ARRAY_COUNTU(arr) (u32)(sizeof(arr) / sizeof(arr[0])) #define SIGN_OF(x) (((x) > 0) ? 1 : ((x) == 0) ? 0 : -1) #define SQ(x) ((x) * (x)) diff --git a/include/sf64player.h b/include/sf64player.h index 96afcdf4..f3a84f6c 100644 --- a/include/sf64player.h +++ b/include/sf64player.h @@ -265,8 +265,8 @@ typedef struct Player { /* 0x2C4 */ s32 unk_2C4; /* 0x2C8 */ Vec3f hit2; /* 0x2D4 */ Vec3f hit1; - /* 0x2E0 */ Vec3f hit4; - /* 0x2EC */ Vec3f hit3; + /* 0x2E0 */ Vec3f hit3; + /* 0x2EC */ Vec3f hit4; /* 0x2F8 */ Vec3f jointTable[30]; /* 0x460 */ f32 sfxPos[3]; /* 0x460 */ f32 sfxVel[3]; |