mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-09-01 18:29:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add more static hints (#3543)

Browse Source 
* WIP biggoron and big poes hint

* commit v0 of biggoron and big poes hints

* adjust for settings update

* Add more hints

* Finish extra Basic Static Hints

* remove vestigial code

* Forgot to remove this

* try to fix windows build

* fix build post conflcit res

* remove StaticHintData as redundent

* last cleanup
This commit is contained in:
Pepper0ni
2024-01-10 15:44:11 +00:00
committed by GitHub
parent a196dd6b7e
commit eb5f7688f8
15 changed files with 416 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
+21 -14
View File
@@ -350,12 +350,13 @@ void EnSsh_Bob(EnSsh* this, PlayState* play) {
}
s32 EnSsh_IsCloseToLink(EnSsh* this, PlayState* play) {
Player* player = GET_PLAYER(play);
f32 yDist;
// #region SOH [Randomizer] automatically lower skultulla people
if (IS_RANDO) {
return true;
}
// #endregion
Player* player = GET_PLAYER(play);
f32 yDist;
if (this->stateFlags & SSH_STATE_GROUND_START) {
return true;
}
@@ -698,19 +699,25 @@ void EnSsh_Idle(EnSsh* this, PlayState* play) {
this->actor.textId = Text_GetFaceReaction(play, 0xD);
if (this->actor.textId == 0) {
if (this->actor.params == ENSSH_FATHER) {
if (gSaveContext.inventory.gsTokens >= 50) {
this->actor.textId = 0x29;
} else if (gSaveContext.inventory.gsTokens >= 10) {
if (Flags_GetInfTable(INFTABLE_197)) {
this->actor.textId = 0x24;
} else {
this->actor.textId = 0x25;
}
// #region SOH [Randomizer] Skip the complexity of the father's text when he should just give a hint
if (IS_RANDO && Randomizer_GetSettingValue(RSK_KAK_100_SKULLS_HINT)){
this->actor.textId = 0x27;
// #endregion
} else {
if (Flags_GetInfTable(INFTABLE_196)) {
this->actor.textId = 0x27;
if (gSaveContext.inventory.gsTokens >= 50) {
this->actor.textId = 0x29;
} else if (gSaveContext.inventory.gsTokens >= 10) {
if (Flags_GetInfTable(INFTABLE_197)) {
this->actor.textId = 0x24;
} else {
this->actor.textId = 0x25;
}
} else {
this->actor.textId = 0x26;
if (Flags_GetInfTable(INFTABLE_196)) {
this->actor.textId = 0x27;
} else {
this->actor.textId = 0x26;
}
}
}
} else {