Various minor cleanups (#1029)

* Fix some disp usage in EffectSsGMagma2

* Fix some incorrect SAC flags

* Remove some instances where bool was used

* Fix a few line numbers to be decimal

* Remove MatrixInternal and use Mtx instead

* Fix gs flag names to be plural for consistency

* Fix some hex numbers to be uppercase

* Fix instances of 0X for hex numbers

5 files changed, 13 insertions, 14 deletions

diff --git a/include/functions.h b/include/functions.h
index 68f0acdd9..95a23c49d 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -2142,8 +2142,8 @@ s32 GfxPrint_Printf(GfxPrint*, const char*, ...);
 void func_800FBCE0();
 void func_800FBFD8(void);
 void* Overlay_AllocateAndLoad(u32 vRomStart, u32 vRomEnd, void* vRamStart, void* vRamEnd);
-void MtxConv_F2L(MatrixInternal* m1, MtxF* m2);
-void MtxConv_L2F(MtxF* m1, MatrixInternal* m2);
+void MtxConv_F2L(Mtx* m1, MtxF* m2);
+void MtxConv_L2F(MtxF* m1, Mtx* m2);
 void Overlay_Relocate(void* allocatedVRamAddress, OverlayRelocationSection* overlayInfo, void* vRamAddress);
 s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void* vRamStart, void* vRamEnd, void* allocatedVRamAddress);
 // ? func_800FC800(?);
@@ -2206,9 +2206,9 @@ void Rand_Seed_Variable(u32* rndNum, u32 seed);
 u32 Rand_Next_Variable(u32* rndNum);
 f32 Rand_ZeroOne_Variable(u32* rndNum);
 f32 Rand_Centered_Variable(u32* rndNum);
-bool ArenaImpl_GetFillAllocBlock(Arena* arena);
-bool ArenaImpl_GetFillFreeBlock(Arena* arena);
-bool ArenaImpl_GetCheckFreeBlock(Arena* arena);
+u32 ArenaImpl_GetFillAllocBlock(Arena* arena);
+u32 ArenaImpl_GetFillFreeBlock(Arena* arena);
+u32 ArenaImpl_GetCheckFreeBlock(Arena* arena);
 void ArenaImpl_SetFillAllocBlock(Arena* arena);
 void ArenaImpl_SetFillFreeBlock(Arena* arena);
 void ArenaImpl_SetCheckFreeBlock(Arena* arena);
diff --git a/include/macros.h b/include/macros.h
index a47fd9a83..013a820ad 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -56,9 +56,9 @@
 #define CHECK_DUNGEON_ITEM(item, dungeonIndex) (gSaveContext.inventory.dungeonItems[dungeonIndex] & gBitFlags[item])
 
 #define GET_GS_FLAGS(index) \
-    ((gSaveContext.gsFlags[(index) >> 2] & gGsFlagsMask[(index) & 3]) >> gGsFlagsShift[(index) & 3])
+    ((gSaveContext.gsFlags[(index) >> 2] & gGsFlagsMasks[(index) & 3]) >> gGsFlagsShifts[(index) & 3])
 #define SET_GS_FLAGS(index, value) \
-    (gSaveContext.gsFlags[(index) >> 2] |= (value) << gGsFlagsShift[(index) & 3])
+    (gSaveContext.gsFlags[(index) >> 2] |= (value) << gGsFlagsShifts[(index) & 3])
 
 #define HIGH_SCORE(score) (gSaveContext.highScores[score])
 
diff --git a/include/ultra64/types.h b/include/ultra64/types.h
index 4545e98ba..6874a5209 100644
--- a/include/ultra64/types.h
+++ b/include/ultra64/types.h
@@ -26,6 +26,10 @@ typedef double f64;
 typedef long int Mtx_t[4][4];
 typedef union {
     Mtx_t m;
+    struct {
+        u16 intPart[4][4];
+        u16 fracPart[4][4];
+    };
     long long int forc_structure_alignment;
 } Mtx;
 
diff --git a/include/variables.h b/include/variables.h
index cbd37e4f3..889f91d68 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -187,8 +187,8 @@ extern u32 gUpgradeNegMasks[8];
 extern u8 gEquipShifts[4];
 extern u8 gUpgradeShifts[8];
 extern u16 gUpgradeCapacities[8][4];
-extern u32 gGsFlagsMask[4];
-extern u32 gGsFlagsShift[4];
+extern u32 gGsFlagsMasks[4];
+extern u32 gGsFlagsShifts[4];
 extern void* gItemIcons[0x82];
 extern u8 gItemSlots[56];
 extern void (*gSceneCmdHandlers[26])(GlobalContext*, SceneCmd*);
diff --git a/include/z64.h b/include/z64.h
index a53ac315a..d8eb8551c 100644
--- a/include/z64.h
+++ b/include/z64.h
@@ -1969,11 +1969,6 @@ typedef struct {
 } SpeedMeterTimeEntry; // size = 0x08
 
 typedef struct {
-    /* 0x00 */ u16 intPart[4][4];
-    /* 0x20 */ u16 fracPart[4][4];
-} MatrixInternal; // size = 0x40
-
-typedef struct {
     /* 0x00 */ u32 value;
     /* 0x04 */ const char* name;
 } F3dzexConst; // size = 0x8