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

9 files changed, 19 insertions, 19 deletions

diff --git a/src/libultra_boot_O2/_Ldtob.c b/src/libultra_boot_O2/_Ldtob.c
index f7a6d1208..cc518a44b 100644
--- a/src/libultra_boot_O2/_Ldtob.c
+++ b/src/libultra_boot_O2/_Ldtob.c
@@ -9,13 +9,13 @@ const f64 D_800122E0[] = { 10e0L, 10e1L, 10e3L, 10e7L, 10e15L, 10e31L, 10e63L, 1
 
 /* float properties */
 #define _D0 0
-#define _DBIAS 0x3ff
+#define _DBIAS 0x3FF
 #define _DLONG 1
 #define _DOFF 4
-#define _FBIAS 0x7e
+#define _FBIAS 0x7E
 #define _FOFF 7
 #define _FRND 1
-#define _LBIAS 0x3ffe
+#define _LBIAS 0x3FFE
 #define _LOFF 15
 /* integer properties */
 #define _C2 1
@@ -26,7 +26,7 @@ const f64 D_800122E0[] = { 10e0L, 10e1L, 10e3L, 10e7L, 10e15L, 10e31L, 10e63L, 1
 #define INF 1
 #define FINITE -1
 #define _DFRAC ((1 << _DOFF) - 1)
-#define _DMASK (0x7fff & ~_DFRAC)
+#define _DMASK (0x7FFF & ~_DFRAC)
 #define _DMAX ((1 << (15 - _DOFF)) - 1)
 #define _DNAN (0x8000 | _DMAX << _DOFF | 1 << (_DOFF - 1))
 #define _DSIGN 0x8000
diff --git a/src/libultra_boot_O2/__osEPiRawStartDma.c b/src/libultra_boot_O2/__osEPiRawStartDma.c
index 924648448..5ae4d9c30 100644
--- a/src/libultra_boot_O2/__osEPiRawStartDma.c
+++ b/src/libultra_boot_O2/__osEPiRawStartDma.c
@@ -53,7 +53,7 @@ s32 __osEPiRawStartDma(OSPiHandle* handle, s32 direction, u32 cartAddr, void* dr
     }
 
     HW_REG(PI_DRAM_ADDR_REG, void*) = (void*)osVirtualToPhysical(dramAddr);
-    HW_REG(PI_CART_ADDR_REG, void*) = (void*)((handle->baseAddress | cartAddr) & 0x1fffffff);
+    HW_REG(PI_CART_ADDR_REG, void*) = (void*)((handle->baseAddress | cartAddr) & 0x1FFFFFFF);
 
     switch (direction) {
         case OS_READ:
diff --git a/src/libultra_boot_O2/__osPiRawStartDma.c b/src/libultra_boot_O2/__osPiRawStartDma.c
index 8fda51351..f2c0a8488 100644
--- a/src/libultra_boot_O2/__osPiRawStartDma.c
+++ b/src/libultra_boot_O2/__osPiRawStartDma.c
@@ -9,7 +9,7 @@ s32 __osPiRawStartDma(s32 dir, u32 cartAddr, void* dramAddr, size_t size) {
 
     HW_REG(PI_DRAM_ADDR_REG, void*) = (void*)osVirtualToPhysical(dramAddr);
 
-    HW_REG(PI_CART_ADDR_REG, void*) = (void*)((osRomBase | cartAddr) & 0x1fffffff);
+    HW_REG(PI_CART_ADDR_REG, void*) = (void*)((osRomBase | cartAddr) & 0x1FFFFFFF);
 
     switch (dir) {
         case OS_READ:
diff --git a/src/libultra_boot_O2/__osViSwapContext.c b/src/libultra_boot_O2/__osViSwapContext.c
index aeadb75af..d82d5cce6 100644
--- a/src/libultra_boot_O2/__osViSwapContext.c
+++ b/src/libultra_boot_O2/__osViSwapContext.c
@@ -17,14 +17,14 @@ void __osViSwapContext(void) {
     s2 = osVirtualToPhysical(viNext->buffer);
     origin = (viMode->fldRegs[field].origin) + s2;
     if (viNext->state & 2) {
-        viNext->x.scale |= viMode->comRegs.xScale & ~0xfff;
+        viNext->x.scale |= viMode->comRegs.xScale & ~0xFFF;
     } else {
         viNext->x.scale = viMode->comRegs.xScale;
     }
     if (viNext->state & 4) {
-        sp34 = (u32)(viMode->fldRegs[field].yScale & 0xfff);
+        sp34 = (u32)(viMode->fldRegs[field].yScale & 0xFFF);
         viNext->y.scale = viNext->y.factor * sp34;
-        viNext->y.scale |= viMode->fldRegs[field].yScale & ~0xfff;
+        viNext->y.scale |= viMode->fldRegs[field].yScale & ~0xFFF;
     } else {
         viNext->y.scale = viMode->fldRegs[field].yScale;
     }
@@ -40,7 +40,7 @@ void __osViSwapContext(void) {
         origin = osVirtualToPhysical(viNext->buffer);
     }
     if (viNext->state & 0x80) {
-        viNext->y.scale = (viNext->y.offset << 0x10) & 0x3ff0000;
+        viNext->y.scale = (viNext->y.offset << 0x10) & 0x3FF0000;
         origin = osVirtualToPhysical(viNext->buffer);
     }
     HW_REG(VI_ORIGIN_REG, u32) = origin;
diff --git a/src/libultra_boot_O2/osCartRomInit.c b/src/libultra_boot_O2/osCartRomInit.c
index ff5dc8292..f87d3bd05 100644
--- a/src/libultra_boot_O2/osCartRomInit.c
+++ b/src/libultra_boot_O2/osCartRomInit.c
@@ -22,7 +22,7 @@ OSPiHandle* osCartRomInit(void) {
 
     D_8000AF10 = 0;
     __CartRomHandle.type = DEVICE_TYPE_CART;
-    __CartRomHandle.baseAddress = 0xb0000000;
+    __CartRomHandle.baseAddress = 0xB0000000;
     __CartRomHandle.domain = 0;
     __CartRomHandle.speed = 0;
     bzero(&__CartRomHandle.transferInfo, sizeof(__OSTranxInfo));
@@ -36,10 +36,10 @@ OSPiHandle* osCartRomInit(void) {
     lastRelDuration = HW_REG(PI_BSD_DOM1_RLS_REG, u32);
     lastPulse = HW_REG(PI_BSD_DOM1_PWD_REG, u32);
 
-    HW_REG(PI_BSD_DOM1_LAT_REG, u32) = 0xff;
+    HW_REG(PI_BSD_DOM1_LAT_REG, u32) = 0xFF;
     HW_REG(PI_BSD_DOM1_PGS_REG, u32) = 0;
     HW_REG(PI_BSD_DOM1_RLS_REG, u32) = 3;
-    HW_REG(PI_BSD_DOM1_PWD_REG, u32) = 0xff;
+    HW_REG(PI_BSD_DOM1_PWD_REG, u32) = 0xFF;
 
     a = HW_REG(__CartRomHandle.baseAddress, u32);
     __CartRomHandle.latency = a & 0xFF;
diff --git a/src/libultra_boot_O2/osDriveRomInit.c b/src/libultra_boot_O2/osDriveRomInit.c
index af478f0e9..a9f2ea02b 100644
--- a/src/libultra_boot_O2/osDriveRomInit.c
+++ b/src/libultra_boot_O2/osDriveRomInit.c
@@ -17,7 +17,7 @@ OSPiHandle* osDriveRomInit(void) {
 
     D_8000AC70 = 0;
     __DriveRomHandle.type = DEVICE_TYPE_BULK;
-    __DriveRomHandle.baseAddress = 0xa6000000;
+    __DriveRomHandle.baseAddress = 0xA6000000;
     __DriveRomHandle.domain = 0;
     __DriveRomHandle.speed = 0;
     bzero(&__DriveRomHandle.transferInfo, sizeof(__OSTranxInfo));
@@ -26,10 +26,10 @@ OSPiHandle* osDriveRomInit(void) {
         ;
     }
 
-    HW_REG(PI_BSD_DOM1_LAT_REG, u32) = 0xff;
+    HW_REG(PI_BSD_DOM1_LAT_REG, u32) = 0xFF;
     HW_REG(PI_BSD_DOM1_PGS_REG, u32) = 0;
     HW_REG(PI_BSD_DOM1_RLS_REG, u32) = 3;
-    HW_REG(PI_BSD_DOM1_PWD_REG, u32) = 0xff;
+    HW_REG(PI_BSD_DOM1_PWD_REG, u32) = 0xFF;
 
     a = HW_REG(__DriveRomHandle.baseAddress, u32);
     __DriveRomHandle.latency = a & 0xFF;
diff --git a/src/libultra_boot_O2/osEPiStartDma.c b/src/libultra_boot_O2/osEPiStartDma.c
index 7547fb695..41b39caa9 100644
--- a/src/libultra_boot_O2/osEPiStartDma.c
+++ b/src/libultra_boot_O2/osEPiStartDma.c
@@ -10,7 +10,7 @@ s32 osEPiStartDma(OSPiHandle* handle, OSIoMesg* mb, s32 direction) {
 
     mb->piHandle = handle;
     if (direction == OS_READ) {
-        mb->hdr.type = 0xf;
+        mb->hdr.type = 0xF;
     } else {
         mb->hdr.type = 0x10;
     }
diff --git a/src/libultra_boot_O2/osViSetXScale.c b/src/libultra_boot_O2/osViSetXScale.c
index 21b4f7aea..aeeb5e784 100644
--- a/src/libultra_boot_O2/osViSetXScale.c
+++ b/src/libultra_boot_O2/osViSetXScale.c
@@ -7,7 +7,7 @@ void osViSetXScale(f32 value) {
     __osViNext->x.factor = value;
     __osViNext->state |= 0x2;
 
-    nomValue = __osViNext->modep->comRegs.xScale & 0xfff;
+    nomValue = __osViNext->modep->comRegs.xScale & 0xFFF;
     __osViNext->x.scale = (u32)(__osViNext->x.factor * nomValue) & 0xFFF;
 
     __osRestoreInt(prevInt);
diff --git a/src/libultra_boot_O2/vimgr.c b/src/libultra_boot_O2/vimgr.c
index c195bbf4c..b57b48d3b 100644
--- a/src/libultra_boot_O2/vimgr.c
+++ b/src/libultra_boot_O2/vimgr.c
@@ -5,7 +5,7 @@ typedef struct {
     u16 unk00;
     u8 unk02;
     u32 unk04;
-    u8 pad[0xc];
+    u8 pad[0xC];
     u16 unk14;
     u16 unk16;
 } viMesgStruct;