Fix divine beast (and more) cutscenes

Author: Crementif

resources/BreathOfTheWild_BetterVR/patch_FirstPersonMode_Events.asm

@@ -3,5 +3,5 @@ moduleMatches = 0x6267BFD0
 
 .origin = codecave
 
-0x031CA268 = ba import.coreinit.hook_GetEventName
-0x031CA288 = ba import.coreinit.hook_GetEventName
+;0x031CA268 = ba import.coreinit.hook_GetEventName
+;0x031CA288 = ba import.coreinit.hook_GetEventName

resources/BreathOfTheWild_BetterVR/patch_Settings.asm

@@ -61,8 +61,6 @@ stw r3, 0x1C(r1)
 stw r4, 0x18(r1)
 stw r5, 0x14(r1)
 stw r6, 0x10(r1)
-stw r7, 0x0C(r1)
-stw r8, 0x08(r1)
 
 lis r5, data_settingsOffset@ha
 addi r5, r5, data_settingsOffset@l
@@ -79,68 +77,33 @@ cmpwi r3, 0
 beq skipGetEventName
 
 ; get active event name
+lis r3, EventMgr__getActiveEventName@ha
+addi r3, r3, EventMgr__getActiveEventName@l
+mtctr r3
+li r3, 0
+addi r5, r1, 0x0C ; ptr to store entrypoint name
+stw r3, 0x0C(r1)
+addi r4, r1, 0x08 ; ptr to store event name
+stw r3, 0x08(r1)
 lis r3, EventMgr__sInstance@ha
 lwz r3, EventMgr__sInstance@l(r3)
-addis r3, r3, 1
-lwz r3, 0x75B0(r3)
-; EventMgr::sInstance->activeEventContext
-cmpwi r3, 0
-beq noActiveEvent
-
-; r3 = EventMgr::sInstance->activeEventContext
-
-; load active event name
-lwz r4, 0x18C(r3) ; load index to event indices
-addi r8, r3, 0x184 ; load array start
-cmplwi r4, 8 ;.int 0x28040008 ;cmplwi r4, 8 ; .long 0x28040008
-lwz r6, 4(r3)
-bge loc_31D8C8C
-add r8, r8, r4
-
-loc_31D8C8C:
-; r4 is unused from here
-li r4, 0
-li r7, 0
-; -------------------------
-
-lbz r5, 0(r8)
-extsb r5, r5 ; .int 0x7CA50774 ; extsb r5, r5
-cmplw r5, r6
-li r4, 0
-bge loc_31D8CAC
-lwz r7, 0x0C(r3)
-slwi r8, r5, 2
-lwzx r4, r8, r7
-
-loc_31D8CAC:
-cmpwi r4, 0
-beq noActiveEvent ; skip if no valid event pointer
-lwz r4, 8(r4)
-li r3, 1
-bla import.coreinit.hook_GetEventName
-b skipGetEventName
-;lis r3, EventMgr__sInstance@ha
-;lwz r3, EventMgr__sInstance@l(r3)
-;bctrl
+bctrl ; bl EventMgr::getActiveEventName
 
-noActiveEvent:
-li r3, 0
+; call C++ hook to handle the results
+lwz r4, 0x08(r1) ; event name
+lwz r5, 0x0C(r1) ; entrypoint name
 bla import.coreinit.hook_GetEventName
 
 skipGetEventName:
-
-; spawn check
-li r3, 0
-bl import.coreinit.hook_CreateNewActor
-cmpwi r3, 1
-bne notSpawnActor
-;bl vr_spawnEquipment
-notSpawnActor:
-
-;bl checkIfDropWeapon
-
-lwz r8, 0x08(r1)
-lwz r7, 0x0C(r1)
+; ; spawn check
+; li r3, 0
+; bl import.coreinit.hook_CreateNewActor
+; cmpwi r3, 1
+; bne notSpawnActor
+; ;bl vr_spawnEquipment
+; notSpawnActor:
+; 
+; ;bl checkIfDropWeapon
 lwz r6, 0x10(r1)
 lwz r5, 0x14(r1)
 lwz r4, 0x18(r1)

src/hooking/camera.cpp

@@ -569,13 +569,16 @@ void CemuHooks::hook_GetEventName(PPCInterpreter_t* hCPU) {
 
     uint32_t isEventActive = hCPU->gpr[3];
     uint32_t eventNamePtr = hCPU->gpr[4];
+    uint32_t entryPointNamePtr = hCPU->gpr[5];
 
     if (isEventActive) {
         std::string eventName = std::string((char*)s_memoryBaseAddress + eventNamePtr);
+        std::string entryPointName = std::string((char*)s_memoryBaseAddress + entryPointNamePtr);
+
         if (s_currentEvent == eventName) {
             return;
         }
-        Log::print<INFO>("Event '{}' is now active.", eventName);
+        Log::print<INFO>("Event '{}' is now active (using entry point '{}').", eventName, entryPointName);
         s_currentEvent = eventName;
 
         auto it = s_eventSettings.find(eventName);