Game-Decompilation/2ship2harkinian
1
0
Fork 0
mirror of https://github.com/HarbourMasters/2ship2harkinian.git synced 2024-11-27 00:00:32 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix some Fierce Diety interactions in Clock Town (#730)

Browse Source 
* fix fd town archery softlock

* allow FD to leave town
This commit is contained in:
balloondude2 2024-09-08 17:01:02 -06:00 committed by GitHub
parent bbfa903a99
commit 4d1ddff798
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mm/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c
View File

@ -405,6 +405,11 @@ void func_80AE7F34(EnStopheishi* this, PlayState* play) {
case PLAYER_FORM_GORON: case PLAYER_FORM_GORON:
phi_a2 = 2; phi_a2 = 2;
break; break;
// 2SH2 [FD Enhancement] - Guard treats FD as if Human has already talked
case PLAYER_FORM_FIERCE_DEITY:
phi_a2 = 1;
break;
} }
if (((phi_a2 == 1) || (phi_a2 == 2) || (phi_a2 == 3)) && if (((phi_a2 == 1) || (phi_a2 == 2) || (phi_a2 == 3)) &&

3
mm/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
View File

@ -587,6 +587,9 @@ void EnSyatekiMan_Town_StartIntroTextbox(EnSyatekiMan* this, PlayState* play) {
} }
break; break;
// 2SH2 [FD Enhancement] Don't allow playing town archery with FD becuase Swamp prevents FD archery by default.
// Get Goron's "quite the build" text
case PLAYER_FORM_FIERCE_DEITY:
case PLAYER_FORM_GORON: case PLAYER_FORM_GORON:
if (CURRENT_DAY != 3) { if (CURRENT_DAY != 3) {
if (!(this->talkFlags & TALK_FLAG_TOWN_HAS_SPOKEN_WITH_GORON)) { if (!(this->talkFlags & TALK_FLAG_TOWN_HAS_SPOKEN_WITH_GORON)) {