From 1bc3e886c5894e607b060ec1dc73ebe40495a7d5 Mon Sep 17 00:00:00 2001
From: Cuyler36 <24523422+Cuyler36@users.noreply.github.com>
Date: Sun, 28 Jul 2024 12:41:48 -0400
Subject: [PATCH] Use mbi segment macros

---
 include/libforest/gbi_extensions.h         | 31 ++++++++++------------
 src/static/libforest/emu64/emu64_print.cpp |  2 +-
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/include/libforest/gbi_extensions.h b/include/libforest/gbi_extensions.h
index a877bfe9..4cde0755 100644
--- a/include/libforest/gbi_extensions.h
+++ b/include/libforest/gbi_extensions.h
@@ -22,24 +22,21 @@ extern "C" {
 #define ANIME_4_TXT_SIZE 0x800
 #define ANIME_6_MODEL_SIZE 0x408
 
-#define SEGMENT_SHIFT 24
+#define SEG_EQUALS(seg_addr, seg) (seg_addr == SEGMENT_ADDR(seg, 0))
 
-#define SEG_2_SEGADDR(seg) (seg << SEGMENT_SHIFT)
-#define SEG_EQUALS(seg_addr, seg) (seg_addr == SEG_2_SEGADDR(seg))
-
-#define softsprite_mtx SEG_2_SEGADDR(SOFTSPRITE_MTX_SEG)
-#define anime_1_txt SEG_2_SEGADDR(ANIME_1_TXT_SEG)
-#define anime_1_model SEG_2_SEGADDR(ANIME_1_TXT_SEG)
-#define anime_2_txt SEG_2_SEGADDR(ANIME_2_TXT_SEG)
-#define anime_2_model SEG_2_SEGADDR(ANIME_2_TXT_SEG)
-#define anime_3_txt SEG_2_SEGADDR(ANIME_3_TXT_SEG)
-#define anime_3_model SEG_2_SEGADDR(ANIME_3_TXT_SEG)
-#define anime_4_txt SEG_2_SEGADDR(ANIME_4_TXT_SEG)
-#define anime_4_model SEG_2_SEGADDR(ANIME_4_TXT_SEG)
-#define anime_5_txt SEG_2_SEGADDR(ANIME_5_TXT_SEG)
-#define anime_5_model SEG_2_SEGADDR(ANIME_5_TXT_SEG)
-#define anime_6_txt SEG_2_SEGADDR(ANIME_6_TXT_SEG)
-#define anime_6_model SEG_2_SEGADDR(ANIME_6_TXT_SEG)
+#define softsprite_mtx SEGMENT_ADDR(SOFTSPRITE_MTX_SEG, 0)
+#define anime_1_txt SEGMENT_ADDR(ANIME_1_TXT_SEG, 0)
+#define anime_1_model SEGMENT_ADDR(ANIME_1_TXT_SEG, 0)
+#define anime_2_txt SEGMENT_ADDR(ANIME_2_TXT_SEG, 0)
+#define anime_2_model SEGMENT_ADDR(ANIME_2_TXT_SEG, 0)
+#define anime_3_txt SEGMENT_ADDR(ANIME_3_TXT_SEG, 0)
+#define anime_3_model SEGMENT_ADDR(ANIME_3_TXT_SEG, 0)
+#define anime_4_txt SEGMENT_ADDR(ANIME_4_TXT_SEG, 0)
+#define anime_4_model SEGMENT_ADDR(ANIME_4_TXT_SEG, 0)
+#define anime_5_txt SEGMENT_ADDR(ANIME_5_TXT_SEG, 0)
+#define anime_5_model SEGMENT_ADDR(ANIME_5_TXT_SEG, 0)
+#define anime_6_txt SEGMENT_ADDR(ANIME_6_TXT_SEG, 0)
+#define anime_6_model SEGMENT_ADDR(ANIME_6_TXT_SEG, 0)
 
 /* New Microcode Command Ids */
 #define G_TRIN 0x09
diff --git a/src/static/libforest/emu64/emu64_print.cpp b/src/static/libforest/emu64/emu64_print.cpp
index 1da4bda2..05969f7e 100644
--- a/src/static/libforest/emu64/emu64_print.cpp
+++ b/src/static/libforest/emu64/emu64_print.cpp
@@ -61,7 +61,7 @@ const char* emu64::segchk(u32 segment) {
         } else if (SEG_EQUALS(segment, ANIME_6_TXT_SEG)) {
             s = "anime_6_model";
         } else if (segment > anime_4_txt && segment < (anime_4_txt + ANIME_4_TXT_SIZE)) {
-            snprintf(buf, sizeof(buf) - 1, str0, segment - SEG_2_SEGADDR(ANIME_4_TXT_SEG));
+            snprintf(buf, sizeof(buf) - 1, str0, segment - anime_4_txt);
             s = buf;
         } else {
             if (segment > anime_6_model && segment < (anime_6_model + ANIME_6_MODEL_SIZE)) {