diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-03-16 13:47:38 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-16 13:47:38 +1100 |
| commit | a17949e73077541437e05d42faed7ed44f5f6fce (patch) | |
| tree | 7e3f23e5e08b2adef2061865eeb50e233c692d10 /src/code | |
| parent | 2987390a2033a8a48b4f1af4a1e58205c32e4471 (diff) | |
Document z_en_time_tag (#1140)
* 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
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/code_800E8EA0.c | 2 | ||||
| -rw-r--r-- | src/code/z_demo.c | 8 | ||||
| -rw-r--r-- | src/code/z_game_over.c | 2 | ||||
| -rw-r--r-- | src/code/z_message.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/code/code_800E8EA0.c b/src/code/code_800E8EA0.c index 7485f2d3a..93970cc6a 100644 --- a/src/code/code_800E8EA0.c +++ b/src/code/code_800E8EA0.c @@ -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; } diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 7d0c1ade3..c3e3ecff0 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -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++; } } diff --git a/src/code/z_game_over.c b/src/code/z_game_over.c index 1e87a6a17..ec5d3b05c 100644 --- a/src/code/z_game_over.c +++ b/src/code/z_game_over.c @@ -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; diff --git a/src/code/z_message.c b/src/code/z_message.c index 97db5e72d..cc1e0c876 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -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; } |
