From cc6a7caad3e4e3b4a4c3aa4109edc9e241502783 Mon Sep 17 00:00:00 2001
From: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>
Date: Wed, 11 May 2022 18:07:57 +0200
Subject: [PATCH] Fix hardcoded segment addresses (#5)

---
 libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp | 4 +++-
 soh/src/code/z_vismono.c                        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
index ec27f33c3..6d3a5a5bc 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
@@ -46,6 +46,8 @@ extern "C" {
 
 using namespace std;
 
+#define SEG_ADDR(seg, addr) (addr | (seg << 24) | 1)
+
 #define SUPPORT_CHECK(x) assert(x)
 
 // SCALE_M_N: upscale/downscale M-bit integer to N-bit
@@ -2149,7 +2151,7 @@ static void gfx_run_dl(Gfx* cmd) {
                 uintptr_t mtxAddr = cmd->words.w1;
 
                 // OTRTODO: Temp way of dealing with gMtxClear. Need something more elegant in the future...
-                if (mtxAddr == 0xF012DB20 || mtxAddr == 0xF012DB40)
+                if (mtxAddr == SEG_ADDR(0, 0x12DB20) || mtxAddr == SEG_ADDR(0, 0x12DB40))
                     mtxAddr = clearMtx;
 
 #ifdef F3DEX_GBI_2
diff --git a/soh/src/code/z_vismono.c b/soh/src/code/z_vismono.c
index 82acc9a17..2af876ad6 100644
--- a/soh/src/code/z_vismono.c
+++ b/soh/src/code/z_vismono.c
@@ -42,7 +42,7 @@ Gfx* VisMono_DrawTexture(VisMono* this, Gfx* gfx)
     s32 y;
     s32 height = 3;
     //u16* tex = D_0F000000;
-    u16* tex = 0xFF000000;
+    u16* tex = SEG_ADDR(0xF, 0);
 
     gDPPipeSync(gfx++);
     gDPSetOtherMode(gfx++,