Small changes to FontDrawMessageMtx custom command handler

Author: Zephiles

ttyd-tools/rel/include/assembly.h

@@ -21,7 +21,7 @@ void asmFixEvtMapBlendSetFlagPartnerCrash();
 void asmFixEvtMapBlendSetFlagFollowerCrash();
 void asmFallThroughMostObjectsStandard();
 void asmFallThroughMostObjectsBowser();
-void asmFontDrawMessageMtxHandleCol();
+void asmFontDrawMessageMtxHandleCommand();
 
 #ifdef TTYD_JP
 void asmBacktraceScreenIncrementYPos();
@@ -53,7 +53,7 @@ void *fallThroughMostObjects(void *ptr);
 
 // draw.cpp
 bool disableDPadOptionsDisplay(uint16_t unkVar);
-bool fontDrawMessageMtxHandleCol(const char *command, const char *colorString);
+bool fontDrawMessageMtxHandleCommand(const char *command, const char *commandValueString);
 
 // Misc assembly functions
 bool asmErrorHandlerCheckPairedSinglesEnabled();

ttyd-tools/rel/source/assembly/FontDrawMessageMtxHandleCol.s renamed to ttyd-tools/rel/source/assembly/FontDrawMessageMtxHandleCommand.s

@@ -1,4 +1,4 @@
-.global asmFontDrawMessageMtxHandleCol
+.global asmFontDrawMessageMtxHandleCommand
 
 #ifdef TTYD_US
 AddressToJumpTo = 0x80075D84
@@ -8,17 +8,17 @@ AddressToJumpTo = 0x80074AC0
 AddressToJumpTo = 0x80077040
 #endif
 
-asmFontDrawMessageMtxHandleCol:
+asmFontDrawMessageMtxHandleCommand:
 # Restore the original instruction
 mr %r24,%r0
 
 stwu %sp,-0x10(%sp)
 mflr %r0
 stw %r0,0x14(%sp)
 
-addi %r3,%sp,0x180 # command
-addi %r4,%sp,0x100 # colorString
-bl fontDrawMessageMtxHandleCol
+addi %r3,%sp,0x180 # command # -> 0x170 + 0x10
+addi %r4,%sp,0x100 # commandValueString # -> 0xF0 + 0x10
+bl fontDrawMessageMtxHandleCommand
 
 # Check the returned value
 cmpwi %r3,0 # False
@@ -28,7 +28,7 @@ mtlr %r0
 addi %sp,%sp,0x10
 bne- jumpPastOtherCommands
 
-# r3 is needed, so restore the original value for that
+# r3 is needed, so restore the original value for it
 addi %r3,%sp,0x170
 blr
 

ttyd-tools/rel/source/draw.cpp

@@ -60,13 +60,12 @@ bool disableDPadOptionsDisplay(uint16_t unkVar)
     return (unkVar & (1 << 8)); // Check the 8 bit
 }
 
-bool fontDrawMessageMtxHandleCol(const char *command, const char *colorString)
+bool fontDrawMessageMtxHandleCommand(const char *command, const char *commandValueString)
 {
-    uint32_t Color;
-    
     if (strcmp(command, "col") == 0)
     {
-        sscanf(colorString, "%" PRIx32, &Color);
+        uint32_t Color;
+        sscanf(commandValueString, "%" PRIx32, &Color);
         ttyd::fontmgr::FontDrawColor(reinterpret_cast<uint8_t *>(&Color));
     }
     else if (strcmp(command, "/col") == 0)
@@ -75,9 +74,11 @@ bool fontDrawMessageMtxHandleCol(const char *command, const char *colorString)
     }
     else
     {
+        // Command not found
         return false;
     }
 
+    // Command found
     return true;
 }
 

ttyd-tools/rel/source/main.cpp

@@ -903,7 +903,7 @@ void initAddressOverwrites()
     void *AutoMashThroughText1Address               = reinterpret_cast<void *>(0x80080FCC);
     void *AutoMashThroughText2Address               = reinterpret_cast<void *>(0x80080FF0);
     void *AutoMashThroughText3Address               = reinterpret_cast<void *>(0x80084268);
-    void *FontDrawMessageMtxHandleColAddress        = reinterpret_cast<void *>(0x800759E0);
+    void *FontDrawMessageMtxHandleCommandAddress    = reinterpret_cast<void *>(0x800759E0);
 #elif defined TTYD_JP
     void *AllowRunningFromBattlesAddress            = reinterpret_cast<void *>(0x8011E7DC);
     void *ForceNPCItemDropAddress                   = reinterpret_cast<void *>(0x8004DFB0);
@@ -932,7 +932,7 @@ void initAddressOverwrites()
     void *AutoMashThroughText1Address               = reinterpret_cast<void *>(0x8008047C);
     void *AutoMashThroughText2Address               = reinterpret_cast<void *>(0x800804A0);
     void *AutoMashThroughText3Address               = reinterpret_cast<void *>(0x80083390);
-    void *FontDrawMessageMtxHandleColAddress        = reinterpret_cast<void *>(0x8007471C);
+    void *FontDrawMessageMtxHandleCommandAddress    = reinterpret_cast<void *>(0x8007471C);
 #elif defined TTYD_EU
     void *AllowRunningFromBattlesAddress            = reinterpret_cast<void *>(0x80124BE4);
     void *ForceNPCItemDropAddress                   = reinterpret_cast<void *>(0x8004ECDC);
@@ -962,7 +962,7 @@ void initAddressOverwrites()
     void *AutoMashThroughText1Address               = reinterpret_cast<void *>(0x80082288);
     void *AutoMashThroughText2Address               = reinterpret_cast<void *>(0x800822AC);
     void *AutoMashThroughText3Address               = reinterpret_cast<void *>(0x800855BC);
-    void *FontDrawMessageMtxHandleColAddress        = reinterpret_cast<void *>(0x80076C9C);
+    void *FontDrawMessageMtxHandleCommandAddress    = reinterpret_cast<void *>(0x80076C9C);
     void *JumpOnWaterAddress                        = reinterpret_cast<void *>(0x80093CF0);
 #endif
 
@@ -985,7 +985,7 @@ void initAddressOverwrites()
     patch::writeBranchBL_Template(AutoMashThroughText1Address, autoMashText);
     patch::writeBranchBL_Template(AutoMashThroughText2Address, autoMashText);
     patch::writeBranchBL_Template(AutoMashThroughText3Address, autoMashText);
-    patch::writeBranchBL_Template(FontDrawMessageMtxHandleColAddress, asmFontDrawMessageMtxHandleCol);
+    patch::writeBranchBL_Template(FontDrawMessageMtxHandleCommandAddress, asmFontDrawMessageMtxHandleCommand);
 
 #ifdef TTYD_EU
     patch::writeBranchBL_Template(JumpOnWaterAddress, asmJumpOnWater);