mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-23 01:42:19 -05:00
Code Issues Projects Releases Wiki Activity

Fix silver rupee room in GtG (#2252)

Browse Source
This commit is contained in:
aMannus 2022-12-24 04:26:26 +01:00 committed by GitHub
parent d215c76eba
commit 99367ebb53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/soh/Enhancements/enemyrandomizer.cpp
View File

@ -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. // Only randomize the initial deku scrub actor (single and triple attack), not the flower they spawn.
case ACTOR_EN_DEKUNUTS: case ACTOR_EN_DEKUNUTS:
return (params == -256 || params == 768); 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). // Only randomize initial floormaster actor (it can split and does some spawning on init).
case ACTOR_EN_FLOORMAS: case ACTOR_EN_FLOORMAS:
return (params == 0 || params == -32768); return (params == 0 || params == -32768);