mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-09-03 02:03:47 -04:00
Code Issues Packages 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
21 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+2 -2
View File
@@ -2008,8 +2008,8 @@ u8 Message_ShouldAdvance(PlayState* play);
void Message_CloseTextbox(PlayState*);
void Message_StartTextbox(PlayState* play, u16 textId, Actor* actor);
void Message_ContinueTextbox(PlayState* play, u16 textId);
void func_8010BD58(PlayState* play, u16 ocarinaActionId);
void func_8010BD88(PlayState* play, u16 ocarinaActionId);
void Message_StartOcarina(PlayState* play, u16 ocarinaActionId);
void Message_StartOcarinaSunsSongDisabled(PlayState* play, u16 ocarinaActionId);
u8 Message_GetState(MessageContext* msgCtx);
void Message_Draw(PlayState* play);
void Message_Update(PlayState* play);
include/z64.h
+2 -2
View File
@@ -540,8 +540,8 @@ typedef struct {
/* 0xE404 */ s16 textboxColorAlphaTarget;
/* 0xE406 */ s16 textboxColorAlphaCurrent;
/* 0xE408 */ Actor* talkActor;
/* 0xE40C */ s16 disableWarpSongs; // warp song flag set by scene commands
/* 0xE40E */ s16 unk_E40E; // ocarina related
/* 0xE40C */ s16 disableWarpSongs; // disables ability to warp with warp songs
/* 0xE40E */ s16 disableSunsSong; // disables Suns Song effect from occurring after song is played
/* 0xE410 */ u8 lastOcarinaButtonIndex;
} MessageContext; // size = 0xE418