diff options
| -rw-r--r-- | mm/src/code/z_message_nes.c | 2 | ||||
| -rw-r--r-- | mm/src/code/z_message_staff.c | 2 | ||||
| -rw-r--r-- | mm/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c | 2 | ||||
| -rw-r--r-- | mm/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c | 2 | ||||
| -rw-r--r-- | mm/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c | 2 | ||||
| -rw-r--r-- | mm/src/overlays/actors/ovl_En_Toto/z_en_toto.c | 3 |
6 files changed, 7 insertions, 6 deletions
diff --git a/mm/src/code/z_message_nes.c b/mm/src/code/z_message_nes.c index 67ccb53b5..6bb06bcaa 100644 --- a/mm/src/code/z_message_nes.c +++ b/mm/src/code/z_message_nes.c @@ -28,7 +28,7 @@ void Message_FindMessageNES(PlayState* play, u16 textId) { while (msgEntry->textId != 0xFFFF) { if (msgEntry->textId == textId) { - // #region 2SH2 [Port] Just assign the msgEntry, we don't need to change the messageStart and messageEnd + // #region 2S2H [Port] Just assign the msgEntry, we don't need to change the messageStart and messageEnd font->messageStart = msgEntry; return; // #endregion diff --git a/mm/src/code/z_message_staff.c b/mm/src/code/z_message_staff.c index 02954c2e5..66e8818ff 100644 --- a/mm/src/code/z_message_staff.c +++ b/mm/src/code/z_message_staff.c @@ -13,7 +13,7 @@ void Message_FindCreditsMessage(PlayState* play, u16 textId) { while (msgEntry->textId != 0xFFFF) { if (msgEntry->textId == textId) { - // 2SH2 [Port] Just assign the msgEntry, we don't need to change the messageStart and messageEnd + // 2S2H [Port] Just assign the msgEntry, we don't need to change the messageStart and messageEnd font->messageStart = msgEntry; font->charBuf[font->unk_11D88][0] = msgEntry->typePos; break; diff --git a/mm/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c b/mm/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c index 0bf87888c..b30498c64 100644 --- a/mm/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c +++ b/mm/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c @@ -237,7 +237,7 @@ u16 EnSob1_GetWelcome(EnSob1* this, PlayState* play) { case PLAYER_MASK_POSTMAN: return 0x644; - // 2SH2 [FD Enhancement] - Treat FD as any other non-human form + // 2S2H [FD Enhancement] - Treat FD as any other non-human form case PLAYER_MASK_FIERCE_DEITY: case PLAYER_MASK_GORON: case PLAYER_MASK_ZORA: diff --git a/mm/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c b/mm/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c index a7c6efa21..aaba9dbe4 100644 --- a/mm/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c +++ b/mm/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c @@ -403,7 +403,7 @@ void func_80AE7F34(EnStopheishi* this, PlayState* play) { phi_a2 = 2; break; - // 2SH2 [FD Enhancement] - Guard treats FD as if Human has already talked + // 2S2H [FD Enhancement] - Guard treats FD as if Human has already talked case PLAYER_FORM_FIERCE_DEITY: phi_a2 = 1; break; diff --git a/mm/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/mm/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 9544f18e9..1aa96a76e 100644 --- a/mm/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/mm/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -590,7 +590,7 @@ void EnSyatekiMan_Town_StartIntroTextbox(EnSyatekiMan* this, PlayState* play) { } break; - // 2SH2 [FD Enhancement] Don't allow playing town archery with FD becuase Swamp prevents FD archery by default. + // 2S2H [FD Enhancement] Don't allow playing town archery with FD because Swamp prevents FD archery by default. // Get Goron's "quite the build" text case PLAYER_FORM_FIERCE_DEITY: case PLAYER_FORM_GORON: diff --git a/mm/src/overlays/actors/ovl_En_Toto/z_en_toto.c b/mm/src/overlays/actors/ovl_En_Toto/z_en_toto.c index cd79ad471..310505bb9 100644 --- a/mm/src/overlays/actors/ovl_En_Toto/z_en_toto.c +++ b/mm/src/overlays/actors/ovl_En_Toto/z_en_toto.c @@ -246,7 +246,8 @@ void func_80BA39C8(EnToto* this, PlayState* play) { } else { this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; Actor_OfferTalk(&this->actor, play, 50.0f); - if (play->sceneId == SCENE_SONCHONOIE) { + // 2S2H [FD Enhancement] - Do not prompt for song if playing as FD. Default to dialog of cancellation + if (play->sceneId == SCENE_SONCHONOIE || player->transformation == PLAYER_FORM_FIERCE_DEITY) { if (player->transformation == PLAYER_FORM_DEKU) { if (!Flags_GetSwitch(play, ENTOTO_GET_SWITCH_FLAG_3(&this->actor))) { this->text = &D_80BA502C[15]; |