diff options
| author | aMannus <mannusmenting@gmail.com> | 2022-12-24 04:26:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-23 22:26:26 -0500 |
| commit | 99367ebb53004ddf6ea95bf62dc606ad1a01792f (patch) | |
| tree | 40fe2e5bca7a7e29984323049009ff7e00e703c3 | |
| parent | d215c76ebaf28138d74ca614dad67de2a6c8d4b9 (diff) | |
Fix silver rupee room in GtG (#2252)
| -rw-r--r-- | soh/soh/Enhancements/enemyrandomizer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/soh/soh/Enhancements/enemyrandomizer.cpp b/soh/soh/Enhancements/enemyrandomizer.cpp index 9b09fce22..a5c0b9b6b 100644 --- a/soh/soh/Enhancements/enemyrandomizer.cpp +++ b/soh/soh/Enhancements/enemyrandomizer.cpp @@ -259,6 +259,10 @@ bool IsEnemyFoundToRandomize(int16_t sceneNum, int8_t roomNum, int16_t actorId, // Only randomize the initial deku scrub actor (single and triple attack), not the flower they spawn. case ACTOR_EN_DEKUNUTS: return (params == -256 || params == 768); + // Don't randomize the OoB wallmaster in the silver rupee room because it's only there to + // not trigger unlocking the door after killing the other wallmaster in authentic gameplay. + case ACTOR_EN_WALLMAS: + return (!(!isMQ && sceneNum == SCENE_MEN && roomNum == 2 && posX == -2345)); // Only randomize initial floormaster actor (it can split and does some spawning on init). case ACTOR_EN_FLOORMAS: return (params == 0 || params == -32768); |
