izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

removed macros

Browse Source
This commit is contained in:
petrie911
2023-06-15 07:22:05 -05:00
parent e1b7794f33
commit 924cf524bc
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/macros.h
-3
View File
@@ -94,9 +94,6 @@
#define CLAMP_MAX(x, max) ((x) > (max) ? (max) : (x))
#define CLAMP_MIN(x, min) ((x) < (min) ? (min) : (x))
#define RAND_BITS(n) ((s32)Rand_Next() >> (0x20 - n))
#define RANDU_BITS(n) (Rand_Next() >> (0x20 - n))
#define RGBA16_GET_R(pixel) (((pixel) >> 11) & 0x1F)
#define RGBA16_GET_G(pixel) (((pixel) >> 6) & 0x1F)
#define RGBA16_GET_B(pixel) (((pixel) >> 1) & 0x1F)
src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c
+6 -6
View File
@@ -374,7 +374,7 @@ void ObjMine_Water_InitChain(ObjMine* this, s32 linkCount) {
waterChain->drag = 0.9f;
waterChain->swayMax = 0.003f;
waterChain->swayPhaseVel = RANDU_BITS(13);
waterChain->swayPhaseVel = Rand_Next() >> (0x20 - 13);
waterChain->restoreXZ = -0.0002f;
waterChain->restoreY = -0.0002f;
@@ -895,9 +895,9 @@ void ObjMine_Air_Chained(ObjMine* this, PlayState* play) {
}
// Applies chain sway, choosing a new sway randomly about every 32 frames
if (RANDU_BITS(5) == 0) {
if ((Rand_Next() >> (0x20 - 5)) == 0) {
airChain->swaySize = Rand_ZeroOne() * airChain->swayMax;
airChain->swayPhase = RANDU_BITS(16);
airChain->swayPhase = Rand_Next() >> (0x20 - 16);
}
xAccel = Math_SinS(airChain->swayPhase) * airChain->swaySize;
zAccel = Math_CosS(airChain->swayPhase) * airChain->swaySize;
@@ -1032,12 +1032,12 @@ void ObjMine_Water_Chained(ObjMine* this, PlayState* play) {
waterChain->swayMax = 0.003f;
// Chooses a new sway randomly about every 32 frames.
if (RANDU_BITS(5) == 0) {
s16 randAngle = RANDU_BITS(16);
if (Rand_Next() >> (0x20 - 5) == 0) {
s16 randAngle = Rand_Next() >> (0x20 - 16);
waterChain->swayXZ = Math_SinS(randAngle) * 1.8f * waterChain->swayMax;
waterChain->swayY = Math_CosS(randAngle) * 0.2f * waterChain->swayMax;
waterChain->swayPhaseVel = RANDU_BITS(13);
waterChain->swayPhaseVel = Rand_Next() >> (0x20 - 13);
}
ObjMine_Water_UpdateChain(this, play);