Fix Bronze Stars....Again

Now the results flyback works lol
SuperHackio · Jan 5, 2024 · 8f2099f · 8f2099f
1 parent 40c224a
commit 8f2099f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/Source/ScenarioEngine/ScenarioUtility.s b/Source/ScenarioEngine/ScenarioUtility.s
@@ -808,8 +808,19 @@ cmpwi r3, 0
 beq .__B_ForceBronze
 #If we're in the ScenarioSelect, we don't need to check if the SuperDreamer has been used.
 .__B_IsUsedSuperDreamer2:
+
+cmpwi r24, 1
+beq .__B_TestForResults
+
 mr r3, r26
 bl .MR_IsSuperDreamerStarBronze
+b .__B_CheckBronzeOrResults
+
+.__B_TestForResults:
+mr r3, r26
+bl .GLE_CheckIfResultsNeedsBronze
+
+.__B_CheckBronzeOrResults:
 cmpwi r3, 0
 beq .__B_UseActual
 

diff --git a/Source/SceneEngine/HubworldState.s b/Source/SceneEngine/HubworldState.s
@@ -645,10 +645,10 @@ addi r3, r1, 0x08
 .GLE ADDRESS registerStarReturnEvents__23MarioFaceShipEventStateFPv
 .GLE PRINTMESSAGE RegisterStarReturnEvents
 .GLE PRINTADDRESS
-stwu      r1, -0x90(r1)
+stwu      r1, -0x100(r1)
 mflr      r0
-stw       r0, 0x94(r1)
-addi      r11, r1, 0x90
+stw       r0, 0x104(r1)
+addi      r11, r1, 0x100
 bl        _savegpr_17
 mr        r31, r3
 bl initEventArray__23MarioFaceShipEventStateFv
@@ -787,11 +787,11 @@ bl getCsvDataElementNum__2MRFPC8JMapInfo
 cmpw r27, r3
 blt .RegisterStarReturnEvents_Loop
 
-addi      r11, r1, 0x90
+addi      r11, r1, 0x100
 bl        _restgpr_17
-lwz       r0, 0x94(r1)
+lwz       r0, 0x104(r1)
 mtlr      r0
-addi      r1, r1, 0x90
+addi      r1, r1, 0x100
 blr
 .GLE ASSERT registerStartEvents__23MarioFaceShipEventStateFPv
 .GLE ENDADDRESS