Small changes to asmFontDrawMessageMtxHandleCommand

Author: Zephiles

ttyd-tools/rel/source/assembly/FontDrawMessageMtxHandleCommand.s

@@ -1,13 +1,5 @@
 .global asmFontDrawMessageMtxHandleCommand
 
-#ifdef TTYD_US
-AddressToJumpTo = 0x80075D84
-#elif defined TTYD_JP
-AddressToJumpTo = 0x80074AC0
-#elif defined TTYD_EU
-AddressToJumpTo = 0x80077040
-#endif
-
 asmFontDrawMessageMtxHandleCommand:
 # Restore the original instruction
 mr %r24,%r0
@@ -20,20 +12,15 @@ addi %r3,%sp,0x180 # command # -> 0x170 + 0x10
 addi %r4,%sp,0x100 # commandValueString # -> 0xF0 + 0x10
 bl fontDrawMessageMtxHandleCommand
 
-# Check the returned value
-cmpwi %r3,0 # False
-
 lwz %r0,0x14(%sp)
 mtlr %r0
 addi %sp,%sp,0x10
-bne- jumpPastOtherCommands
 
-# r3 is needed, so restore the original value for it
+# Check the returned value
+cmpwi %r3,0 # False
+
+# r3 is needed if False is returned, so restore the original value for it
 addi %r3,%sp,0x170
-blr
+beqlr+
 
-jumpPastOtherCommands:
-lis %r3,AddressToJumpTo@h
-ori %r3,%r3,AddressToJumpTo@l
-mtctr %r3
-bctr
+b (FontDrawMessageMtx + 0x45C) # 0x45C offset is the same for all retail versions

ttyd-tools/rel/source/draw.cpp

@@ -280,7 +280,7 @@ void drawIconFromItem(int32_t posX, int32_t posY, int16_t itemNum, float scale)
         }
     }
 
-    return drawIcon(posX, posY, iconNum, scale);
+    drawIcon(posX, posY, iconNum, scale);
 }
 
 // Set width to a negative value to not have a width limit