Patches cleanup

Signed-off-by: Isaac Marovitz <isaacryu@icloud.com>

Author: IsaacMarovitz

MarathonRecomp/patches/misc_patches.cpp

@@ -85,7 +85,8 @@ void ContextualHUD_RING_1(PPCRegister& index, PPCRegister& hud)
     index.u32 = chr_index;
 }
 
-void PostureDisableEdgeGrabLeftover(PPCRegister& posture) {
+void PostureDisableEdgeGrabLeftover(PPCRegister& posture)
+{
     if (!Config::DisableEdgeGrabLeftover) {
         return;
     }
@@ -94,7 +95,8 @@ void PostureDisableEdgeGrabLeftover(PPCRegister& posture) {
     *(volatile uint8_t*)(base + (posture.u32 + 0x3C0)) = 1;
 }
 
-void PedestrianAnimationLOD(PPCRegister& val) {
+void PedestrianAnimationLOD(PPCRegister& val)
+{
     val.u32 = 0;
 }
 

MarathonRecomp/patches/player_patches.cpp

@@ -71,27 +71,12 @@ PPC_FUNC(sub_821E8C48)
     __imp__sub_821E8C48(ctx, base);
 }
 
-bool MidairMachSpeedControl1()
+bool MidairMachSpeedControl()
 {
     return Config::MidairControlForMachSpeed;
 }
 
-bool MidairMachSpeedControl2()
-{
-    return Config::MidairControlForMachSpeed;
-}
-
-bool MidairSnowboardControl1()
-{
-    return Config::MidairControlForSnowboards;
-}
-
-bool MidairSnowboardControl2()
-{
-    return Config::MidairControlForSnowboards;
-}
-
-bool MidairSnowboardControl3()
+bool MidairSnowboardControl()
 {
     return Config::MidairControlForSnowboards;
 }

MarathonRecompLib/config/Marathon.toml

@@ -161,27 +161,27 @@ registers = ["r29"]
 after_instruction = true
 
 [[midasm_hook]]
-name = "MidairMachSpeedControl1"
+name = "MidairMachSpeedControl"
 address = 0x82210380
 jump_address_on_true = 0x82210388
 
 [[midasm_hook]]
-name = "MidairMachSpeedControl2"
+name = "MidairMachSpeedControl"
 address = 0x822103B4
 jump_address_on_true = 0x822103BC
 
 [[midasm_hook]]
-name = "MidairSnowboardControl1"
+name = "MidairSnowboardControl"
 address = 0x82214710
 jump_address_on_true = 0x82214714
 
 [[midasm_hook]]
-name = "MidairSnowboardControl2"
+name = "MidairSnowboardControl"
 address = 0x82214878
 jump_address_on_true = 0x8221487C
 
 [[midasm_hook]]
-name = "MidairSnowboardControl3"
+name = "MidairSnowboardControl"
 address = 0x822145B8
 jump_address_on_true = 0x822145BC