summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMegaMech <MegaMech@users.noreply.github.com>2024-06-11 09:49:44 -0600
committerGitHub <noreply@github.com>2024-06-11 09:49:44 -0600
commitb594f112e05c46fa4f8da2e4be74ba1a28ee50b4 (patch)
tree5b15245bb14120a8acac7c57ed4936525a5ed8d7 /include
parent78a7d156c9a080fab1c530d2aa8210c6d4cf5596 (diff)
Update lus (#16)
* Updates
Diffstat (limited to 'include')
-rw-r--r--include/common_structs.h2
-rw-r--r--include/course.h2
-rw-r--r--include/defines.h4
-rw-r--r--include/mk64.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/include/common_structs.h b/include/common_structs.h
index 7726cace8..347d14c6b 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -372,7 +372,7 @@ typedef struct {
/* 0x023C */ f32 unk_23C;
/* 0x0240 */ s32 unk_240;
/* 0x0244 */ u16 animFrameSelector[4]; // [0] Active texture group
- /* 0x024C */ u16 animGroupSelector[4];
+ /* 0x024C */ u16 animGroupSelector[4]; // Based on screen
/* 0x0254 */ u16 characterId;
/* 0x0256 */ u16 unk_256;
/* 0x0258 */ UnkPlayerStruct258 unk_258[40];
diff --git a/include/course.h b/include/course.h
index 60c70744a..511916ac2 100644
--- a/include/course.h
+++ b/include/course.h
@@ -10,7 +10,7 @@
*/
typedef struct {
- Gfx *addr;
+ uintptr_t addr;
u8 surfaceType;
u8 sectionId;
u16 flags;
diff --git a/include/defines.h b/include/defines.h
index c575ffb85..cd59cd740 100644
--- a/include/defines.h
+++ b/include/defines.h
@@ -42,8 +42,8 @@
#define DEBUG_MODE 1
#define DEBUG_MENU 2
#else
- #define DEBUG_MODE 0
- #define DEBUG_MENU 1
+ #define DEBUG_MODE 1
+ #define DEBUG_MENU 2
#endif
#define HOLD_ALL_DPAD_AND_C_BUTTONS (U_JPAD | L_JPAD | R_JPAD | D_JPAD | U_CBUTTONS | L_CBUTTONS | R_CBUTTONS | D_CBUTTONS)
diff --git a/include/mk64.h b/include/mk64.h
index 0196f7e98..96628edc6 100644
--- a/include/mk64.h
+++ b/include/mk64.h
@@ -97,7 +97,7 @@ enum SURFACE_TYPE {
/* 0xFF */ RAMP // Koopa Troopa beach
};
-#define GFX_GET_OPCODE(var) ((uintptr_t)((var) & 0xFF000000))
+#define GFX_GET_OPCODE(var) ((uint32_t)((var) & 0xFF000000))
// Pointer casting is technically UB, and avoiding it gets rid of endian issues
// as well as a nice side effect.