mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-21 06:48:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix graveyard sign checks at night (#7057)

Browse Source
This commit is contained in:
A Green Spoon
2026-08-12 07:42:16 -04:00
committed by GitHub
parent 253e672473
commit 08cb0dcf70
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/randomizer/ShuffleSigns.cpp
+19 -5
View File
@@ -94,20 +94,34 @@ static CheckIdentity IdentifySign(s32 sceneNum, s32 posX, s32 posZ, s32 id) {
uint32_t signSceneNum = sceneNum;
Rando::Location* location = nullptr;
// align child/adult signs
// align child/adult and day/night signs
if (sceneNum == SCENE_KAKARIKO_VILLAGE && LINK_IS_ADULT && posX == 1165 && posZ == 1545) {
posZ = 1550;
} else if (sceneNum == SCENE_GRAVEYARD && LINK_IS_ADULT) {
if (id == ACTOR_EN_WONDER_TALK2 && posX == -807 && posZ == 266) {
if (id == ACTOR_EN_WONDER_TALK2 && ((posX == -807 && posZ == 266) || (posX == -806 && posZ == 266))) {
posX = -805;
} else if (id == ACTOR_EN_WONDER_TALK) {
if (posX == 634 && posZ == 260) {
if ((posX == 634 && posZ == 260) || (posX == 638 && posZ == 260)) {
posX = 654;
posZ = 258;
} else if (posX == 634 && posZ == -100) {
} else if ((posX == 634 && posZ == -100) || (posX == 638 && posZ == -100)) {
posX = 654;
posZ = -102;
} else if (posX == 753 && posZ == 85) {
} else if ((posX == 753 && posZ == 85) || (posX == 758 && posZ == 85)) {
posX = 752;
}
}
} else if (sceneNum == SCENE_GRAVEYARD && LINK_IS_CHILD) {
if (id == ACTOR_EN_WONDER_TALK2 && posX == -805 && posZ == 264) {
posZ = 266;
} else if (id == ACTOR_EN_WONDER_TALK) {
if (posX == 630 && posZ == 260) {
posX = 654;
posZ = 258;
} else if (posX == 630 && posZ == -100) {
posX = 654;
posZ = -102;
} else if (posX == 758 && posZ == 85) {
posX = 752;
}
}