VBify #4255
VBify #4255
Conversation
|
|
||
| f32 triforcePieceScale; | ||
|
|
||
| void RandomizerOnPlayerUpdateHandler() { |
There was a problem hiding this comment.
We should likely split this into two separate hook handlers, both of them only being registered when their respective options are on (triforce hunt & the randomized swimming)
There was a problem hiding this comment.
I was thinking that it might be better to have only one hook handler for each hook in randomizer and split if off inside the hook to prevent registering too many hooks, if it's preferred to use separate hooks, I'll change it to that.
|
|
||
| extern "C" void func_8099485C(DoorGerudo* gerudoDoor, PlayState* play); | ||
|
|
||
| void RandomizerOnActorUpdateHandler(void* refActor) { |
There was a problem hiding this comment.
This is by far the most expensive hook we can register, we need to be very careful and precise about how and when this is registered. Each of the different target actors should be specified by the RegisterGameHookForID hook, and these hooks should only be registered when their respective options are on
There was a problem hiding this comment.
eg
onFileLoad(() {
// unregister skeletonKeyDoorUpdate
if (skeletonKeyEnabled) {
// Because we're doing RegisterGameHookForID this will only ever be called for door updates
GameInteractor::Instance->RegisterGameHookForID<GameInteractor::OnActorUpdate>(ACTOR_EN_DOOR, skeletonKeyDoorUpdate);
}
})| } | ||
| } | ||
|
|
||
| void RandomizerOnGameFrameUpdateHandler() { |
There was a problem hiding this comment.
Similarly here, we should only register this hook handler when the infinite upgrades option is enabled in the current save
| gPlayState->transitionTrigger != TRANS_TRIGGER_START && | ||
| (1 << 0 & gSaveContext.inventory.dungeonItems[SCENE_GANONS_TOWER]) == 0 | ||
| ) { | ||
| GiveItemEntryWithoutActor(gPlayState, ItemTableManager::Instance->RetrieveItemEntry(MOD_RANDOMIZER, RG_GANONS_CASTLE_BOSS_KEY)); |
There was a problem hiding this comment.
This doesn't seem to be working, I'm not getting the GCBK after reloading in after the credits sequence.
There was a problem hiding this comment.
Oh I missed this, yeah this should be migrated to just doing a flag set and letting the queue handle the give like everything else
There was a problem hiding this comment.
The problem is that it's not a check so we can't use randomizerQueuedChecks.
There was a problem hiding this comment.
This might be scope creep, but this made me think of the "ganon boss key on LACS" situation, and how seperating the conditional GCBK gives from LACS would be a good idea. Making a new type of GCBK give would solve both that and this.
Pepe20129
added
code cleanup
rando v3
| @@ -533,11 +533,15 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) { | |||
| if (GameInteractor_Should(VB_GIVE_ITEM_FROM_BLUE_WARP, true, ITEM_GORON_RUBY)) { | |||
| Item_Give(play, ITEM_GORON_RUBY); | |||
| } | |||
| play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_0; | |||
| gSaveContext.nextCutsceneIndex = 0xFFF1; | |||
| if (GameInteractor_Should(VB_BLUE_WARP_APPLY_ENTRANCE_AND_CUTSCENE, true, this)) { | |||
There was a problem hiding this comment.
Upon second look at all the changes here in this file, I don't think we need any of them. You should be able to override the destination of the blue warp the same way we are for rando & cutscene skips with the VB_PLAY_TRANSITION_CS
This PR moves some parts of randomizer and boss rush to VB.
It also got a little bit out of hand so it also moves some stuff from random places into their respective hooks (as an example there was a bit of rando code that run right before the
OnSceneInithook, so I've moved it to theOnSceneInithook itself).I recommend looking at this PR commit by commit as it's easier to understand (specially in
BossRush.cpp).Build Artifacts