summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDragorn421 <Dragorn421@users.noreply.github.com>2024-06-25 00:39:08 +0200
committerGitHub <noreply@github.com>2024-06-24 18:39:08 -0400
commit2ce4742bf69faebb16ea1710c4d4e7902b1be0f1 (patch)
treefd512e9dca50980936ab32ea30a10575be2879d7 /include
parent4dc70fefeee8f6b587aa611da580141c6b9ea4be (diff)
Fix misc 22 (#1971)
* remove trailing whitespace * fix/docbug about dright for next page of fault menu * // size = ...; -> // size = ... * access `ColliderJntSph.elements` as an array * fixup doc in PreRender.c * empty line after decl * gdSPDefLights1 xyz arguments for direction are signed 8bit values * doc bug of bad use of free in EffDust actor * decimal for Actor.colorFilterTimer * shopItemEntries -> sShopItemEntries * HEISHI4_AT_KAKRIKO_ENTRANCE -> HEISHI4_AT_KAKARIKO_ENTRANCE * format
Diffstat (limited to 'include')
-rw-r--r--include/audiothread_cmd.h2
-rw-r--r--include/z64animation.h8
-rw-r--r--include/z64player.h6
-rw-r--r--include/z64transition_instances.h4
4 files changed, 10 insertions, 10 deletions
diff --git a/include/audiothread_cmd.h b/include/audiothread_cmd.h
index 3ec2cdeba..ab0ea1c17 100644
--- a/include/audiothread_cmd.h
+++ b/include/audiothread_cmd.h
@@ -428,7 +428,7 @@ typedef enum {
/**
* Unmute all sequence players
*
- * @param restartNotes (s32) if set to 1, then notes with the `MUTE_BEHAVIOR_STOP_SAMPLES` flag set
+ * @param restartNotes (s32) if set to 1, then notes with the `MUTE_BEHAVIOR_STOP_SAMPLES` flag set
* are marked as finished for all seqPlayers
*/
#define AUDIOCMD_GLOBAL_UNMUTE(restartNotes) \
diff --git a/include/z64animation.h b/include/z64animation.h
index 1851defc5..2be8a5a21 100644
--- a/include/z64animation.h
+++ b/include/z64animation.h
@@ -88,7 +88,7 @@ typedef enum {
/* 1 */ ANIMTAPER_ACCEL
} AnimationTapers;
-// This flag seems like it was intended to be paired with `ANIM_FLAG_UPDATE_Y` to control
+// This flag seems like it was intended to be paired with `ANIM_FLAG_UPDATE_Y` to control
// XZ movement based on the current animation.
// However, this flag is not checked by the Skelanime system. XZ movement will always occur
// regardless of the current state of this flag, as long as the "Actor Move" Anim Task is in use.
@@ -102,16 +102,16 @@ typedef enum {
#define ANIM_FLAG_UPDATE_Y (1 << 1)
// (player-only) Related to scaling an animation from/to child/adult
-#define ANIM_FLAG_PLAYER_2 (1 << 2)
+#define ANIM_FLAG_PLAYER_2 (1 << 2)
// (player-only) Call AnimTaskQueue_AddActorMove
-#define ANIM_FLAG_PLAYER_SETMOVE (1 << 3)
+#define ANIM_FLAG_PLAYER_SETMOVE (1 << 3)
//
#define ANIM_FLAG_NO_MOVE (1 << 4)
// (player-only)
-#define ANIM_FLAG_PLAYER_7 (1 << 7)
+#define ANIM_FLAG_PLAYER_7 (1 << 7)
typedef struct SkelAnime {
/* 0x00 */ u8 limbCount; // Number of limbs in the skeleton
diff --git a/include/z64player.h b/include/z64player.h
index 6f6239251..979afd744 100644
--- a/include/z64player.h
+++ b/include/z64player.h
@@ -786,7 +786,7 @@ typedef struct Player {
/* 0x0450 */ Vec3f unk_450;
/* 0x045C */ Vec3f unk_45C;
/* 0x0468 */ char unk_468[0x002];
- /* 0x046A */ union {
+ /* 0x046A */ union {
s16 haltActorsDuringCsAction; // If true, halt actors belonging to certain categories during a `csAction`
s16 slidingDoorBgCamIndex; // `BgCamIndex` used during a sliding door cutscene
} cv; // "Cutscene Variable": context dependent variable that has different meanings depending on what function is called
@@ -848,11 +848,11 @@ typedef struct Player {
/* 0x0847 */ s8 controlStickSpinAngles[4]; // Stores a modified version of the control stick angle for the last 4 frames. Used for checking spins.
/* 0x084B */ s8 controlStickDirections[4]; // Stores the control stick direction (relative to shape yaw) for the last 4 frames. See `PlayerStickDirection`.
- /* 0x084F */ union {
+ /* 0x084F */ union {
s8 actionVar1;
} av1; // "Action Variable 1": context dependent variable that has different meanings depending on what action is currently running
- /* 0x0850 */ union {
+ /* 0x0850 */ union {
s16 actionVar2;
} av2; // "Action Variable 2": context dependent variable that has different meanings depending on what action is currently running
diff --git a/include/z64transition_instances.h b/include/z64transition_instances.h
index c8fd3f16c..1d08ab34b 100644
--- a/include/z64transition_instances.h
+++ b/include/z64transition_instances.h
@@ -88,7 +88,7 @@ typedef struct {
/* 0x060 */ Mtx lookAt;
/* 0x0A0 */ void* texture;
/* 0x0A8 */ Mtx modelView[2][3];
-} TransitionCircle; // size = 0x228;
+} TransitionCircle; // size = 0x228
typedef struct {
/* 0x000 */ Color_RGBA8_u32 color;
@@ -99,6 +99,6 @@ typedef struct {
/* 0x018 */ Mtx projection;
/* 0x058 */ s32 frame;
/* 0x060 */ Mtx modelView[2][3];
-} TransitionTriforce; // size = 0x1E0;
+} TransitionTriforce; // size = 0x1E0
#endif