Skip to content

Commit

Permalink
ocarina: Fix Song of Soaring playback skip
Browse files Browse the repository at this point in the history
GlobalContext::field_83EC must always be false; otherwise the Song of
Soaring handler will refuse to show the map screen.
  • Loading branch information
leoetlino committed Jul 30, 2019
1 parent 836a8f1 commit 5417db6
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion source/rst/fixes/ocarina.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@ bool HandleOcarinaSong(game::ui::MessageWindow* self, game::OcarinaSong song) {
gctx->ocarina_song = song;
gctx->ocarina_state = game::OcarinaState::PlayingAndReplayDone;
util::Write<u32>(self, 0x428, u16(song));
util::Write<u32>(self, 0x42C, 0xF);
// This flag must always be false; otherwise the Song of Soaring handler will refuse
// to show the map screen.
util::Write<bool>(gctx, 0x83EC, false);
const auto handle_songs = util::GetPointer<void(game::ui::MessageWindow*)>(0x1D78F0);
handle_songs(self);
return true;
}

Expand Down

0 comments on commit 5417db6

Please sign in to comment.