Replace old methods with ShipUtils (#5151)

* Replace old methods with ShipUtils

* remove PAL naming

3 files changed, 17 insertions, 45 deletions

diff --git a/soh/src/code/z_kanfont.c b/soh/src/code/z_kanfont.c
index b0b754b89..97ed4294c 100644
--- a/soh/src/code/z_kanfont.c
+++ b/soh/src/code/z_kanfont.c
@@ -7,7 +7,8 @@
 #include "textures/kanji/kanji.h"
 #include "textures/message_static/message_static.h"
 
-static const char* fntTbl[] =
+// #region SOH [Port] Asset tables we can pull from instead of from ROM
+const char* fontTbl[140] =
 {
     gMsgChar20SpaceTex,
     gMsgChar21ExclamationMarkTex,
@@ -4138,6 +4139,7 @@ const char* msgStaticTbl[] =
     gMessageEndSquareTex,
     gMessageArrowTex
 };
+// #endregion
 
 void func_8006EE50(Font* font, u16 character, u16 codePointIndex) {
     // #region SOH [NTSC]
@@ -4159,11 +4161,7 @@ void Font_LoadChar(Font* font, u8 character, u16 codePointIndex) {
                         //__FILE__, __LINE__);
 
     if (character < 0x8B)
-        memcpy(&font->charTexBuf[codePointIndex], fntTbl[character], strlen(fntTbl[character]) + 1);
-}
-
-void* Font_FetchCharTexture(u8 character) {
-    return fntTbl[character];
+        memcpy(&font->charTexBuf[codePointIndex], fontTbl[character], strlen(fontTbl[character]) + 1);
 }
 
 /**
@@ -4207,7 +4205,7 @@ void Font_LoadOrderedFont(Font* font) {
             osSyncPrintf("nes_mes_buf[%d]=%d\n", codePointIndex, font->msgBuf[codePointIndex]);
 
             offset = (font->msgBuf[codePointIndex] - '\x20') * FONT_CHAR_TEX_SIZE;
-            memcpy(fontBuf, fntTbl[offset / FONT_CHAR_TEX_SIZE], strlen(fntTbl[offset / FONT_CHAR_TEX_SIZE]) + 1);
+            memcpy(fontBuf, fontTbl[offset / FONT_CHAR_TEX_SIZE], strlen(fontTbl[offset / FONT_CHAR_TEX_SIZE]) + 1);
             //DmaMgr_SendRequest1(fontBuf, fontStatic + offset, FONT_CHAR_TEX_SIZE, __FILE__, __LINE__);
             fontBufIndex += FONT_CHAR_TEX_SIZE / 8;
         }
diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c
index 4ab76a93b..317f317ca 100644
--- a/soh/src/code/z_message_PAL.c
+++ b/soh/src/code/z_message_PAL.c
@@ -831,10 +831,6 @@ f32 sFontWidths[144] = {
     14.0f, // ?
 };
 
-f32 Message_GetCharacterWidth(unsigned char characterIndex) {
-    return sFontWidths[characterIndex] * (R_TEXT_CHAR_SCALE / 100.0f);
-}
-
 u16 Message_DrawItemIcon(PlayState* play, u16 itemId, Gfx** p, u16 i) {
     s32 pad;
     Gfx* gfx = *p;
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 6df6665ed..a221e570f 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -12,6 +12,7 @@
 #include "soh/Enhancements/custom-message/CustomMessageInterfaceAddon.h"
 #include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
 #include "soh/Enhancements/enhancementTypes.h"
+#include "soh/ShipUtils.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -3591,31 +3592,6 @@ void Interface_DrawMagicBar(PlayState* play) {
 static Vtx sEnemyHealthVtx[16];
 static Mtx sEnemyHealthMtx[2];
 
-// Build vertex coordinates for a quad command
-// In order of top left, top right, bottom left, then bottom right
-// Supports flipping the texture horizontally
-void Interface_CreateQuadVertexGroup(Vtx* vtxList, s32 xStart, s32 yStart, s32 width, s32 height, u8 flippedH) {
-    vtxList[0].v.ob[0] = xStart;
-    vtxList[0].v.ob[1] = yStart;
-    vtxList[0].v.tc[0] = (flippedH ? width : 0) << 5;
-    vtxList[0].v.tc[1] = 0 << 5;
-
-    vtxList[1].v.ob[0] = xStart + width;
-    vtxList[1].v.ob[1] = yStart;
-    vtxList[1].v.tc[0] = (flippedH ? width * 2 : width) << 5;
-    vtxList[1].v.tc[1] = 0 << 5;
-
-    vtxList[2].v.ob[0] = xStart;
-    vtxList[2].v.ob[1] = yStart + height;
-    vtxList[2].v.tc[0] = (flippedH ? width : 0) << 5;
-    vtxList[2].v.tc[1] = height << 5;
-
-    vtxList[3].v.ob[0] = xStart + width;
-    vtxList[3].v.ob[1] = yStart + height;
-    vtxList[3].v.tc[0] = (flippedH ? width * 2 : width) << 5;
-    vtxList[3].v.tc[1] = height << 5;
-}
-
 // Draws an enemy health bar using the magic bar textures and positions it in a similar way to Z-Targeting
 void Interface_DrawEnemyHealthBar(TargetContext* targetCtx, PlayState* play) {
     InterfaceContext* interfaceCtx = &play->interfaceCtx;
@@ -3675,16 +3651,17 @@ void Interface_DrawEnemyHealthBar(TargetContext* targetCtx, PlayState* play) {
         }
 
         // Health bar border end left
-        Interface_CreateQuadVertexGroup(&sEnemyHealthVtx[0], -floorf(halfBarWidth), -texHeight / 2, endTexWidth, texHeight, 0);
+        Ship_CreateQuadVertexGroup(&sEnemyHealthVtx[0], -floorf(halfBarWidth), -texHeight / 2, endTexWidth, texHeight,
+                                   0);
         // Health bar border middle
-        Interface_CreateQuadVertexGroup(&sEnemyHealthVtx[4], -floorf(halfBarWidth) + endTexWidth, -texHeight / 2,
-                                        healthbar_fillWidth, texHeight, 0);
+        Ship_CreateQuadVertexGroup(&sEnemyHealthVtx[4], -floorf(halfBarWidth) + endTexWidth, -texHeight / 2,
+                                   healthbar_fillWidth, texHeight, 0);
         // Health bar border end right
-        Interface_CreateQuadVertexGroup(&sEnemyHealthVtx[8], ceilf(halfBarWidth) - endTexWidth, -texHeight / 2, endTexWidth,
-                                        texHeight, 1);
+        Ship_CreateQuadVertexGroup(&sEnemyHealthVtx[8], ceilf(halfBarWidth) - endTexWidth, -texHeight / 2, endTexWidth,
+                                   texHeight, 1);
         // Health bar fill
-        Interface_CreateQuadVertexGroup(&sEnemyHealthVtx[12], -floorf(halfBarWidth) + endTexWidth, (-texHeight / 2) + 3,
-                                        healthBarFill, 7, 0);
+        Ship_CreateQuadVertexGroup(&sEnemyHealthVtx[12], -floorf(halfBarWidth) + endTexWidth, (-texHeight / 2) + 3,
+                                   healthBarFill, 7, 0);
 
         if (((!(player->stateFlags1 & PLAYER_STATE1_TALKING)) || (actor != player->focusActor)) && targetCtx->unk_44 < 500.0f) {
             f32 slideInOffsetY = 0;
@@ -6713,11 +6690,12 @@ uint16_t Interface_DrawTextLine(GraphicsContext* gfx, char text[], int16_t x, in
             textureIndex = processedText[i] - 32;
 
             if (textureIndex != 0) {
-                texture = Font_FetchCharTexture(textureIndex);
+                texture = Ship_GetCharFontTexture(processedText[i]);
                 Interface_DrawTextCharacter(gfx, x + kerningOffset, y + lineOffset, texture, colorR, colorG, colorB,
                                             colorA, textScale, textShadow);
             }
-            kerningOffset += (uint16_t)(Message_GetCharacterWidth(textureIndex) * textScale);
+            kerningOffset +=
+                (uint16_t)(Ship_GetCharFontWidth(processedText[i]) * (R_TEXT_CHAR_SCALE / 100.0f) * textScale);
         }
     }