mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-05-23 15:01:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Document z_en_time_tag (#1140)

Browse Source 
* time-tag docs

* simplify enums

* PR Reviews

* PR Suggestions

* small change

* small fix

* PR Suggestions

* add extra func ref

* rm raw text from first actor I decompiled

* Stock Pot Inn

* fix master merge
This commit is contained in:
engineer124
2023-03-16 13:47:38 +11:00
committed by GitHub
parent 2987390a20
commit a17949e730
104 changed files with 904 additions and 815 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/code_800E8EA0.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include "global.h"
void Actor_ContinueText(PlayState* play, Actor* actor, u16 textId) {
func_80151938(play, textId);
Message_ContinueTextbox(play, textId);
actor->textId = textId;
}
src/code/z_demo.c
+4 -4
View File
@@ -1035,7 +1035,7 @@ void Cutscene_Command_Textbox(PlayState* play, CutsceneContext* csCtx, CsCmdText
}
if (cmd->textId1 != 0xFFFF) {
func_80151938(play, cmd->textId1);
Message_ContinueTextbox(play, cmd->textId1);
if (cmd->type == CS_TEXTBOX_TYPE_3) {
D_801BB160 = CS_TEXTBOX_TYPE_3;
if (cmd->textId2 != 0xFFFF) {
@@ -1043,7 +1043,7 @@ void Cutscene_Command_Textbox(PlayState* play, CutsceneContext* csCtx, CsCmdText
}
}
} else {
func_801477B4(play);
Message_CloseTextbox(play);
csCtx->frames++;
}
} else {
@@ -1052,7 +1052,7 @@ void Cutscene_Command_Textbox(PlayState* play, CutsceneContext* csCtx, CsCmdText
}
if (cmd->textId2 != 0xFFFF) {
func_80151938(play, cmd->textId2);
Message_ContinueTextbox(play, cmd->textId2);
if (cmd->type == CS_TEXTBOX_TYPE_3) {
D_801BB160 = CS_TEXTBOX_TYPE_3;
if (cmd->textId1 != 0xFFFF) {
@@ -1060,7 +1060,7 @@ void Cutscene_Command_Textbox(PlayState* play, CutsceneContext* csCtx, CsCmdText
}
}
} else {
func_801477B4(play);
Message_CloseTextbox(play);
csCtx->frames++;
}
}
src/code/z_game_over.c
+1 -1
View File
@@ -23,7 +23,7 @@ void GameOver_Update(PlayState* play) {
switch (gameOverCtx->state) {
case GAMEOVER_DEATH_START:
func_801477B4(play);
Message_CloseTextbox(play);
for (timerId = 0; timerId < TIMER_ID_MAX; timerId++) {
gSaveContext.timerStates[timerId] = TIMER_STATE_OFF;
src/code/z_message.c
+3 -3
View File
@@ -99,7 +99,7 @@ s32 Message_ShouldAdvanceSilent(PlayState* play) {
}
}
void func_801477B4(PlayState* play) {
void Message_CloseTextbox(PlayState* play) {
MessageContext* msgCtx = &play->msgCtx;
if (play->msgCtx.msgLength != 0) {
@@ -309,7 +309,7 @@ void Message_StartTextbox(PlayState* play, u16 textId, Actor* Actor) {
play->msgCtx.ocarinaMode = 0;
}
void func_80151938(PlayState* play, u16 textId) {
void Message_ContinueTextbox(PlayState* play, u16 textId) {
MessageContext* msgCtx = &play->msgCtx;
InterfaceContext* interfaceCtx = &play->interfaceCtx;
@@ -395,7 +395,7 @@ u32 func_80151C9C(PlayState* play) {
SET_WEEKEVENTREG(D_801C6B28[msgCtx->unk120B2[msgCtx->unk120B1]]);
if ((D_801C6AB8[msgCtx->unk120B2[msgCtx->unk120B1]] != 0) && CHECK_QUEST_ITEM(QUEST_BOMBERS_NOTEBOOK)) {
func_80151938(play, D_801C6AB8[msgCtx->unk120B2[msgCtx->unk120B1]]);
Message_ContinueTextbox(play, D_801C6AB8[msgCtx->unk120B2[msgCtx->unk120B1]]);
play_sound(NA_SE_SY_SCHEDULE_WRITE);
return true;
}