nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove EnFr_RandomizerCheckFromSongIndex (#5169)

Browse Source 
* Remove EnFr_RandomizerCheckFromSongIndex

Also handle missing return in RawAction::CheckFlag

Also adjust jabu jabu shabom timer override to be non-overflowing constant (but same constant)

* Update soh/soh/Enhancements/enemyrandomizer.cpp

Co-authored-by: Archez <Archez@users.noreply.github.com>

* remove shabom room hack from z_obj_roomtimer.c

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
This commit is contained in:
Philip Dubé
2025-03-21 11:27:53 +00:00
committed by GitHub
parent 04458f2274
commit 1e294134af
4 changed files with 5 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
soh/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c
View File

@@ -32,13 +32,7 @@ void ObjRoomtimer_Init(Actor* thisx, PlayState* play) {
ObjRoomtimer* this = (ObjRoomtimer*)thisx;
s16 params = this->actor.params;
// Shabom room in Jabu Jabu has a lengthened timer in Enemy Randomizer. Flag doesn't match what the game
// expects. Instead set it back to the same flag as what it would be in vanilla.
if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) && play->sceneNum == SCENE_JABU_JABU && play->roomCtx.curRoom.num == 12) {
this->switchFlag = 30;
} else {
this->switchFlag = (params >> 10) & 0x3F;
}
this->switchFlag = (params >> 10) & 0x3F;
this->actor.params = params & 0x3FF;
params = this->actor.params;