github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-07-30 11:39:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix early eyeball frog source adaption in King Zora (#5255)

Browse source 
* Fix early eyeball frog source adaption in king zora

* revert inftable sets
This commit is contained in:
Pepper0ni 2025-03-30 20:07:48 +01:00 • committed by GitHub
parent 714b9a731a
commit 28393fba78
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
View file

@ -125,23 +125,23 @@ u16 EnKz_GetText(PlayState* play, Actor* thisx) {
s16 func_80A9C6C0(PlayState* play, Actor* thisx) { s16 func_80A9C6C0(PlayState* play, Actor* thisx) {
EnKz* this = (EnKz*)thisx; EnKz* this = (EnKz*)thisx;
s16 ret = NPC_TALK_STATE_TALKING; s16 talkState = NPC_TALK_STATE_TALKING;
switch (Message_GetState(&play->msgCtx)) { switch (Message_GetState(&play->msgCtx)) {
case TEXT_STATE_DONE: case TEXT_STATE_DONE:
if (CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) { if (CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) {
if (Message_ShouldAdvance(play)) { if (Message_ShouldAdvance(play)) {
ret = NPC_TALK_STATE_ITEM_GIVEN; talkState = NPC_TALK_STATE_ITEM_GIVEN;
} }
} else { } else {
ret = NPC_TALK_STATE_IDLE; talkState = NPC_TALK_STATE_IDLE;
switch (this->actor.textId) { switch (this->actor.textId) {
case 0x4012: case 0x4012:
Flags_SetInfTable(INFTABLE_139); Flags_SetInfTable(INFTABLE_139);
ret = NPC_TALK_STATE_ACTION; talkState = NPC_TALK_STATE_ACTION;
break; break;
case 0x401B: case 0x401B:
ret = !Message_ShouldAdvance(play) ? NPC_TALK_STATE_TALKING : NPC_TALK_STATE_ACTION; talkState = !Message_ShouldAdvance(play) ? NPC_TALK_STATE_TALKING : NPC_TALK_STATE_ACTION;
break; break;
case 0x401F: case 0x401F:
Flags_SetInfTable(INFTABLE_139); Flags_SetInfTable(INFTABLE_139);
@ -151,14 +151,13 @@ s16 func_80A9C6C0(PlayState* play, Actor* thisx) {
break; break;
case TEXT_STATE_CLOSING: case TEXT_STATE_CLOSING:
if (CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) { if (CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) {
ret = NPC_TALK_STATE_IDLE; talkState = NPC_TALK_STATE_IDLE;
switch (this->actor.textId) { switch (this->actor.textId) {
case 0x4012: case 0x4012:
Flags_SetInfTable(INFTABLE_139); Flags_SetInfTable(INFTABLE_139);
ret = NPC_TALK_STATE_ACTION; FALLTHROUGH;
break;
case 0x401B: case 0x401B:
ret = !Message_ShouldAdvance(play) ? NPC_TALK_STATE_TALKING : NPC_TALK_STATE_ACTION; talkState = NPC_TALK_STATE_ACTION;
break; break;
case 0x401F: case 0x401F:
Flags_SetInfTable(INFTABLE_139); Flags_SetInfTable(INFTABLE_139);
@ -187,7 +186,7 @@ s16 func_80A9C6C0(PlayState* play, Actor* thisx) {
if (!CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) { if (!CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) {
EnKz_SetupGetItem(this, play); EnKz_SetupGetItem(this, play);
} }
ret = NPC_TALK_STATE_ACTION; talkState = NPC_TALK_STATE_ACTION;
} else { } else {
this->actor.textId = 0x4016; this->actor.textId = 0x4016;
Message_ContinueTextbox(play, this->actor.textId); Message_ContinueTextbox(play, this->actor.textId);
@ -196,7 +195,7 @@ s16 func_80A9C6C0(PlayState* play, Actor* thisx) {
break; break;
case TEXT_STATE_EVENT: case TEXT_STATE_EVENT:
if (Message_ShouldAdvance(play)) { if (Message_ShouldAdvance(play)) {
ret = NPC_TALK_STATE_ACTION; talkState = NPC_TALK_STATE_ACTION;
} }
break; break;
case TEXT_STATE_NONE: case TEXT_STATE_NONE:
@ -206,7 +205,7 @@ s16 func_80A9C6C0(PlayState* play, Actor* thisx) {
case TEXT_STATE_9: case TEXT_STATE_9:
break; break;
} }
return ret; return talkState;
} }
void EnKz_UpdateEyes(EnKz* this) { void EnKz_UpdateEyes(EnKz* this) {