Stored the Link Register when calling functions via assembly

This is mainly done so that the backtrace screen will show the proper address(es) in the LR Save field when the function that was called at that point was done via injected assembly.

Doing this also allows using bl branches instead of regular branches, which actually ends up using less memory overall.

Renamed and/or moved some functions that are called via assembly.

Created a trampoline for the marioKeyOn fix, as it is easier to manage.

Adjusted the Player struct to include the key variable.

Author: Zephiles

ttyd-tools/rel/include/codes.h

@@ -34,7 +34,6 @@ void displayYoshiSkipDetails();
 void displayPalaceSkipDetails();
 void actionCommandsTimingsInit();
 void displayActionCommandsTiming();
-void displayArtAttackHitboxes();
 
 int32_t warpToMap(uint32_t value);
 int32_t warpToMapByString(const char *map);

ttyd-tools/rel/include/mod.h

@@ -20,6 +20,7 @@ class Mod
 	const char *getCustomMessage(const char *);
 	uint32_t pauseArtAttackTimer();
 	uint32_t setIndexWarpEntrance(void *, uint32_t);
+	int32_t fixMarioKeyOn();
 
 private:
 	void (*mPFN_marioStMain_trampoline)() = nullptr;
@@ -34,6 +35,7 @@ class Mod
 	const char *(*mPFN_msgSearch_trampoline)(const char *) = nullptr;
 	uint32_t (*mPFN_scissor_timer_main_trampoline)() = nullptr;
 	uint32_t (*mPFN_evt_bero_get_info_trampoline)(void *, uint32_t) = nullptr;
+	int32_t (*mPFN_marioKeyOn_trampoline)() = nullptr;
 };
 
 }

ttyd-tools/rel/include/ttyd/mario.h

@@ -22,7 +22,9 @@ struct Player
 	uint16_t prevMotionId;
 	uint16_t pad_32;
 	uint32_t wMapTime;
-	uint32_t wUnkCounter;
+	uint8_t unk_38;
+	int8_t wKey;
+	uint8_t unk_3a[2];
 	int8_t characterId;
 	int8_t colorId;
 	uint8_t unk_3e;

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

@@ -1,10 +1,15 @@
 .global StartAllowRunningFromBattles
-.global BranchBackAllowRunningFromBattles
 
 StartAllowRunningFromBattles:
+stwu %sp,-0x8(%sp)
+mflr %r0
+stw %r0,0xC(%sp)
+
 # r3 already contains ptr
 bl allowRunningFromBattles
 mr %r0,%r3
 
-BranchBackAllowRunningFromBattles:
-b 0
+lwz %r3,0xC(%sp)
+mtlr %r3
+addi %sp,%sp,0x8
+blr

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

@@ -1,8 +1,9 @@
 .global StartDisableDPadOptionsDisplay
-.global BranchBackDisableDPadOptionsDisplay
 
 StartDisableDPadOptionsDisplay:
 stwu %sp,-0xC(%sp)
+mflr %r3
+stw %r3,0x10(%sp)
 stw %r31,0x8(%sp)
 mr %r31,%r4
 
@@ -14,7 +15,7 @@ cmpwi %r3,0 # False
 
 mr %r4,%r31
 lwz %r31,0x8(%sp)
+lwz %r0,0x10(%sp)
+mtlr %r0
 addi %sp,%sp,0xC
-
-BranchBackDisableDPadOptionsDisplay:
-b 0
+blr

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

@@ -1,13 +1,18 @@
 .global StartDisableBattles
-.global BranchBackDisableBattles
 
 StartDisableBattles:
+stwu %sp,-0x8(%sp)
+mflr %r0
+stw %r0,0xC(%sp)
+
 mr %r3,%r30 # ptr
 bl disableBattles
 mr %r21,%r3
 
-# Restore overwritten CR value(s)
-rlwinm. %r26,%r19,0,27,27
+lwz %r0,0xC(%sp)
+mtlr %r0
+addi %sp,%sp,0x8
 
-BranchBackDisableBattles:
-b 0
+# Restore the overwritten CR value(s)
+rlwinm. %r26,%r19,0,27,27
+blr

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

@@ -3,20 +3,22 @@
 
 StartDisplayMegaHammerBadgesBattleMenu:
 stwu %sp,-0x14(%sp)
+mflr %r3
+stw %r3,0x18(%sp)
 stmw %r30,0x8(%sp)
 mr %r31,%r4
 mr %r30,%r5
 
 mr %r3,%r0 # checkBit
 bl displayMegaHammerBadgesInMenu
 
+# Check the returned bool
+cmpwi %r3,0 # False
+
 mr %r4,%r31
 mr %r5,%r30
 lmw %r30,0x8(%sp)
+lwz %r0,0x18(%sp)
+mtlr %r0
 addi %sp,%sp,0x14
-
-# Check the returned bool
-cmpwi %r3,0 # False
-
-BranchBackDisplayMegaHammerBadgesBattleMenu:
-b 0
+blr

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

@@ -3,20 +3,22 @@
 
 StartDisplayMegaJumpBadgeBattleMenu:
 stwu %sp,-0x14(%sp)
+mflr %r3
+stw %r3,0x18(%sp)
 stmw %r30,0x8(%sp)
 mr %r31,%r4
 mr %r30,%r5
 
 mr %r3,%r0 # checkBit
 bl displayMegaJumpBadgeInMenu
 
+# Check the returned bool
+cmpwi %r3,0 # False
+
 mr %r4,%r31
 mr %r5,%r30
 lmw %r30,0x8(%sp)
+lwz %r0,0x18(%sp)
+mtlr %r0
 addi %sp,%sp,0x14
-
-# Check the returned bool
-cmpwi %r3,0 # False
-
-BranchBackDisplayMegaJumpBadgeBattleMenu:
-b 0
+blr

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

@@ -0,0 +1,16 @@
+.global StartDrawArtAttackHitboxes
+
+StartDrawArtAttackHitboxes:
+stwu %sp,-0x8(%sp)
+mflr %r0
+stw %r0,0xC(%sp)
+
+bl drawArtAttackHitboxes
+
+lwz %r0,0xC(%sp)
+mtlr %r0
+addi %sp,%sp,0x8
+
+# Restore the overwritten instruction
+lmw %r26,0x18(%sp)
+blr

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

@@ -1,10 +1,6 @@
 .global StartFixBlooperCrash1
-.global BranchBackFixBlooperCrash1
 
 StartFixBlooperCrash1:
 mr %r3,%r31 # unkValue
 # r4 already contains battleUnitPointer
-bl fixBlooperCrash1
-
-BranchBackFixBlooperCrash1:
-b 0
+b fixBlooperCrash1