diff options
| author | Eblo <7004497+Eblo@users.noreply.github.com> | 2024-10-10 00:46:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-09 23:46:05 -0500 |
| commit | 0b16bced84e7e97edcf93b7fbaa125062ee33c43 (patch) | |
| tree | df40724e89418c88d0c0973e043f4e39f4701365 /mm/src/code | |
| parent | b7d7a2d9bfd063d7b7ef0cc499343985f5be1f1d (diff) | |
[Cheat] Allow Elegy of Emptiness anywhere (#712)
* Add cheat to allow Elegy of Emptiness anywhere
* Use modern menu for Elegy Anywhere, rename VB
Removed redundant null from Elegy scene check
Moved ElegyAnywhere enhancement's menu order
* Remove extraneous widgets from ElegyAnywhere menu
Diffstat (limited to 'mm/src/code')
| -rw-r--r-- | mm/src/code/z_message.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mm/src/code/z_message.c b/mm/src/code/z_message.c index 7f0c82be5..68d1fa5e7 100644 --- a/mm/src/code/z_message.c +++ b/mm/src/code/z_message.c @@ -4821,12 +4821,14 @@ void Message_DrawMain(PlayState* play, Gfx** gfxP) { if (msgCtx->ocarinaAction == OCARINA_ACTION_FREE_PLAY_DONE) { if (sLastPlayedSong == OCARINA_SONG_ELEGY) { - if ((play->sceneId == SCENE_F40) || (play->sceneId == SCENE_F41) || - (play->sceneId == SCENE_IKANAMAE) || (play->sceneId == SCENE_CASTLE) || - (play->sceneId == SCENE_IKNINSIDE) || (play->sceneId == SCENE_IKANA) || - (play->sceneId == SCENE_INISIE_N) || (play->sceneId == SCENE_INISIE_R) || - (play->sceneId == SCENE_INISIE_BS) || (play->sceneId == SCENE_RANDOM) || - (play->sceneId == SCENE_REDEAD) || (play->sceneId == SCENE_TOUGITES)) { + if (GameInteractor_Should( + VB_ELEGY_CHECK_SCENE, + (play->sceneId == SCENE_F40) || (play->sceneId == SCENE_F41) || + (play->sceneId == SCENE_IKANAMAE) || (play->sceneId == SCENE_CASTLE) || + (play->sceneId == SCENE_IKNINSIDE) || (play->sceneId == SCENE_IKANA) || + (play->sceneId == SCENE_INISIE_N) || (play->sceneId == SCENE_INISIE_R) || + (play->sceneId == SCENE_INISIE_BS) || (play->sceneId == SCENE_RANDOM) || + (play->sceneId == SCENE_REDEAD) || (play->sceneId == SCENE_TOUGITES))) { play->msgCtx.ocarinaMode = OCARINA_MODE_EVENT; } else { sLastPlayedSong = 0xFF; |