From 6efb59069962abeeaa2ebf1d959cd344ed2aacb9 Mon Sep 17 00:00:00 2001
From: Roman971 <32455037+Roman971@users.noreply.github.com>
Date: Fri, 26 Nov 2021 23:37:33 +0100
Subject: 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
---
 src/libultra_code_O2/__osContAddressCrc.c | 2 +-
 src/libultra_code_O2/__osContRamWrite.c   | 4 ++--
 src/libultra_code_O2/cosf.c               | 2 +-
 src/libultra_code_O2/guLookAtHilite.c     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/libultra_code_O2')

diff --git a/src/libultra_code_O2/__osContAddressCrc.c b/src/libultra_code_O2/__osContAddressCrc.c
index d22668d14..c1af0b12c 100644
--- a/src/libultra_code_O2/__osContAddressCrc.c
+++ b/src/libultra_code_O2/__osContAddressCrc.c
@@ -28,7 +28,7 @@ u8 __osContAddressCrc(u16 addr) {
         }
     }
 
-    return ret & 0x1f;
+    return ret & 0x1F;
 }
 
 u8 __osContDataCrc(u8* data) {
diff --git a/src/libultra_code_O2/__osContRamWrite.c b/src/libultra_code_O2/__osContRamWrite.c
index d65f86a19..e27c03227 100644
--- a/src/libultra_code_O2/__osContRamWrite.c
+++ b/src/libultra_code_O2/__osContRamWrite.c
@@ -27,11 +27,11 @@ s32 __osContRamWrite(OSMesgQueue* mq, s32 channel, u16 address, u8* buffer, s32
 
             gPifMempakBuf.status = 1;
 
-            ((__OSContRamHeader*)ptr)->unk_00 = 0xff;
+            ((__OSContRamHeader*)ptr)->unk_00 = 0xFF;
             ((__OSContRamHeader*)ptr)->txsize = 35;
             ((__OSContRamHeader*)ptr)->rxsize = 1;
             ((__OSContRamHeader*)ptr)->poll = CONT_CMD_WRITE_MEMPACK;
-            ((__OSContRamHeader*)ptr)->datacrc = 0xff;
+            ((__OSContRamHeader*)ptr)->datacrc = 0xFF;
 
             ptr[sizeof(__OSContRamHeader)] = CONT_CMD_END;
         } else {
diff --git a/src/libultra_code_O2/cosf.c b/src/libultra_code_O2/cosf.c
index 1d9c7e83d..cae7159ea 100644
--- a/src/libultra_code_O2/cosf.c
+++ b/src/libultra_code_O2/cosf.c
@@ -3,7 +3,7 @@
 
 static const du P[] = {
     { 0x3FF00000, 0x00000000 }, { 0xBFC55554, 0xBC83656D }, { 0x3F8110ED, 0x3804C2A0 },
-    { 0xBF29f6FF, 0xEEA56814 }, { 0x3EC5DBDF, 0x0E314BFE },
+    { 0xBF29F6FF, 0xEEA56814 }, { 0x3EC5DBDF, 0x0E314BFE },
 };
 
 static const du rpi = { 0x3FD45F30, 0x6DC9C883 };
diff --git a/src/libultra_code_O2/guLookAtHilite.c b/src/libultra_code_O2/guLookAtHilite.c
index ebb915724..d1070b579 100644
--- a/src/libultra_code_O2/guLookAtHilite.c
+++ b/src/libultra_code_O2/guLookAtHilite.c
@@ -1,6 +1,6 @@
 #include "global.h"
 
-#define FTOFRAC8(x) ((s32)MIN(((x) * (128.0f)), 127.0f) & 0xff)
+#define FTOFRAC8(x) ((s32)MIN(((x) * (128.0f)), 127.0f) & 0xFF)
 
 /**
  * guLookAtHiliteF
-- 
cgit v1.2.3