izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07: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
docs/tutorial/advanced_control_flow.md
+46 -46
View File
@@ -113,7 +113,7 @@ void func_809529AC(EnMs* this, PlayState* play) {
void func_80952A1C(EnMs* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
func_80151938(play, 0x936U);
Message_ContinueTextbox(play, 0x936U);
this->actionFunc = func_809527F8;
} else {
func_800B8500(&this->actor, play, this->actor.xzDistToPlayer, this->actor.playerHeightRel, -1);
@@ -167,7 +167,7 @@ void func_809527F8(EnMs* this, PlayState* play) {
return;
}
if (Message_ShouldAdvance(play) != 0) {
func_801477B4(play);
Message_CloseTextbox(play);
Actor_OfferGetItem((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
this->actionFunc = func_809529AC;
return;
@@ -182,19 +182,19 @@ void func_809527F8(EnMs* this, PlayState* play) {
}
func_8019F230();
func_80151938(play, 0x934U);
Message_ContinueTextbox(play, 0x934U);
// Duplicate return node #17. Try simplifying control flow for better match
return;
}
func_801477B4(play);
Message_CloseTextbox(play);
if ((s32) gSaveContext.save.playerData.rupees < 0xA) {
play_sound(0x4806U);
func_80151938(play, 0x935U);
Message_ContinueTextbox(play, 0x935U);
return;
}
if ((s32) gSaveContext.save.inventory.ammo[gItemSlots[0xA]] >= 0x14) {
play_sound(0x4806U);
func_80151938(play, 0x937U);
Message_ContinueTextbox(play, 0x937U);
return;
}
func_8019F208();
@@ -256,7 +256,7 @@ block_5:
if (Message_ShouldAdvance(play) == 0) {
goto block_17;
}
func_801477B4(play);
Message_CloseTextbox(play);
Actor_OfferGetItem((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
this->actionFunc = func_809529AC;
return;
@@ -273,19 +273,19 @@ block_7:
}
goto block_16;
block_11:
func_801477B4(play);
Message_CloseTextbox(play);
if ((s32) gSaveContext.save.playerData.rupees >= 0xA) {
goto block_13;
}
play_sound(0x4806U);
func_80151938(play, 0x935U);
Message_ContinueTextbox(play, 0x935U);
return;
block_13:
if ((s32) gSaveContext.save.inventory.ammo[gItemSlots[0xA]] < 0x14) {
goto block_15;
}
play_sound(0x4806U);
func_80151938(play, 0x937U);
Message_ContinueTextbox(play, 0x937U);
return;
block_15:
func_8019F208();
@@ -295,7 +295,7 @@ block_15:
return;
block_16:
func_8019F230();
func_80151938(play, 0x934U);
Message_ContinueTextbox(play, 0x934U);
block_17:
return;
}
@@ -316,7 +316,7 @@ The simplest sort of block label to eliminate is one that is only used once, and
goto block_13;
}
play_sound(0x4806U);
func_80151938(play, 0x935U);
Message_ContinueTextbox(play, 0x935U);
return;
block_13:
```
@@ -326,7 +326,7 @@ Currently, this says to jump over the code block `play_sound...` if the conditio
```C
if (gSaveContext.save.playerData.rupees < 0xA) {
play_sound(0x4806U);
func_80151938(play, 0x935U);
Message_ContinueTextbox(play, 0x935U);
return;
}
```
@@ -359,7 +359,7 @@ block_5:
if (Message_ShouldAdvance(play) == 0) {
goto block_17;
}
func_801477B4(play);
Message_CloseTextbox(play);
Actor_OfferGetItem((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
this->actionFunc = func_809529AC;
return;
@@ -376,16 +376,16 @@ block_7:
}
goto block_16;
block_11:
func_801477B4(play);
Message_CloseTextbox(play);
if (gSaveContext.save.playerData.rupees < 0xA) {
play_sound(0x4806U);
func_80151938(play, 0x935U);
Message_ContinueTextbox(play, 0x935U);
return;
}
if (gSaveContext.save.inventory.ammo[gItemSlots[0xA]] >= 0x14) {
play_sound(0x4806U);
func_80151938(play, 0x937U);
Message_ContinueTextbox(play, 0x937U);
return;
}
@@ -396,7 +396,7 @@ block_11:
return;
block_16:
func_8019F230();
func_80151938(play, 0x934U);
Message_ContinueTextbox(play, 0x934U);
block_17:
return;
}
@@ -428,7 +428,7 @@ block_5:
if (Message_ShouldAdvance(play) == 0) {
return;
}
func_801477B4(play);
Message_CloseTextbox(play);
Actor_OfferGetItem((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
this->actionFunc = func_809529AC;
return;
@@ -445,16 +445,16 @@ block_7:
}
goto block_16;
block_11:
func_801477B4(play);
Message_CloseTextbox(play);
if (gSaveContext.save.playerData.rupees < 0xA) {
play_sound(0x4806U);
func_80151938(play, 0x935U);
Message_ContinueTextbox(play, 0x935U);
return;
}
if (gSaveContext.save.inventory.ammo[gItemSlots[0xA]] >= 0x14) {
play_sound(0x4806U);
func_80151938(play, 0x937U);
Message_ContinueTextbox(play, 0x937U);
return;
}
@@ -465,7 +465,7 @@ block_11:
return;
block_16:
func_8019F230();
func_80151938(play, 0x934U);
Message_ContinueTextbox(play, 0x934U);
}
```
@@ -495,16 +495,16 @@ So let us rewrite the entire second half as a switch:
```C
switch (play->msgCtx.choiceIndex) {
case 0:
func_801477B4(play);
Message_CloseTextbox(play);
if (gSaveContext.save.playerData.rupees < 0xA) {
play_sound(0x4806U);
func_80151938(play, 0x935U);
Message_ContinueTextbox(play, 0x935U);
return;
}
if (gSaveContext.save.inventory.ammo[gItemSlots[0xA]] >= 0x14) {
play_sound(0x4806U);
func_80151938(play, 0x937U);
Message_ContinueTextbox(play, 0x937U);
return;
}
@@ -518,7 +518,7 @@ So let us rewrite the entire second half as a switch:
case 1:
default:
func_8019F230();
func_80151938(play, 0x934U);
Message_ContinueTextbox(play, 0x934U);
break;
}
```
@@ -531,14 +531,14 @@ There's a couple of other obvious things here:
```C
switch (play->msgCtx.choiceIndex) {
case 0:
func_801477B4(play);
Message_CloseTextbox(play);
if (gSaveContext.save.playerData.rupees < 0xA) {
play_sound(0x4806U);
func_80151938(play, 0x935U);
Message_ContinueTextbox(play, 0x935U);
} else if (gSaveContext.save.inventory.ammo[gItemSlots[0xA]] >= 0x14) {
play_sound(0x4806U);
func_80151938(play, 0x937U);
Message_ContinueTextbox(play, 0x937U);
} else {
func_8019F208();
Actor_OfferGetItem((Actor *) this, play, 0x35, 90.0f, 10.0f);
@@ -550,7 +550,7 @@ There's a couple of other obvious things here:
case 1:
default:
func_8019F230();
func_80151938(play, 0x934U);
Message_ContinueTextbox(play, 0x934U);
break;
}
```
@@ -588,7 +588,7 @@ block_5:
if (Message_ShouldAdvance(play) == 0) {
return;
}
func_801477B4(play);
Message_CloseTextbox(play);
Actor_OfferGetItem((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
this->actionFunc = func_809529AC;
return;
@@ -596,14 +596,14 @@ block_7:
if (Message_ShouldAdvance(play) != 0) {
switch (play->msgCtx.choiceIndex) {
case 0:
func_801477B4(play);
Message_CloseTextbox(play);
if (gSaveContext.save.playerData.rupees < 0xA) {
play_sound(0x4806U);
func_80151938(play, 0x935U);
Message_ContinueTextbox(play, 0x935U);
} else if (gSaveContext.save.inventory.ammo[gItemSlots[0xA]] >= 0x14) {
play_sound(0x4806U);
func_80151938(play, 0x937U);
Message_ContinueTextbox(play, 0x937U);
} else {
func_8019F208();
Actor_OfferGetItem((Actor *) this, play, 0x35, 90.0f, 10.0f);
@@ -615,7 +615,7 @@ block_7:
case 1:
default:
func_8019F230();
func_80151938(play, 0x934U);
Message_ContinueTextbox(play, 0x934U);
break;
}
}
@@ -652,7 +652,7 @@ void func_809527F8(EnMs* this, PlayState* play) {
if (Message_ShouldAdvance(play) == 0) {
return;
}
func_801477B4(play);
Message_CloseTextbox(play);
Actor_OfferGetItem((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
this->actionFunc = func_809529AC;
break;
@@ -661,14 +661,14 @@ void func_809527F8(EnMs* this, PlayState* play) {
if (Message_ShouldAdvance(play) != 0) {
switch (play->msgCtx.choiceIndex) {
case 0:
func_801477B4(play);
Message_CloseTextbox(play);
if (gSaveContext.save.playerData.rupees < 0xA) {
play_sound(0x4806U);
func_80151938(play, 0x935U);
Message_ContinueTextbox(play, 0x935U);
} else if (gSaveContext.save.inventory.ammo[gItemSlots[0xA]] >= 0x14) {
play_sound(0x4806U);
func_80151938(play, 0x937U);
Message_ContinueTextbox(play, 0x937U);
} else {
func_8019F208();
Actor_OfferGetItem((Actor *) this, play, 0x35, 90.0f, 10.0f);
@@ -680,7 +680,7 @@ void func_809527F8(EnMs* this, PlayState* play) {
case 1:
default:
func_8019F230();
func_80151938(play, 0x934U);
Message_ContinueTextbox(play, 0x934U);
break;
}
}
@@ -703,7 +703,7 @@ void func_809527F8(EnMs* this, PlayState* play) {
case 5:
if (Message_ShouldAdvance(play) != 0) {
func_801477B4(play);
Message_CloseTextbox(play);
Actor_OfferGetItem((Actor *) this, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
this->actionFunc = func_809529AC;
}
@@ -713,14 +713,14 @@ void func_809527F8(EnMs* this, PlayState* play) {
if (Message_ShouldAdvance(play) != 0) {
switch (play->msgCtx.choiceIndex) {
case 0:
func_801477B4(play);
Message_CloseTextbox(play);
if (gSaveContext.save.playerData.rupees < 0xA) {
play_sound(0x4806U);
func_80151938(play, 0x935U);
Message_ContinueTextbox(play, 0x935U);
} else if (gSaveContext.save.inventory.ammo[gItemSlots[0xA]] >= 0x14) {
play_sound(0x4806U);
func_80151938(play, 0x937U);
Message_ContinueTextbox(play, 0x937U);
} else {
func_8019F208();
Actor_OfferGetItem((Actor *) this, play, 0x35, 90.0f, 10.0f);
@@ -732,7 +732,7 @@ void func_809527F8(EnMs* this, PlayState* play) {
case 1:
default:
func_8019F230();
func_80151938(play, 0x934U);
Message_ContinueTextbox(play, 0x934U);
break;
}
}
docs/tutorial/documenting.md
+2 -2
View File
@@ -203,7 +203,7 @@ void func_80C102D4(EnRecepgirl* this, PlayState* play) {
this->actor.textId = 0x2AE0;
}
}
func_80151938(play, this->actor.textId);
Message_ContinueTextbox(play, this->actor.textId);
}
}
@@ -540,7 +540,7 @@ void func_80C102D4(EnRecepgirl* this, PlayState* play) {
this->actor.textId = 0x2AE0; // drawing room on the right, don't go in without an appointment
}
}
func_80151938(play, this->actor.textId);
Message_ContinueTextbox(play, this->actor.textId);
}
}
```
docs/tutorial/other_functions.md
+2 -2
View File
@@ -334,7 +334,7 @@ void func_80C102D4(EnRecepgirl* this, PlayState* play) {
this->actor.textId = 0x2AE0;
}
}
func_80151938(play, this->actor.textId);
Message_ContinueTextbox(play, this->actor.textId);
}
}
```
@@ -392,7 +392,7 @@ void func_80C102D4(EnRecepgirl* this, PlayState* play) {
this->actor.textId = 0x2AE0;
}
}
func_80151938(play, this->actor.textId);
Message_ContinueTextbox(play, this->actor.textId);
}
}
```
include/functions.h
+2 -2
View File
@@ -2146,7 +2146,7 @@ void func_80142100(void* arg0, Gfx** gfx, u32 arg2);
void func_80147564(PlayState* play);
s32 Message_ShouldAdvance(PlayState* play);
s32 Message_ShouldAdvanceSilent(PlayState* play);
void func_801477B4(PlayState* play);
void Message_CloseTextbox(PlayState* play);
void func_80147818(PlayState* play, UNK_PTR puParm2, UNK_TYPE4 uParm3, UNK_TYPE4 uParm4);
// void func_80147F18(PlayState* play, UNK_PTR puParm2, UNK_TYPE4 uParm3, UNK_TYPE4 uParm4);
// void func_80148558(PlayState* play, UNK_PTR puParm2, UNK_TYPE4 uParm3, UNK_TYPE4 uParm4);
@@ -2175,7 +2175,7 @@ void func_80150A84(PlayState* play);
void func_80150D08(PlayState* play, u32 uParm2);
void func_801514B0(PlayState* play, u16 arg1, u8 arg2);
void Message_StartTextbox(PlayState* play, u16 textId, Actor* Actor);
void func_80151938(PlayState* play, u16 textId);
void Message_ContinueTextbox(PlayState* play, u16 textId);
void func_80151A68(PlayState* play, u16 textId);
void func_80151BB4(PlayState* play, u8 arg1);
// void func_80151C9C(void);
include/macros.h
+1 -1
View File
@@ -47,9 +47,9 @@
#define CLOCK_TIME_MINUTE (CLOCK_TIME(0, 1))
#define DAY_LENGTH (CLOCK_TIME(24, 0))
#define TIME_TO_HOURS_F(time) ((time) * (24.0f / 0x10000))
#define TIME_TO_MINUTES_F(time) ((time) * ((24.0f * 60.0f) / 0x10000)) // 0.021972656f
#define TIME_TO_MINUTES_ALT_F(time) ((time) / (0x10000 / (24.0f * 60.0f)))
#define TIME_TO_SECONDS_F(time) ((time) * ((24.0f * 60.0f * 60.0f) / 0x10000))
#define CLOCK_TIME_F(hr, min) (((hr) * 60.0f + (min)) * (0x10000 / (24.0f * 60.0f)))
include/z64message.h
+1 -1
View File
@@ -67,7 +67,7 @@ typedef struct MessageContext {
/* 0x00168 */ Font font;
/* 0x11EF8 */ UNK_PTR unk11EF8;
/* 0x11EFC */ UNK_TYPE1 unk11EFC[0x4];
/* 0x11F00 */ struct OcarinaStaff* unk11F00;
/* 0x11F00 */ struct OcarinaStaff* ocarinaStaff;
/* 0x11F04 */ u16 currentTextId;
/* 0x11F06 */ UNK_TYPE1 unk11F06[0x2];
/* 0x11F08 */ u16 unk11F08;
include/z64save.h
+9 -2
View File
@@ -580,7 +580,10 @@ typedef enum SunsSongState {
#define WEEKEVENTREG_08_08 PACK_WEEKEVENTREG_FLAG(8, 0x08)
#define WEEKEVENTREG_08_10 PACK_WEEKEVENTREG_FLAG(8, 0x10)
#define WEEKEVENTREG_08_20 PACK_WEEKEVENTREG_FLAG(8, 0x20)
// Related to final hours
#define WEEKEVENTREG_08_40 PACK_WEEKEVENTREG_FLAG(8, 0x40)
#define WEEKEVENTREG_08_80 PACK_WEEKEVENTREG_FLAG(8, 0x80)
#define WEEKEVENTREG_09_01 PACK_WEEKEVENTREG_FLAG(9, 0x01)
#define WEEKEVENTREG_09_02 PACK_WEEKEVENTREG_FLAG(9, 0x02)
@@ -1090,8 +1093,12 @@ typedef enum SunsSongState {
#define WEEKEVENTREG_62_20 PACK_WEEKEVENTREG_FLAG(62, 0x20)
#define WEEKEVENTREG_62_40 PACK_WEEKEVENTREG_FLAG(62, 0x40)
#define WEEKEVENTREG_62_80 PACK_WEEKEVENTREG_FLAG(62, 0x80)
#define WEEKEVENTREG_63_01 PACK_WEEKEVENTREG_FLAG(63, 0x01)
#define WEEKEVENTREG_63_02 PACK_WEEKEVENTREG_FLAG(63, 0x02)
// See `EnTimeTag_KickOut_WaitForTime` and `EnTimeTag_KickOut_WaitForTrigger`
#define WEEKEVENTREG_KICKOUT_WAIT PACK_WEEKEVENTREG_FLAG(63, 0x01)
// See `EnTimeTag_KickOut_WaitForTime` and `EnTimeTag_KickOut_WaitForTrigger`
#define WEEKEVENTREG_KICKOUT_TIME_PASSED PACK_WEEKEVENTREG_FLAG(63, 0x02)
#define WEEKEVENTREG_63_04 PACK_WEEKEVENTREG_FLAG(63, 0x04)
#define WEEKEVENTREG_63_08 PACK_WEEKEVENTREG_FLAG(63, 0x08)
#define WEEKEVENTREG_63_10 PACK_WEEKEVENTREG_FLAG(63, 0x10)
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;
}
src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
+3 -3
View File
@@ -276,7 +276,7 @@ void func_809543D4(BgIngate* this, PlayState* play) {
switch (this->dyna.actor.textId) {
case 0x9E4:
this->dyna.actor.textId = 0x9E5;
func_80151938(play, this->dyna.actor.textId);
Message_ContinueTextbox(play, this->dyna.actor.textId);
break;
case 0x9E5:
if (play->msgCtx.choiceIndex == 0) {
@@ -293,7 +293,7 @@ void func_809543D4(BgIngate* this, PlayState* play) {
CLEAR_WEEKEVENTREG(WEEKEVENTREG_90_40);
func_8019F230();
}
func_801477B4(play);
Message_CloseTextbox(play);
break;
case 0x9E6:
if (play->msgCtx.choiceIndex == 0) {
@@ -307,7 +307,7 @@ void func_809543D4(BgIngate* this, PlayState* play) {
Environment_StartTime();
func_8019F230();
}
func_801477B4(play);
Message_CloseTextbox(play);
break;
}
}
src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
+1 -1
View File
@@ -422,7 +422,7 @@ void func_80AAFCCC(DmChar08* this, PlayState* play) {
case 2:
if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) {
func_801477B4(play);
Message_CloseTextbox(play);
this->unk_206 = 0;
}
break;
src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+1 -1
View File
@@ -358,7 +358,7 @@ void func_808B93A0(DoorWarp1* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) && Message_ShouldAdvance(play)) {
func_801477B4(play);
Message_CloseTextbox(play);
if (play->msgCtx.choiceIndex == 0) {
func_8019F208();
func_800B7298(play, &this->dyna.actor, PLAYER_CSMODE_9);
src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c
+2 -2
View File
@@ -1084,10 +1084,10 @@ void func_80BEE73C(EnAkindonuts* this, PlayState* play) {
this->unk_33C = player->actor.textId;
this->actionFunc = func_80BEF18C;
}
func_801477B4(play);
Message_CloseTextbox(play);
} else if (itemAction <= PLAYER_IA_MINUS1) {
this->unk_33C = D_80BF04AC[params];
func_80151938(play, this->unk_33C);
Message_ContinueTextbox(play, this->unk_33C);
this->actionFunc = func_80BEF18C;
}
}
src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
+12 -12
View File
@@ -414,8 +414,8 @@ void func_809C16DC(EnAob01* this, PlayState* play) {
void func_809C1C9C(EnAob01* this, PlayState* play) {
if (gSaveContext.rupeeAccumulator == 0) {
SET_WEEKEVENTREG(WEEKEVENTREG_63_01);
CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02);
SET_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT);
CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED);
this->unk_2D2 |= 0x20;
func_800FD750(0x40);
play->nextEntrance = ENTRANCE(DOGGY_RACETRACK, 1);
@@ -781,12 +781,12 @@ void func_809C2BE4(EnAob01* this, PlayState* play) {
u8 talkState = Message_GetState(&play->msgCtx);
if (((talkState == TEXT_STATE_5) || (talkState == TEXT_STATE_DONE)) && Message_ShouldAdvance(play)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_63_02)) {
CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02);
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED)) {
CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED);
}
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_63_01)) {
CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_01);
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT)) {
CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT);
}
this->unk_210 = 0;
@@ -799,7 +799,7 @@ void func_809C2BE4(EnAob01* this, PlayState* play) {
void func_809C2C9C(EnAob01* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
this->unk_210 = 0x354C;
func_80151938(play, this->unk_210);
Message_ContinueTextbox(play, this->unk_210);
this->actionFunc = func_809C1D64;
} else {
func_800B85E0(&this->actor, play, 400.0f, PLAYER_IA_MINUS1);
@@ -835,12 +835,12 @@ void func_809C2D0C(EnAob01* this, PlayState* play) {
this->unk_434 = 0;
this->actor.shape.rot.y = this->actor.world.rot.y;
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_63_02)) {
CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02);
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED)) {
CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED);
}
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_63_01)) {
CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_01);
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT)) {
CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT);
}
this->unk_210 = 0x354C;
@@ -969,7 +969,7 @@ void EnAob01_Destroy(Actor* thisx, PlayState* play) {
EnAob01* this = THIS;
if (!(this->unk_2D2 & 0x20)) {
CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_01);
CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT);
}
Collider_DestroyCylinder(play, &this->collider);
}
src/overlays/actors/ovl_En_Az/z_en_az.c
+3 -3
View File
@@ -1293,7 +1293,7 @@ void func_80A97410(EnAz* this, PlayState* play) {
}
}
if (this->unk_378 == 3) {
func_80151938(play, this->actor.textId);
Message_ContinueTextbox(play, this->actor.textId);
this->unk_378 = 2;
} else if (this->unk_378 == 5) {
Message_StartTextbox(play, this->actor.textId, &this->actor);
@@ -1420,7 +1420,7 @@ void func_80A97AB4(EnAz* this, PlayState* play) {
if (Message_ShouldAdvance(play)) {
switch (play->msgCtx.currentTextId) {
case 0x10D7:
func_80151938(play, 0x10D8);
Message_ContinueTextbox(play, 0x10D8);
break;
case 0x10D8:
if (play->msgCtx.choiceIndex == 0) {
@@ -1434,7 +1434,7 @@ void func_80A97AB4(EnAz* this, PlayState* play) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_24_04)) {
CLEAR_WEEKEVENTREG(WEEKEVENTREG_24_04);
}
func_80151938(play, 0x10D9);
Message_ContinueTextbox(play, 0x10D9);
}
break;
case 0x10D9:
src/overlays/actors/ovl_En_Baisen/z_en_baisen.c
+2 -2
View File
@@ -221,10 +221,10 @@ void func_80BE8AAC(EnBaisen* this, PlayState* play) {
}
}
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) {
func_801477B4(play);
Message_CloseTextbox(play);
this->textIdIndex++;
if (this->textIdIndex < 6) {
func_80151938(play, sTextIds[this->textIdIndex]);
Message_ContinueTextbox(play, sTextIds[this->textIdIndex]);
if ((this->textIdIndex % 2) == 0) {
this->unk2A4 = this->heishiPointer;
} else {
src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
+11 -11
View File
@@ -208,21 +208,21 @@ void EnBji01_DialogueHandler(EnBji01* this, PlayState* play) {
switch (play->msgCtx.choiceIndex) {
case 0:
func_8019F208();
func_801477B4(play);
Message_CloseTextbox(play);
func_809CD634(this, play);
break;
case 1:
func_8019F230();
switch (gSaveContext.save.playerForm) {
case PLAYER_FORM_DEKU:
func_80151938(play, 0x5F0);
Message_ContinueTextbox(play, 0x5F0);
break;
case PLAYER_FORM_HUMAN:
func_80151938(play, 0x5F8);
Message_ContinueTextbox(play, 0x5F8);
break;
case PLAYER_FORM_GORON:
case PLAYER_FORM_ZORA:
func_80151938(play, 0x5E1);
Message_ContinueTextbox(play, 0x5E1);
break;
}
break;
@@ -235,16 +235,16 @@ void EnBji01_DialogueHandler(EnBji01* this, PlayState* play) {
switch (play->msgCtx.currentTextId) {
case 0x5DE:
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationInfo, 3, &this->animIndex);
func_80151938(play, 0x5DF);
Message_ContinueTextbox(play, 0x5DF);
break;
case 0x5E4:
func_80151938(play, 0x5E7);
Message_ContinueTextbox(play, 0x5E7);
break;
case 0x5E5:
func_80151938(play, 0x5E0);
Message_ContinueTextbox(play, 0x5E0);
break;
case 0x5E7:
func_80151938(play, 0x5E5);
Message_ContinueTextbox(play, 0x5E5);
break;
case 0x5DC:
case 0x5DD:
@@ -254,11 +254,11 @@ void EnBji01_DialogueHandler(EnBji01* this, PlayState* play) {
case 0x5EE:
case 0x5F2:
case 0x5F5:
func_80151938(play, play->msgCtx.currentTextId + 1);
Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1);
break;
case 0x5F0:
case 0x5F6:
func_80151938(play, 0x5EF);
Message_ContinueTextbox(play, 0x5EF);
break;
case 0x5E1:
case 0x5E8:
@@ -270,7 +270,7 @@ void EnBji01_DialogueHandler(EnBji01* this, PlayState* play) {
case 0x5F4:
case 0x5F7:
case 0x5F8:
func_801477B4(play);
Message_CloseTextbox(play);
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.params = SHIKASHI_TYPE_FINISHED_CONVERSATION;
func_809CCE98(this, play);
src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
+6 -6
View File
@@ -242,7 +242,7 @@ void func_809C4DA4(EnBomBowlMan* this, PlayState* play) {
s32 pad;
s32 sp28 = false;
func_801477B4(play);
Message_CloseTextbox(play);
switch (this->unk_2C0) {
case 0:
@@ -319,9 +319,9 @@ void func_809C4DA4(EnBomBowlMan* this, PlayState* play) {
if (!sp28) {
if (player->transformation == PLAYER_FORM_HUMAN) {
func_80151938(play, D_809C618C[this->unk_2C0]);
Message_ContinueTextbox(play, D_809C618C[this->unk_2C0]);
} else {
func_80151938(play, D_809C6198[this->unk_2C0]);
Message_ContinueTextbox(play, D_809C6198[this->unk_2C0]);
}
}
}
@@ -411,7 +411,7 @@ void func_809C5524(EnBomBowlMan* this, PlayState* play) {
void func_809C5598(EnBomBowlMan* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) {
func_801477B4(play);
Message_CloseTextbox(play);
if ((this->actor.textId == 0x72F) || (this->actor.textId == 0x730)) {
this->actor.textId = 0x731;
} else if (this->actor.textId == 0x731) {
@@ -439,7 +439,7 @@ void func_809C5598(EnBomBowlMan* this, PlayState* play) {
this->actionFunc = func_809C5738;
return;
}
func_80151938(play, this->actor.textId);
Message_ContinueTextbox(play, this->actor.textId);
}
}
@@ -579,7 +579,7 @@ void func_809C5BF4(EnBomBowlMan* this, PlayState* play) {
if (D_809C6100 > 5) {
Player* player = GET_PLAYER(play);
func_801477B4(play);
Message_CloseTextbox(play);
Camera_SetTargetActor(subCam, &this->unk_2D8[0]->actor);
func_809C493C(this, 13, 1.0f);
D_809C6100 = 0;

Some files were not shown because too many files have changed in this diff Show More