Clean assembly patches

Author: Crementif

include/game_structs.h

@@ -636,6 +636,35 @@ namespace ksys::phys {
     };
 }
 
+struct BaseProcLink {
+    BEType<uint32_t> baseProcLinkData;
+    BEType<uint32_t> idAndPadding3;
+    BEType<uint32_t> engaged;
+};
+
+struct InlineParamVec3 {
+    BEType<uint32_t> intOrFloatOrBool;
+    BaseProcLink procLink;
+    BEVec3 value;
+    BEType<uint8_t> gap1C[16];
+    BEType<uint32_t> type;
+    BEType<uint32_t> keyPtr;
+};
+
+struct InlineParamBool {
+    BEType<uint8_t> value;
+    BEType<uint8_t> gap1[3];
+    BaseProcLink procLink;
+    BEType<uint8_t> gap1C[16+4+4+4];
+    BEType<uint32_t> type;
+    BEType<uint32_t> keyPtr;
+};
+
+static_assert(sizeof(InlineParamVec3) == 0x34, "InlineParamVec3 size mismatch");
+static_assert(sizeof(InlineParamBool) == 0x34, "InlineParamBool size mismatch");
+
+
+
 #pragma pack(pop)
 
 inline std::string contactLayerNames[] = {

resources/BreathOfTheWild_BetterVR/patch_CTRL_FixScreenChecks.asm

@@ -3,13 +3,9 @@ moduleMatches = 0x6267BFD0
 
 .origin = codecave
 
-; disable agl::fx::Cloud::drawSunOcc which uses texture readback
-;0x0340425C = cmpwi r1, 0
+; --------------------------------------------------------------------------------
+; Hook the uniform buffer that is used to test the screen position (normally centered) for the magnesis target
 
-; disable peekTexture_checksQueuedRegions to narrow down interesting readback function
-;0x030F1B78 = nop
-
-; hook GX2SetPixelUniformBlock to hook the right pixels
 hook_GX2SetPixelUniformBlock:
 mflr r0
 stwu r1, -0x20(r1)
@@ -43,4 +39,41 @@ addi r1, r1, 0x20
 mtlr r0
 blr
 
-0x038B2B2C = bla hook_GX2SetPixelUniformBlock
+0x038B2B2C = bla hook_GX2SetPixelUniformBlock
+
+; --------------------------------------------------------------------------------
+; Fix the stamina gauge position that's normally attached to the player position
+
+0x02FB2468 = orig_StaminaGaugeScreenPositionFn:
+
+hook_fixStaminaGaugeToScreenPosition:
+mflr r0
+stwu r1, -0x20(r1)
+stw r0, 0x24(r1)
+stw r3, 0x1C(r1)
+stw r4, 0x18(r1)
+stw r5, 0x14(r1)
+
+lis r3, orig_StaminaGaugeScreenPositionFn@ha
+addi r3, r3, orig_StaminaGaugeScreenPositionFn@l
+mtctr r3
+lwz r3, 0x1C(r1)
+bctrl ; call original function to get the original screen position
+
+lwz r4, 0x18(r1) ; r4 is a pointer to the 2D screen position that we need to overwrite
+lwz r5, 0x14(r1) ; r5 is a pointer to the world position
+bla import.coreinit.hook_FixStaminaGaugeScreenPosition
+
+lwz r5, 0x14(r1)
+lwz r4, 0x18(r1)
+lwz r3, 0x1C(r1)
+lwz r0, 0x24(r1)
+addi r1, r1, 0x20
+mtlr r0
+blr
+
+; replace the player pos to screen position with static screen coords
+0x02FB2608 = bla hook_fixStaminaGaugeToScreenPosition
+
+; force extra stamina gauge icons to just stay in place instead of dynamically hanging onto the regular stamina wheel once it appears
+0x02FB2760 = bla import.coreinit.hook_FixExtraStaminaGaugeIconPositions

resources/BreathOfTheWild_BetterVR/patch_CTRL_HookWeaponHands.asm

@@ -3,9 +3,6 @@ moduleMatches = 0x6267BFD0
 
 .origin = codecave
 
-0x1046CF88 = Camera__sInstance:
-0x03191B70 = Camera__getLookAtCamera:
-
 0x020081AC = PlayerOrEnemy__dropWeapon:
 0x033BCD9C = ActorWeapons__resetBaseProc:
 

resources/BreathOfTheWild_BetterVR/patch_Misc.asm

@@ -3,6 +3,12 @@ moduleMatches = 0x6267BFD0
 
 .origin = codecave
 
+; disable agl::fx::Cloud::drawSunOcc which uses texture readback
+;0x0340425C = cmpwi r1, 0
+
+; disable peekTexture_checksQueuedRegions to narrow down interesting readback function
+;0x030F1B78 = nop
+
 ; disable AutoExposure
 ; 0x039D99A4 = li r3, 0