mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-24 16:01:26 +00:00
Code Issues Projects Releases Wiki Activity

Name Message_StartOcarina and related things (#1473)

Browse source 
* name functions and msg ctx var

* start ocarina

* clarifying comments

* typo
This commit is contained in:
fig02 2022-12-20 17:03:41 -05:00 • committed by GitHub
parent 7100b17e5f
commit 1c6878b070
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 43 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
View file

@ -80,7 +80,8 @@ void OceffSpot_End(OceffSpot* this, PlayState* play) {
this->unk_174 -= 0.05f;
} else {
Actor_Kill(&this->actor);
if (gTimeSpeed != 400 && play->msgCtx.unk_E40E == 0 && GET_EVENTINF_HORSES_STATE() != EVENTINF_HORSES_STATE_1) {
if (gTimeSpeed != 400 && !play->msgCtx.disableSunsSong &&
GET_EVENTINF_HORSES_STATE() != EVENTINF_HORSES_STATE_1) {
if (play->msgCtx.ocarinaAction != OCARINA_ACTION_CHECK_NOWARP_DONE ||
play->msgCtx.ocarinaMode != OCARINA_MODE_08) {
gSaveContext.sunsSongState = SUNSSONG_START;